Refactor matrix

bridge/matrix/matrix.go

@@ -2,15 +2,15 @@ package bmatrix
 
 import (
 	"bytes"
+	"fmt"
+	"github.com/42wim/matterbridge/bridge/config"
+	"github.com/42wim/matterbridge/bridge/helper"
+	matrix "github.com/matterbridge/gomatrix"
+	log "github.com/sirupsen/logrus"
 	"mime"
 	"regexp"
 	"strings"
 	"sync"
-
-	"github.com/42wim/matterbridge/bridge/config"
-	"github.com/42wim/matterbridge/bridge/helper"
-	log "github.com/sirupsen/logrus"
-	matrix "github.com/matterbridge/gomatrix"
 )
 
 type Bmatrix struct {
@@ -39,7 +39,6 @@ func (b *Bmatrix) Connect() error {
 	flog.Infof("Connecting %s", b.Config.Server)
 	b.mc, err = matrix.NewClient(b.Config.Server, "", "")
 	if err != nil {
-		flog.Debugf("%#v", err)
 		return err
 	}
 	resp, err := b.mc.Login(&matrix.ReqLogin{
@@ -48,7 +47,6 @@ func (b *Bmatrix) Connect() error {
 		Password: b.Config.Password,
 	})
 	if err != nil {
-		flog.Debugf("%#v", err)
 		return err
 	}
 	b.mc.SetCredentials(resp.UserID, resp.AccessToken)
@@ -75,8 +73,21 @@ func (b *Bmatrix) JoinChannel(channel config.ChannelInfo) error {
 
 func (b *Bmatrix) Send(msg config.Message) (string, error) {
 	flog.Debugf("Receiving %#v", msg)
+
 	channel := b.getRoomID(msg.Channel)
-	// ignore delete messages
+	flog.Debugf("Channel %s maps to channel id %s", msg.Channel, channel)
+
+	// Make a action /me of the message
+	if msg.Event == config.EVENT_USER_ACTION {
+		resp, err := b.mc.SendMessageEvent(channel, "m.room.message",
+			matrix.TextMessage{"m.emote", msg.Username + msg.Text})
+		if err != nil {
+			return "", err
+		}
+		return resp.EventID, err
+	}
+
+	// Delete message
 	if msg.Event == config.EVENT_MSG_DELETE {
 		if msg.ID == "" {
 			return "", nil
@@ -87,62 +98,22 @@ func (b *Bmatrix) Send(msg config.Message) (string, error) {
 		}
 		return resp.EventID, err
 	}
-	flog.Debugf("Sending to channel %s", channel)
-	if msg.Event == config.EVENT_USER_ACTION {
-		resp, err := b.mc.SendMessageEvent(channel, "m.room.message",
-			matrix.TextMessage{"m.emote", msg.Username + msg.Text})
-		if err != nil {
-			return "", err
-		}
-		return resp.EventID, err
-	}
 
+	// Upload a file if it exists
 	if msg.Extra != nil {
 		for _, rmsg := range helper.HandleExtra(&msg, b.General) {
 			b.mc.SendText(channel, rmsg.Username+rmsg.Text)
 		}
 		// check if we have files to upload (from slack, telegram or mattermost)
 		if len(msg.Extra["file"]) > 0 {
-			for _, f := range msg.Extra["file"] {
+			return b.handleUploadFile(&msg, channel)
-				fi := f.(config.FileInfo)
-				content := bytes.NewReader(*fi.Data)
-				sp := strings.Split(fi.Name, ".")
-				mtype := mime.TypeByExtension("." + sp[len(sp)-1])
-				if strings.Contains(mtype, "image") ||
-					strings.Contains(mtype, "video") {
-					if fi.Comment != "" {
-						_, err := b.mc.SendText(channel, msg.Username+fi.Comment)
-						if err != nil {
-							flog.Errorf("file comment failed: %#v", err)
-						}
-					}
-					flog.Debugf("uploading file: %s %s", fi.Name, mtype)
-					res, err := b.mc.UploadToContentRepo(content, mtype, int64(len(*fi.Data)))
-					if err != nil {
-						flog.Errorf("file upload failed: %#v", err)
-						continue
-					}
-					if strings.Contains(mtype, "video") {
-						flog.Debugf("sendVideo %s", res.ContentURI)
-						_, err = b.mc.SendVideo(channel, fi.Name, res.ContentURI)
-						if err != nil {
-							flog.Errorf("sendVideo failed: %#v", err)
-						}
-					}
-					if strings.Contains(mtype, "image") {
-						flog.Debugf("sendImage %s", res.ContentURI)
-						_, err = b.mc.SendImage(channel, fi.Name, res.ContentURI)
-						if err != nil {
-							flog.Errorf("sendImage failed: %#v", err)
-						}
-					}
-					flog.Debugf("result: %#v", res)
-				}
-			}
-			return "", nil
 		}
 	}
 
+	// Edit message if we have an ID
+	// matrix has no editing support
+
+	// Post normal message
 	resp, err := b.mc.SendText(channel, msg.Username+msg.Text)
 	if err != nil {
 		return "", err
@@ -185,15 +156,25 @@ func (b *Bmatrix) handleEvent(ev *matrix.Event) {
 			flog.Debugf("Unknown room %s", ev.RoomID)
 			return
 		}
-		username := ev.Sender[1:]
+
+		// TODO download avatar
+
+		// Create our message
+		rmsg := config.Message{Username: ev.Sender[1:], Channel: channel, Account: b.Account, UserID: ev.Sender, ID: ev.ID}
+
+		// Text must be a string
+		if rmsg.Text, ok = ev.Content["body"].(string); !ok {
+			flog.Errorf("Content[body] wasn't a %T ?", rmsg.Text)
+			return
+		}
+
+		// Remove homeserver suffix if configured
 		if b.Config.NoHomeServerSuffix {
 			re := regexp.MustCompile("(.*?):.*")
-			username = re.ReplaceAllString(username, `$1`)
+			rmsg.Username = re.ReplaceAllString(rmsg.Username, `$1`)
 		}
-		var text string
+
-		text, _ = ev.Content["body"].(string)
+		// Delete event
-		rmsg := config.Message{Username: username, Text: text, Channel: channel, Account: b.Account, UserID: ev.Sender}
-		rmsg.ID = ev.ID
 		if ev.Type == "m.room.redaction" {
 			rmsg.Event = config.EVENT_MSG_DELETE
 			rmsg.ID = ev.Redacts
@@ -201,23 +182,59 @@ func (b *Bmatrix) handleEvent(ev *matrix.Event) {
 			b.Remote <- rmsg
 			return
 		}
+
+		// Do we have a /me action
 		if ev.Content["msgtype"].(string) == "m.emote" {
 			rmsg.Event = config.EVENT_USER_ACTION
 		}
-		if ev.Content["msgtype"] != nil && ev.Content["msgtype"].(string) == "m.image" ||
+
-			ev.Content["msgtype"].(string) == "m.video" ||
+		// Do we have attachments
-			ev.Content["msgtype"].(string) == "m.file" {
+		if b.containsAttachment(ev.Content) {
-			flog.Debugf("ev: %#v", ev)
+			err := b.handleDownloadFile(&rmsg, ev.Content)
+			if err != nil {
+				flog.Errorf("download failed: %#v", err)
+			}
+		}
+
+		flog.Debugf("Sending message from %s on %s to gateway", ev.Sender, b.Account)
+		b.Remote <- rmsg
+	}
+}
+
+// handleDownloadFile handles file download
+func (b *Bmatrix) handleDownloadFile(rmsg *config.Message, content map[string]interface{}) error {
+	var (
+		ok                        bool
+		url, name, msgtype, mtype string
+		info                      map[string]interface{}
+		size                      float64
+	)
+
 	rmsg.Extra = make(map[string][]interface{})
-			url := ev.Content["url"].(string)
+	if url, ok = content["url"].(string); !ok {
+		return fmt.Errorf("url isn't a %T", url)
+	}
 	url = strings.Replace(url, "mxc://", b.Config.Server+"/_matrix/media/v1/download/", -1)
-			info := ev.Content["info"].(map[string]interface{})
+
-			size := info["size"].(float64)
+	if info, ok = content["info"].(map[string]interface{}); !ok {
-			name := ev.Content["body"].(string)
+		return fmt.Errorf("info isn't a %T", info)
+	}
+	if size, ok = info["size"].(float64); !ok {
+		return fmt.Errorf("size isn't a %T", size)
+	}
+	if name, ok = content["body"].(string); !ok {
+		return fmt.Errorf("name isn't a %T", name)
+	}
+	if msgtype, ok = content["msgtype"].(string); !ok {
+		return fmt.Errorf("msgtype isn't a %T", msgtype)
+	}
+	if mtype, ok = info["mimetype"].(string); !ok {
+		return fmt.Errorf("mtype isn't a %T", mtype)
+	}
+
 	// check if we have an image uploaded without extension
 	if !strings.Contains(name, ".") {
-				if ev.Content["msgtype"].(string) == "m.image" {
+		if msgtype == "m.image" {
-					if mtype, ok := ev.Content["mimetype"].(string); ok {
 			mext, _ := mime.ExtensionsByType(mtype)
 			if len(mext) > 0 {
 				name = name + mext[0]
@@ -227,24 +244,75 @@ func (b *Bmatrix) handleEvent(ev *matrix.Event) {
 			name = name + ".png"
 		}
 	}
+
+	// check if the size is ok
+	err := helper.HandleDownloadSize(flog, rmsg, name, int64(size), b.General)
+	if err != nil {
+		return err
 	}
-			flog.Debugf("trying to download %#v with size %#v", name, size)
+	// actually download the file
-			if size <= float64(b.General.MediaDownloadSize) {
 	data, err := helper.DownloadFile(url)
 	if err != nil {
-					flog.Errorf("download %s failed %#v", url, err)
+		return fmt.Errorf("download %s failed %#v", url, err)
-				} else {
-					flog.Debugf("download OK %#v %#v %#v", name, len(*data), len(url))
-					rmsg.Extra["file"] = append(rmsg.Extra["file"], config.FileInfo{Name: name, Data: data})
-				}
-			} else {
-				flog.Errorf("File %#v to large to download (%#v). MediaDownloadSize is %#v", name, size, b.General.MediaDownloadSize)
-				rmsg.Event = config.EVENT_FILE_FAILURE_SIZE
-				rmsg.Extra[rmsg.Event] = append(rmsg.Extra[rmsg.Event], config.FileInfo{Name: name, Size: int64(size)})
-			}
-			rmsg.Text = ""
-		}
-		flog.Debugf("Sending message from %s on %s to gateway", ev.Sender, b.Account)
-		b.Remote <- rmsg
 	}
+	// add the downloaded data to the message
+	helper.HandleDownloadData(flog, rmsg, name, "", url, data, b.General)
+	return nil
+}
+
+// handleUploadFile handles native upload of files
+func (b *Bmatrix) handleUploadFile(msg *config.Message, channel string) (string, error) {
+	for _, f := range msg.Extra["file"] {
+		fi := f.(config.FileInfo)
+		content := bytes.NewReader(*fi.Data)
+		sp := strings.Split(fi.Name, ".")
+		mtype := mime.TypeByExtension("." + sp[len(sp)-1])
+		if strings.Contains(mtype, "image") ||
+			strings.Contains(mtype, "video") {
+			if fi.Comment != "" {
+				_, err := b.mc.SendText(channel, msg.Username+fi.Comment)
+				if err != nil {
+					flog.Errorf("file comment failed: %#v", err)
+				}
+			}
+			flog.Debugf("uploading file: %s %s", fi.Name, mtype)
+			res, err := b.mc.UploadToContentRepo(content, mtype, int64(len(*fi.Data)))
+			if err != nil {
+				flog.Errorf("file upload failed: %#v", err)
+				continue
+			}
+			if strings.Contains(mtype, "video") {
+				flog.Debugf("sendVideo %s", res.ContentURI)
+				_, err = b.mc.SendVideo(channel, fi.Name, res.ContentURI)
+				if err != nil {
+					flog.Errorf("sendVideo failed: %#v", err)
+				}
+			}
+			if strings.Contains(mtype, "image") {
+				flog.Debugf("sendImage %s", res.ContentURI)
+				_, err = b.mc.SendImage(channel, fi.Name, res.ContentURI)
+				if err != nil {
+					flog.Errorf("sendImage failed: %#v", err)
+				}
+			}
+			flog.Debugf("result: %#v", res)
+		}
+	}
+	return "", nil
+}
+
+// skipMessages returns true if this message should not be handled
+func (b *Bmatrix) containsAttachment(content map[string]interface{}) bool {
+	// Skip empty messages
+	if content["msgtype"] == nil {
+		return false
+	}
+
+	// Only allow image,video or file msgtypes
+	if !(content["msgtype"].(string) == "m.image" ||
+		content["msgtype"].(string) == "m.video" ||
+		content["msgtype"].(string) == "m.file") {
+		return false
+	}
+	return true
 }