lug/matterbridge
10
0
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Rejigged event skip logic for recently-uploaded files.

Browse Source
This commit is contained in:
Patrick Connolly
2018-11-09 17:06:54 +08:00
parent 52138301d3
commit 2836c06a56
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bridge/slack/handlers.go
View File

@@ -132,6 +132,15 @@ func (b *Bslack) skipMessageEvent(ev *slack.MessageEvent) bool {
ev.SubMessage.Edited == nil { ev.SubMessage.Edited == nil {
return true return true
} }
for _, f := range ev.Files {
// If the file is in the cache and isn't older then a minute, skip it
if b.fileIsRecentlyCached(&f) {
b.Log.Debugf("Not downloading file id %s which we uploaded", f.ID)
return true
}
}
return false return false
} }
@@ -248,10 +257,6 @@ func (b *Bslack) handleTypingEvent(ev *slack.UserTypingEvent) (*config.Message,
// handleDownloadFile handles file download // handleDownloadFile handles file download
func (b *Bslack) handleDownloadFile(rmsg *config.Message, file *slack.File) error { func (b *Bslack) handleDownloadFile(rmsg *config.Message, file *slack.File) error {
if b.fileIsAvailable(file) {
return nil
}
// Check that the file is neither too large nor blacklisted. // Check that the file is neither too large nor blacklisted.
if err := helper.HandleDownloadSize(b.Log, rmsg, file.Name, int64(file.Size), b.General); err != nil { if err := helper.HandleDownloadSize(b.Log, rmsg, file.Name, int64(file.Size), b.General); err != nil {
b.Log.WithError(err).Infof("Skipping download of incoming file.") b.Log.WithError(err).Infof("Skipping download of incoming file.")
@@ -273,11 +278,10 @@ func (b *Bslack) handleDownloadFile(rmsg *config.Message, file *slack.File) erro
return nil return nil
} }
func (b *Bslack) fileIsAvailable(file *slack.File) bool { func (b *Bslack) fileIsRecentlyCached(file *slack.File) bool {
// Only download a file if it is not in the cache or if it has been entered more than a minute ago. if ts, ok := b.cache.Get("file" + file.ID); ok && time.Since(ts.(time.Time)) < time.Minute {
if ts, ok := b.cache.Get("file" + file.ID); ok && time.Since(ts.(time.Time)) > time.Minute {
return true return true
} else if ts, ok = b.cache.Get("filename" + file.Name); ok && time.Since(ts.(time.Time)) > 10*time.Second { } else if ts, ok = b.cache.Get("filename" + file.Name); ok && time.Since(ts.(time.Time)) < 10*time.Second {
return true return true
} }
return false return false

2
bridge/slack/slack.go
View File

@@ -298,7 +298,7 @@ func (b *Bslack) sendRTM(msg config.Message) (string, error) {
// Upload a file if it exists. // Upload a file if it exists.
if msg.Extra != nil { if msg.Extra != nil {
for _, rmsg := range helper.HandleExtra(&msg, b.General) { for _, rmsg := range helper.HandleExtra(&msg, b.General) {
_, _, err = b.sc.PostMessage(channelInfo.ID, rmsg.Username+rmsg.Text, *messageParameters) _, _, err = b.rtm.PostMessage(channelInfo.ID, rmsg.Username+rmsg.Text, *messageParameters)
if err != nil { if err != nil {
b.Log.Error(err) b.Log.Error(err)
} }