sum7/thrempp
sum7
/
thrempp
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix xmpp reading of message extensions

This commit is contained in:
Martin/Geno 2019-06-06 22:54:45 +02:00
parent b72998ae4b
commit e1585612fa
No known key found for this signature in database
GPG Key ID: 9D7D3C6BFF600C6A
2 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
component/threema/send.go
View File

@ -19,29 +19,38 @@ func (a *Account) Send(to string, msg xmpp.Message) error {
return nil
}
func (a *Account) sending(to string, msg xmpp.Message) (o3.Message, error) {
logger := log.WithFields(map[string]interface{}{
"from": a.XMPP.String(),
"to": to,
})
chatState := false
chatStateComposing := false
msgStateID := ""
msgStateRead := false
for _, el := range msg.Extensions {
switch ex := el.(type) {
case xmpp.StateActive:
case *xmpp.StateActive:
chatState = true
case xmpp.StateComposing:
case *xmpp.StateComposing:
chatState = true
chatStateComposing = true
case xmpp.StateGone:
case *xmpp.StateGone:
chatState = true
case xmpp.StateInactive:
case *xmpp.StateInactive:
chatState = true
case xmpp.StatePaused:
case *xmpp.StatePaused:
chatState = true
case xmpp.ReceiptReceived:
case *xmpp.ReceiptReceived:
msgStateID = ex.ID
case xmpp.MarkReceived:
case *xmpp.MarkReceived:
msgStateID = ex.ID
case xmpp.MarkDisplayed:
case *xmpp.MarkDisplayed:
msgStateRead = true
msgStateID = ex.ID
}
@ -60,18 +69,22 @@ func (a *Account) sending(to string, msg xmpp.Message) (o3.Message, error) {
if err != nil {
return nil, err
}
log.WithFields(map[string]interface{}{
"tid": to,
logger.WithFields(map[string]interface{}{
"msg_id": id,
"type": msgType,
}).Debug("update status of threema message")
return drm, nil
}
if chatStateComposing {
return nil, nil
}
if chatState {
return nil, nil
tnm := o3.TypingNotificationMessage{}
if chatStateComposing {
tnm.OnOff = 0x1
}
logger.WithFields(map[string]interface{}{
"state": chatStateComposing,
}).Debug("send typing")
return tnm, nil
}
}
@ -82,5 +95,10 @@ func (a *Account) sending(to string, msg xmpp.Message) (o3.Message, error) {
}
a.deliveredMSG[msg3.ID()] = msg.Id
a.readedMSG[msg3.ID()] = msg.Id
logger.WithFields(map[string]interface{}{
"x_id": msg.Id,
"t_id": msg3.ID(),
"text": msg.Body,
}).Debug("send text")
return msg3, nil
}

28
component/threema/send_test.go
View File

@ -34,7 +34,7 @@ func TestAccountSend(t *testing.T) {
err := a.Send("a", xmpp.Message{
PacketAttrs: xmpp.PacketAttrs{From: "a@example.org"},
Extensions: []xmpp.MsgExtension{
xmpp.ReceiptReceived{ID: "blub"},
&xmpp.ReceiptReceived{ID: "blub"},
},
})
assert.Error(err)
@ -51,7 +51,7 @@ func TestAccountSendingDeliviery(t *testing.T) {
msg, err := a.sending("a", xmpp.Message{
PacketAttrs: xmpp.PacketAttrs{From: "a@example.org"},
Extensions: []xmpp.MsgExtension{
xmpp.ReceiptReceived{ID: "blub"},
&xmpp.ReceiptReceived{ID: "blub"},
},
})
assert.Error(err)
@ -61,7 +61,7 @@ func TestAccountSendingDeliviery(t *testing.T) {
msg, err = a.sending("a", xmpp.Message{
PacketAttrs: xmpp.PacketAttrs{From: "a@example.org"},
Extensions: []xmpp.MsgExtension{
xmpp.MarkReceived{ID: "3"},
&xmpp.MarkReceived{ID: "3"},
},
})
assert.NoError(err)
@ -73,7 +73,7 @@ func TestAccountSendingDeliviery(t *testing.T) {
msg, err = a.sending("a", xmpp.Message{
PacketAttrs: xmpp.PacketAttrs{From: "a@example.org"},
Extensions: []xmpp.MsgExtension{
xmpp.MarkDisplayed{ID: "5"},
&xmpp.MarkDisplayed{ID: "5"},
},
})
assert.NoError(err)
@ -94,7 +94,7 @@ func TestSendTyping(t *testing.T) {
msg, err := a.sending("a", xmpp.Message{
PacketAttrs: xmpp.PacketAttrs{From: "a@example.org"},
Extensions: []xmpp.MsgExtension{
xmpp.StateComposing{},
&xmpp.StateComposing{},
},
})
assert.NoError(err)
@ -104,10 +104,10 @@ func TestSendTyping(t *testing.T) {
msg, err = a.sending("a", xmpp.Message{
PacketAttrs: xmpp.PacketAttrs{From: "a@example.org"},
Extensions: []xmpp.MsgExtension{
xmpp.StateActive{},
xmpp.StateGone{},
xmpp.StateInactive{},
xmpp.StatePaused{},
&xmpp.StateActive{},
&xmpp.StateGone{},
&xmpp.StateInactive{},
&xmpp.StatePaused{},
},
})
assert.NoError(err)
@ -117,11 +117,11 @@ func TestSendTyping(t *testing.T) {
msg, err = a.sending("a", xmpp.Message{
PacketAttrs: xmpp.PacketAttrs{From: "a@example.org"},
Extensions: []xmpp.MsgExtension{
xmpp.StateActive{},
xmpp.StateComposing{},
xmpp.StateGone{},
xmpp.StateInactive{},
xmpp.StatePaused{},
&xmpp.StateActive{},
&xmpp.StateComposing{},
&xmpp.StateGone{},
&xmpp.StateInactive{},
&xmpp.StatePaused{},
},
Body: "hi",
})