uwaru/matterbridge
1
0
Fork 0
forked from lug/matterbridge
Code Pull Requests Activity

Update dependencies and go1.18 (#1873)

Browse Source 
* Update dependencies and go1.18

* Exclude unnecessary linters and update build to go1.18
This commit is contained in:
Wim
2022-08-13 16:14:26 +02:00
committed by GitHub
parent 3c4192ebf6
commit 6a3fc71397
396 changed files with 350176 additions and 309792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
vendor/go.mau.fi/whatsmeow/message.go vendored
View File

@@ -51,6 +51,11 @@ func (cli *Client) handleEncryptedMessage(node *waBinary.Node) {
}
func (cli *Client) parseMessageSource(node *waBinary.Node, requireParticipant bool) (source types.MessageSource, err error) {
clientID := cli.Store.ID
if clientID == nil {
err = ErrNotLoggedIn
return
}
ag := node.AttrGetter()
from := ag.JID("from")
if from.Server == types.GroupServer || from.Server == types.BroadcastServer {
@@ -61,13 +66,13 @@ func (cli *Client) parseMessageSource(node *waBinary.Node, requireParticipant bo
} else {
source.Sender = ag.OptionalJIDOrEmpty("participant")
}
if source.Sender.User == cli.Store.ID.User {
if source.Sender.User == clientID.User {
source.IsFromMe = true
}
if from.Server == types.BroadcastServer {
source.BroadcastListOwner = ag.OptionalJIDOrEmpty("recipient")
}
} else if from.User == cli.Store.ID.User {
} else if from.User == clientID.User {
source.IsFromMe = true
source.Sender = from
recipient := ag.OptionalJID("recipient")
@@ -395,7 +400,8 @@ func (cli *Client) handleDecryptedMessage(info *types.MessageInfo, msg *waProto.
}
func (cli *Client) sendProtocolMessageReceipt(id, msgType string) {
if len(id) == 0 || cli.Store.ID == nil {
clientID := cli.Store.ID
if len(id) == 0 || clientID == nil {
return
}
err := cli.sendNode(waBinary.Node{
@@ -403,7 +409,7 @@ func (cli *Client) sendProtocolMessageReceipt(id, msgType string) {
Attrs: waBinary.Attrs{
"id": id,
"type": msgType,
"to": types.NewJID(cli.Store.ID.User, types.LegacyUserServer),
"to": types.NewJID(clientID.User, types.LegacyUserServer),
},
Content: nil,
})