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

Update mautrix-go and stop sending all thread messages as replies

Browse Source
This commit is contained in:
Tulir Asokan
2022-10-28 23:45:35 +03:00
parent 8728867737
commit b64617a699
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/message.go
View File

@@ -29,7 +29,7 @@ func (mq *MessageQuery) New() *Message {
} }
} }
func (mq *MessageQuery) scanAll(rows *sql.Rows, err error) []*Message { func (mq *MessageQuery) scanAll(rows dbutil.Rows, err error) []*Message {
if err != nil { if err != nil {
mq.log.Warnfln("Failed to query many messages: %v", err) mq.log.Warnfln("Failed to query many messages: %v", err)
panic(err) panic(err)

2
database/userportal.go
View File

@@ -33,7 +33,7 @@ func (up UserPortal) Scan(l log.Logger, row dbutil.Scannable) *UserPortal {
return &up return &up
} }
func (u *User) scanUserPortals(rows *sql.Rows) []UserPortal { func (u *User) scanUserPortals(rows dbutil.Rows) []UserPortal {
var ups []UserPortal var ups []UserPortal
for rows.Next() { for rows.Next() {
up := UserPortal{}.Scan(u.log, rows) up := UserPortal{}.Scan(u.log, rows)

2
go.mod
View File

@@ -12,7 +12,7 @@ require (
github.com/stretchr/testify v1.8.0 github.com/stretchr/testify v1.8.0
github.com/yuin/goldmark v1.5.2 github.com/yuin/goldmark v1.5.2
maunium.net/go/maulogger/v2 v2.3.2 maunium.net/go/maulogger/v2 v2.3.2
maunium.net/go/mautrix v0.12.2-0.20221016082058-f7d28cc18df8 maunium.net/go/mautrix v0.12.3-0.20221028204432-e511c408c3bd
) )
require ( require (

4
go.sum
View File

@@ -66,5 +66,5 @@ maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA= maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
maunium.net/go/maulogger/v2 v2.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0= 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/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
maunium.net/go/mautrix v0.12.2-0.20221016082058-f7d28cc18df8 h1:OsKa24dXPnBgT5lr5ResRbTO9f+bZpZe/K5ioO2+1a8= maunium.net/go/mautrix v0.12.3-0.20221028204432-e511c408c3bd h1:FrVjihHG2J5+vZlap0FSdN44ybr+nZkqFxACtTY5Yhk=
maunium.net/go/mautrix v0.12.2-0.20221016082058-f7d28cc18df8/go.mod h1:bCw45Qx/m9qsz7eazmbe7Rzq5ZbTPzwRE1UgX2S9DXs= maunium.net/go/mautrix v0.12.3-0.20221028204432-e511c408c3bd/go.mod h1:bCw45Qx/m9qsz7eazmbe7Rzq5ZbTPzwRE1UgX2S9DXs=

2
portal.go
View File

@@ -1174,7 +1174,7 @@ func (portal *Portal) handleMatrixMessage(sender *User, evt *event.Event) {
switch content.MsgType { switch content.MsgType {
case event.MsgText, event.MsgEmote, event.MsgNotice: case event.MsgText, event.MsgEmote, event.MsgNotice:
if replyToMXID := content.GetReplyTo(); replyToMXID != "" { if replyToMXID := content.RelatesTo.GetNonFallbackReplyTo(); replyToMXID != "" {
replyTo := portal.bridge.DB.Message.GetByMXID(portal.Key, replyToMXID) replyTo := portal.bridge.DB.Message.GetByMXID(portal.Key, replyToMXID)
if replyTo != nil && replyTo.ThreadID == threadID { if replyTo != nil && replyTo.ThreadID == threadID {
sendReq.Reference = &discordgo.MessageReference{ sendReq.Reference = &discordgo.MessageReference{