3pp-mirror/pushbits
1
0
Fork 0
mirror of https://github.com/pushbits/server.git synced 2025-04-29 10:16:50 +02:00
Code Issues Projects Releases Packages Wiki Activity

remove gomatrix dependency and clean up

Browse source
This commit is contained in:
cubicroot 2022-03-13 18:25:04 +01:00
parent dc6c76747f
commit 4e8c477ae3
4 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
go.mod
View file

@ -12,7 +12,6 @@ require (
github.com/jinzhu/configor v1.2.1
github.com/json-iterator/go v1.1.10 // indirect
github.com/leodido/go-urn v1.2.1 // indirect
github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/stretchr/testify v1.7.0

2
go.sum
View file

@ -75,8 +75,6 @@ github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6
github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY=
github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd h1:xVrqJK3xHREMNjwjljkAUaadalWc0rRbmVuQatzmgwg=
github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s=
github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
github.com/mattn/go-sqlite3 v1.14.5/go.mod h1:WVKg1VTActs4Qso6iwGbiFih2UIHo0ENGwNd0Lj+XmI=

2
internal/dispatcher/dispatcher.go
View file

@ -40,7 +40,7 @@ func Create(homeserver, username, password string, formatting configuration.Form
// Close closes the dispatcher connection.
func (d *Dispatcher) Close() {
log.Printf("Logging out.")
_, err := d.mautrixClient.Logout()
if err != nil {
log.Printf("Error while logging out: %s", err)

6
internal/dispatcher/notification.go
View file

@ -264,9 +264,9 @@ func bodiesFromMessage(message *event.Event) (body, formattedBody string, err er
return "", "", pberrors.ErrorMessageNotFound
}
formattedBody = msgContent.FormattedBody
if formattedBody == "" {
formattedBody = msgContent.Body
formattedBody = msgContent.Body
if msgContent.FormattedBody != "" {
formattedBody = msgContent.FormattedBody
}
return msgContent.Body, formattedBody, nil