diff options
| author | Qais Patankar <qaisjp@gmail.com> | 2020-03-22 17:39:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 18:39:11 +0100 |
| commit | 98033b1ba77fcf55378eccf35c2a251b1278464b (patch) | |
| tree | fd5d46b0a3d0e6358cd29345bae47bdd5a820ec7 /bridge/discord | |
| parent | 2b7eab629d959b10388d21cf6242fdfbdbe0e197 (diff) | |
| download | matterbridge-msglm-98033b1ba77fcf55378eccf35c2a251b1278464b.tar.gz matterbridge-msglm-98033b1ba77fcf55378eccf35c2a251b1278464b.tar.bz2 matterbridge-msglm-98033b1ba77fcf55378eccf35c2a251b1278464b.zip | |
Don't transmit typing events from ourselves (slack/discord) (#1056)
Diffstat (limited to 'bridge/discord')
| -rw-r--r-- | bridge/discord/discord.go | 2 | ||||
| -rw-r--r-- | bridge/discord/handlers.go | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index d2871360..a59735ad 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -21,6 +21,7 @@ type Bdiscord struct { c *discordgo.Session nick string + userID string guildID string webhookID string webhookToken string @@ -92,6 +93,7 @@ func (b *Bdiscord) Connect() error { } serverName := strings.Replace(b.GetString("Server"), "ID:", "", -1) b.nick = userinfo.Username + b.userID = userinfo.ID b.channelsMutex.Lock() for _, guild := range guilds { if guild.Name == serverName || guild.ID == serverName { diff --git a/bridge/discord/handlers.go b/bridge/discord/handlers.go index 2bae3664..79697266 100644 --- a/bridge/discord/handlers.go +++ b/bridge/discord/handlers.go @@ -36,6 +36,11 @@ func (b *Bdiscord) messageTyping(s *discordgo.Session, m *discordgo.TypingStart) return } + // Ignore our own typing messages + if m.UserID == b.userID { + return + } + rmsg := config.Message{Account: b.Account, Event: config.EventUserTyping} rmsg.Channel = b.getChannelName(m.ChannelID) b.Remote <- rmsg |