From c1bb55d3cfc3d54f1aa0556216af22ed7579ee06 Mon Sep 17 00:00:00 2001 From: Gary Kramlich Date: Mon, 31 Jan 2022 04:53:21 -0600 Subject: [PATCH] Tons of works on dm's. They mostly work including display names and avatars. However that's about all they do right now. --- bridge/matrix.go | 8 +- bridge/portal.go | 145 +++++++++++++++++++++------ bridge/puppet.go | 151 +++++++++++++++++++++++++++-- bridge/user.go | 18 +++- database/migrations/01-initial.sql | 4 +- database/portal.go | 12 +-- database/portalkey.go | 12 +-- database/portalquery.go | 6 +- database/userquery.go | 13 ++- go.mod | 15 ++- go.sum | 31 +++--- 11 files changed, 329 insertions(+), 86 deletions(-) diff --git a/bridge/matrix.go b/bridge/matrix.go index b05de42..9e305d0 100644 --- a/bridge/matrix.go +++ b/bridge/matrix.go @@ -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) } diff --git a/bridge/portal.go b/bridge/portal.go index 1bc9495..9f7bd88 100644 --- a/bridge/portal.go +++ b/bridge/portal.go @@ -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) +} diff --git a/bridge/puppet.go b/bridge/puppet.go index 17674c1..1c0654d 100644 --- a/bridge/puppet.go +++ b/bridge/puppet.go @@ -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() + } } diff --git a/bridge/user.go b/bridge/user.go index c8adf8e..6270abb 100644 --- a/bridge/user.go +++ b/bridge/user.go @@ -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{ diff --git a/database/migrations/01-initial.sql b/database/migrations/01-initial.sql index 22e484c..35ff22d 100644 --- a/database/migrations/01-initial.sql +++ b/database/migrations/01-initial.sql @@ -1,6 +1,6 @@ CREATE TABLE portal ( - id TEXT, channel_id TEXT, + receiver TEXT, mxid TEXT UNIQUE, name TEXT NOT NULL, @@ -11,7 +11,7 @@ CREATE TABLE portal ( first_event_id TEXT, - PRIMARY KEY (id, channel_id) + PRIMARY KEY (channel_id, receiver) ); CREATE TABLE puppet ( diff --git a/database/portal.go b/database/portal.go index cf8be1e..e47c0ec 100644 --- a/database/portal.go +++ b/database/portal.go @@ -26,7 +26,7 @@ type Portal struct { func (p *Portal) Scan(row Scannable) *Portal { var mxid, avatarURL, firstEventID sql.NullString - err := row.Scan(&p.Key.ID, &p.Key.ChannelID, &mxid, &p.Name, &p.Topic, &p.Avatar, &avatarURL, &firstEventID) + err := row.Scan(&p.Key.ChannelID, &p.Key.Receiver, &mxid, &p.Name, &p.Topic, &p.Avatar, &avatarURL, &firstEventID) if err != nil { if err != sql.ErrNoRows { p.log.Errorln("Database scan failed:", err) @@ -44,10 +44,10 @@ func (p *Portal) Scan(row Scannable) *Portal { func (p *Portal) Insert() { query := "INSERT INTO portal" + - " (id, mxid, channel_id, name, topic, avatar, avatar_url, first_event_id)" + + " (channel_id, receiver, mxid, name, topic, avatar, avatar_url, first_event_id)" + " VALUES ($1, $2, $3, $4, $5, $6, $7, $8)" - _, err := p.db.Exec(query, p.Key.ID, p.MXID, p.Key.ChannelID, + _, err := p.db.Exec(query, p.Key.ChannelID, p.Key.Receiver, p.MXID, p.Name, p.Topic, p.Avatar, p.AvatarURL.String(), p.FirstEventID.String()) if err != nil { @@ -58,11 +58,11 @@ func (p *Portal) Insert() { func (p *Portal) Update() { query := "UPDATE portal SET" + " mxid=$1, name=$2, topic=$3, avatar=$4, avatar_url=$5, first_event_id=$6" + - " WHERE id=$7 AND channel_id=$8" + " WHERE channel_id=$7 AND receiver=$8" _, err := p.db.Exec(query, p.MXID, p.Name, p.Topic, p.Avatar, - p.AvatarURL.String(), p.FirstEventID.String(), p.Key.ID, - p.Key.ChannelID) + p.AvatarURL.String(), p.FirstEventID.String(), p.Key.ChannelID, + p.Key.Receiver) if err != nil { p.log.Warnfln("Failed to update %s: %v", p.Key, err) diff --git a/database/portalkey.go b/database/portalkey.go index 59f8328..b597cf3 100644 --- a/database/portalkey.go +++ b/database/portalkey.go @@ -1,20 +1,20 @@ package database type PortalKey struct { - ID string ChannelID string + Receiver string } -func NewPortalKey(id, channelID string) PortalKey { +func NewPortalKey(channelID, receiver string) PortalKey { return PortalKey{ - ID: id, ChannelID: channelID, + Receiver: receiver, } } func (key PortalKey) String() string { - if key.ChannelID == key.ID { - return key.ID + if key.ChannelID == key.Receiver { + return key.Receiver } - return key.ID + "-" + key.ChannelID + return key.ChannelID + "-" + key.Receiver } diff --git a/database/portalquery.go b/database/portalquery.go index 650d6ee..5f14c9b 100644 --- a/database/portalquery.go +++ b/database/portalquery.go @@ -22,15 +22,15 @@ func (pq *PortalQuery) GetAll() []*Portal { } func (pq *PortalQuery) GetByID(key PortalKey) *Portal { - return pq.get("SELECT * FROM portal WHERE id=$1 AND channel_id=$2", key.ID, key.ChannelID) + return pq.get("SELECT * FROM portal WHERE channel_id=$1 AND receiver=$2", key.ChannelID, key.Receiver) } func (pq *PortalQuery) GetByMXID(mxid id.RoomID) *Portal { return pq.get("SELECT * FROM portal WHERE mxid=$1", mxid) } -func (pq *PortalQuery) GetAllByDID(did string) []*Portal { - return pq.getAll("SELECT * FROM portal WHERE id=$1", did) +func (pq *PortalQuery) GetAllByID(id string) []*Portal { + return pq.getAll("SELECT * FROM portal WHERE receiver=$1", id) } func (pq *PortalQuery) getAll(query string, args ...interface{}) []*Portal { diff --git a/database/userquery.go b/database/userquery.go index ff86371..e9c8baa 100644 --- a/database/userquery.go +++ b/database/userquery.go @@ -18,7 +18,18 @@ func (uq *UserQuery) New() *User { } func (uq *UserQuery) GetByMXID(userID id.UserID) *User { - row := uq.db.QueryRow("SELECT mxid, id, management_room, token FROM user where mxid=$1", userID) + query := "SELECT mxid, id, management_room, token FROM user WHERE mxid=$1" + row := uq.db.QueryRow(query, userID) + if row == nil { + return nil + } + + return uq.New().Scan(row) +} + +func (uq *UserQuery) GetByID(id string) *User { + query := "SELECT mxid, id, management_room, token FROM user WHERE id=$1" + row := uq.db.QueryRow(query, id) if row == nil { return nil } diff --git a/go.mod b/go.mod index 1262a5b..103b9d2 100644 --- a/go.mod +++ b/go.mod @@ -9,22 +9,21 @@ require ( github.com/gorilla/websocket v1.4.2 github.com/lib/pq v1.9.0 github.com/lopezator/migrator v0.3.0 - github.com/mattn/go-sqlite3 v1.14.9 + github.com/mattn/go-sqlite3 v1.14.10 github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e gopkg.in/yaml.v2 v2.4.0 - maunium.net/go/maulogger/v2 v2.3.1 - maunium.net/go/mautrix v0.10.8 + maunium.net/go/maulogger/v2 v2.3.2 + maunium.net/go/mautrix v0.10.10 ) require ( github.com/btcsuite/btcutil v1.0.2 // indirect github.com/gorilla/mux v1.8.0 // indirect - github.com/grimmy/discordgo v0.23.3-0.20220127181915-5589d3741f1b // indirect github.com/pkg/errors v0.9.1 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect - golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect - golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect - golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect + golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed // indirect + golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect + golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect ) -replace github.com/bwmarrin/discordgo => github.com/grimmy/discordgo v0.23.3-0.20220126043435-7470d1aacd64 +replace github.com/bwmarrin/discordgo v0.32.2 => gitlab.com/beeper/discordgo v0.23.3-0.20220131095000-cb6b649ac596 diff --git a/go.sum b/go.sum index 65793b7..35db1cc 100644 --- a/go.sum +++ b/go.sum @@ -28,10 +28,6 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grimmy/discordgo v0.23.3-0.20220126043435-7470d1aacd64 h1:KrZb8UPGlmlnUx+eLQDHWnt1uPkdCUeVgUgFRFFdR1o= -github.com/grimmy/discordgo v0.23.3-0.20220126043435-7470d1aacd64/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= -github.com/grimmy/discordgo v0.23.3-0.20220127181915-5589d3741f1b h1:KHIGkNKPsAMOZljqSn/gJRtiXn4+FjbWuEwV+ynL0iU= -github.com/grimmy/discordgo v0.23.3-0.20220127181915-5589d3741f1b/go.mod h1:FvaIclGb1/7p5Z+Zj4L9/swAEKL7njB7bDreLdN+JDU= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ= @@ -41,8 +37,8 @@ github.com/lib/pq v1.9.0 h1:L8nSXQQzAYByakOFMTwpjRoHsMJklur4Gi59b6VivR8= github.com/lib/pq v1.9.0/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lopezator/migrator v0.3.0 h1:VW/rR+J8NYwPdkBxjrFdjwejpgvP59LbmANJxXuNbuk= github.com/lopezator/migrator v0.3.0/go.mod h1:bpVAVPkWSvTw8ya2Pk7E/KiNAyDWNImgivQY79o8/8I= -github.com/mattn/go-sqlite3 v1.14.9 h1:10HX2Td0ocZpYEjhilsuo6WWtUqttj2Kb0KtD86/KYA= -github.com/mattn/go-sqlite3 v1.14.9/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= +github.com/mattn/go-sqlite3 v1.14.10 h1:MLn+5bFRlWMGoSRmJour3CL1w/qL96mvipqpwQW/Sfk= +github.com/mattn/go-sqlite3 v1.14.10/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -65,29 +61,30 @@ golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnf golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 h1:0es+/5331RGQPcXlMfP+WrnIIS6dNnNRe0WB02W0F4M= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed h1:YoWVYYAfvQ4ddHv3OKmIvX7NCAhFGTj62VP2l2kfBbA= +golang.org/x/crypto v0.0.0-20220128200615-198e4374d7ed/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklzaDs90JI2az5YMd4fPM= golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 h1:SrN+KX8Art/Sf4HNj6Zcz06G7VEz+7w9tdXTPOZ7+l4= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -101,7 +98,7 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -maunium.net/go/maulogger/v2 v2.3.1 h1:fwBYJne0pHvJrrIPHK+TAPfyxxbBEz46oVGez2x0ODE= -maunium.net/go/maulogger/v2 v2.3.1/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A= -maunium.net/go/mautrix v0.10.8 h1:h64yDl8fMPk3j/tnkb6c5itSo/LZ1QSKQ3ze5zyanUg= -maunium.net/go/mautrix v0.10.8/go.mod h1:k4Ng5oci83MEbqPL6KOjPdbU7f8v01KlMjR/zTQ+7mA= +maunium.net/go/maulogger/v2 v2.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0= +maunium.net/go/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A= +maunium.net/go/mautrix v0.10.10 h1:aaEuVopM3rkgOxL8Ldn2E8vcIIfKDE+tBfX/uPCRFWs= +maunium.net/go/mautrix v0.10.10/go.mod h1:4XljZZGZiIlpfbQ+Tt2ykjapskJ8a7Z2i9y/+YaceF8=