commit f1940f06baf90427dc9e4d63c821d692d7c8f491
Author: Wim <wim@42.be>
Date: Wed Feb 14 23:05:50 2018 +0000
Use discordgo ContentWithMoreMentionsReplace (discord)
diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go
index 1f7e50c..79acf13 100644
--- a/bridge/discord/discord.go
+++ b/bridge/discord/discord.go
@@ -2026 +2027 @@ func (b *bdiscord) messageUpdate(s *discordgo.Session, m *discordgo.MessageUpdat
}
func (b *bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreate) {
+ var err error
// not relay our own messages
if m.Author.Username == b.Nick {
return
@@ -22012 +22119 @@ func (b *bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
var text string
if m.Content != "" {
flog.Debugf("Receiving message %#v", m.Message)
- if len(m.MentionRoles) > 0 {
- m.Message.Content = b.replaceRoleMentions(m.Message.Content)
- }
+ /*
+ if len(m.MentionRoles) > 0 {
+ m.Message.Content = b.replaceRoleMentions(m.Message.Content)
+ }
+ */
m.Message.Content = b.stripCustomoji(m.Message.Content)
m.Message.Content = b.replaceChannelMentions(m.Message.Content)
- text = m.ContentWithMentionsReplaced()
+ text, err = m.ContentWithMoreMentionsReplaced(b.c)
+ if err != nil {
+ flog.Errorf("ContentWithMoreMentionsReplaced failed: %s", err)
+ text = m.ContentWithMentionsReplaced()
+ }
+ // text = m.ContentWithMentionsReplaced()
}
rmsg := config.Message{Account: b.Account, Avatar: "https://cdn.discordapp.com/avatars/" + m.Author.ID + "/" + m.Author.Avatar + ".jpg",
