From 035c2b906a6f0258840b4a15abecae7364756497 Mon Sep 17 00:00:00 2001 From: Wim Date: Sat, 15 Apr 2017 16:23:34 +0200 Subject: [PATCH] Strip custom emoji metadata (discord). Closes #148 --- bridge/discord/discord.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index 1cf81337..f1ab4a76 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -4,6 +4,7 @@ import ( "github.com/42wim/matterbridge/bridge/config" log "github.com/Sirupsen/logrus" "github.com/bwmarrin/discordgo" + "regexp" "strings" "sync" ) @@ -125,6 +126,7 @@ func (b *bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat if len(m.MentionRoles) > 0 { m.Message.Content = b.replaceRoleMentions(m.Message.Content) } + m.Message.Content = b.stripCustomoji(m.Message.Content) b.Remote <- config.Message{Username: username, Text: m.ContentWithMentionsReplaced(), Channel: channelName, Account: b.Account, Avatar: "https://cdn.discordapp.com/avatars/" + m.Author.ID + "/" + m.Author.Avatar + ".jpg"} } @@ -195,3 +197,9 @@ func (b *bdiscord) replaceRoleMentions(text string) string { } return text } + +func (b *bdiscord) stripCustomoji(text string) string { + // <:doge:302803592035958784> + re := regexp.MustCompile("<(:.*?:)[0-9]+>") + return re.ReplaceAllString(text, `$1`) +}