cwtch.im
/
cwtch
16
20
Fork 15
Code Issues 10 Pull Requests 2 Releases 163 Wiki Activity

MessageOverlay time to pointer
continuous-integration/drone/pr Build is pending Details

This commit is contained in:
Sarah Jamie Lewis 2024-02-11 13:56:00 -08:00
parent 792e79dceb
commit 3124f7b7c4
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
model/overlay.go
View File

@ -10,13 +10,13 @@ type MessageWrapper struct {
Data string `json:"d"`
// when the data was assembled
SendTime time.Time `json:"s,omitempty"`
SendTime *time.Time `json:"s,omitempty"`
// when the data was transmitted (by protocol engine e.g. over Tor)
TransitTime time.Time `json:"t,omitempty"`
TransitTime *time.Time `json:"t,omitempty"`
// when the data was received
RecvTime time.Time `json:"r,omitempty"`
RecvTime *time.Time `json:"r,omitempty"`
}
// OverlayChat is the canonical identifier for chat overlays

10
protocol/connections/peerapp.go
View File

@ -136,8 +136,9 @@ func (pa *PeerApp) listen() {
}
} else {
if cm, err := model.DeserializeMessage(string(packet.Data)); err == nil {
if !cm.TransitTime.IsZero() {
cm.RecvTime = time.Now().UTC()
if cm.TransitTime != nil {
rt := time.Now().UTC()
cm.RecvTime = &rt
data, _ := json.Marshal(cm)
packet.Data = data
}
@ -158,8 +159,9 @@ func (pa *PeerApp) SendMessage(message model2.PeerMessage) error {
var err error
if cm, err := model.DeserializeMessage(string(message.Data)); err == nil {
if !cm.SendTime.IsZero() {
cm.TransitTime = time.Now().UTC()
if cm.SendTime != nil {
tt := time.Now().UTC()
cm.TransitTime = &tt
data, _ := json.Marshal(cm)
message.Data = data
}