Skip to content

Commit c4157a4

Browse files
42wim42wim
authored
Update dependencies (42wim#2180)
* Update dependencies * Fix whatsmeow API changes
1 parent d16645c commit c4157a4

589 files changed

Lines changed: 681110 additions & 198259 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎bridge/whatsappmulti/handlers.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ func (b *Bwhatsapp) eventHandler(evt interface{}) {
2727
}
2828

2929
func (b *Bwhatsapp) handleGroupInfo(event *events.GroupInfo) {
30-
3130
b.Log.Debugf("Receiving event %#v", event)
3231

3332
switch {
@@ -57,6 +56,7 @@ func (b *Bwhatsapp) handleUserJoin(event *events.GroupInfo) {
5756
b.Remote <- rmsg
5857
}
5958
}
59+
6060
func (b *Bwhatsapp) handleUserLeave(event *events.GroupInfo) {
6161
for _, leftJid := range event.Leave {
6262
senderName := b.getSenderNameFromJID(leftJid)
@@ -74,6 +74,7 @@ func (b *Bwhatsapp) handleUserLeave(event *events.GroupInfo) {
7474
b.Remote <- rmsg
7575
}
7676
}
77+
7778
func (b *Bwhatsapp) handleTopicChange(event *events.GroupInfo) {
7879
msg := event.Topic
7980
senderJid := msg.TopicSetBy
@@ -151,9 +152,9 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto.
151152
senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer)
152153
}
153154

154-
if ci.MentionedJid != nil {
155+
if ci.MentionedJID != nil {
155156
// handle user mentions
156-
for _, mentionedJID := range ci.MentionedJid {
157+
for _, mentionedJID := range ci.MentionedJID {
157158
numberAndSuffix := strings.SplitN(mentionedJID, "@", 2)
158159

159160
// mentions comes as telephone numbers and we don't want to expose it to other bridges
@@ -441,10 +442,10 @@ func (b *Bwhatsapp) handleDelete(messageInfo *proto.ProtocolMessage) {
441442
rmsg := config.Message{
442443
Account: b.Account,
443444
Protocol: b.Protocol,
444-
ID: getMessageIdFormat(sender, *messageInfo.Key.Id),
445+
ID: getMessageIdFormat(sender, *messageInfo.Key.ID),
445446
Event: config.EventMsgDelete,
446447
Text: config.EventMsgDelete,
447-
Channel: *messageInfo.Key.RemoteJid,
448+
Channel: *messageInfo.Key.RemoteJID,
448449
}
449450

450451
b.Log.Debugf("<= Sending message from %s to gateway", b.Account)

‎bridge/whatsappmulti/helpers.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ func (b *Bwhatsapp) getNewReplyContext(parentID string) (*proto.ContextInfo, err
157157

158158
sender := fmt.Sprintf("%s@%s", replyInfo.Sender.User, replyInfo.Sender.Server)
159159
ctx := &proto.ContextInfo{
160-
StanzaId: &replyInfo.MessageID,
160+
StanzaID: &replyInfo.MessageID,
161161
Participant: &sender,
162162
QuotedMessage: &proto.Message{Conversation: goproto.String("")},
163163
}
@@ -191,11 +191,11 @@ func (b *Bwhatsapp) parseMessageID(id string) (*Replyable, error) {
191191
}
192192

193193
func getParentIdFromCtx(ci *proto.ContextInfo) string {
194-
if ci != nil && ci.StanzaId != nil {
194+
if ci != nil && ci.StanzaID != nil {
195195
senderJid, err := types.ParseJID(*ci.Participant)
196196

197197
if err == nil {
198-
return getMessageIdFormat(senderJid, *ci.StanzaId)
198+
return getMessageIdFormat(senderJid, *ci.StanzaID)
199199
}
200200
}
201201

‎bridge/whatsappmulti/whatsapp.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,10 @@ func (b *Bwhatsapp) PostDocumentMessage(msg config.Message, filetype string) (st
239239
Mimetype: &filetype,
240240
Caption: &caption,
241241
MediaKey: resp.MediaKey,
242-
FileEncSha256: resp.FileEncSHA256,
243-
FileSha256: resp.FileSHA256,
242+
FileEncSHA256: resp.FileEncSHA256,
243+
FileSHA256: resp.FileSHA256,
244244
FileLength: goproto.Uint64(resp.FileLength),
245-
Url: &resp.URL,
245+
URL: &resp.URL,
246246
DirectPath: &resp.DirectPath,
247247
ContextInfo: ctx,
248248
}
@@ -277,10 +277,10 @@ func (b *Bwhatsapp) PostImageMessage(msg config.Message, filetype string) (strin
277277
Mimetype: &filetype,
278278
Caption: &caption,
279279
MediaKey: resp.MediaKey,
280-
FileEncSha256: resp.FileEncSHA256,
281-
FileSha256: resp.FileSHA256,
280+
FileEncSHA256: resp.FileEncSHA256,
281+
FileSHA256: resp.FileSHA256,
282282
FileLength: goproto.Uint64(resp.FileLength),
283-
Url: &resp.URL,
283+
URL: &resp.URL,
284284
DirectPath: &resp.DirectPath,
285285
ContextInfo: ctx,
286286
}
@@ -311,10 +311,10 @@ func (b *Bwhatsapp) PostVideoMessage(msg config.Message, filetype string) (strin
311311
Mimetype: &filetype,
312312
Caption: &caption,
313313
MediaKey: resp.MediaKey,
314-
FileEncSha256: resp.FileEncSHA256,
315-
FileSha256: resp.FileSHA256,
314+
FileEncSHA256: resp.FileEncSHA256,
315+
FileSHA256: resp.FileSHA256,
316316
FileLength: goproto.Uint64(resp.FileLength),
317-
Url: &resp.URL,
317+
URL: &resp.URL,
318318
DirectPath: &resp.DirectPath,
319319
ContextInfo: ctx,
320320
}
@@ -344,10 +344,10 @@ func (b *Bwhatsapp) PostAudioMessage(msg config.Message, filetype string) (strin
344344
message.AudioMessage = &proto.AudioMessage{
345345
Mimetype: &filetype,
346346
MediaKey: resp.MediaKey,
347-
FileEncSha256: resp.FileEncSHA256,
348-
FileSha256: resp.FileSHA256,
347+
FileEncSHA256: resp.FileEncSHA256,
348+
FileSHA256: resp.FileSHA256,
349349
FileLength: goproto.Uint64(resp.FileLength),
350-
Url: &resp.URL,
350+
URL: &resp.URL,
351351
DirectPath: &resp.DirectPath,
352352
ContextInfo: ctx,
353353
}

‎go.mod‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,83 +5,83 @@ require (
55
github.com/Benau/tgsconverter v0.0.0-20210809170556-99f4a4f6337f
66
github.com/Philipp15b/go-steam v1.0.1-0.20200727090957-6ae9b3c0a560
77
github.com/Rhymen/go-whatsapp v0.1.2-0.20211102134409-31a2e740845c
8-
github.com/SevereCloud/vksdk/v2 v2.16.1
8+
github.com/SevereCloud/vksdk/v2 v2.17.0
99
github.com/bwmarrin/discordgo v0.28.1
1010
github.com/d5/tengo/v2 v2.17.0
1111
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
1212
github.com/fsnotify/fsnotify v1.7.0
1313
github.com/gomarkdown/markdown v0.0.0-20240419095408-642f0ee99ae2
1414
github.com/google/gops v0.3.27
15-
github.com/gorilla/schema v1.3.0
15+
github.com/gorilla/schema v1.4.1
1616
github.com/harmony-development/shibshib v0.0.0-20220101224523-c98059d09cfa
1717
github.com/hashicorp/golang-lru v1.0.2
1818
github.com/jpillora/backoff v1.0.0
1919
github.com/keybase/go-keybase-chat-bot v0.0.0-20221220212439-e48d9abd2c20
2020
github.com/kyokomi/emoji/v2 v2.2.13
2121
github.com/labstack/echo/v4 v4.12.0
22-
github.com/lrstanley/girc v0.0.0-20240519163535-a518c5b87a79
22+
github.com/lrstanley/girc v0.0.0-20240823210506-80555f2adb03
2323
github.com/matterbridge/Rocket.Chat.Go.SDK v0.0.0-20211016222428-79310a412696
2424
github.com/matterbridge/go-xmpp v0.0.0-20240523230155-7154bfeb76e8
2525
github.com/matterbridge/gomatrix v0.0.0-20220411225302-271e5088ea27
2626
github.com/matterbridge/gozulipbot v0.0.0-20211023205727-a19d6c1f3b75
2727
github.com/matterbridge/logrus-prefixed-formatter v0.5.3-0.20200523233437-d971309a77ba
28-
github.com/matterbridge/matterclient v0.0.0-20240523235056-57f299489168
28+
github.com/matterbridge/matterclient v0.0.0-20240817214420-3d4c3aef3dc1
2929
github.com/matterbridge/telegram-bot-api/v6 v6.5.0
30-
github.com/mattermost/mattermost/server/public v0.1.3
30+
github.com/mattermost/mattermost/server/public v0.1.6
3131
github.com/mattn/godown v0.0.1
3232
github.com/mdp/qrterminal v1.0.1
3333
github.com/mitchellh/mapstructure v1.5.0
3434
github.com/nelsonken/gomf v0.0.0-20190423072027-c65cc0469e94
35-
github.com/olahol/melody v1.1.4
35+
github.com/olahol/melody v1.2.1
3636
github.com/paulrosania/go-charset v0.0.0-20190326053356-55c9d7a5834c
3737
github.com/rs/xid v1.5.0
3838
github.com/russross/blackfriday v1.6.0
3939
github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d
4040
github.com/shazow/ssh-chat v1.10.1
4141
github.com/sirupsen/logrus v1.9.3
42-
github.com/slack-go/slack v0.13.0
43-
github.com/spf13/viper v1.18.2
42+
github.com/slack-go/slack v0.14.0
43+
github.com/spf13/viper v1.19.0
4444
github.com/stretchr/testify v1.9.0
4545
github.com/vincent-petithory/dataurl v1.0.0
4646
github.com/writeas/go-strip-markdown v2.0.1+incompatible
4747
github.com/yaegashi/msgraph.go v0.1.4
4848
github.com/zfjagann/golang-ring v0.0.0-20220330170733-19bcea1b6289
49-
go.mau.fi/whatsmeow v0.0.0-20240520180327-81f8f07f1dfb
50-
golang.org/x/image v0.16.0
51-
golang.org/x/oauth2 v0.20.0
52-
golang.org/x/text v0.15.0
49+
go.mau.fi/whatsmeow v0.0.0-20240821142752-3d63c6fcc1a7
50+
golang.org/x/image v0.19.0
51+
golang.org/x/oauth2 v0.22.0
52+
golang.org/x/text v0.17.0
5353
gomod.garykim.dev/nc-talk v0.3.0
54-
google.golang.org/protobuf v1.33.0
54+
google.golang.org/protobuf v1.34.2
5555
layeh.com/gumble v0.0.0-20221205141517-d1df60a3cc14
56-
modernc.org/sqlite v1.29.10
56+
modernc.org/sqlite v1.32.0
5757
)
5858

5959
require (
60-
filippo.io/edwards25519 v1.0.0 // indirect
60+
filippo.io/edwards25519 v1.1.0 // indirect
6161
github.com/Benau/go_rlottie v0.0.0-20210807002906-98c1b2421989 // indirect
6262
github.com/Jeffail/gabs v1.4.0 // indirect
6363
github.com/apex/log v1.9.0 // indirect
6464
github.com/av-elier/go-decimal-to-rational v0.0.0-20191127152832-89e6aad02ecf // indirect
6565
github.com/blang/semver/v4 v4.0.0 // indirect
6666
github.com/dustin/go-humanize v1.0.1 // indirect
6767
github.com/dyatlov/go-opengraph/opengraph v0.0.0-20220524092352-606d7b1e5f8a // indirect
68-
github.com/fatih/color v1.16.0 // indirect
68+
github.com/fatih/color v1.17.0 // indirect
6969
github.com/francoispqt/gojay v1.2.13 // indirect
70-
github.com/go-asn1-ber/asn1-ber v1.5.5 // indirect
70+
github.com/go-asn1-ber/asn1-ber v1.5.7 // indirect
7171
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
7272
github.com/golang/protobuf v1.5.4 // indirect
7373
github.com/google/uuid v1.6.0 // indirect
7474
github.com/gopackage/ddp v0.0.3 // indirect
75-
github.com/gorilla/websocket v1.5.1 // indirect
75+
github.com/gorilla/websocket v1.5.3 // indirect
7676
github.com/hashicorp/errwrap v1.1.0 // indirect
77-
github.com/hashicorp/go-hclog v1.6.2 // indirect
77+
github.com/hashicorp/go-hclog v1.6.3 // indirect
7878
github.com/hashicorp/go-multierror v1.1.1 // indirect
79-
github.com/hashicorp/go-plugin v1.6.0 // indirect
79+
github.com/hashicorp/go-plugin v1.6.1 // indirect
8080
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
8181
github.com/hashicorp/hcl v1.0.0 // indirect
8282
github.com/hashicorp/yamux v0.1.1 // indirect
8383
github.com/kettek/apng v0.0.0-20191108220231-414630eed80f // indirect
84-
github.com/klauspost/compress v1.17.7 // indirect
84+
github.com/klauspost/compress v1.17.9 // indirect
8585
github.com/labstack/gommon v0.4.2 // indirect
8686
github.com/magiconair/properties v1.8.7 // indirect
8787
github.com/mattermost/go-i18n v1.11.1-0.20211013152124-5c415071e404 // indirect
@@ -98,15 +98,15 @@ require (
9898
github.com/oklog/run v1.1.0 // indirect
9999
github.com/pborman/uuid v1.2.1 // indirect
100100
github.com/pelletier/go-toml v1.9.5 // indirect
101-
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
102-
github.com/philhofer/fwd v1.1.2 // indirect
101+
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
102+
github.com/philhofer/fwd v1.1.3-0.20240612014219-fbbf4953d986 // indirect
103103
github.com/pkg/errors v0.9.1 // indirect
104104
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
105105
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
106106
github.com/rickb777/date v1.12.4 // indirect
107107
github.com/rickb777/plural v1.2.0 // indirect
108108
github.com/rivo/uniseg v0.4.7 // indirect
109-
github.com/rs/zerolog v1.32.0 // indirect
109+
github.com/rs/zerolog v1.33.0 // indirect
110110
github.com/sagikazarmark/locafero v0.4.0 // indirect
111111
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
112112
github.com/shazow/rateio v0.0.0-20200113175441-4461efc8bdc4 // indirect
@@ -117,30 +117,30 @@ require (
117117
github.com/spf13/cast v1.6.0 // indirect
118118
github.com/spf13/pflag v1.0.5 // indirect
119119
github.com/subosito/gotenv v1.6.0 // indirect
120-
github.com/tinylib/msgp v1.1.9 // indirect
120+
github.com/tinylib/msgp v1.2.0 // indirect
121121
github.com/valyala/bytebufferpool v1.0.0 // indirect
122122
github.com/valyala/fasttemplate v1.2.2 // indirect
123123
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
124124
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
125125
github.com/wiggin77/merror v1.0.5 // indirect
126126
github.com/wiggin77/srslog v1.0.1 // indirect
127-
go.mau.fi/libsignal v0.1.0 // indirect
128-
go.mau.fi/util v0.4.1 // indirect
127+
go.mau.fi/libsignal v0.1.1 // indirect
128+
go.mau.fi/util v0.6.0 // indirect
129129
go.uber.org/multierr v1.11.0 // indirect
130-
golang.org/x/crypto v0.23.0 // indirect
131-
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f // indirect
132-
golang.org/x/net v0.25.0 // indirect
133-
golang.org/x/sys v0.20.0 // indirect
134-
golang.org/x/term v0.20.0 // indirect
130+
golang.org/x/crypto v0.25.0 // indirect
131+
golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect
132+
golang.org/x/net v0.27.0 // indirect
133+
golang.org/x/sys v0.22.0 // indirect
134+
golang.org/x/term v0.22.0 // indirect
135135
golang.org/x/time v0.5.0 // indirect
136-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240227224415-6ceb2ff114de // indirect
137-
google.golang.org/grpc v1.62.0 // indirect
136+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect
137+
google.golang.org/grpc v1.65.0 // indirect
138138
gopkg.in/ini.v1 v1.67.0 // indirect
139139
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
140140
gopkg.in/yaml.v2 v2.4.0 // indirect
141141
gopkg.in/yaml.v3 v3.0.1 // indirect
142142
modernc.org/gc/v3 v3.0.0-20240107210532-573471604cb6 // indirect
143-
modernc.org/libc v1.49.3 // indirect
143+
modernc.org/libc v1.55.3 // indirect
144144
modernc.org/mathutil v1.6.0 // indirect
145145
modernc.org/memory v1.8.0 // indirect
146146
modernc.org/strutil v1.2.0 // indirect

0 commit comments

Comments
 (0)