commit 60d3c38a83d82e00e12b0faf3e7b4ac9f8f5d515
Author: Wim <wim@42.be>
Date: Mon Feb 10 00:06:54 2020 +0000
Add support for avatars from matrix. #984 (#1007)
diff --git a/bridge/matrix/matrix.go b/bridge/matrix/matrix.go
index 16562c7..824870c 100644
--- a/bridge/matrix/matrix.go
+++ b/bridge/matrix/matrix.go
@@ -17210 +17215 @@ func (b *Bmatrix) handleEvent(ev *matrix.Event) {
return
}
- // TODO download avatar
-
// Create our message
- rmsg := config.Message{Username: ev.Sender[1:], Channel: channel, Account: b.Account, UserID: ev.Sender, ID: ev.ID}
+ rmsg := config.Message{
+ Username: ev.Sender[1:],
+ Channel: channel,
+ Account: b.Account,
+ UserID: ev.Sender,
+ ID: ev.ID,
+ Avatar: b.getAvatarURL(ev.Sender),
+ }
// Text must be a string
if rmsg.Text, ok = ev.Content["body"].(string); !ok {
@@ -3583 +36315 @@ func (b *Bmatrix) containsAttachment(content map[string]interface{}) bool {
}
return true
}
+
+// getAvatarURL returns the avatar URL of the specified sender
+func (b *Bmatrix) getAvatarURL(sender string) string {
+ mxcURL, err := b.mc.GetSenderAvatarURL(sender)
+ if err != nil {
+ b.Log.Errorf("getAvatarURL failed: %s", err)
+ return ""
+ }
+ url := strings.ReplaceAll(mxcURL, "mxc://", b.GetString("Server")+"/_matrix/media/r0/thumbnail/")
+ url += "?width=37&height=37&method=crop"
+ return url
+}
diff --git a/go.mod b/go.mod
index 6e34992..2f19f2e 100644
--- a/go.mod
+++ b/go.mod
@@ -257 +257 @@ require (
github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20190210153444-cc9d05784d5d
github.com/matterbridge/emoji v2.1.1-0.20191117213217-af507f6b02db+incompatible
github.com/matterbridge/go-xmpp v0.0.0-20180529212104-cd19799fba91
- github.com/matterbridge/gomatrix v0.0.0-20200209221412-326bea8d866e
+ github.com/matterbridge/gomatrix v0.0.0-20200209224845-c2104d7936a6
github.com/matterbridge/gozulipbot v0.0.0-20190212232658-7aa251978a18
github.com/matterbridge/logrus-prefixed-formatter v0.0.0-20180806162718-01618749af61
github.com/mattermost/mattermost-server v5.5.0+incompatible
diff --git a/go.sum b/go.sum
index ce9b3be..9232baa 100644
--- a/go.sum
+++ b/go.sum
@@ -1346 +1348 @@ github.com/matterbridge/go-xmpp v0.0.0-20180529212104-cd19799fba91 h1:KzDEcy8eDb
github.com/matterbridge/go-xmpp v0.0.0-20180529212104-cd19799fba91/go.mod h1:ECDRehsR9TYTKCAsRS8/wLeOk6UUqDydw47ln7wG41Q=
github.com/matterbridge/gomatrix v0.0.0-20200209221412-326bea8d866e h1:i1wiGiwjRZ1Yy0JbERoDeikLzOnM6tkkQTT20b3Yy1E=
github.com/matterbridge/gomatrix v0.0.0-20200209221412-326bea8d866e/go.mod h1:+jWeaaUtXQbBRdKYWfjW6JDDYiI2XXE+3NnTjW5kg8g=
+github.com/matterbridge/gomatrix v0.0.0-20200209224845-c2104d7936a6 h1:Kl65VJv38HjYFnnwH+MP6Z8hcJT5UHuSpHVU5vW1HH0=
+github.com/matterbridge/gomatrix v0.0.0-20200209224845-c2104d7936a6/go.mod h1:+jWeaaUtXQbBRdKYWfjW6JDDYiI2XXE+3NnTjW5kg8g=
github.com/matterbridge/gozulipbot v0.0.0-20190212232658-7aa251978a18 h1:fLhwXtWGtfTgZVxHG1lcKjv+re7dRwyyuYFNu69xdho=
github.com/matterbridge/gozulipbot v0.0.0-20190212232658-7aa251978a18/go.mod h1:yAjnZ34DuDyPHMPHHjOsTk/FefW4JJjoMMCGt/8uuQA=
github.com/matterbridge/logrus-prefixed-formatter v0.0.0-20180806162718-01618749af61 h1:R/MgM/eUyRBQx2FiH6JVmXck8PaAuKfe2M1tWIzW7nE=
