summaryrefslogtreecommitdiffstats
path: root/bridge
diff options
context:
space:
mode:
authorQais Patankar <qaisjp@gmail.com>2020-03-22 13:16:31 +0000
committerGitHub <noreply@github.com>2020-03-22 14:16:31 +0100
commitaf0acf0daece8c4857513f3fea84a332709e8c55 (patch)
tree7aab8b1a3dbe7103fc1dc46996b5f25939a6b5a5 /bridge
parent76e5fe5a87d7e60919075f96eee599f3c6255a9f (diff)
downloadmatterbridge-msglm-af0acf0daece8c4857513f3fea84a332709e8c55.tar.gz
matterbridge-msglm-af0acf0daece8c4857513f3fea84a332709e8c55.tar.bz2
matterbridge-msglm-af0acf0daece8c4857513f3fea84a332709e8c55.zip
Strip extra info from emotes (discord) (#1052)
Diffstat (limited to 'bridge')
-rw-r--r--bridge/discord/handlers.go3
-rw-r--r--bridge/discord/helpers.go5
2 files changed, 8 insertions, 0 deletions
diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go
index 1ce402c5..2bae3664 100644
--- a/bridge/discord/handlers.go
+++ b/bridge/discord/handlers.go
@@ -119,6 +119,9 @@ func (b *Bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
rmsg.Event = config.EventUserAction
}
+ // Replace emotes
+ rmsg.Text = replaceEmotes(rmsg.Text)
+
b.Log.Debugf("<= Sending message from %s on %s to gateway", m.Author.Username, b.Account)
b.Log.Debugf("<= Message is %#v", rmsg)
b.Remote <- rmsg
diff --git a/bridge/discord/helpers.go b/bridge/discord/helpers.go
index 8bc4f336..9ef234c5 100644
--- a/bridge/discord/helpers.go
+++ b/bridge/discord/helpers.go
@@ -137,6 +137,7 @@ var (
// See https://discordapp.com/developers/docs/reference#message-formatting.
channelMentionRE = regexp.MustCompile("<#[0-9]+>")
userMentionRE = regexp.MustCompile("@[^@\n]{1,32}")
+ emoteRE = regexp.MustCompile(`<a?(:\w+:)\d+>`)
)
func (b *Bdiscord) replaceChannelMentions(text string) string {
@@ -182,6 +183,10 @@ func (b *Bdiscord) replaceUserMentions(text string) string {
return userMentionRE.ReplaceAllStringFunc(text, replaceUserMentionFunc)
}
+func replaceEmotes(text string) string {
+ return emoteRE.ReplaceAllString(text, "$1")
+}
+
func (b *Bdiscord) replaceAction(text string) (string, bool) {
if strings.HasPrefix(text, "_") && strings.HasSuffix(text, "_") {
return text[1 : len(text)-1], true