Release v1.11.0

* potential fixes for #431
* go: fix formatting/gofmt/goreturns

README.md

@@ -49,7 +49,7 @@ Used by at least 2 projects. Feel free to make a PR to add your project to this
 
 # Requirements
 Accounts to one of the supported bridges
-* [Mattermost](https://github.com/mattermost/platform/) 3.8.x - 3.10.x, 4.x
+* [Mattermost](https://github.com/mattermost/platform/) 3.8.x - 3.10.x, 4.x, 5.x
 * [IRC](http://www.mirc.com/servers.html)
 * [XMPP](https://jabber.org)
 * [Gitter](https://gitter.im)
@@ -69,11 +69,13 @@ See https://github.com/42wim/matterbridge/wiki
 
 # Installing
 ## Binaries
-* Latest stable release [v1.10.1](https://github.com/42wim/matterbridge/releases/latest)
+* Latest stable release [v1.11.0](https://github.com/42wim/matterbridge/releases/latest)
 * Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/)  
 
 ## Building
-Go 1.8+ 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)
+Go 1.8+ 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).
+
+After Go is setup, download matterbridge to your $GOPATH directory. 
 
 ```
 cd $GOPATH

bridge/api/api.go

@@ -2,14 +2,15 @@ package api
 
 import (
 	"encoding/json"
+	"net/http"
+	"sync"
+	"time"
+
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/labstack/echo"
 	"github.com/labstack/echo/middleware"
 	"github.com/zfjagann/golang-ring"
-	"net/http"
-	"sync"
-	"time"
 )
 
 type Api struct {

bridge/config/config.go

@@ -2,14 +2,15 @@ package config
 
 import (
 	"bytes"
-	"github.com/fsnotify/fsnotify"
-	log "github.com/sirupsen/logrus"
-	"github.com/spf13/viper"
-	prefixed "github.com/x-cray/logrus-prefixed-formatter"
 	"os"
 	"strings"
 	"sync"
 	"time"
+
+	"github.com/fsnotify/fsnotify"
+	log "github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
+	prefixed "github.com/x-cray/logrus-prefixed-formatter"
 )
 
 const (
@@ -73,6 +74,8 @@ type Protocol struct {
 	Jid                    string // xmpp
 	Label                  string // all protocols
 	Login                  string // mattermost, matrix
+	MediaDownloadBlackList []string
+	MediaDownloadPath      string // Basically MediaServerUpload, but instead of uploading it, just write it to a file on the same server.
 	MediaDownloadSize      int    // all protocols
 	MediaServerDownload    string
 	MediaServerUpload      string
@@ -123,7 +126,7 @@ type Protocol struct {
 }
 
 type ChannelOptions struct {
-	Key        string // irc
+	Key        string // irc, xmpp
 	WebhookURL string // discord
 }
 

bridge/discord/discord.go

@@ -3,13 +3,14 @@ package bdiscord
 import (
 	"bytes"
 	"fmt"
+	"regexp"
+	"strings"
+	"sync"
+
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/bridge/helper"
 	"github.com/bwmarrin/discordgo"
-	"regexp"
-	"strings"
-	"sync"
 )
 
 type Bdiscord struct {

bridge/gitter/gitter.go

@@ -2,11 +2,12 @@ package bgitter
 
 import (
 	"fmt"
+	"strings"
+
 	"github.com/42wim/go-gitter"
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/bridge/helper"
-	"strings"
 )
 
 type Bgitter struct {

bridge/helper/helper.go

@@ -3,12 +3,14 @@ package helper
 import (
 	"bytes"
 	"fmt"
-	"github.com/42wim/matterbridge/bridge/config"
-	log "github.com/sirupsen/logrus"
 	"io"
 	"net/http"
+	"regexp"
 	"strings"
 	"time"
+
+	"github.com/42wim/matterbridge/bridge/config"
+	log "github.com/sirupsen/logrus"
 )
 
 func DownloadFile(url string) (*[]byte, error) {
@@ -72,6 +74,19 @@ func GetAvatar(av map[string]string, userid string, general *config.Protocol) st
 }
 
 func HandleDownloadSize(flog *log.Entry, msg *config.Message, name string, size int64, general *config.Protocol) error {
+	// check blacklist here
+	for _, entry := range general.MediaDownloadBlackList {
+		if entry != "" {
+			re, err := regexp.Compile(entry)
+			if err != nil {
+				flog.Errorf("incorrect regexp %s for %s", entry, msg.Account)
+				continue
+			}
+			if re.MatchString(name) {
+				return fmt.Errorf("Matching blacklist %s. Not downloading %s", entry, name)
+			}
+		}
+	}
 	flog.Debugf("Trying to download %#v with size %#v", name, size)
 	if int(size) > general.MediaDownloadSize {
 		msg.Event = config.EVENT_FILE_FAILURE_SIZE

bridge/irc/irc.go

@@ -4,14 +4,6 @@ import (
 	"bytes"
 	"crypto/tls"
 	"fmt"
-	"github.com/42wim/matterbridge/bridge"
-	"github.com/42wim/matterbridge/bridge/config"
-	"github.com/42wim/matterbridge/bridge/helper"
-	"github.com/dfordsoft/golib/ic"
-	"github.com/lrstanley/girc"
-	"github.com/paulrosania/go-charset/charset"
-	_ "github.com/paulrosania/go-charset/data"
-	"github.com/saintfish/chardet"
 	"hash/crc32"
 	"io"
 	"io/ioutil"
@@ -22,6 +14,15 @@ import (
 	"strings"
 	"time"
 	"unicode/utf8"
+
+	"github.com/42wim/matterbridge/bridge"
+	"github.com/42wim/matterbridge/bridge/config"
+	"github.com/42wim/matterbridge/bridge/helper"
+	"github.com/dfordsoft/golib/ic"
+	"github.com/lrstanley/girc"
+	"github.com/paulrosania/go-charset/charset"
+	_ "github.com/paulrosania/go-charset/data"
+	"github.com/saintfish/chardet"
 )
 
 type Birc struct {
@@ -114,18 +115,19 @@ func (b *Birc) Connect() error {
 	go func() {
 		for {
 			if err := i.Connect(); err != nil {
-				b.Log.Errorf("error: %s", err)
-				b.Log.Info("reconnecting in 30 seconds...")
-				time.Sleep(30 * time.Second)
-				i.Handlers.Clear(girc.RPL_WELCOME)
-				i.Handlers.Add(girc.RPL_WELCOME, func(client *girc.Client, event girc.Event) {
-					b.Remote <- config.Message{Username: "system", Text: "rejoin", Channel: "", Account: b.Account, Event: config.EVENT_REJOIN_CHANNELS}
-					// set our correct nick on reconnect if necessary
-					b.Nick = event.Source.Name
-				})
+				b.Log.Errorf("disconnect: error: %s", err)
 			} else {
-				return
+				b.Log.Info("disconnect: client requested quit")
 			}
+
+			b.Log.Info("reconnecting in 30 seconds...")
+			time.Sleep(30 * time.Second)
+			i.Handlers.Clear(girc.RPL_WELCOME)
+			i.Handlers.Add(girc.RPL_WELCOME, func(client *girc.Client, event girc.Event) {
+				b.Remote <- config.Message{Username: "system", Text: "rejoin", Channel: "", Account: b.Account, Event: config.EVENT_REJOIN_CHANNELS}
+				// set our correct nick on reconnect if necessary
+				b.Nick = event.Source.Name
+			})
 		}
 	}()
 	b.i = i
@@ -250,7 +252,8 @@ func (b *Birc) doSend() {
 		username := msg.Username
 		if b.GetBool("Colornicks") {
 			checksum := crc32.ChecksumIEEE([]byte(msg.Username))
-			username = fmt.Sprintf("\x03%02d%s\x0F", checksum%0x10, msg.Username)
+			colorCode := checksum%14 + 2 // quick fix - prevent white or black color codes
+			username = fmt.Sprintf("\x03%02d%s\x0F", colorCode, msg.Username)
 		}
 		if msg.Event == config.EVENT_USER_ACTION {
 			b.i.Cmd.Action(msg.Channel, username+msg.Text)

bridge/matrix/matrix.go

@@ -3,14 +3,15 @@ package bmatrix
 import (
 	"bytes"
 	"fmt"
-	"github.com/42wim/matterbridge/bridge"
-	"github.com/42wim/matterbridge/bridge/config"
-	"github.com/42wim/matterbridge/bridge/helper"
-	matrix "github.com/matterbridge/gomatrix"
 	"mime"
 	"regexp"
 	"strings"
 	"sync"
+
+	"github.com/42wim/matterbridge/bridge"
+	"github.com/42wim/matterbridge/bridge/config"
+	"github.com/42wim/matterbridge/bridge/helper"
+	matrix "github.com/matterbridge/gomatrix"
 )
 
 type Bmatrix struct {

bridge/mattermost/mattermost.go

@@ -3,13 +3,14 @@ package bmattermost
 import (
 	"errors"
 	"fmt"
+	"strings"
+
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/bridge/helper"
 	"github.com/42wim/matterbridge/matterclient"
 	"github.com/42wim/matterbridge/matterhook"
 	"github.com/rs/xid"
-	"strings"
 )
 
 type Bmattermost struct {
@@ -220,6 +221,18 @@ func (b *Bmattermost) handleMatterClient(messages chan *config.Message) {
 			}
 			if _, ok := props["attachments"].([]interface{}); ok {
 				rmsg.Extra["attachments"] = props["attachments"].([]interface{})
+				if rmsg.Text == "" {
+					for _, attachment := range rmsg.Extra["attachments"] {
+						attach := attachment.(map[string]interface{})
+						if attach["text"].(string) != "" {
+							rmsg.Text += attach["text"].(string)
+							continue
+						}
+						if attach["fallback"].(string) != "" {
+							rmsg.Text += attach["fallback"].(string)
+						}
+					}
+				}
 			}
 		}
 

bridge/slack/slack.go

@@ -357,7 +357,7 @@ func (b *Bslack) userGroupName(id string) string {
 
 // @see https://api.slack.com/docs/message-formatting#linking_to_channels_and_users
 func (b *Bslack) replaceMention(text string) string {
-	results := regexp.MustCompile(`<@([a-zA-z0-9]+)>`).FindAllStringSubmatch(text, -1)
+	results := regexp.MustCompile(`<@([a-zA-Z0-9]+)>`).FindAllStringSubmatch(text, -1)
 	for _, r := range results {
 		text = strings.Replace(text, "<@"+r[1]+">", "@"+b.userName(r[1]), -1)
 	}
@@ -503,7 +503,10 @@ func (b *Bslack) handleMessageEvent(ev *slack.MessageEvent) (*config.Message, er
 	if rmsg.Text == "" {
 		for _, attach := range ev.Attachments {
 			if attach.Text != "" {
-				rmsg.Text = attach.Text
+				if attach.Title != "" {
+					rmsg.Text = attach.Title + "\n"
+				}
+				rmsg.Text += attach.Text
 			} else {
 				rmsg.Text = attach.Fallback
 			}

bridge/sshchat/sshchat.go

@@ -2,13 +2,14 @@ package bsshchat
 
 import (
 	"bufio"
+	"io"
+	"strings"
+
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/bridge/helper"
 	"github.com/shazow/ssh-chat/sshd"
 	log "github.com/sirupsen/logrus"
-	"io"
-	"strings"
 )
 
 type Bsshchat struct {
@@ -120,6 +121,10 @@ func (b *Bsshchat) handleSshChat() error {
 	wait := true
 	for {
 		if b.r.Scan() {
+			// ignore messages from ourselves
+			if !strings.Contains(b.r.Text(), "\033[K") {
+				continue
+			}
 			res := strings.Split(stripPrompt(b.r.Text()), ":")
 			if res[0] == "-> Set theme" {
 				wait = false

bridge/telegram/html.go

@@ -2,8 +2,9 @@ package btelegram
 
 import (
 	"bytes"
-	"github.com/russross/blackfriday"
 	"html"
+
+	"github.com/russross/blackfriday"
 )
 
 type customHTML struct {

bridge/telegram/telegram.go

@@ -1,6 +1,7 @@
 package btelegram
 
 import (
+	"html"
 	"regexp"
 	"strconv"
 	"strings"
@@ -97,6 +98,10 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
 		if err != nil {
 			return "", err
 		}
+		if strings.ToLower(b.GetString("MessageFormat")) == "htmlnick" {
+			b.Log.Debug("Using mode HTML - nick only")
+			msg.Text = html.EscapeString(msg.Text)
+		}
 		m := tgbotapi.NewEditMessageText(chatid, msgid, msg.Username+msg.Text)
 		if b.GetString("MessageFormat") == "HTML" {
 			b.Log.Debug("Using mode HTML")
@@ -106,6 +111,10 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
 			b.Log.Debug("Using mode markdown")
 			m.ParseMode = tgbotapi.ModeMarkdown
 		}
+		if strings.ToLower(b.GetString("MessageFormat")) == "htmlnick" {
+			b.Log.Debug("Using mode HTML - nick only")
+			m.ParseMode = tgbotapi.ModeHTML
+		}
 		_, err = b.c.Send(m)
 		if err != nil {
 			return "", err
@@ -391,13 +400,17 @@ func (b *Btelegram) sendMessage(chatid int64, username, text string) (string, er
 	m.Text = username + text
 	if b.GetString("MessageFormat") == "HTML" {
 		b.Log.Debug("Using mode HTML")
-		m.Text = username + text
 		m.ParseMode = tgbotapi.ModeHTML
 	}
 	if b.GetString("MessageFormat") == "Markdown" {
 		b.Log.Debug("Using mode markdown")
 		m.ParseMode = tgbotapi.ModeMarkdown
 	}
+	if strings.ToLower(b.GetString("MessageFormat")) == "htmlnick" {
+		b.Log.Debug("Using mode HTML - nick only")
+		m.Text = username + html.EscapeString(text)
+		m.ParseMode = tgbotapi.ModeHTML
+	}
 	res, err := b.c.Send(m)
 	if err != nil {
 		return "", err

bridge/xmpp/xmpp.go

@@ -2,13 +2,15 @@ package bxmpp
 
 import (
 	"crypto/tls"
+	"strings"
+	"time"
+
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/bridge/helper"
 	"github.com/jpillora/backoff"
 	"github.com/matterbridge/go-xmpp"
-	"strings"
-	"time"
+	"github.com/rs/xid"
 )
 
 type Bxmpp struct {
@@ -63,11 +65,18 @@ func (b *Bxmpp) Disconnect() error {
 }
 
 func (b *Bxmpp) JoinChannel(channel config.ChannelInfo) error {
-	b.xc.JoinMUCNoHistory(channel.Name+"@"+b.GetString("Muc"), b.GetString("Nick"))
+	if channel.Options.Key != "" {
+		b.Log.Debugf("using key %s for channel %s", channel.Options.Key, channel.Name)
+		b.xc.JoinProtectedMUC(channel.Name+"@"+b.GetString("Muc"), b.GetString("Nick"), channel.Options.Key, xmpp.NoHistory, 0, nil)
+	} else {
+		b.xc.JoinMUCNoHistory(channel.Name+"@"+b.GetString("Muc"), b.GetString("Nick"))
+	}
 	return nil
 }
 
 func (b *Bxmpp) Send(msg config.Message) (string, error) {
+	var msgid = ""
+	var msgreplaceid = ""
 	// ignore delete messages
 	if msg.Event == config.EVENT_MSG_DELETE {
 		return "", nil
@@ -84,12 +93,17 @@ func (b *Bxmpp) Send(msg config.Message) (string, error) {
 		}
 	}
 
+	msgid = xid.New().String()
+	if msg.ID != "" {
+		msgid = msg.ID
+		msgreplaceid = msg.ID
+	}
 	// Post normal message
-	_, err := b.xc.Send(xmpp.Chat{Type: "groupchat", Remote: msg.Channel + "@" + b.GetString("Muc"), Text: msg.Username + msg.Text})
+	_, err := b.xc.Send(xmpp.Chat{Type: "groupchat", Remote: msg.Channel + "@" + b.GetString("Muc"), Text: msg.Username + msg.Text, ID: msgid, ReplaceID: msgreplaceid})
 	if err != nil {
 		return "", err
 	}
-	return "", nil
+	return msgid, nil
 }
 
 func (b *Bxmpp) createXMPP() (*xmpp.Client, error) {
@@ -139,6 +153,7 @@ func (b *Bxmpp) xmppKeepAlive() chan bool {
 
 func (b *Bxmpp) handleXMPP() error {
 	var ok bool
+	var msgid string
 	done := b.xmppKeepAlive()
 	defer close(done)
 	for {
@@ -154,7 +169,11 @@ func (b *Bxmpp) handleXMPP() error {
 				if b.skipMessage(v) {
 					continue
 				}
-				rmsg := config.Message{Username: b.parseNick(v.Remote), Text: v.Text, Channel: b.parseChannel(v.Remote), Account: b.Account, UserID: v.Remote}
+				msgid = v.ID
+				if v.ReplaceID != "" {
+					msgid = v.ReplaceID
+				}
+				rmsg := config.Message{Username: b.parseNick(v.Remote), Text: v.Text, Channel: b.parseChannel(v.Remote), Account: b.Account, UserID: v.Remote, ID: msgid}
 
 				// check if we have an action event
 				rmsg.Text, ok = b.replaceAction(rmsg.Text)
@@ -181,6 +200,7 @@ func (b *Bxmpp) replaceAction(text string) (string, bool) {
 // handleUploadFile handles native upload of files
 func (b *Bxmpp) handleUploadFile(msg *config.Message) (string, error) {
 	var urldesc = ""
+
 	for _, f := range msg.Extra["file"] {
 		fi := f.(config.FileInfo)
 		if fi.Comment != "" {

changelog.md

@@ -1,14 +1,35 @@
+# v1.11.0
+
+## New features
+* general: Add config option MediaDownloadPath (#443). See `MediaDownloadPath` in matterbridge.toml.sample
+* general: Add MediaDownloadBlacklist option. Closes #442. See `MediaDownloadBlacklist` in matterbridge.toml.sample
+* xmpp: Add channel password support for XMPP (#451)
+* xmpp: Add message correction support for XMPP (#437)
+* telegram: Add support for MessageFormat=htmlnick (telegram). #444
+* mattermost: Add support for mattermost 5.x
+
+## Enhancements
+* slack: Add Title from attachment slack message (#446)
+* irc: Prevent white or black color codes (irc) (#434)
+
+## Bugfix
+* slack: Fix regexp in replaceMention (slack). (#435)
+* irc: Reconnect on quit. (irc) See #431 (#445)
+* sshchat: Ignore messages from ourself. (sshchat) Closes #439
+
 # v1.10.1
+## New features
+* irc: Colorize username sent to IRC using its crc32 IEEE checksum (#423). See `ColorNicks` in matterbridge.toml.sample
+* irc: Add support for CJK to/from utf-8 (irc). #400
+* telegram: Add QuoteFormat option (telegram). Closes #413. See `QuoteFormat` in matterbridge.toml.sample
+* xmpp: Send attached files to XMPP in different message with OOB data and without body (#421)
+
 ## Bugfix
 * general: updated irc/xmpp/telegram libraries
 * mattermost/slack/rocketchat: Fix iconurl regression. Closes #430
 * mattermost/slack: Use uuid instead of userid. Fixes #429
 * slack: Avatar spoofing from Slack to Discord with uppercase in nick doesn't work (#433)
 * irc: Fix format string bug (irc) (#428)
-* irc: Colorize username sent to IRC using its crc32 IEEE checksum (#423). See `ColorNicks` in matterbridge.toml.sample
-* irc: Add support for CJK to/from utf-8 (irc). #400
-* telegram: Add QuoteFormat option (telegram). Closes #41. See `QuoteFormat` in matterbridge.toml.sample
-* xmpp: Send attached files to XMPP in different message with OOB data and without body (#421)
 
 # v1.10.0
 ## New features

gateway/gateway.go

@@ -3,31 +3,35 @@ package gateway
 import (
 	"bytes"
 	"fmt"
+	"io/ioutil"
+	"net/http"
+	"os"
+
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/api"
 	"github.com/42wim/matterbridge/bridge/config"
-	"github.com/42wim/matterbridge/bridge/discord"
-	"github.com/42wim/matterbridge/bridge/gitter"
-	"github.com/42wim/matterbridge/bridge/irc"
-	"github.com/42wim/matterbridge/bridge/matrix"
-	"github.com/42wim/matterbridge/bridge/mattermost"
-	"github.com/42wim/matterbridge/bridge/rocketchat"
-	"github.com/42wim/matterbridge/bridge/slack"
-	"github.com/42wim/matterbridge/bridge/sshchat"
-	"github.com/42wim/matterbridge/bridge/steam"
-	"github.com/42wim/matterbridge/bridge/telegram"
-	"github.com/42wim/matterbridge/bridge/xmpp"
-	"github.com/42wim/matterbridge/bridge/zulip"
+	bdiscord "github.com/42wim/matterbridge/bridge/discord"
+	bgitter "github.com/42wim/matterbridge/bridge/gitter"
+	birc "github.com/42wim/matterbridge/bridge/irc"
+	bmatrix "github.com/42wim/matterbridge/bridge/matrix"
+	bmattermost "github.com/42wim/matterbridge/bridge/mattermost"
+	brocketchat "github.com/42wim/matterbridge/bridge/rocketchat"
+	bslack "github.com/42wim/matterbridge/bridge/slack"
+	bsshchat "github.com/42wim/matterbridge/bridge/sshchat"
+	bsteam "github.com/42wim/matterbridge/bridge/steam"
+	btelegram "github.com/42wim/matterbridge/bridge/telegram"
+	bxmpp "github.com/42wim/matterbridge/bridge/xmpp"
+	bzulip "github.com/42wim/matterbridge/bridge/zulip"
+	"github.com/hashicorp/golang-lru"
 	log "github.com/sirupsen/logrus"
 	//	"github.com/davecgh/go-spew/spew"
 	"crypto/sha1"
-	"github.com/hashicorp/golang-lru"
-	"github.com/peterhellberg/emojilib"
-	"net/http"
 	"path/filepath"
 	"regexp"
 	"strings"
 	"time"
+
+	"github.com/peterhellberg/emojilib"
 )
 
 type Gateway struct {
@@ -411,46 +415,83 @@ func (gw *Gateway) modifyMessage(msg *config.Message) {
 	}
 }
 
+// handleFiles uploads or places all files on the given msg to the MediaServer and
+// adds the new URL of the file on the MediaServer onto the given msg.
 func (gw *Gateway) handleFiles(msg *config.Message) {
 	reg := regexp.MustCompile("[^a-zA-Z0-9]+")
-	// if we don't have a attachfield or we don't have a mediaserver configured return
-	if msg.Extra == nil || gw.Config.General.MediaServerUpload == "" {
+
+	// If we don't have a attachfield or we don't have a mediaserver configured return
+	if msg.Extra == nil || (gw.Config.General.MediaServerUpload == "" && gw.Config.General.MediaDownloadPath == "") {
 		return
 	}
 
-	// if we actually have files, start uploading them to the mediaserver
-	if len(msg.Extra["file"]) > 0 {
-		client := &http.Client{
-			Timeout: time.Second * 5,
-		}
-		for i, f := range msg.Extra["file"] {
-			fi := f.(config.FileInfo)
-			ext := filepath.Ext(fi.Name)
-			fi.Name = fi.Name[0 : len(fi.Name)-len(ext)]
-			fi.Name = reg.ReplaceAllString(fi.Name, "_")
-			fi.Name = fi.Name + ext
-			sha1sum := fmt.Sprintf("%x", sha1.Sum(*fi.Data))
-			reader := bytes.NewReader(*fi.Data)
+	// If we don't have files, nothing to upload.
+	if len(msg.Extra["file"]) == 0 {
+		return
+	}
+
+	client := &http.Client{
+		Timeout: time.Second * 5,
+	}
+
+	for i, f := range msg.Extra["file"] {
+		fi := f.(config.FileInfo)
+		ext := filepath.Ext(fi.Name)
+		fi.Name = fi.Name[0 : len(fi.Name)-len(ext)]
+		fi.Name = reg.ReplaceAllString(fi.Name, "_")
+		fi.Name = fi.Name + ext
+
+		sha1sum := fmt.Sprintf("%x", sha1.Sum(*fi.Data))[:8]
+
+		if gw.Config.General.MediaServerUpload != "" {
+			// Use MediaServerUpload. Upload using a PUT HTTP request and basicauth.
+
 			url := gw.Config.General.MediaServerUpload + "/" + sha1sum + "/" + fi.Name
-			durl := gw.Config.General.MediaServerDownload + "/" + sha1sum + "/" + fi.Name
-			extra := msg.Extra["file"][i].(config.FileInfo)
-			extra.URL = durl
-			req, err := http.NewRequest("PUT", url, reader)
+
+			req, err := http.NewRequest("PUT", url, bytes.NewReader(*fi.Data))
 			if err != nil {
-				flog.Errorf("mediaserver upload failed: %#v", err)
+				flog.Errorf("mediaserver upload failed, could not create request: %#v", err)
 				continue
 			}
+
+			flog.Debugf("mediaserver upload url: %s", url)
+
 			req.Header.Set("Content-Type", "binary/octet-stream")
 			_, err = client.Do(req)
 			if err != nil {
-				flog.Errorf("mediaserver upload failed: %#v", err)
+				flog.Errorf("mediaserver upload failed, could not Do request: %#v", err)
+				continue
+			}
+		} else {
+			// Use MediaServerPath. Place the file on the current filesystem.
+
+			dir := gw.Config.General.MediaDownloadPath + "/" + sha1sum
+			err := os.Mkdir(dir, os.ModePerm)
+			if err != nil && !os.IsExist(err) {
+				flog.Errorf("mediaserver path failed, could not mkdir: %s %#v", err, err)
+				continue
+			}
+
+			path := dir + "/" + fi.Name
+			flog.Debugf("mediaserver path placing file: %s", path)
+
+			err = ioutil.WriteFile(path, *fi.Data, os.ModePerm)
+			if err != nil {
+				flog.Errorf("mediaserver path failed, could not writefile: %s %#v", err, err)
 				continue
 			}
-			flog.Debugf("mediaserver download URL = %s", durl)
-			// we uploaded the file successfully. Add the SHA
-			extra.SHA = sha1sum
-			msg.Extra["file"][i] = extra
 		}
+
+		// Download URL.
+		durl := gw.Config.General.MediaServerDownload + "/" + sha1sum + "/" + fi.Name
+
+		flog.Debugf("mediaserver download URL = %s", durl)
+
+		// We uploaded/placed the file successfully. Add the SHA and URL.
+		extra := msg.Extra["file"][i].(config.FileInfo)
+		extra.URL = durl
+		extra.SHA = sha1sum
+		msg.Extra["file"][i] = extra
 	}
 }
 

gateway/gateway_test.go

@@ -2,9 +2,10 @@ package gateway
 
 import (
 	"fmt"
+	"strconv"
+
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/stretchr/testify/assert"
-	"strconv"
 
 	"testing"
 )

gateway/router.go

@@ -2,9 +2,10 @@ package gateway
 
 import (
 	"fmt"
+
 	"github.com/42wim/matterbridge/bridge"
 	"github.com/42wim/matterbridge/bridge/config"
-	"github.com/42wim/matterbridge/gateway/samechannel"
+	samechannelgateway "github.com/42wim/matterbridge/gateway/samechannel"
 	//	"github.com/davecgh/go-spew/spew"
 	"time"
 )

gateway/samechannel/samechannel_test.go

@@ -2,6 +2,7 @@ package samechannelgateway
 
 import (
 	"fmt"
+
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/BurntSushi/toml"
 	"github.com/stretchr/testify/assert"

matterbridge.go

@@ -3,17 +3,18 @@ package main
 import (
 	"flag"
 	"fmt"
+	"os"
+	"strings"
+
 	"github.com/42wim/matterbridge/bridge/config"
 	"github.com/42wim/matterbridge/gateway"
 	"github.com/google/gops/agent"
 	log "github.com/sirupsen/logrus"
 	prefixed "github.com/x-cray/logrus-prefixed-formatter"
-	"os"
-	"strings"
 )
 
 var (
-	version = "1.10.1"
+	version = "1.11.0"
 	githash string
 )
 

matterbridge.toml.sample

@@ -799,8 +799,10 @@ Token="Yourtokenhere"
 ## Settings below can be reloaded by editing the file
 
 #OPTIONAL (default empty)
-#Only supported format is "HTML", messages will be sent in html parsemode.
+#Supported formats are "HTML", "Markdown" and "HTMLNick"
 #See https://core.telegram.org/bots/api#html-style
+#See https://core.telegram.org/bots/api#markdown-style
+#HTMLNick only allows HTML for the nick, the message itself will be html-escaped
 MessageFormat=""
 
 #If enabled use the "First Name" as username. If this is empty use the Username
@@ -1305,10 +1307,13 @@ RemoteNickFormat="[{PROTOCOL}] <{NICK}> "
 StripNick=false
 
 
-#MediaServerUpload and MediaServerDownload are used for uploading images/files/video to
-#a remote "mediaserver" (a webserver like caddy for example).
-#When configured images/files uploaded on bridges like mattermost,slack, telegram will be downloaded
-#and uploaded again to MediaServerUpload URL
+#MediaServerUpload (or MediaDownloadPath) and MediaServerDownload are used for uploading
+#images/files/video to a remote "mediaserver" (a webserver like caddy for example).
+#When configured images/files uploaded on bridges like mattermost, slack, telegram will be
+#downloaded and uploaded again to MediaServerUpload URL
+#MediaDownloadPath is the filesystem path where the media file will be placed, instead of uploaded,
+#for if Matterbridge has write access to the directory your webserver is serving.
+#It is an alternative to MediaServerUpload.
 #The MediaServerDownload will be used so that bridges without native uploading support:
 #gitter, irc and xmpp will be shown links to the files on MediaServerDownload
 #
@@ -1316,6 +1321,8 @@ StripNick=false
 #OPTIONAL (default empty)
 MediaServerUpload="https://user:pass@yourserver.com/upload"
 #OPTIONAL (default empty)
+MediaDownloadPath="/srv/http/yourserver.com/public/download"
+#OPTIONAL (default empty)
 MediaServerDownload="https://youserver.com/download"
 
 #MediaDownloadSize is the maximum size of attachments, videos, images
@@ -1325,9 +1332,15 @@ MediaServerDownload="https://youserver.com/download"
 #It will only download from bridges that don't have public links available, which are for the moment
 #slack, telegram, matrix and mattermost
 #
-#Optional (default 1000000 (1 megabyte))
+#OPTIONAL (default 1000000 (1 megabyte))
 MediaDownloadSize=1000000
 
+#MediaDownloadBlacklist allows you to blacklist specific files from being downloaded.
+#Filenames matching these regexp will not be download/uploaded to the mediaserver
+#You can use regex for this, see https://regex-golang.appspot.com/assets/html/index.html for more regex info
+#OPTIONAL (default empty)
+MediaDownloadBlacklist=[".html$",".htm$"]
+
 ###################################################################
 #Gateway configuration
 ###################################################################
@@ -1380,9 +1393,9 @@ enable=true
     #REQUIRED
     channel="#testing"
 
-        #OPTIONAL - only used for IRC protocol at the moment
+        #OPTIONAL - only used for IRC and XMPP protocols at the moment
         [gateway.in.options]
-        #OPTIONAL - your irc channel key
+        #OPTIONAL - your irc / xmpp channel key
         key="yourkey"
 
 
@@ -1391,9 +1404,9 @@ enable=true
     account="irc.freenode"
     channel="#testing"
 
-        #OPTIONAL - only used for IRC protocol at the moment
+        #OPTIONAL - only used for IRC and XMPP protocols at the moment
         [gateway.out.options]
-        #OPTIONAL - your irc channel key
+        #OPTIONAL - your irc / xmpp channel key
         key="yourkey"
 
     #[[gateway.inout]] can be used when then channel will be used to receive from 
@@ -1402,9 +1415,9 @@ enable=true
     account="mattermost.work"
     channel="off-topic"
 
-        #OPTIONAL - only used for IRC protocol at the moment
+        #OPTIONAL - only used for IRC and XMPP protocols at the moment
         [gateway.inout.options]
-        #OPTIONAL - your irc channel key
+        #OPTIONAL - your irc / xmpp channel key
         key="yourkey"
 
     [[gateway.inout]]

matterclient/matterclient.go

@@ -917,7 +917,8 @@ func supportedVersion(version string) bool {
 	if strings.HasPrefix(version, "3.8.0") ||
 		strings.HasPrefix(version, "3.9.0") ||
 		strings.HasPrefix(version, "3.10.0") ||
-		strings.HasPrefix(version, "4.") {
+		strings.HasPrefix(version, "4.") ||
+		strings.HasPrefix(version, "5.") {
 		return true
 	}
 	return false

matterhook/matterhook.go

@@ -6,14 +6,15 @@ import (
 	"crypto/tls"
 	"encoding/json"
 	"fmt"
-	"github.com/gorilla/schema"
-	"github.com/nlopes/slack"
 	"io"
 	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
 	"time"
+
+	"github.com/gorilla/schema"
+	"github.com/nlopes/slack"
 )
 
 // OMessage for mattermost incoming webhook. (send to mattermost)

vendor/github.com/matterbridge/go-xmpp/xmpp.go

@@ -575,6 +575,8 @@ type Chat struct {
 	Thread    string
 	Ooburl    string
 	Oobdesc   string
+	ID        string
+	ReplaceID string
 	Roster    Roster
 	Other     []string
 	OtherElem []XMLElement
@@ -626,6 +628,8 @@ func (c *Client) Recv() (stanza interface{}, err error) {
 				Text:      v.Body,
 				Subject:   v.Subject,
 				Thread:    v.Thread,
+				ID:        v.ID,
+				ReplaceID: v.ReplaceID.ID,
 				Other:     v.OtherStrings(),
 				OtherElem: v.Other,
 				Stamp:     stamp,
@@ -657,6 +661,8 @@ func (c *Client) Send(chat Chat) (n int, err error) {
 	var subtext = ``
 	var thdtext = ``
 	var oobtext = ``
+	var msgidtext = ``
+	var msgcorrecttext = ``
 	if chat.Subject != `` {
 		subtext = `<subject>` + xmlEscape(chat.Subject) + `</subject>`
 	}
@@ -670,7 +676,13 @@ func (c *Client) Send(chat Chat) (n int, err error) {
 		}
 		oobtext += `</x>`
 	}
-	return fmt.Fprintf(c.conn, "<message to='%s' type='%s' xml:lang='en'>" + subtext + "<body>%s</body>" + oobtext + thdtext + "</message>",
+	if chat.ID != `` {
+		msgidtext = `id='` + xmlEscape(chat.ID) + `'`
+	}
+	if chat.ReplaceID != `` {
+		msgcorrecttext = `<replace id='` + xmlEscape(chat.ReplaceID) + `' xmlns='urn:xmpp:message-correct:0'/>`
+	}
+	return fmt.Fprintf(c.conn, "<message to='%s' type='%s' " + msgidtext + " xml:lang='en'>" + subtext + "<body>%s</body>" + msgcorrecttext + oobtext + thdtext + "</message>",
 		xmlEscape(chat.Remote), xmlEscape(chat.Type), xmlEscape(chat.Text))
 }
 
@@ -787,6 +799,11 @@ type bindBind struct {
 	Jid      string `xml:"jid"`
 }
 
+type clientMessageCorrect struct {
+	XMLName  xml.Name `xml:"urn:xmpp:message-correct:0 replace"`
+	ID       string   `xml:"id,attr"`
+}
+
 // RFC 3921  B.1  jabber:client
 type clientMessage struct {
 	XMLName xml.Name `xml:"jabber:client message"`
@@ -799,6 +816,7 @@ type clientMessage struct {
 	Subject string `xml:"subject"`
 	Body    string `xml:"body"`
 	Thread  string `xml:"thread"`
+	ReplaceID clientMessageCorrect
 
 	// Any hasn't matched element
 	Other []XMLElement `xml:",any"`

vendor/manifest

@@ -402,7 +402,7 @@
 			"importpath": "github.com/matterbridge/go-xmpp",
 			"repository": "https://github.com/matterbridge/go-xmpp",
 			"vcs": "git",
-			"revision": "3cceb718219057817b66c4bb55673f5f417c0bff",
+			"revision": "cd19799fba91790ac733655c546bce2107e5b838",
 			"branch": "work",
 			"notests": true
 		},
@@ -601,7 +601,7 @@
 			"repository": "https://github.com/nlopes/slack",
 			"vcs": "git",
 			"revision": "107290b5bbaf3e634833346bb4ff389b1c782bc7",
-			"branch": "master",
+			"branch": "HEAD",
 			"notests": true
 		},
 		{