Browse Source

Update whatsmeow

Tulir Asokan 3 years ago
parent
commit
a438e1e53d
4 changed files with 5 additions and 6 deletions
  1. 2 2
      commands.go
  2. 1 1
      go.mod
  3. 2 2
      go.sum
  4. 0 1
      user.go

+ 2 - 2
commands.go

@@ -278,7 +278,7 @@ func (handler *CommandHandler) CommandJoin(ce *CommandEvent) {
 		return
 	}
 
-	jid, err := ce.User.Client.JoinGroupViaLink(ce.Args[0])
+	jid, err := ce.User.Client.JoinGroupWithLink(ce.Args[0])
 	if err != nil {
 		ce.Reply("Failed to join group: %v", err)
 		return
@@ -299,7 +299,7 @@ func (handler *CommandHandler) CommandAccept(ce *CommandEvent) {
 		ce.Reply("That doesn't look like a group invite message.")
 	} else if inviter.User == ce.User.JID.User {
 		ce.Reply("You can't accept your own invites")
-	} else if err = ce.User.Client.AcceptGroupInvite(jid, inviter, code, expiration); err != nil {
+	} else if err = ce.User.Client.JoinGroupWithInvite(jid, inviter, code, expiration); err != nil {
 		ce.Reply("Failed to accept group invite: %v", err)
 	} else {
 		ce.Reply("Successfully accepted the invite, the portal should be created momentarily")

+ 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-20211031213406-f7df98c1e267
+	go.mau.fi/whatsmeow v0.0.0-20211101094345-577401c71258
 	golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d
 	google.golang.org/protobuf v1.27.1
 	gopkg.in/yaml.v2 v2.4.0

+ 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-20211024113310-f9fc6a1855f2 h1:xpQTMgJGGaF+c8jV/LA/FVXAPJxZbSAGeflOc+Ly6uQ=
 go.mau.fi/libsignal v0.0.0-20211024113310-f9fc6a1855f2/go.mod h1:3XlVlwOfp8f9Wri+C1D4ORqgUsN4ZvunJOoPjQMBhos=
-go.mau.fi/whatsmeow v0.0.0-20211031213406-f7df98c1e267 h1:l4IhbH3HxCG121i1uqj5pU3NX0t4ERbwiJkKAguk1bQ=
-go.mau.fi/whatsmeow v0.0.0-20211031213406-f7df98c1e267/go.mod h1:ODEmmqeUn9eBDQHFc1S902YA3YFLtmaBujYRRFl53jI=
+go.mau.fi/whatsmeow v0.0.0-20211101094345-577401c71258 h1:pff9ri4N+T8IjrNitGtynoh4nkTk28cRPH9bS7fN/F8=
+go.mau.fi/whatsmeow v0.0.0-20211101094345-577401c71258/go.mod h1:ODEmmqeUn9eBDQHFc1S902YA3YFLtmaBujYRRFl53jI=
 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=

+ 0 - 1
user.go

@@ -776,7 +776,6 @@ func (user *User) handleGroupCreate(evt *events.JoinedGroup) {
 func (user *User) handleGroupUpdate(evt *events.GroupInfo) {
 	portal := user.GetPortalByJID(evt.JID)
 	if portal == nil || len(portal.MXID) == 0 {
-		// TODO create portal when added to group
 		user.log.Debugfln("Ignoring group info update in chat with no portal: %+v", evt)
 		return
 	}