Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't allow overriding set-relay without unsetting first

Browse Source
This commit is contained in:
Tulir Asokan
2023-03-04 14:17:23 +02:00
parent 3c52e76e15
commit 4e9e50dbed
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
commands.go
View File

@@ -426,14 +426,23 @@ func fnSetRelay(ce *WrappedCommandEvent) {
ce.Reply("You must either run the command in a portal, or specify an internal room ID as the first parameter") ce.Reply("You must either run the command in a portal, or specify an internal room ID as the first parameter")
return return
} }
if ce.Portal.GuildID == "" { log := ce.ZLog.With().Str("channel_id", portal.Key.ChannelID).Logger()
if portal.GuildID == "" {
ce.Reply("Only guild channels can have relays") ce.Reply("Only guild channels can have relays")
return return
} else if portal.RelayWebhookID != "" {
webhookMeta, err := relayClient.WebhookWithToken(portal.RelayWebhookID, portal.RelayWebhookSecret)
if err != nil {
log.Warn().Err(err).Msg("Failed to get existing webhook info")
ce.Reply("This channel has a relay webhook set, but getting its info failed: %v", err)
return
}
ce.Reply("This channel already has a relay webhook %s (%s)", webhookMeta.Name, webhookMeta.ID)
return
} else if len(ce.Args) == 0 { } else if len(ce.Args) == 0 {
ce.Reply(selectRelayHelp) ce.Reply(selectRelayHelp)
return return
} }
log := ce.ZLog.With().Str("channel_id", portal.Key.ChannelID).Logger()
createType := strings.ToLower(strings.TrimLeft(ce.Args[0], "-")) createType := strings.ToLower(strings.TrimLeft(ce.Args[0], "-"))
var webhookMeta *discordgo.Webhook var webhookMeta *discordgo.Webhook
switch createType { switch createType {