From 246c8e4f74ab21e0abde1cae09e051a23bb1e6ae Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Mon, 17 Apr 2017 18:01:24 +0200
Subject: [PATCH] Ignore error on private channel join (slack) Fixes #150

---
 bridge/slack/slack.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bridge/slack/slack.go b/bridge/slack/slack.go
index 9c9f3fc3..cc03e9ed 100644
--- a/bridge/slack/slack.go
+++ b/bridge/slack/slack.go
@@ -79,7 +79,9 @@ func (b *Bslack) JoinChannel(channel string) error {
 		}
 		_, err := b.sc.JoinChannel(channel)
 		if err != nil {
-			return err
+			if err.Error() != "name_taken" {
+				return err
+			}
 		}
 	}
 	return nil