summaryrefslogtreecommitdiffstats
path: root/vendor
diff options
context:
space:
mode:
authorWim <wim@42.be>2021-10-25 00:08:08 +0200
committerGitHub <noreply@github.com>2021-10-25 00:08:08 +0200
commit1635db93c7c2679fb7bc1a604b58c254153a483a (patch)
treee2c7886c526263ad7f8392014c918691a784cc7f /vendor
parentc4fe462d11c9949c9132e65fd9bf40a71c38d61c (diff)
downloadmatterbridge-msglm-1635db93c7c2679fb7bc1a604b58c254153a483a.tar.gz
matterbridge-msglm-1635db93c7c2679fb7bc1a604b58c254153a483a.tar.bz2
matterbridge-msglm-1635db93c7c2679fb7bc1a604b58c254153a483a.zip
Do not check cache on deleted messages (mattermost). Fixes #1555 (#1624)
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/matterbridge/matterclient/messages.go2
-rw-r--r--vendor/modules.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/vendor/github.com/matterbridge/matterclient/messages.go b/vendor/github.com/matterbridge/matterclient/messages.go
index 3b8a3acc..60363285 100644
--- a/vendor/github.com/matterbridge/matterclient/messages.go
+++ b/vendor/github.com/matterbridge/matterclient/messages.go
@@ -217,7 +217,7 @@ func (m *Client) UploadFile(data []byte, channelID string, filename string) (str
func (m *Client) parseActionPost(rmsg *Message) {
// add post to cache, if it already exists don't relay this again.
// this should fix reposts
- if ok, _ := m.lruCache.ContainsOrAdd(digestString(rmsg.Raw.GetData()["post"].(string)), true); ok {
+ if ok, _ := m.lruCache.ContainsOrAdd(digestString(rmsg.Raw.GetData()["post"].(string)), true); ok && rmsg.Raw.EventType() != model.WebsocketEventPostDeleted {
m.logger.Debugf("message %#v in cache, not processing again", rmsg.Raw.GetData()["post"].(string))
rmsg.Text = ""
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 4cf2e8d0..d588ed36 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -189,7 +189,7 @@ github.com/matterbridge/gozulipbot
# github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba
## explicit
github.com/matterbridge/logrus-prefixed-formatter
-# github.com/matterbridge/matterclient v0.0.0-20211021135437-2dc2bc7dce2d
+# github.com/matterbridge/matterclient v0.0.0-20211024214211-22e762684b4a
## explicit; go 1.16
github.com/matterbridge/matterclient
# github.com/mattermost/go-i18n v1.11.0