From e1585612fa0ac161e1403176daf4fc388ef0c0d8 Mon Sep 17 00:00:00 2001
From: Martin/Geno <geno+dev@fireorbit.de>
Date: Thu, 6 Jun 2019 22:54:45 +0200
Subject: [PATCH] fix xmpp reading of message extensions

---
 component/threema/send.go      | 46 +++++++++++++++++++++++-----------
 component/threema/send_test.go | 28 ++++++++++-----------
 2 files changed, 46 insertions(+), 28 deletions(-)

diff --git a/component/threema/send.go b/component/threema/send.go
index a1dd575..e734fb1 100644
--- a/component/threema/send.go
+++ b/component/threema/send.go
@@ -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
 }
diff --git a/component/threema/send_test.go b/component/threema/send_test.go
index 570dab0..532bac1 100644
--- a/component/threema/send_test.go
+++ b/component/threema/send_test.go
@@ -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",
 	})