lug/matterbridge
10
0
Fork 2
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Bump go.mau.fi/whatsmeow v0.0.0-20240625083845-6acab596dd8c

Browse Source
This commit is contained in:
IntGrah
2024-08-27 11:17:32 +01:00
parent d16645c952
commit d3ade23665
344 changed files with 51582 additions and 43492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
bridge/whatsappmulti/handlers.go
View File

@@ -41,11 +41,11 @@ func (b *Bwhatsapp) handleGroupInfo(event *events.GroupInfo) {
}
func (b *Bwhatsapp) handleUserJoin(event *events.GroupInfo) {
for _, joinedJid := range event.Join {
senderName := b.getSenderNameFromJID(joinedJid)
for _, joinedJID := range event.Join {
senderName := b.getSenderNameFromJID(joinedJID)
rmsg := config.Message{
UserID: joinedJid.String(),
UserID: joinedJID.String(),
Username: senderName,
Channel: event.JID.String(),
Account: b.Account,
@@ -58,11 +58,11 @@ func (b *Bwhatsapp) handleUserJoin(event *events.GroupInfo) {
}
}
func (b *Bwhatsapp) handleUserLeave(event *events.GroupInfo) {
for _, leftJid := range event.Leave {
senderName := b.getSenderNameFromJID(leftJid)
for _, leftJID := range event.Leave {
senderName := b.getSenderNameFromJID(leftJID)
rmsg := config.Message{
UserID: leftJid.String(),
UserID: leftJID.String(),
Username: senderName,
Channel: event.JID.String(),
Account: b.Account,
@@ -76,8 +76,8 @@ func (b *Bwhatsapp) handleUserLeave(event *events.GroupInfo) {
}
func (b *Bwhatsapp) handleTopicChange(event *events.GroupInfo) {
msg := event.Topic
senderJid := msg.TopicSetBy
senderName := b.getSenderNameFromJID(senderJid)
senderJID := msg.TopicSetBy
senderName := b.getSenderNameFromJID(senderJID)
text := msg.Topic
if text == "" {
@@ -85,7 +85,7 @@ func (b *Bwhatsapp) handleTopicChange(event *events.GroupInfo) {
}
rmsg := config.Message{
UserID: senderJid.String(),
UserID: senderJID.String(),
Username: senderName,
Channel: event.JID.String(),
Account: b.Account,
@@ -151,9 +151,9 @@ func (b *Bwhatsapp) handleTextMessage(messageInfo types.MessageInfo, msg *proto.
senderJID = types.NewJID(ci.GetParticipant(), types.DefaultUserServer)
}
if ci.MentionedJid != nil {
if ci.MentionedJID != nil {
// handle user mentions
for _, mentionedJID := range ci.MentionedJid {
for _, mentionedJID := range ci.MentionedJID {
numberAndSuffix := strings.SplitN(mentionedJID, "@", 2)
// mentions comes as telephone numbers and we don't want to expose it to other bridges
@@ -441,10 +441,10 @@ func (b *Bwhatsapp) handleDelete(messageInfo *proto.ProtocolMessage) {
rmsg := config.Message{
Account: b.Account,
Protocol: b.Protocol,
ID: getMessageIdFormat(sender, *messageInfo.Key.Id),
ID: getMessageIdFormat(sender, *messageInfo.Key.ID),
Event: config.EventMsgDelete,
Text: config.EventMsgDelete,
Channel: *messageInfo.Key.RemoteJid,
Channel: *messageInfo.Key.RemoteJID,
}
b.Log.Debugf("<= Sending message from %s to gateway", b.Account)

6
bridge/whatsappmulti/helpers.go
View File

@@ -157,7 +157,7 @@ func (b *Bwhatsapp) getNewReplyContext(parentID string) (*proto.ContextInfo, err
sender := fmt.Sprintf("%s@%s", replyInfo.Sender.User, replyInfo.Sender.Server)
ctx := &proto.ContextInfo{
StanzaId: &replyInfo.MessageID,
StanzaID: &replyInfo.MessageID,
Participant: &sender,
QuotedMessage: &proto.Message{Conversation: goproto.String("")},
}
@@ -191,11 +191,11 @@ func (b *Bwhatsapp) parseMessageID(id string) (*Replyable, error) {
}
func getParentIdFromCtx(ci *proto.ContextInfo) string {
if ci != nil && ci.StanzaId != nil {
if ci != nil && ci.StanzaID != nil {
senderJid, err := types.ParseJID(*ci.Participant)
if err == nil {
return getMessageIdFormat(senderJid, *ci.StanzaId)
return getMessageIdFormat(senderJid, *ci.StanzaID)
}
}

24
bridge/whatsappmulti/whatsapp.go
View File

@@ -239,10 +239,10 @@ func (b *Bwhatsapp) PostDocumentMessage(msg config.Message, filetype string) (st
Mimetype: &filetype,
Caption: &caption,
MediaKey: resp.MediaKey,
FileEncSha256: resp.FileEncSHA256,
FileSha256: resp.FileSHA256,
FileEncSHA256: resp.FileEncSHA256,
FileSHA256: resp.FileSHA256,
FileLength: goproto.Uint64(resp.FileLength),
Url: &resp.URL,
URL: &resp.URL,
DirectPath: &resp.DirectPath,
ContextInfo: ctx,
}
@@ -277,10 +277,10 @@ func (b *Bwhatsapp) PostImageMessage(msg config.Message, filetype string) (strin
Mimetype: &filetype,
Caption: &caption,
MediaKey: resp.MediaKey,
FileEncSha256: resp.FileEncSHA256,
FileSha256: resp.FileSHA256,
FileEncSHA256: resp.FileEncSHA256,
FileSHA256: resp.FileSHA256,
FileLength: goproto.Uint64(resp.FileLength),
Url: &resp.URL,
URL: &resp.URL,
DirectPath: &resp.DirectPath,
ContextInfo: ctx,
}
@@ -311,10 +311,10 @@ func (b *Bwhatsapp) PostVideoMessage(msg config.Message, filetype string) (strin
Mimetype: &filetype,
Caption: &caption,
MediaKey: resp.MediaKey,
FileEncSha256: resp.FileEncSHA256,
FileSha256: resp.FileSHA256,
FileEncSHA256: resp.FileEncSHA256,
FileSHA256: resp.FileSHA256,
FileLength: goproto.Uint64(resp.FileLength),
Url: &resp.URL,
URL: &resp.URL,
DirectPath: &resp.DirectPath,
ContextInfo: ctx,
}
@@ -344,10 +344,10 @@ func (b *Bwhatsapp) PostAudioMessage(msg config.Message, filetype string) (strin
message.AudioMessage = &proto.AudioMessage{
Mimetype: &filetype,
MediaKey: resp.MediaKey,
FileEncSha256: resp.FileEncSHA256,
FileSha256: resp.FileSHA256,
FileEncSHA256: resp.FileEncSHA256,
FileSHA256: resp.FileSHA256,
FileLength: goproto.Uint64(resp.FileLength),
Url: &resp.URL,
URL: &resp.URL,
DirectPath: &resp.DirectPath,
ContextInfo: ctx,
}