From c4ba9c9ca98a79c435dfe6b6905312c5c0b8866e Mon Sep 17 00:00:00 2001 From: Reach Date: Wed, 5 May 2021 18:40:41 +0200 Subject: [PATCH] Replace 'AllowPingEveryoneHere' with 'AllowPingEveryone' --- bridge/config/config.go | 2 +- bridge/discord/helpers.go | 2 +- matterbridge.toml.sample | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bridge/config/config.go b/bridge/config/config.go index f2f015ff..382dbbfe 100644 --- a/bridge/config/config.go +++ b/bridge/config/config.go @@ -85,7 +85,7 @@ type ChannelMember struct { type ChannelMembers []ChannelMember type Protocol struct { - AllowPingEveryoneHere bool // discord + AllowPingEveryone bool // discord AllowPingRoles bool // discord AllowPingUsers bool // discord AuthCode string // steam diff --git a/bridge/discord/helpers.go b/bridge/discord/helpers.go index 21d2c524..57d46c8f 100644 --- a/bridge/discord/helpers.go +++ b/bridge/discord/helpers.go @@ -12,7 +12,7 @@ import ( func (b *Bdiscord) getAllowedMentions() *discordgo.MessageAllowedMentions { // Allow only the mention types that are not disabled by the config (default is all allowed) allowedMentionTypes := make([]discordgo.AllowedMentionType, 0, 3) - if b.GetBool("AllowPingEveryoneHere") || !b.IsKeySet("AllowPingEveryoneHere") { + if b.GetBool("AllowPingEveryone") || !b.IsKeySet("AllowPingEveryone") { allowedMentionTypes = append(allowedMentionTypes, discordgo.AllowedMentionTypeEveryone) } if b.GetBool("AllowPingRoles") || !b.IsKeySet("AllowPingRoles") { diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample index 2b4c8305..72115baa 100644 --- a/matterbridge.toml.sample +++ b/matterbridge.toml.sample @@ -848,8 +848,8 @@ Server="yourservername" ## All settings below can be reloaded by editing the file. ## They are also all optional. -# AllowPingEveryoneHere controls if @everyone and @here mentions should send a mention/ping to users. (default true) -AllowPingEveryoneHere=true +# AllowPingEveryone controls if @everyone and @here mentions should send a mention/ping to users. (default true) +AllowPingEveryone=true # AllowPingRoles controls if @role mentions should send a mention/ping to users. (default true) AllowPingRoles=true