Skip to content
Snippets Groups Projects
Commit 1343a409 authored by Josh Brooks's avatar Josh Brooks
Browse files

Add debugs

parent 046d5d0c
No related branches found
No related tags found
2 merge requests!510Release,!388Xx 4214/group message
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
package groupChat package groupChat
import ( import (
"encoding/base64"
"encoding/json"
"fmt" "fmt"
"gitlab.com/xx_network/primitives/netTime" "gitlab.com/xx_network/primitives/netTime"
"time" "time"
...@@ -113,6 +115,16 @@ func decryptMessage(g gs.Group, fingerprint format.Fingerprint, ...@@ -113,6 +115,16 @@ func decryptMessage(g gs.Group, fingerprint format.Fingerprint,
return MessageReceive{}, errors.Errorf(unmarshalSenderIdErr, err) return MessageReceive{}, errors.Errorf(unmarshalSenderIdErr, err)
} }
mar, _ := json.Marshal(NewPublicInternalMessage_DeleteThis(intlMsg))
jww.INFO.Printf("GROUP MSG ID DEBUG (decryptMsg): "+
"senders group ID: %s, "+
"internalMessage: %s"+
"internalMessage: %s",
g.ID,
base64.StdEncoding.EncodeToString(intlMsg.Marshal()),
string(mar))
return MessageReceive{ return MessageReceive{
ID: group.NewMessageID(g.ID, intlMsg.Marshal()), ID: group.NewMessageID(g.ID, intlMsg.Marshal()),
Payload: intlMsg.GetPayload(), Payload: intlMsg.GetPayload(),
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
package groupChat package groupChat
import ( import (
"encoding/base64"
"encoding/json"
"github.com/pkg/errors" "github.com/pkg/errors"
jww "github.com/spf13/jwalterweatherman" jww "github.com/spf13/jwalterweatherman"
"gitlab.com/elixxir/client/cmix" "gitlab.com/elixxir/client/cmix"
...@@ -176,6 +178,27 @@ func newCmixMsg(g gs.Group, tag string, msg []byte, timestamp time.Time, ...@@ -176,6 +178,27 @@ func newCmixMsg(g gs.Group, tag string, msg []byte, timestamp time.Time,
return cmixMsg, nil return cmixMsg, nil
} }
// PublicInternalMessage_DeleteThis so internalMsg could be json marshalled for legibility
// in a debug ticket.
type PublicInternalMessage_DeleteThis struct {
Data []byte // Serial of all the parts of the message
Timestamp []byte // 64-bit Unix time timestamp stored in nanoseconds
SenderID []byte // 264-bit sender ID
Size []byte // Size of the payload
Payload []byte // Message contents
}
func NewPublicInternalMessage_DeleteThis(msg internalMsg) *PublicInternalMessage_DeleteThis {
return &PublicInternalMessage_DeleteThis{
Data: msg.data,
Timestamp: msg.timestamp,
SenderID: msg.senderID,
Size: msg.size,
Payload: msg.payload,
}
}
// getGroupMessageId builds the group message ID. // getGroupMessageId builds the group message ID.
func getGroupMessageId(grp *cyclic.Group, groupId, senderId *id.ID, func getGroupMessageId(grp *cyclic.Group, groupId, senderId *id.ID,
timestamp time.Time, msg []byte) (group.MessageID, error) { timestamp time.Time, msg []byte) (group.MessageID, error) {
...@@ -185,8 +208,19 @@ func getGroupMessageId(grp *cyclic.Group, groupId, senderId *id.ID, ...@@ -185,8 +208,19 @@ func getGroupMessageId(grp *cyclic.Group, groupId, senderId *id.ID,
return group.MessageID{}, errors.WithMessage(err, return group.MessageID{}, errors.WithMessage(err,
"Failed to make message parts for message ID") "Failed to make message parts for message ID")
} }
return group.NewMessageID(groupId,
setInternalPayload(intlMsg, timestamp, senderId, msg)), nil intlMsgMarshal := setInternalPayload(intlMsg, timestamp, senderId, msg)
mar, _ := json.Marshal(NewPublicInternalMessage_DeleteThis(intlMsg))
jww.INFO.Printf("GROUP MSG ID DEBUG (getGroupMsgId): "+
"senders group ID: %s, "+
"internalMessage: %s"+
"internalMessage: %s",
groupId,
base64.StdEncoding.EncodeToString(intlMsgMarshal),
string(mar))
return group.NewMessageID(groupId, intlMsgMarshal), nil
} }
// newMessageParts generates a public payload message and the internal payload // newMessageParts generates a public payload message and the internal payload
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment