MessageOverlay time to pointer
continuous-integration/drone/pr Build is pending
Details
continuous-integration/drone/pr Build is pending
Details
This commit is contained in:
parent
792e79dceb
commit
3124f7b7c4
|
@ -10,13 +10,13 @@ type MessageWrapper struct {
|
||||||
Data string `json:"d"`
|
Data string `json:"d"`
|
||||||
|
|
||||||
// when the data was assembled
|
// 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)
|
// 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
|
// 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
|
// OverlayChat is the canonical identifier for chat overlays
|
||||||
|
|
|
@ -136,8 +136,9 @@ func (pa *PeerApp) listen() {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if cm, err := model.DeserializeMessage(string(packet.Data)); err == nil {
|
if cm, err := model.DeserializeMessage(string(packet.Data)); err == nil {
|
||||||
if !cm.TransitTime.IsZero() {
|
if cm.TransitTime != nil {
|
||||||
cm.RecvTime = time.Now().UTC()
|
rt := time.Now().UTC()
|
||||||
|
cm.RecvTime = &rt
|
||||||
data, _ := json.Marshal(cm)
|
data, _ := json.Marshal(cm)
|
||||||
packet.Data = data
|
packet.Data = data
|
||||||
}
|
}
|
||||||
|
@ -158,8 +159,9 @@ func (pa *PeerApp) SendMessage(message model2.PeerMessage) error {
|
||||||
var err error
|
var err error
|
||||||
|
|
||||||
if cm, err := model.DeserializeMessage(string(message.Data)); err == nil {
|
if cm, err := model.DeserializeMessage(string(message.Data)); err == nil {
|
||||||
if !cm.SendTime.IsZero() {
|
if cm.SendTime != nil {
|
||||||
cm.TransitTime = time.Now().UTC()
|
tt := time.Now().UTC()
|
||||||
|
cm.TransitTime = &tt
|
||||||
data, _ := json.Marshal(cm)
|
data, _ := json.Marshal(cm)
|
||||||
message.Data = data
|
message.Data = data
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue