Release v0.12.0

This reverts commit 17b8b86d68.
Reverted because of lingering file descriptors (memory leak)

README.md

@@ -28,7 +28,7 @@ Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, R
 
 # Requirements
 Accounts to one of the supported bridges
-* [Mattermost](https://github.com/mattermost/platform/) 3.5.x - 3.7.x
+* [Mattermost](https://github.com/mattermost/platform/) 3.5.x - 3.9.x
 * [IRC](http://www.mirc.com/servers.html)
 * [XMPP](https://jabber.org)
 * [Gitter](https://gitter.im)
@@ -42,7 +42,7 @@ Accounts to one of the supported bridges
 # Installing
 ## Binaries
 Binaries can be found [here] (https://github.com/42wim/matterbridge/releases/)
-* Latest release [v0.10.3](https://github.com/42wim/matterbridge/releases/latest)
+* Latest stable release [v0.12.0](https://github.com/42wim/matterbridge/releases/latest)
 
 ## Building
 Go 1.6+ is required. Make sure you have [Go](https://golang.org/doc/install) properly installed, including setting up your [GOPATH] (https://golang.org/doc/code.html#GOPATH)

bridge/config/config.go

@@ -39,6 +39,8 @@ type ChannelInfo struct {
 type Protocol struct {
 	BindAddress            string // mattermost, slack
 	Buffer                 int    // api
+	EditSuffix             string // mattermost, slack, discord, telegram, gitter
+	EditDisable            bool   // mattermost, slack, discord, telegram, gitter
 	IconURL                string // mattermost, slack
 	IgnoreNicks            string // all protocols
 	Jid                    string // xmpp

bridge/discord/discord.go

@@ -4,6 +4,7 @@ import (
 	"github.com/42wim/matterbridge/bridge/config"
 	log "github.com/Sirupsen/logrus"
 	"github.com/bwmarrin/discordgo"
+	"regexp"
 	"strings"
 	"sync"
 )
@@ -51,6 +52,7 @@ func (b *bdiscord) Connect() error {
 	flog.Info("Connection succeeded")
 	b.c.AddHandler(b.messageCreate)
 	b.c.AddHandler(b.memberUpdate)
+	b.c.AddHandler(b.messageUpdate)
 	err = b.c.Open()
 	if err != nil {
 		flog.Debugf("%#v", err)
@@ -103,6 +105,18 @@ func (b *bdiscord) Send(msg config.Message) error {
 	return nil
 }
 
+func (b *bdiscord) messageUpdate(s *discordgo.Session, m *discordgo.MessageUpdate) {
+	if b.Config.EditDisable {
+		return
+	}
+	// only when message is actually edited
+	if m.Message.EditedTimestamp != "" {
+		flog.Debugf("Sending edit message")
+		m.Content = m.Content + b.Config.EditSuffix
+		b.messageCreate(s, (*discordgo.MessageCreate)(m))
+	}
+}
+
 func (b *bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreate) {
 	// not relay our own messages
 	if m.Author.Username == b.Nick {
@@ -125,6 +139,7 @@ func (b *bdiscord) messageCreate(s *discordgo.Session, m *discordgo.MessageCreat
 	if len(m.MentionRoles) > 0 {
 		m.Message.Content = b.replaceRoleMentions(m.Message.Content)
 	}
+	m.Message.Content = b.stripCustomoji(m.Message.Content)
 	b.Remote <- config.Message{Username: username, Text: m.ContentWithMentionsReplaced(), Channel: channelName,
 		Account: b.Account, Avatar: "https://cdn.discordapp.com/avatars/" + m.Author.ID + "/" + m.Author.Avatar + ".jpg"}
 }
@@ -195,3 +210,9 @@ func (b *bdiscord) replaceRoleMentions(text string) string {
 	}
 	return text
 }
+
+func (b *bdiscord) stripCustomoji(text string) string {
+	// <:doge:302803592035958784>
+	re := regexp.MustCompile("<(:.*?:)[0-9]+>")
+	return re.ReplaceAllString(text, `$1`)
+}

bridge/irc/irc.go

@@ -109,7 +109,6 @@ func (b *Birc) Send(msg config.Message) error {
 	}
 	if strings.HasPrefix(msg.Text, "!") {
 		b.Command(&msg)
-		return nil
 	}
 	for _, text := range strings.Split(msg.Text, "\n") {
 		if len(b.Local) < b.Config.MessageQueue {

bridge/mattermost/mattermost.go

@@ -143,12 +143,16 @@ func (b *Bmattermost) handleMatterClient(mchan chan *MMMessage) {
 		}
 		// do not post our own messages back to irc
 		// only listen to message from our team
-		if message.Raw.Event == "posted" && b.mc.User.Username != message.Username && message.Raw.Data["team_id"].(string) == b.TeamId {
+		if (message.Raw.Event == "posted" || message.Raw.Event == "post_edited") &&
+			b.mc.User.Username != message.Username && message.Raw.Data["team_id"].(string) == b.TeamId {
 			flog.Debugf("Receiving from matterclient %#v", message)
 			m := &MMMessage{}
 			m.Username = message.Username
 			m.Channel = message.Channel
 			m.Text = message.Text
+			if message.Raw.Event == "post_edited" && !b.Config.EditDisable {
+				m.Text = message.Text + b.Config.EditSuffix
+			}
 			if len(message.Post.FileIds) > 0 {
 				for _, link := range b.mc.GetPublicLinks(message.Post.FileIds) {
 					m.Text = m.Text + "\n" + link

bridge/slack/slack.go

@@ -79,7 +79,9 @@ func (b *Bslack) JoinChannel(channel string) error {
 		}
 		_, err := b.sc.JoinChannel(channel)
 		if err != nil {
-			return err
+			if err.Error() != "name_taken" {
+				return err
+			}
 		}
 	}
 	return nil
@@ -199,6 +201,11 @@ func (b *Bslack) handleSlackClient(mchan chan *MMMessage) {
 			// ignore first message
 			if count > 0 {
 				flog.Debugf("Receiving from slackclient %#v", ev)
+				if !b.Config.EditDisable && ev.SubMessage != nil {
+					flog.Debugf("SubMessage %#v", ev.SubMessage)
+					ev.User = ev.SubMessage.User
+					ev.Text = ev.SubMessage.Text + b.Config.EditSuffix
+				}
 				// use our own func because rtm.GetChannelInfo doesn't work for private channels
 				channel, err := b.getChannelByID(ev.Channel)
 				if err != nil {

bridge/telegram/telegram.go

@@ -85,15 +85,17 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
 		if update.ChannelPost != nil {
 			message = update.ChannelPost
 		}
-		if update.EditedChannelPost != nil {
+		if update.EditedChannelPost != nil && !b.Config.EditDisable {
 			message = update.EditedChannelPost
+			message.Text = message.Text + b.Config.EditSuffix
 		}
 		// handle groups
 		if update.Message != nil {
 			message = update.Message
 		}
-		if update.EditedMessage != nil {
+		if update.EditedMessage != nil && !b.Config.EditDisable {
 			message = update.EditedMessage
+			message.Text = message.Text + b.Config.EditSuffix
 		}
 		if message.From != nil {
 			username = message.From.FirstName

changelog.md

@@ -1,4 +1,16 @@
-# v0.11.0-dev
+# v0.12.0
+## Changes
+* 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.
+
+## Enhancements
+* discord: Strip custom emoji metadata (discord). Closes #148
+
+# v0.11.0
 ## New features
 * general: reusing the same account on multiple gateways now also reuses the connection.
   This is particuarly useful for irc. See #87

matterbridge.go

@@ -12,7 +12,7 @@ import (
 )
 
 var (
-	version = "0.11.0-dev"
+	version = "0.12.0"
 	githash string
 )
 

matterbridge.toml.sample

@@ -200,9 +200,9 @@ IconURL="http://youricon.png"
 #OPTIONAL
 useAPI=false
 
-#The mattermost hostname. 
+#The mattermost hostname. (do not prefix it with http or https)
 #REQUIRED (when useAPI=true)
-Server="yourmattermostserver.domain"
+Server="yourmattermostserver.domain" 
 
 #Your team on mattermost. 
 #REQUIRED (when useAPI=true)
@@ -241,6 +241,14 @@ NicksPerRow=4
 #OPTIONAL (default false)
 PrefixMessagesWithNick=false
 
+#Disable sending of edits to other bridges
+#OPTIONAL (default false)
+EditDisable=false
+
+#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
@@ -347,6 +355,14 @@ NickFormatter="plain"
 #OPTIONAL (default 4)
 NicksPerRow=4
 
+#Disable sending of edits to other bridges
+#OPTIONAL (default false)
+EditDisable=true
+
+#Message to be appended to every edited message
+#OPTIONAL (default empty)
+EditSuffix=" (edited)"
+
 #Whether to prefix messages from other bridges to mattermost with RemoteNickFormat
 #Useful if username overrides for incoming webhooks isn't enabled on the 
 #slack server. If you set PrefixMessagesWithNick to true, each message 
@@ -391,6 +407,14 @@ Token="Yourtokenhere"
 #REQUIRED
 Server="yourservername"
 
+#Disable sending of edits to other bridges
+#OPTIONAL (default false)
+EditDisable=false
+
+#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
@@ -427,6 +451,14 @@ Token="Yourtokenhere"
 #See https://core.telegram.org/bots/api#html-style
 MessageFormat=""
 
+#Disable sending of edits to other bridges
+#OPTIONAL (default false)
+EditDisable=false
+
+#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

matterbridge.toml.simple

@@ -6,7 +6,8 @@
 [mattermost]
     [mattermost.work]
     useAPI=true
-    Server="yourmattermostserver.domain"
+    #do not prefix it wit http:// or https://
+    Server="yourmattermostserver.domain" 
     Team="yourteam"
     Login="yourlogin"
     Password="yourpass"

matterclient/matterclient.go

@@ -4,9 +4,11 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"errors"
+	"fmt"
 	"net/http"
 	"net/http/cookiejar"
 	"net/url"
+	"strconv"
 	"strings"
 	"sync"
 	"time"
@@ -48,19 +50,20 @@ type Team struct {
 type MMClient struct {
 	sync.RWMutex
 	*Credentials
-	Team        *Team
-	OtherTeams  []*Team
-	Client      *model.Client
-	User        *model.User
-	Users       map[string]*model.User
-	MessageChan chan *Message
-	log         *log.Entry
-	WsClient    *websocket.Conn
-	WsQuit      bool
-	WsAway      bool
-	WsConnected bool
-	WsSequence  int64
-	WsPingChan  chan *model.WebSocketResponse
+	Team          *Team
+	OtherTeams    []*Team
+	Client        *model.Client
+	User          *model.User
+	Users         map[string]*model.User
+	MessageChan   chan *Message
+	log           *log.Entry
+	WsClient      *websocket.Conn
+	WsQuit        bool
+	WsAway        bool
+	WsConnected   bool
+	WsSequence    int64
+	WsPingChan    chan *model.WebSocketResponse
+	ServerVersion string
 }
 
 func New(login, pass, team, server string) *MMClient {
@@ -103,8 +106,27 @@ func (m *MMClient) Login() error {
 	}
 	// login to mattermost
 	m.Client = model.NewClient(uriScheme + m.Credentials.Server)
-	m.Client.HttpClient.Transport = &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: m.SkipTLSVerify}}
+	m.Client.HttpClient.Transport = &http.Transport{TLSClientConfig: &tls.Config{InsecureSkipVerify: m.SkipTLSVerify}, Proxy: http.ProxyFromEnvironment}
 	m.Client.HttpClient.Timeout = time.Second * 10
+
+	for {
+		d := b.Duration()
+		// bogus call to get the serverversion
+		m.Client.GetClientProperties()
+		if firstConnection && !supportedVersion(m.Client.ServerVersion) {
+			return fmt.Errorf("unsupported mattermost version: %s", m.Client.ServerVersion)
+		}
+		m.ServerVersion = m.Client.ServerVersion
+		if m.ServerVersion == "" {
+			m.log.Debugf("Server not up yet, reconnecting in %s", d)
+			time.Sleep(d)
+		} else {
+			m.log.Infof("Found version %s", m.ServerVersion)
+			break
+		}
+	}
+	b.Reset()
+
 	var myinfo *model.Result
 	var appErr *model.AppError
 	var logmsg = "trying login"
@@ -240,7 +262,7 @@ func (m *MMClient) WsReceiver() {
 
 func (m *MMClient) parseMessage(rmsg *Message) {
 	switch rmsg.Raw.Event {
-	case model.WEBSOCKET_EVENT_POSTED:
+	case model.WEBSOCKET_EVENT_POSTED, model.WEBSOCKET_EVENT_POST_EDITED:
 		m.parseActionPost(rmsg)
 		/*
 			case model.ACTION_USER_REMOVED:
@@ -269,7 +291,17 @@ func (m *MMClient) parseActionPost(rmsg *Message) {
 	rmsg.Username = m.GetUser(data.UserId).Username
 	rmsg.Channel = m.GetChannelName(data.ChannelId)
 	rmsg.Type = data.Type
-	rmsg.Team = m.GetTeamName(rmsg.Raw.Data["team_id"].(string))
+	teamid, _ := rmsg.Raw.Data["team_id"].(string)
+	// edit messsages have no team_id for some reason
+	if teamid == "" {
+		// we can find the team_id from the channelid
+		result, _ := m.Client.GetChannel(data.ChannelId, "")
+		teamid = result.Data.(*model.ChannelData).Channel.TeamId
+		rmsg.Raw.Data["team_id"] = teamid
+	}
+	if teamid != "" {
+		rmsg.Team = m.GetTeamName(teamid)
+	}
 	// direct message
 	if rmsg.Raw.Data["channel_type"] == "D" {
 		rmsg.Channel = m.GetUser(data.UserId).Username
@@ -295,7 +327,12 @@ func (m *MMClient) UpdateChannels() error {
 	if err != nil {
 		return errors.New(err.DetailedError)
 	}
-	mmchannels2, err := m.Client.GetMoreChannels("")
+	var mmchannels2 *model.Result
+	if m.mmVersion() >= 3.8 {
+		mmchannels2, err = m.Client.GetMoreChannelsPage(0, 5000)
+	} else {
+		mmchannels2, err = m.Client.GetMoreChannels("")
+	}
 	if err != nil {
 		return errors.New(err.DetailedError)
 	}
@@ -430,6 +467,14 @@ func (m *MMClient) UpdateChannelHeader(channelId string, header string) {
 
 func (m *MMClient) UpdateLastViewed(channelId string) {
 	m.log.Debugf("posting lastview %#v", channelId)
+	if m.mmVersion() >= 3.8 {
+		view := model.ChannelView{ChannelId: channelId}
+		res, _ := m.Client.ViewChannel(view)
+		if res == false {
+			m.log.Errorf("ChannelView update for %s failed", channelId)
+		}
+		return
+	}
 	_, err := m.Client.UpdateLastViewedAt(channelId, true)
 	if err != nil {
 		m.log.Error(err)
@@ -663,7 +708,11 @@ func (m *MMClient) initUser() error {
 			return errors.New(err.DetailedError)
 		}
 		t.Channels = mmchannels.Data.(*model.ChannelList)
-		mmchannels, err = m.Client.GetMoreChannels("")
+		if m.mmVersion() >= 3.8 {
+			mmchannels, err = m.Client.GetMoreChannelsPage(0, 5000)
+		} else {
+			mmchannels, err = m.Client.GetMoreChannels("")
+		}
 		if err != nil {
 			return errors.New(err.DetailedError)
 		}
@@ -691,3 +740,19 @@ func (m *MMClient) sendWSRequest(action string, data map[string]interface{}) err
 	m.WsClient.WriteJSON(req)
 	return nil
 }
+
+func (m *MMClient) mmVersion() float64 {
+	v, _ := strconv.ParseFloat(m.ServerVersion[0:3], 64)
+	return v
+}
+
+func supportedVersion(version string) bool {
+	if strings.HasPrefix(version, "3.5.0") ||
+		strings.HasPrefix(version, "3.6.0") ||
+		strings.HasPrefix(version, "3.7.0") ||
+		strings.HasPrefix(version, "3.8.0") ||
+		strings.HasPrefix(version, "3.9.0") {
+		return true
+	}
+	return false
+}

vendor/github.com/mattermost/platform/vendor/github.com/alecthomas/log4go/examples/ConsoleLogWriter_Manual.go

@@ -1,14 +0,0 @@
-package main
-
-import (
-	"time"
-)
-
-import l4g "code.google.com/p/log4go"
-
-func main() {
-	log := l4g.NewLogger()
-	defer log.Close()
-	log.AddFilter("stdout", l4g.DEBUG, l4g.NewConsoleLogWriter())
-	log.Info("The time is now: %s", time.Now().Format("15:04:05 MST 2006/01/02"))
-}

vendor/github.com/mattermost/platform/vendor/github.com/alecthomas/log4go/examples/FileLogWriter_Manual.go

@@ -1,57 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"os"
-	"time"
-)
-
-import l4g "code.google.com/p/log4go"
-
-const (
-	filename = "flw.log"
-)
-
-func main() {
-	// Get a new logger instance
-	log := l4g.NewLogger()
-
-	// Create a default logger that is logging messages of FINE or higher
-	log.AddFilter("file", l4g.FINE, l4g.NewFileLogWriter(filename, false))
-	log.Close()
-
-	/* Can also specify manually via the following: (these are the defaults) */
-	flw := l4g.NewFileLogWriter(filename, false)
-	flw.SetFormat("[%D %T] [%L] (%S) %M")
-	flw.SetRotate(false)
-	flw.SetRotateSize(0)
-	flw.SetRotateLines(0)
-	flw.SetRotateDaily(false)
-	log.AddFilter("file", l4g.FINE, flw)
-
-	// Log some experimental messages
-	log.Finest("Everything is created now (notice that I will not be printing to the file)")
-	log.Info("The time is now: %s", time.Now().Format("15:04:05 MST 2006/01/02"))
-	log.Critical("Time to close out!")
-
-	// Close the log
-	log.Close()
-
-	// Print what was logged to the file (yes, I know I'm skipping error checking)
-	fd, _ := os.Open(filename)
-	in := bufio.NewReader(fd)
-	fmt.Print("Messages logged to file were: (line numbers not included)\n")
-	for lineno := 1; ; lineno++ {
-		line, err := in.ReadString('\n')
-		if err == io.EOF {
-			break
-		}
-		fmt.Printf("%3d:\t%s", lineno, line)
-	}
-	fd.Close()
-
-	// Remove the file so it's not lying around
-	os.Remove(filename)
-}

vendor/github.com/mattermost/platform/vendor/github.com/alecthomas/log4go/examples/SimpleNetLogServer.go

@@ -1,42 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"net"
-	"os"
-)
-
-var (
-	port = flag.String("p", "12124", "Port number to listen on")
-)
-
-func e(err error) {
-	if err != nil {
-		fmt.Printf("Erroring out: %s\n", err)
-		os.Exit(1)
-	}
-}
-
-func main() {
-	flag.Parse()
-
-	// Bind to the port
-	bind, err := net.ResolveUDPAddr("0.0.0.0:" + *port)
-	e(err)
-
-	// Create listener
-	listener, err := net.ListenUDP("udp", bind)
-	e(err)
-
-	fmt.Printf("Listening to port %s...\n", *port)
-	for {
-		// read into a new buffer
-		buffer := make([]byte, 1024)
-		_, _, err := listener.ReadFrom(buffer)
-		e(err)
-
-		// log to standard output
-		fmt.Println(string(buffer))
-	}
-}

vendor/github.com/mattermost/platform/vendor/github.com/alecthomas/log4go/examples/SocketLogWriter_Manual.go

@@ -1,18 +0,0 @@
-package main
-
-import (
-	"time"
-)
-
-import l4g "code.google.com/p/log4go"
-
-func main() {
-	log := l4g.NewLogger()
-	log.AddFilter("network", l4g.FINEST, l4g.NewSocketLogWriter("udp", "192.168.1.255:12124"))
-
-	// Run `nc -u -l -p 12124` or similar before you run this to see the following message
-	log.Info("The time is now: %s", time.Now().Format("15:04:05 MST 2006/01/02"))
-
-	// This makes sure the output stream buffer is written
-	log.Close()
-}

vendor/github.com/mattermost/platform/vendor/github.com/alecthomas/log4go/examples/XMLConfigurationExample.go

@@ -1,13 +0,0 @@
-package main
-
-import l4g "code.google.com/p/log4go"
-
-func main() {
-	// Load the configuration (isn't this easy?)
-	l4g.LoadConfiguration("example.xml")
-
-	// And now we're ready!
-	l4g.Finest("This will only go to those of you really cool UDP kids!  If you change enabled=true.")
-	l4g.Debug("Oh no!  %d + %d = %d!", 2, 2, 2+2)
-	l4g.Info("About that time, eh chaps?")
-}