Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tons of works on dm's.

Browse Source 
They mostly work including display names and avatars. However that's about all
they do right now.
This commit is contained in:
Gary Kramlich
2022-01-31 04:53:21 -06:00
parent f20d204dd7
commit c1bb55d3cf
11 changed files with 329 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridge/matrix.go
View File

@@ -71,6 +71,7 @@ func (mh *matrixHandler) handleMessage(evt *event.Event) {
user := mh.bridge.GetUserByMXID(evt.Sender)
if user == nil {
mh.log.Debugln("unknown user", evt.Sender)
return
}
@@ -90,6 +91,12 @@ func (mh *matrixHandler) handleMessage(evt *event.Event) {
return
}
}
portal := mh.bridge.GetPortalByMXID(evt.RoomID)
if portal != nil {
portal.matrixMessages <- portalMatrixMessage{user: user, evt: evt}
}
}
func (mh *matrixHandler) joinAndCheckMembers(evt *event.Event, intent *appservice.IntentAPI) *mautrix.RespJoinedMembers {
@@ -206,7 +213,6 @@ func (mh *matrixHandler) handleMembership(evt *event.Event) {
isSelf := id.UserID(evt.GetStateKey()) == evt.Sender
// Handle matrix invites.
if content.Membership == event.MembershipInvite && !isSelf {
portal.HandleMatrixInvite(user, evt)
}

145
bridge/portal.go
View File

@@ -31,7 +31,7 @@ type Portal struct {
bridge *Bridge
log log.Logger
channelType discordgo.ChannelType
channel *discordgo.Channel
roomCreateLock sync.Mutex
@@ -92,6 +92,35 @@ func (b *Bridge) GetPortalByID(key database.PortalKey) *Portal {
return portal
}
func (b *Bridge) GetAllPortals() []*Portal {
return b.dbPortalsToPortals(b.db.Portal.GetAll())
}
func (b *Bridge) GetAllPortalsByID(id string) []*Portal {
return b.dbPortalsToPortals(b.db.Portal.GetAllByID(id))
}
func (b *Bridge) dbPortalsToPortals(dbPortals []*database.Portal) []*Portal {
b.portalsLock.Lock()
defer b.portalsLock.Unlock()
output := make([]*Portal, len(dbPortals))
for index, dbPortal := range dbPortals {
if dbPortal == nil {
continue
}
portal, ok := b.portalsByID[dbPortal.Key]
if !ok {
portal = b.loadPortal(dbPortal, nil)
}
output[index] = portal
}
return output
}
func (b *Bridge) NewPortal(dbPortal *database.Portal) *Portal {
portal := &Portal{
Portal: dbPortal,
@@ -121,26 +150,48 @@ func (p *Portal) messageLoop() {
for {
select {
case msg := <-p.matrixMessages:
p.log.Infoln("got matrix message", msg)
p.handleMatrixMessages(msg)
case msg := <-p.discordMessages:
p.handleDiscordMessage(msg)
p.handleDiscordMessages(msg)
}
}
}
func (p *Portal) IsPrivateChat() bool {
return (p.channelType == discordgo.ChannelTypeDM || p.channelType == discordgo.ChannelTypeGroupDM)
if p.channel != nil {
return p.channel.Type == discordgo.ChannelTypeDM
}
return false
}
func (p *Portal) MainIntent() *appservice.IntentAPI {
if p.IsPrivateChat() {
return p.bridge.GetPuppetByID(p.Key.ID).DefaultIntent()
if p.IsPrivateChat() && p.channel != nil && len(p.channel.Recipients) == 1 {
return p.bridge.GetPuppetByID(p.channel.Recipients[0].ID).DefaultIntent()
}
return p.bridge.bot
}
func (p *Portal) getMessagePuppet(user *User, message *discordgo.Message) *Puppet {
p.log.Debugf("getMessagePuppet")
if message.Author.ID == user.ID {
return p.bridge.GetPuppetByID(user.ID)
}
puppet := p.bridge.GetPuppetByID(message.Author.ID)
puppet.SyncContact(user)
return puppet
}
func (p *Portal) getMessageIntent(user *User, message *discordgo.Message) *appservice.IntentAPI {
return p.getMessagePuppet(user, message).IntentFor(p)
}
func (p *Portal) createMatrixRoom(user *User, channel *discordgo.Channel) error {
p.channel = channel
p.roomCreateLock.Lock()
defer p.roomCreateLock.Unlock()
@@ -149,23 +200,21 @@ func (p *Portal) createMatrixRoom(user *User, channel *discordgo.Channel) error
return nil
}
p.channelType = channel.Type
intent := p.MainIntent()
if err := intent.EnsureRegistered(); err != nil {
return err
}
if p.IsPrivateChat() {
puppet := p.bridge.GetPuppetByID(p.Key.ID)
puppet.SyncContact(user)
// if p.IsPrivateChat() {
p.Name = channel.Name
p.Topic = channel.Topic
p.Name = puppet.DisplayName
p.Avatar = puppet.Avatar
p.AvatarURL = puppet.AvatarURL
}
// TODO: get avatars figured out
// p.Avatar = puppet.Avatar
// p.AvatarURL = puppet.AvatarURL
// }
p.log.Infoln("Creating Matrix room. Info source:", p.Portal.Key.ID)
p.log.Infoln("Creating Matrix room for channel:", p.Portal.Key.ChannelID)
initialState := []*event.Event{}
@@ -199,20 +248,12 @@ func (p *Portal) createMatrixRoom(user *User, channel *discordgo.Channel) error
p.bridge.portalsByMXID[p.MXID] = p
p.bridge.portalsLock.Unlock()
p.log.Debugln("inviting user", user)
p.ensureUserInvited(user)
// if p.IsPrivateChat() {
// puppet := user.bridge.GetPuppetByID(p.Key.ID)
// if p.bridge.Config.Bridge.Encryption.Default {
// err = portal.bridge.Bot.EnsureJoined(portal.MXID)
// if err != nil {
// portal.log.Errorln("Failed to join created portal with bridge bot for e2be:", err)
// }
// }
// user.UpdateDirectChats(map[id.UserID][]id.RoomID{puppet.MXID: {portal.MXID}})
// }
if p.IsPrivateChat() {
p.syncParticipants(user, channel.Recipients)
}
firstEventResp, err := p.MainIntent().SendMessageEvent(p.MXID, portalCreationDummyEvent, struct{}{})
if err != nil {
@@ -225,7 +266,7 @@ func (p *Portal) createMatrixRoom(user *User, channel *discordgo.Channel) error
return nil
}
func (p *Portal) handleDiscordMessage(msg portalDiscordMessage) {
func (p *Portal) handleDiscordMessages(msg portalDiscordMessage) {
if p.MXID == "" {
p.log.Debugln("Creating Matrix room from incoming message")
@@ -246,7 +287,7 @@ func (p *Portal) handleDiscordMessage(msg portalDiscordMessage) {
switch msg.msg.(type) {
case *discordgo.MessageCreate:
p.handleMessage(msg.msg.(*discordgo.MessageCreate).Message)
p.handleDiscordMessage(msg.msg.(*discordgo.MessageCreate).Message)
default:
p.log.Warnln("unknown message type")
}
@@ -256,10 +297,9 @@ func (p *Portal) ensureUserInvited(user *User) bool {
return user.ensureInvited(p.MainIntent(), p.MXID, p.IsPrivateChat())
}
func (p *Portal) handleMessage(msg *discordgo.Message) {
func (p *Portal) handleDiscordMessage(msg *discordgo.Message) {
if p.MXID == "" {
p.log.Warnln("handle message called without a valid portal")
return
}
@@ -273,3 +313,44 @@ func (p *Portal) handleMessage(msg *discordgo.Message) {
p.log.Warnln("response:", resp)
p.log.Warnln("error:", err)
}
func (p *Portal) syncParticipants(source *User, participants []*discordgo.User) {
for _, participant := range participants {
puppet := p.bridge.GetPuppetByID(participant.ID)
puppet.SyncContact(source)
user := p.bridge.GetUserByID(participant.ID)
if user != nil {
p.ensureUserInvited(user)
}
if user == nil || !puppet.IntentFor(p).IsCustomPuppet {
if err := puppet.IntentFor(p).EnsureJoined(p.MXID); err != nil {
p.log.Warnfln("Failed to make puppet of %s join %s: %v", participant.ID, p.MXID, err)
}
}
}
}
func (p *Portal) handleMatrixMessages(msg portalMatrixMessage) {
switch msg.evt.Type {
case event.EventMessage:
p.handleMatrixMessage(msg.user, msg.evt)
}
}
func (p *Portal) handleMatrixMessage(sender *User, evt *event.Event) {
if p.IsPrivateChat() && sender.ID != p.Key.Receiver {
return
}
content, ok := evt.Content.Parsed.(*event.MessageEventContent)
if !ok {
p.log.Debugfln("Failed to handle event %s: unexpected parsed content type %T", evt.ID, evt.Content.Parsed)
return
}
sender.Session.ChannelMessageSend(p.Key.ChannelID, content.Body)
p.log.Debugln("sent message:", content.Body)
}

151
bridge/puppet.go
View File

@@ -2,6 +2,8 @@ package bridge
import (
"fmt"
"io"
"net/http"
"regexp"
"sync"
@@ -94,18 +96,153 @@ func (p *Puppet) DefaultIntent() *appservice.IntentAPI {
return p.bridge.as.Intent(p.MXID)
}
func (p *Puppet) SyncContact(user *User) {
func (p *Puppet) IntentFor(portal *Portal) *appservice.IntentAPI {
// TODO: when we add double puppeting we need to adjust this.
return p.DefaultIntent()
}
func (p *Puppet) updatePortalMeta(meta func(portal *Portal)) {
for _, portal := range p.bridge.GetAllPortalsByID(p.ID) {
meta(portal)
}
}
func (p *Puppet) updateName(source *User) bool {
user, err := source.Session.User(p.ID)
if err != nil {
p.log.Warnln("failed to get user from id:", err)
return false
}
newName := p.bridge.Config.Bridge.FormatDisplayname(user)
if p.DisplayName != newName {
err := p.DefaultIntent().SetDisplayName(newName)
if err == nil {
p.DisplayName = newName
go p.updatePortalName()
p.Update()
} else {
p.log.Warnln("failed to set display name:", err)
}
return true
}
return false
}
func (p *Puppet) updatePortalName() {
p.updatePortalMeta(func(portal *Portal) {
if portal.MXID != "" {
_, err := portal.MainIntent().SetRoomName(portal.MXID, p.DisplayName)
if err != nil {
portal.log.Warnln("Failed to set name:", err)
}
}
portal.Name = p.DisplayName
portal.Update()
})
}
func (p *Puppet) uploadAvatar(intent *appservice.IntentAPI, url string) (id.ContentURI, error) {
getResp, err := http.DefaultClient.Get(url)
if err != nil {
return id.ContentURI{}, fmt.Errorf("failed to download avatar: %w", err)
}
data, err := io.ReadAll(getResp.Body)
getResp.Body.Close()
if err != nil {
return id.ContentURI{}, fmt.Errorf("failed to read avatar data: %w", err)
}
mime := http.DetectContentType(data)
resp, err := intent.UploadBytes(data, mime)
if err != nil {
return id.ContentURI{}, fmt.Errorf("failed to upload avatar to Matrix: %w", err)
}
return resp.ContentURI, nil
}
func (p *Puppet) updateAvatar(source *User) bool {
user, err := source.Session.User(p.ID)
if err != nil {
p.log.Warnln("Failed to get user:", err)
return false
}
if p.Avatar == user.Avatar {
return false
}
if user.Avatar == "" {
p.log.Warnln("User does not have an avatar")
return false
}
url, err := p.uploadAvatar(p.DefaultIntent(), user.AvatarURL(""))
if err != nil {
p.log.Warnln("Failed to upload user avatar:", err)
return false
}
p.AvatarURL = url
err = p.DefaultIntent().SetAvatarURL(p.AvatarURL)
if err != nil {
p.log.Warnln("Failed to set avatar:", err)
}
p.log.Debugln("Updated avatar", p.Avatar, "->", user.Avatar)
p.Avatar = user.Avatar
go p.updatePortalAvatar()
return true
}
func (p *Puppet) updatePortalAvatar() {
p.updatePortalMeta(func(portal *Portal) {
if portal.MXID != "" {
_, err := portal.MainIntent().SetRoomAvatar(portal.MXID, p.AvatarURL)
if err != nil {
portal.log.Warnln("Failed to set avatar:", err)
}
}
portal.AvatarURL = p.AvatarURL
portal.Avatar = p.Avatar
portal.Update()
})
}
func (p *Puppet) SyncContact(source *User) {
p.syncLock.Lock()
defer p.syncLock.Unlock()
dUser, err := user.Session.User(p.ID)
if err != nil {
p.log.Warnfln("failed to sync puppet %s: %v", p.ID, err)
p.log.Debugln("syncing contact", p.DisplayName)
return
err := p.DefaultIntent().EnsureRegistered()
if err != nil {
p.log.Errorln("Failed to ensure registered:", err)
}
p.DisplayName = p.bridge.Config.Bridge.FormatDisplayname(dUser)
update := false
p.Update()
update = p.updateName(source) || update
if p.Avatar == "" {
update = p.updateAvatar(source) || update
p.log.Debugln("update avatar returned", update)
}
if update {
p.Update()
}
}

18
bridge/user.go
View File

@@ -68,6 +68,18 @@ func (b *Bridge) GetUserByMXID(userID id.UserID) *User {
return user
}
func (b *Bridge) GetUserByID(id string) *User {
b.usersLock.Lock()
defer b.usersLock.Unlock()
user, ok := b.usersByID[id]
if !ok {
return b.loadUser(b.db.User.GetByID(id), nil)
}
return user
}
func (b *Bridge) NewUser(dbUser *database.User) *User {
user := &User{
User: dbUser,
@@ -230,7 +242,7 @@ func (u *User) disconnectedHandler(s *discordgo.Session, d *discordgo.Disconnect
}
func (u *User) channelCreateHandler(s *discordgo.Session, c *discordgo.ChannelCreate) {
key := database.NewPortalKey(u.User.ID, c.ID)
key := database.NewPortalKey(c.ID, u.User.ID)
portal := u.bridge.GetPortalByID(key)
portal.Name = c.Name
@@ -254,7 +266,7 @@ func (u *User) channelPinsUpdateHandler(s *discordgo.Session, c *discordgo.Chann
}
func (u *User) channelUpdateHandler(s *discordgo.Session, c *discordgo.ChannelUpdate) {
key := database.NewPortalKey(u.User.ID, c.ID)
key := database.NewPortalKey(c.ID, u.User.ID)
portal := u.bridge.GetPortalByID(key)
portal.Name = c.Name
@@ -272,7 +284,7 @@ func (u *User) messageHandler(s *discordgo.Session, m *discordgo.MessageCreate)
return
}
key := database.NewPortalKey(u.User.ID, m.ChannelID)
key := database.NewPortalKey(m.ChannelID, u.User.ID)
portal := u.bridge.GetPortalByID(key)
msg := portalDiscordMessage{