Populate user on channel join (slack) (#644)

2 files changed, 23 insertions, 0 deletions

diff --git a/bridge/slack/handlers.go b/bridge/slack/handlers.go
index 035c5af5..609fff18 100644
--- a/bridge/slack/handlers.go
+++ b/bridge/slack/handlers.go
@@ -89,7 +89,10 @@ func (b *Bslack) handleSlackClient(messages chan *config.Message) {
 			b.Log.Fatalf("Invalid Token %#v", ev)
 		case *slack.ConnectionErrorEvent:
 			b.Log.Errorf("Connection failed %#v %#v", ev.Error(), ev.ErrorObj)
+		case *slack.MemberJoinedChannelEvent:
+			b.populateUser(ev.User)
 		default:
+			b.Log.Debugf("Unhandled incoming event: %T", ev)
 		}
 	}
 }
diff --git a/bridge/slack/helpers.go b/bridge/slack/helpers.go
index 26a4748e..a03feb7b 100644
--- a/bridge/slack/helpers.go
+++ b/bridge/slack/helpers.go
@@ -65,6 +65,26 @@ func (b *Bslack) getChannelByID(ID string) (*slack.Channel, error) {
 
 const minimumRefreshInterval = 10 * time.Second
 
+func (b *Bslack) populateUser(userID string) {
+	b.usersMutex.RLock()
+	_, exists := b.users[userID]
+	b.usersMutex.RUnlock()
+	if exists {
+		// already in cache
+		return
+	}
+
+	user, err := b.sc.GetUserInfo(userID)
+	if err != nil {
+		b.Log.Debugf("GetUserInfo failed for %v: %v", userID, err)
+		return
+	}
+
+	b.usersMutex.Lock()
+	b.users[userID] = user
+	b.usersMutex.Unlock()
+}
+
 func (b *Bslack) populateUsers() {
 	b.refreshMutex.Lock()
 	if time.Now().Before(b.earliestUserRefresh) || b.refreshInProgress {