commit e7fccf66ea1639a8f98b3da8591233a735a3296d
Author: Qais Patankar <qaisjp@gmail.com>
Date: Mon Nov 30 05:57:16 2020 +0000
Remove WebhookURL support (discord)
diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 1a3af92..78c579a 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -4314 +437 @@ func New(cfg *bridge.Config) bridge.Bridger {
b.nickMemberMap = make(map[string]*discordgo.Member)
b.channelInfoMap = make(map[string]*config.ChannelInfo)
- // If WebhookURL is set to anything, we assume preference for autoWebhooks
- //
- // Legacy note: WebhookURL used to have an actual webhook URL that we would edit,
- // but we stopped doing that due to Discord making rate limits more aggressive.
- //
- // We're keeping the same setting for now, and we will late deprecate this setting
- // in favour of a new setting, something like "AutoWebhooks=true"
- b.useAutoWebhooks = b.GetString("WebhookURL") != ""
+ b.useAutoWebhooks = b.GetBool("AutoWebhooks")
if b.useAutoWebhooks {
b.Log.Debug("Using automatic webhooks")
}
@@ -1476 +14019 @@ func (b *Bdiscord) Connect() error {
return err
}
+ // Legacy note: WebhookURL used to have an actual webhook URL that we would edit,
+ // but we stopped doing that due to Discord making rate limits more aggressive.
+ //
+ // Even older: the same WebhookURL used to be used by every channel, which is usually unexpected.
+ // This is no longer possible.
+ if b.GetString("WebhookURL") != "" {
+ message := "The global WebhookURL setting has been removed. "
+ message += "You can get similar \"webhook editing\" behaviour by replacing this line with `AutoWebhooks=true`. "
+ message += "If you rely on the old-OLD (non-editing) behaviour, can move the WebhookURL to specific channel sections."
+ b.Log.Errorln(message)
+ return fmt.Errorf("use of removed WebhookURL setting")
+ }
+
// Initialise webhook management
b.transmitter = transmitter.New(b.c, b.guildID, "matterbridge", b.useAutoWebhooks)
b.transmitter.Log = b.Log
diff --git a/bridge/discord/transmitter/transmitter.go b/bridge/discord/transmitter/transmitter.go
index 41ed055..e6d52a9 100644
--- a/bridge/discord/transmitter/transmitter.go
+++ b/bridge/discord/transmitter/transmitter.go
@@ -1117 +1117 @@ func (t *Transmitter) HasWebhook(id string) bool {
}
// AddWebhook allows you to register a channel's webhook with the transmitter.
-func (t *Transmitter) AddWebhook(channelID string, webhook *discordgo.Webhook) (replaced bool) {
+func (t *Transmitter) AddWebhook(channelID string, webhook *discordgo.Webhook) bool {
t.Log.Debugf("Manually added webhook %#v to channel %#v", webhook.ID, channelID)
t.mutex.Lock()
defer t.mutex.Unlock()
