diff --git a/app/http/endpoints/api/whitelabel/whitelabelcreateinteractions.go b/app/http/endpoints/api/whitelabel/whitelabelcreateinteractions.go index fe1831d..f1e03e6 100644 --- a/app/http/endpoints/api/whitelabel/whitelabelcreateinteractions.go +++ b/app/http/endpoints/api/whitelabel/whitelabelcreateinteractions.go @@ -19,7 +19,6 @@ func GetWhitelabelCreateInteractions() func(*gin.Context) { cm.RegisterCommands() return func(ctx *gin.Context) { - userId := ctx.Keys["userid"].(uint64) // Get bot @@ -92,11 +91,16 @@ func GetWhitelabelCreateInteractions() func(*gin.Context) { option := admin.BuildOption(cmd) + var description string + if properties.Type == interaction.ApplicationCommandTypeChatInput { + description = option.Description + } + data := rest.CreateCommandData{ Name: option.Name, - Description: option.Description, + Description: description, Options: option.Options, - Type: interaction.ApplicationCommandTypeChatInput, + Type: properties.Type, } interactions = append(interactions, data) diff --git a/app/http/server.go b/app/http/server.go index c3b7b6c..a453903 100644 --- a/app/http/server.go +++ b/app/http/server.go @@ -45,6 +45,7 @@ func StartServer() { router.Use(sentrygin.New(sentrygin.Options{})) // Defaults are ok router.Use(rl(middleware.RateLimitTypeIp, 60, time.Minute)) + router.Use(rl(middleware.RateLimitTypeIp, 20, time.Second*10)) router.Use(rl(middleware.RateLimitTypeUser, 60, time.Minute)) router.Use(rl(middleware.RateLimitTypeGuild, 600, time.Minute*5)) @@ -120,7 +121,7 @@ func StartServer() { guildAuthApiAdmin.POST("/autoclose", api_autoclose.PostAutoClose) guildAuthApiAdmin.GET("/team", api_team.GetTeams) - guildAuthApiAdmin.GET("/team/:teamid", rl(middleware.RateLimitTypeUser ,10, time.Second*30), api_team.GetMembers) + guildAuthApiAdmin.GET("/team/:teamid", rl(middleware.RateLimitTypeUser, 10, time.Second*30), api_team.GetMembers) guildAuthApiAdmin.POST("/team", rl(middleware.RateLimitTypeUser, 10, time.Minute), api_team.CreateTeam) guildAuthApiAdmin.PUT("/team/:teamid/:snowflake", rl(middleware.RateLimitTypeGuild, 5, time.Second*10), api_team.AddMember) guildAuthApiAdmin.DELETE("/team/:teamid", api_team.DeleteTeam) diff --git a/frontend/src/components/manage/SettingsCard.svelte b/frontend/src/components/manage/SettingsCard.svelte index 59b2c07..c6c1ae6 100644 --- a/frontend/src/components/manage/SettingsCard.svelte +++ b/frontend/src/components/manage/SettingsCard.svelte @@ -34,8 +34,9 @@ - - + +
@@ -63,7 +64,6 @@ import Button from "../Button.svelte"; import NamingScheme from "../NamingScheme.svelte"; import Dropdown from "../form/Dropdown.svelte"; - import PanelDropdown from "../PanelDropdown.svelte"; import SimplePanelDropdown from "../SimplePanelDropdown.svelte"; export let guildId; @@ -101,15 +101,14 @@ async function updateSettings() { // Svelte hack - let mapped = Object.fromEntries(Object.entries(data).map(([k,v]) => { - if(v === "null") { + let mapped = Object.fromEntries(Object.entries(data).map(([k, v]) => { + if (v === "null") { return [k, null]; } else { - return [k,v]; + return [k, v]; } })); - const res = await axios.post(`${API_URL}/api/${guildId}/settings`, mapped); if (res.status === 200) { if (showValidations(res.data)) { @@ -215,6 +214,8 @@ .from-message-settings { border-top: 1px solid rgba(0, 0, 0, .25); + margin-top: 25px; + padding-top: 10px; } @media only screen and (max-width: 950px) { diff --git a/go.mod b/go.mod index 46bf373..17dfc21 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/TicketsBot/archiverclient v0.0.0-20210220155137-a562b2f1bbbb github.com/TicketsBot/common v0.0.0-20210903095620-eb02b87cb4ca github.com/TicketsBot/database v0.0.0-20210903140813-152a2383314c - github.com/TicketsBot/worker v0.0.0-20210903100019-6e6eab3a3196 + github.com/TicketsBot/worker v0.0.0-20210904102739-4fb249194842 github.com/apex/log v1.1.2 github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect github.com/getsentry/sentry-go v0.11.0 @@ -25,6 +25,5 @@ require ( github.com/pkg/errors v0.9.1 github.com/rxdn/gdl v0.0.0-20210903095530-5a1c35525d2a github.com/sirupsen/logrus v1.5.0 - github.com/ulule/limiter/v3 v3.5.0 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 ) diff --git a/locale b/locale index 2d5a1b6..e21b732 160000 --- a/locale +++ b/locale @@ -1 +1 @@ -Subproject commit 2d5a1b686f1ea19a14968c424c4bb177b93c4e06 +Subproject commit e21b73209a122b7feb5c8672c34b73d0a7f6ab03