diff options
author | Wim <wim@42.be> | 2017-04-19 19:50:52 +0200 |
---|---|---|
committer | Wim <wim@42.be> | 2017-04-19 19:51:33 +0200 |
commit | 4fcedabfd051bcaa1130b2ee1c6ed1b4cd1bb3ff (patch) | |
tree | 568603a9a13d4d70747ca74f75a64fc1caa1989f | |
parent | 246c8e4f74ab21e0abde1cae09e051a23bb1e6ae (diff) | |
download | matterbridge-msglm-4fcedabfd051bcaa1130b2ee1c6ed1b4cd1bb3ff.tar.gz matterbridge-msglm-4fcedabfd051bcaa1130b2ee1c6ed1b4cd1bb3ff.tar.bz2 matterbridge-msglm-4fcedabfd051bcaa1130b2ee1c6ed1b4cd1bb3ff.zip |
Revert "Add support for edited messages (gitter)"
This reverts commit 17b8b86d68badfe27c29c7448548f9eb97dd26e9.
Reverted because of lingering file descriptors (memory leak)
-rw-r--r-- | bridge/gitter/gitter.go | 47 | ||||
-rw-r--r-- | changelog.md | 11 | ||||
-rw-r--r-- | matterbridge.toml.sample | 9 |
3 files changed, 14 insertions, 53 deletions
diff --git a/bridge/gitter/gitter.go b/bridge/gitter/gitter.go index a962f923..af71d892 100644 --- a/bridge/gitter/gitter.go +++ b/bridge/gitter/gitter.go @@ -2,12 +2,10 @@ package bgitter import ( "fmt" - "strings" - "time" - "github.com/42wim/matterbridge/bridge/config" log "github.com/Sirupsen/logrus" "github.com/sromku/go-gitter" + "strings" ) type Bgitter struct { @@ -73,48 +71,27 @@ func (b *Bgitter) JoinChannel(channel string) error { } users, _ := b.c.GetUsersInRoom(roomID) b.Users = append(b.Users, users...) - - // we need to use (experimental) faye for edits. - // streaming API doesn't show edits. - if !b.Config.EditDisable { - faye := b.c.Faye(roomID) - go faye.Listen() - go func(stream *gitter.Faye, room string) { - for event := range stream.Event { - b.handleEvent(event, room) - } - }(faye, room.Name) - return nil - } stream := b.c.Stream(roomID) go b.c.Listen(stream) go func(stream *gitter.Stream, room string) { for event := range stream.Event { - b.handleEvent(event, room) + switch ev := event.Data.(type) { + case *gitter.MessageReceived: + // check for ZWSP to see if it's not an echo + if !strings.HasSuffix(ev.Message.Text, "") { + flog.Debugf("Sending message from %s on %s to gateway", ev.Message.From.Username, b.Account) + b.Remote <- config.Message{Username: ev.Message.From.Username, Text: ev.Message.Text, Channel: room, + Account: b.Account, Avatar: b.getAvatar(ev.Message.From.Username)} + } + case *gitter.GitterConnectionClosed: + flog.Errorf("connection with gitter closed for room %s", room) + } } }(stream, room.Name) return nil } -func (b *Bgitter) handleEvent(event gitter.Event, room string) { - flog.Debugf("event: %#v %#v", event.Data, event.Data.(*gitter.MessageReceived).Message.EditedAt.Sub(time.Now()).String()) - switch ev := event.Data.(type) { - case *gitter.MessageReceived: - // check for ZWSP to see if it's not an echo - if !strings.HasSuffix(ev.Message.Text, "") { - if !ev.Message.EditedAt.IsZero() && !b.Config.EditDisable { - ev.Message.Text = ev.Message.Text + b.Config.EditSuffix - } - flog.Debugf("Sending message from %s on %s to gateway", ev.Message.From.Username, b.Account) - b.Remote <- config.Message{Username: ev.Message.From.Username, Text: ev.Message.Text, Channel: room, - Account: b.Account, Avatar: b.getAvatar(ev.Message.From.Username)} - } - case *gitter.GitterConnectionClosed: - flog.Errorf("connection with gitter closed for room %s", room) - } -} - func (b *Bgitter) Send(msg config.Message) error { flog.Debugf("Receiving %#v", msg) roomID := b.getRoomID(msg.Channel) diff --git a/changelog.md b/changelog.md index 035ac2e9..485fdb3a 100644 --- a/changelog.md +++ b/changelog.md @@ -1,18 +1,11 @@ # v0.12.0 ## Changes -* general: edited messages are now being sent by default on discord/mattermost/telegram/gitter/slack. See "New Features" -* gitter: The default support for edited messages enables experimental FAYE support for gitter. - If you need stable code add EditDisable=true to your gitter configuration. +* general: edited messages are now being sent by default on discord/mattermost/telegram/slack. See "New Features" ## New features * general: add support for edited messages. Add new keyword EditDisable (false/true), default false. Which means by default edited messages will be sent to other bridges. - Add new keyword EditSuffix , default "". You can change this eg to " (edited)", this will be appended to every edit message. - -* discord: Add support for edited messages. See EditDisable/EditSuffix -* mattermost: Add support for edited messages. See EditDisable/EditSuffix -* telegram: Add support for edited messages. See EditDisable/EditSuffix -* gitter: Add support for edited messages. See EditDisable/EditSuffix + Add new keyword EditSuffix , default "". You can change this eg to "(edited)", this will be appended to every edit message. ## Enhancements * discord: Strip custom emoji metadata (discord). Closes #148 diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample index 531dba7b..33dfca05 100644 --- a/matterbridge.toml.sample +++ b/matterbridge.toml.sample @@ -282,15 +282,6 @@ ShowJoinPart=false #REQUIRED Token="Yourtokenhere" -#Disable sending of edits to other bridges -#WARNING: the default uses FAYE which is experimental. If you need stability set EditDisable=true -#OPTIONAL (default false) -EditDisable=true - -#Message to be appended to every edited message -#OPTIONAL (default empty) -EditSuffix=" (edited)" - #Nicks you want to ignore. #Messages from those users will not be sent to other bridges. #OPTIONAL |