summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWim <wim@42.be>2018-02-24 15:54:43 +0100
committerWim <wim@42.be>2018-02-27 23:22:10 +0100
commit63b88e77f20e2869d3c9bf136a0c9fa84980ca69 (patch)
treead01649c526f0486c84a5fe8328e797ec540f75e
parent3d8f15c20b988684e1fd0e17f65e13d4d2a3b90e (diff)
downloadmatterbridge-msglm-63b88e77f20e2869d3c9bf136a0c9fa84980ca69.tar.gz
matterbridge-msglm-63b88e77f20e2869d3c9bf136a0c9fa84980ca69.tar.bz2
matterbridge-msglm-63b88e77f20e2869d3c9bf136a0c9fa84980ca69.zip
Refactor matrix
-rw-r--r--bridge/matrix/matrix.go260
1 files changed, 164 insertions, 96 deletions
diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go
index 56616357..6e1f0ccc 100644
--- a/bridge/matrix/matrix.go
+++ b/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,74 +73,47 @@ 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
- if msg.Event == config.EVENT_MSG_DELETE {
- if msg.ID == "" {
- return "", nil
- }
- resp, err := b.mc.RedactEvent(channel, msg.ID, &matrix.ReqRedact{})
+ 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
}
- 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})
+
+ // Delete message
+ if msg.Event == config.EVENT_MSG_DELETE {
+ if msg.ID == "" {
+ return "", nil
+ }
+ resp, err := b.mc.RedactEvent(channel, msg.ID, &matrix.ReqRedact{})
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"] {
- 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
+ return b.handleUploadFile(&msg, channel)
}
}
+ // 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)
- rmsg := config.Message{Username: username, Text: text, Channel: channel, Account: b.Account, UserID: ev.Sender}
- rmsg.ID = ev.ID
+
+ // Delete event
if ev.Type == "m.room.redaction" {
rmsg.Event = config.EVENT_MSG_DELETE
rmsg.ID = ev.Redacts
@@ -201,50 +182,137 @@ 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" ||
- ev.Content["msgtype"].(string) == "m.file" {
- flog.Debugf("ev: %#v", ev)
- rmsg.Extra = make(map[string][]interface{})
- url := ev.Content["url"].(string)
- url = strings.Replace(url, "mxc://", b.Config.Server+"/_matrix/media/v1/download/", -1)
- info := ev.Content["info"].(map[string]interface{})
- size := info["size"].(float64)
- name := ev.Content["body"].(string)
- // check if we have an image uploaded without extension
- if !strings.Contains(name, ".") {
- if ev.Content["msgtype"].(string) == "m.image" {
- if mtype, ok := ev.Content["mimetype"].(string); ok {
- mext, _ := mime.ExtensionsByType(mtype)
- if len(mext) > 0 {
- name = name + mext[0]
- }
- } else {
- // just a default .png extension if we don't have mime info
- name = name + ".png"
- }
+
+ // Do we have attachments
+ if b.containsAttachment(ev.Content) {
+ 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{})
+ 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)
+
+ if info, ok = content["info"].(map[string]interface{}); !ok {
+ 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 msgtype == "m.image" {
+ mext, _ := mime.ExtensionsByType(mtype)
+ if len(mext) > 0 {
+ name = name + mext[0]
+ }
+ } else {
+ // just a default .png extension if we don't have mime info
+ name = name + ".png"
+ }
+ }
+
+ // check if the size is ok
+ err := helper.HandleDownloadSize(flog, rmsg, name, int64(size), b.General)
+ if err != nil {
+ return err
+ }
+ // actually download the file
+ data, err := helper.DownloadFile(url)
+ if err != nil {
+ return fmt.Errorf("download %s failed %#v", url, err)
+ }
+ // 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)
}
}
- flog.Debugf("trying to download %#v with size %#v", name, size)
- if size <= float64(b.General.MediaDownloadSize) {
- data, err := helper.DownloadFile(url)
+ 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("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})
+ flog.Errorf("sendImage failed: %#v", err)
}
- } 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("result: %#v", res)
}
- flog.Debugf("Sending message from %s on %s to gateway", ev.Sender, b.Account)
- b.Remote <- rmsg
}
+ 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
}