From 5f5d6c6e8a7d112aaa2a8b72ce8acf23337abec0 Mon Sep 17 00:00:00 2001 From: Wim Date: Tue, 23 Apr 2019 23:29:15 +0200 Subject: [PATCH] Disable user lookups on delete messages (slack) (#812) --- bridge/slack/handlers.go | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/bridge/slack/handlers.go b/bridge/slack/handlers.go index 87102636..5a55949a 100644 --- a/bridge/slack/handlers.go +++ b/bridge/slack/handlers.go @@ -22,20 +22,20 @@ func (b *Bslack) handleSlack() { time.Sleep(time.Second) b.Log.Debug("Start listening for Slack messages") for message := range messages { - if message.Event != config.EventUserTyping { + // don't do any action on deleted/typing messages + if message.Event != config.EventUserTyping && message.Event != config.EventMsgDelete { b.Log.Debugf("<= Sending message from %s on %s to gateway", message.Username, b.Account) + // cleanup the message + message.Text = b.replaceMention(message.Text) + message.Text = b.replaceVariable(message.Text) + message.Text = b.replaceChannel(message.Text) + message.Text = b.replaceURL(message.Text) + message.Text = html.UnescapeString(message.Text) + + // Add the avatar + message.Avatar = b.users.getAvatar(message.UserID) } - // cleanup the message - message.Text = b.replaceMention(message.Text) - message.Text = b.replaceVariable(message.Text) - message.Text = b.replaceChannel(message.Text) - message.Text = b.replaceURL(message.Text) - message.Text = html.UnescapeString(message.Text) - - // Add the avatar - message.Avatar = b.users.getAvatar(message.UserID) - b.Log.Debugf("<= Message is %#v", message) b.Remote <- *message }