summaryrefslogtreecommitdiffstats
path: root/bridge/discord/discord.go
diff options
context:
space:
mode:
authorAlexandre GV <contact@alexandregv.fr>2021-05-13 22:39:25 +0200
committerGitHub <noreply@github.com>2021-05-13 22:39:25 +0200
commitac4aee39e3256f9061d2057bb377862def4dd9d9 (patch)
tree4593f9938dfb355afc02a1f2b3795ba0ae19e538 /bridge/discord/discord.go
parenta0bca42a7ad98a37f4bdc4d7adc419471163edfb (diff)
downloadmatterbridge-msglm-ac4aee39e3256f9061d2057bb377862def4dd9d9.tar.gz
matterbridge-msglm-ac4aee39e3256f9061d2057bb377862def4dd9d9.tar.bz2
matterbridge-msglm-ac4aee39e3256f9061d2057bb377862def4dd9d9.zip
discord: Add AllowMention to restrict allowed mentions (#1462)
* Add DisablePingEveryoneHere/DisablePingRoles/DisablePingUsers keys to config * Add basic AllowedMentions behavior to discord webhooks * Initialize b.AllowedMentions on Discord Bridger init * Call b.getAllowedMentions on each webhook to allow config hot reloading * Add AllowedMentions on all Discord webhooks/messages * Add DisablePingEveryoneHere/DisablePingRoles/DisablePingUsers to matterbridge.toml.sample * Change 'Disable' for 'Allow' and revert logic in Discord AllowedMentions * Update Discord AllowedMentions in matterbridge.toml.sample * Fix typo in DisableWebPagePreview * Replace 'AllowPingEveryoneHere' with 'AllowPingEveryone' * Replace 3 AllowPingEveryone/Roles/Users bools with an array * Fix typo
Diffstat (limited to 'bridge/discord/discord.go')
-rw-r--r--bridge/discord/discord.go8
1 files changed, 5 insertions, 3 deletions
diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 9cc83ddc..2fcf0abc 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -304,7 +304,8 @@ func (b *Bdiscord) handleEventBotUser(msg *config.Message, channelID string) (st
}
m := discordgo.MessageSend{
- Content: msg.Username + msg.Text,
+ Content: msg.Username + msg.Text,
+ AllowedMentions: b.getAllowedMentions(),
}
if msg.ParentValid() {
@@ -335,8 +336,9 @@ func (b *Bdiscord) handleUploadFile(msg *config.Message, channelID string) (stri
Reader: bytes.NewReader(*fi.Data),
}
m := discordgo.MessageSend{
- Content: msg.Username + fi.Comment,
- Files: []*discordgo.File{&file},
+ Content: msg.Username + fi.Comment,
+ Files: []*discordgo.File{&file},
+ AllowedMentions: b.getAllowedMentions(),
}
_, err = b.c.ChannelMessageSendComplex(channelID, &m)
if err != nil {