commit 1c3479f14e5d6d3355ab170645e9b816a28e873e
Author: Wim <wim@42.be>
Date: Tue Aug 29 20:28:44 2017 +0000
Do not add messages without ID to cache
diff --git a/bridge/gitter/gitter.go b/bridge/gitter/gitter.go
index 829be59..98aba86 100644
--- a/bridge/gitter/gitter.go
+++ b/bridge/gitter/gitter.go
@@ -1058 +1058 @@ func (b *Bgitter) Send(msg config.Message) (string, error) {
flog.Errorf("Could not find roomID for %v", msg.Channel)
return "", nil
}
- // add ZWSP because gitter echoes our own messages
if msg.ID != "" {
+ flog.Debugf("updating message with id %s", msg.ID)
_, err := b.c.UpdateMessage(roomID, msg.ID, msg.Username+msg.Text)
if err != nil {
return "", err
diff --git a/gateway/gateway.go b/gateway/gateway.go
index aca8ece..d09741f 100644
--- a/gateway/gateway.go
+++ b/gateway/gateway.go
@@ -1867 +1869 @@ func (gw *Gateway) handleMessage(msg config.Message, dest *bridge.Bridge) []*BrM
fmt.Println(err)
}
// append the message ID (mID) from this bridge (dest) to our brMsgIDs slice
- brMsgIDs = append(brMsgIDs, &BrMsgID{dest, mID})
+ if mID != "" {
+ brMsgIDs = append(brMsgIDs, &BrMsgID{dest, mID})
+ }
}
return brMsgIDs
}
diff --git a/gateway/router.go b/gateway/router.go
index 56518e6..28f8133 100644
--- a/gateway/router.go
+++ b/gateway/router.go
@@ -1037 +1037 @@ func (r *Router) handleReceive() {
msgIDs = append(msgIDs, gw.handleMessage(msg, br)...)
}
// only add the message ID if it doesn't already exists
- if _, ok := gw.Messages.Get(msg.ID); !ok {
+ if _, ok := gw.Messages.Get(msg.ID); !ok && msg.ID != "" {
gw.Messages.Add(msg.ID, msgIDs)
}
}
