scout_ante/dashboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix slash command creation

Browse Source
This commit is contained in:
rxdn 2021-09-04 12:47:16 +01:00
parent 734ca2567a
commit b33caae987
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/http/endpoints/api/whitelabel/whitelabelcreateinteractions.go
View File

@ -19,7 +19,6 @@ func GetWhitelabelCreateInteractions() func(*gin.Context) {
cm.RegisterCommands() cm.RegisterCommands()
return func(ctx *gin.Context) { return func(ctx *gin.Context) {
userId := ctx.Keys["userid"].(uint64) userId := ctx.Keys["userid"].(uint64)
// Get bot // Get bot
@ -92,11 +91,16 @@ func GetWhitelabelCreateInteractions() func(*gin.Context) {
option := admin.BuildOption(cmd) option := admin.BuildOption(cmd)
var description string
if properties.Type == interaction.ApplicationCommandTypeChatInput {
description = option.Description
}
data := rest.CreateCommandData{ data := rest.CreateCommandData{
Name: option.Name, Name: option.Name,
Description: option.Description, Description: description,
Options: option.Options, Options: option.Options,
Type: interaction.ApplicationCommandTypeChatInput, Type: properties.Type,
} }
interactions = append(interactions, data) interactions = append(interactions, data)

1
app/http/server.go
View File

@ -45,6 +45,7 @@ func StartServer() {
router.Use(sentrygin.New(sentrygin.Options{})) // Defaults are ok router.Use(sentrygin.New(sentrygin.Options{})) // Defaults are ok
router.Use(rl(middleware.RateLimitTypeIp, 60, time.Minute)) 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.RateLimitTypeUser, 60, time.Minute))
router.Use(rl(middleware.RateLimitTypeGuild, 600, time.Minute*5)) router.Use(rl(middleware.RateLimitTypeGuild, 600, time.Minute*5))

7
frontend/src/components/manage/SettingsCard.svelte
View File

@ -35,7 +35,8 @@
</Dropdown> </Dropdown>
<Checkbox label="Add Message Sender To Ticket" col3={true} bind:value={data.context_menu_add_sender}/> <Checkbox label="Add Message Sender To Ticket" col3={true} bind:value={data.context_menu_add_sender}/>
<SimplePanelDropdown label="Use Settings From Panel" col3={true} allowNone={true} bind:panels bind:value={data.context_menu_panel} /> <SimplePanelDropdown label="Use Settings From Panel" col3={true} allowNone={true} bind:panels
bind:value={data.context_menu_panel}/>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -63,7 +64,6 @@
import Button from "../Button.svelte"; import Button from "../Button.svelte";
import NamingScheme from "../NamingScheme.svelte"; import NamingScheme from "../NamingScheme.svelte";
import Dropdown from "../form/Dropdown.svelte"; import Dropdown from "../form/Dropdown.svelte";
import PanelDropdown from "../PanelDropdown.svelte";
import SimplePanelDropdown from "../SimplePanelDropdown.svelte"; import SimplePanelDropdown from "../SimplePanelDropdown.svelte";
export let guildId; export let guildId;
@ -109,7 +109,6 @@
} }
})); }));
const res = await axios.post(`${API_URL}/api/${guildId}/settings`, mapped); const res = await axios.post(`${API_URL}/api/${guildId}/settings`, mapped);
if (res.status === 200) { if (res.status === 200) {
if (showValidations(res.data)) { if (showValidations(res.data)) {
@ -215,6 +214,8 @@
.from-message-settings { .from-message-settings {
border-top: 1px solid rgba(0, 0, 0, .25); border-top: 1px solid rgba(0, 0, 0, .25);
margin-top: 25px;
padding-top: 10px;
} }
@media only screen and (max-width: 950px) { @media only screen and (max-width: 950px) {

3
go.mod
View File

@ -7,7 +7,7 @@ require (
github.com/TicketsBot/archiverclient v0.0.0-20210220155137-a562b2f1bbbb github.com/TicketsBot/archiverclient v0.0.0-20210220155137-a562b2f1bbbb
github.com/TicketsBot/common v0.0.0-20210903095620-eb02b87cb4ca github.com/TicketsBot/common v0.0.0-20210903095620-eb02b87cb4ca
github.com/TicketsBot/database v0.0.0-20210903140813-152a2383314c 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/apex/log v1.1.2
github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect
github.com/getsentry/sentry-go v0.11.0 github.com/getsentry/sentry-go v0.11.0
@ -25,6 +25,5 @@ require (
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/rxdn/gdl v0.0.0-20210903095530-5a1c35525d2a github.com/rxdn/gdl v0.0.0-20210903095530-5a1c35525d2a
github.com/sirupsen/logrus v1.5.0 github.com/sirupsen/logrus v1.5.0
github.com/ulule/limiter/v3 v3.5.0
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
) )

2
locale

@ -1 +1 @@
Subproject commit 2d5a1b686f1ea19a14968c424c4bb177b93c4e06 Subproject commit e21b73209a122b7feb5c8672c34b73d0a7f6ab03