From eddc691fc9e8ced74a33d3c4cbd568c2728fe6f1 Mon Sep 17 00:00:00 2001 From: Wim Date: Sat, 18 Mar 2017 15:32:57 +0100 Subject: [PATCH] Join rooms not already joined by the bot (gitter). See #135 --- bridge/gitter/gitter.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/bridge/gitter/gitter.go b/bridge/gitter/gitter.go index ae9ef021..b5beac40 100644 --- a/bridge/gitter/gitter.go +++ b/bridge/gitter/gitter.go @@ -52,11 +52,14 @@ func (b *Bgitter) Disconnect() error { } func (b *Bgitter) JoinChannel(channel string) error { - room := channel - roomID := b.getRoomID(room) - if roomID == "" { + roomID, err := b.c.GetRoomId(channel) + if err != nil { return fmt.Errorf("Could not find roomID for %v. Please create the room on gitter.im", channel) } + room, err := b.c.GetRoom(roomID) + if err != nil { + b.Rooms = append(b.Rooms, *room) + } user, err := b.c.GetUser() if err != nil { return err @@ -84,7 +87,7 @@ func (b *Bgitter) JoinChannel(channel string) error { flog.Errorf("connection with gitter closed for room %s", room) } } - }(stream, room) + }(stream, room.Name) return nil }