Эх сурвалжийг харах

Update whatsmeow to handle identity changes in prekey messages

Tulir Asokan 3 жил өмнө
parent
commit
e81b5ae405
3 өөрчлөгдсөн 8 нэмэгдсэн , 4 устгасан
  1. 1 1
      go.mod
  2. 2 2
      go.sum
  3. 5 1
      user.go

+ 1 - 1
go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.9
 	github.com/prometheus/client_golang v1.11.0
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
-	go.mau.fi/whatsmeow v0.0.0-20211109154617-2fabbeecad6a
+	go.mau.fi/whatsmeow v0.0.0-20211109210528-7aea95b68ce3
 	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d
 	google.golang.org/protobuf v1.27.1
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b

+ 2 - 2
go.sum

@@ -139,8 +139,8 @@ github.com/tidwall/sjson v1.2.3 h1:5+deguEhHSEjmuICXZ21uSSsXotWMA0orU783+Z7Cp8=
 github.com/tidwall/sjson v1.2.3/go.mod h1:5WdjKx3AQMvCJ4RG6/2UYT7dLrGvJUV1x4jdTAyGvZs=
 go.mau.fi/libsignal v0.0.0-20211109153248-a67163214910 h1:9FFhG0OmkuMau5UEaTgiUQ+7cSbtbOQ7hiWKdN8OI3I=
 go.mau.fi/libsignal v0.0.0-20211109153248-a67163214910/go.mod h1:AufGrvVh+00Nc07Jm4hTquh7yleZyn20tKJI2wCPAKg=
-go.mau.fi/whatsmeow v0.0.0-20211109154617-2fabbeecad6a h1:ZDFmCqUXbayxtVgSIY75Odx6y2Il7d9LGFgLcFlEtrY=
-go.mau.fi/whatsmeow v0.0.0-20211109154617-2fabbeecad6a/go.mod h1:8jUjOAi3xtGubxcZgG8uSHpAdyQXBRbWAfxkctX/4y4=
+go.mau.fi/whatsmeow v0.0.0-20211109210528-7aea95b68ce3 h1:UYFUEgnx2yfSLcsB753q3vyXi8vrN/VGCk/toIG20f0=
+go.mau.fi/whatsmeow v0.0.0-20211109210528-7aea95b68ce3/go.mod h1:8jUjOAi3xtGubxcZgG8uSHpAdyQXBRbWAfxkctX/4y4=
 golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

+ 5 - 1
user.go

@@ -440,10 +440,14 @@ func (user *User) HandleEvent(event interface{}) {
 		puppet := user.bridge.GetPuppetByJID(v.JID)
 		portal := user.GetPortalByJID(v.JID)
 		if len(portal.MXID) > 0 && user.bridge.Config.Bridge.IdentityChangeNotices {
+			text := fmt.Sprintf("Your security code with %s changed.", puppet.Displayname)
+			if v.Implicit {
+				text = fmt.Sprintf("Your security code with %s (device #%d) changed.", puppet.Displayname, v.JID.Device)
+			}
 			portal.messages <- PortalMessage{
 				fake: &fakeMessage{
 					Sender:    v.JID,
-					Text:      fmt.Sprintf("Your security code with %s changed.", puppet.Displayname),
+					Text:      text,
 					ID:        strconv.FormatInt(v.Timestamp.Unix(), 10),
 					Time:      v.Timestamp,
 					Important: false,