From dda214671852a49186ab701dc0adaed830a49535 Mon Sep 17 00:00:00 2001
From: Patrick Connolly <patrick.c.connolly@gmail.com>
Date: Wed, 7 Nov 2018 13:28:52 +0800
Subject: [PATCH] Adopted @42wim's suggestions.

---
 bridge/slack/handlers.go |  2 --
 bridge/slack/slack.go    | 13 ++++++-------
 matterbridge.toml.sample |  4 ++--
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/bridge/slack/handlers.go b/bridge/slack/handlers.go
index e06077f8..e8d07435 100644
--- a/bridge/slack/handlers.go
+++ b/bridge/slack/handlers.go
@@ -256,8 +256,6 @@ func (b *Bslack) handleTypingEvent(ev *slack.UserTypingEvent) (*config.Message,
 		Channel:  channelInfo.Name,
 		Account:  b.Account,
 		Event:    config.EVENT_USER_TYPING,
-		ID:       "slack " + time.Now().String(),
-		Extra:    map[string][]interface{}{},
 	}
 
 	return &rmsg, nil
diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index 76f96e02..701f4769 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -265,17 +265,16 @@ func (b *Bslack) sendWebhook(msg config.Message) (string, error) {
 }
 
 func (b *Bslack) sendRTM(msg config.Message) (string, error) {
-	if msg.Event == config.EVENT_USER_TYPING && b.GetBool("ShowUserTyping") {
-		if b.GetBool("ShowUserTyping") {
-			chanID := b.channelsByName[msg.Channel].ID
-			b.rtm.SendMessage(b.rtm.NewTypingMessage(chanID))
-		}
-		return "", nil
-	}
 	channelInfo, err := b.getChannel(msg.Channel)
 	if err != nil {
 		return "", fmt.Errorf("could not send message: %v", err)
 	}
+	if msg.Event == config.EVENT_USER_TYPING {
+		if b.GetBool("ShowUserTyping") {
+			b.rtm.SendMessage(b.rtm.NewTypingMessage(channelInfo.ID))
+		}
+		return "", nil
+	}
 
 	// Delete message
 	if msg.Event == config.EVENT_MSG_DELETE {
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 640931fa..d4b2fbbe 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -668,8 +668,8 @@ PreserveThreading=false
 #Enable showing "user_typing" events from across gateway when available.
 #Hint: Set your bot/user's "Full Name" to be "Someone",
 #and so the message will say "Someone is typing".
-#OPTIONAL (default true)
-ShowUserTyping=true
+#OPTIONAL (default false)
+ShowUserTyping=false
 
 ###################################################################
 #discord section