From ad0236759794a45304450c5ecc5262333d4a48d7 Mon Sep 17 00:00:00 2001 From: James Nylen Date: Wed, 9 Jan 2019 00:25:56 -0500 Subject: [PATCH] Change repeated string into constant --- bridge/discord/discord.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index 7d6adf57..a3f5f1ec 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -13,7 +13,10 @@ import ( "github.com/bwmarrin/discordgo" ) -const MessageLength = 1950 +const ( + MessageLength = 1950 + webhookPlaceholderMessageID = "-webhook-message-" +) type Bdiscord struct { *bridge.Config @@ -203,7 +206,7 @@ func (b *Bdiscord) Send(msg config.Message) (string, error) { return "", nil } - if msg.ID == "-webhook-" { + if msg.ID == webhookPlaceholderMessageID { // Received an edit for a message that was previously sent via a // webhook. We can't edit the original message, but we can mark // the new version with a pencil icon. @@ -225,14 +228,14 @@ func (b *Bdiscord) Send(msg config.Message) (string, error) { AvatarURL: msg.Avatar, }) // Replace with real ID after https://github.com/bwmarrin/discordgo/issues/622 - return "-webhook-", err + return webhookPlaceholderMessageID, err } b.Log.Debugf("Broadcasting using token (API)") // Delete message if msg.Event == config.EventMsgDelete { - if msg.ID == "" || msg.ID == "-webhook-" { + if msg.ID == "" || msg.ID == webhookPlaceholderMessageID { return "", nil } err := b.c.ChannelMessageDelete(channelID, msg.ID) @@ -257,7 +260,7 @@ func (b *Bdiscord) Send(msg config.Message) (string, error) { msg.Text = b.replaceUserMentions(msg.Text) // Edit message - if msg.ID != "" && msg.ID != "-webhook-" { + if msg.ID != "" && msg.ID != webhookPlaceholderMessageID { // Note: cannot edit messages made by a webhook. This should never // happen though, because if we get here then it means we don't have a // usable webhook.