commit 1cc4e38edad2a38c3307c55b5622cef2a490e7e7
Author: Wim <wim@42.be>
Date: Sat Mar 18 15:32:57 2017 +0000
Join rooms not already joined by the bot (gitter). See #135
diff --git a/bridge/gitter/gitter.go b/bridge/gitter/gitter.go
index ae9ef02..b5beac4 100644
--- a/bridge/gitter/gitter.go
+++ b/bridge/gitter/gitter.go
@@ -5211 +5214 @@ 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
@@ -847 +877 @@ func (b *Bgitter) JoinChannel(channel string) error {
flog.Errorf("connection with gitter closed for room %s", room)
}
}
- }(stream, room)
+ }(stream, room.Name)
return nil
}
