jshiffer/matterbridge
1
0
Fork 1
mirror of https://github.com/42wim/matterbridge.git synced 2024-11-24 19:52:03 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor gitter

Browse Source
This commit is contained in:
Wim 2018-02-23 23:31:37 +01:00
parent bd2a672c14
commit cac5d56d60
1 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
bridge/gitter/gitter.go
View File

@ -34,11 +34,13 @@ func (b *Bgitter) Connect() error {
b.c = gitter.New(b.Config.Token) b.c = gitter.New(b.Config.Token)
b.User, err = b.c.GetUser() b.User, err = b.c.GetUser()
if err != nil { if err != nil {
flog.Debugf("%#v", err) return err
}
b.Rooms, err = b.c.GetRooms()
if err != nil {
return err return err
} }
flog.Info("Connection succeeded") flog.Info("Connection succeeded")
b.Rooms, _ = b.c.GetRooms()
return nil return nil
} }
@ -74,6 +76,7 @@ func (b *Bgitter) JoinChannel(channel config.ChannelInfo) error {
for event := range stream.Event { for event := range stream.Event {
switch ev := event.Data.(type) { switch ev := event.Data.(type) {
case *gitter.MessageReceived: case *gitter.MessageReceived:
// ignore message sent from ourselves
if ev.Message.From.ID != b.User.ID { if ev.Message.From.ID != b.User.ID {
flog.Debugf("Sending message from %s on %s to gateway", ev.Message.From.Username, b.Account) flog.Debugf("Sending message from %s on %s to gateway", ev.Message.From.Username, b.Account)
rmsg := config.Message{Username: ev.Message.From.Username, Text: ev.Message.Text, Channel: room, rmsg := config.Message{Username: ev.Message.From.Username, Text: ev.Message.Text, Channel: room,
@ -101,17 +104,31 @@ func (b *Bgitter) Send(msg config.Message) (string, error) {
flog.Errorf("Could not find roomID for %v", msg.Channel) flog.Errorf("Could not find roomID for %v", msg.Channel)
return "", nil return "", nil
} }
// Delete message
if msg.Event == config.EVENT_MSG_DELETE { if msg.Event == config.EVENT_MSG_DELETE {
if msg.ID == "" { if msg.ID == "" {
return "", nil return "", nil
} }
// gitter has no delete message api // gitter has no delete message api so we edit message to ""
_, err := b.c.UpdateMessage(roomID, msg.ID, "") _, err := b.c.UpdateMessage(roomID, msg.ID, "")
if err != nil { if err != nil {
return "", err return "", err
} }
return "", nil return "", nil
} }
// Upload a file (in gitter case send the upload URL because gitter has no native upload support)
if msg.Extra != nil {
for _, rmsg := range helper.HandleExtra(&msg, b.General) {
b.c.SendMessage(roomID, rmsg.Username+rmsg.Text)
}
if len(msg.Extra["file"]) > 0 {
return b.handleUploadFile(&msg, roomID)
}
}
// Edit message
if msg.ID != "" { if msg.ID != "" {
flog.Debugf("updating message with id %s", msg.ID) flog.Debugf("updating message with id %s", msg.ID)
_, err := b.c.UpdateMessage(roomID, msg.ID, msg.Username+msg.Text) _, err := b.c.UpdateMessage(roomID, msg.ID, msg.Username+msg.Text)
@ -121,28 +138,7 @@ func (b *Bgitter) Send(msg config.Message) (string, error) {
return "", nil return "", nil
} }
if msg.Extra != nil { // Post normal message
for _, rmsg := range helper.HandleExtra(&msg, b.General) {
b.c.SendMessage(roomID, rmsg.Username+rmsg.Text)
}
if len(msg.Extra["file"]) > 0 {
for _, f := range msg.Extra["file"] {
fi := f.(config.FileInfo)
if fi.Comment != "" {
msg.Text += fi.Comment + ": "
}
if fi.URL != "" {
msg.Text = fi.URL
}
_, err := b.c.SendMessage(roomID, msg.Username+msg.Text)
if err != nil {
return "", err
}
}
return "", nil
}
}
resp, err := b.c.SendMessage(roomID, msg.Username+msg.Text) resp, err := b.c.SendMessage(roomID, msg.Username+msg.Text)
if err != nil { if err != nil {
return "", err return "", err
@ -170,3 +166,20 @@ func (b *Bgitter) getAvatar(user string) string {
} }
return avatar return avatar
} }
func (b *Bgitter) handleUploadFile(msg *config.Message, roomID string) (string, error) {
for _, f := range msg.Extra["file"] {
fi := f.(config.FileInfo)
if fi.Comment != "" {
msg.Text += fi.Comment + ": "
}
if fi.URL != "" {
msg.Text = fi.URL
}
_, err := b.c.SendMessage(roomID, msg.Username+msg.Text)
if err != nil {
return "", err
}
}
return "", nil
}