From dc454ad8498fb13a6059dc451b63cce60f8937bd Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 2 Nov 2021 12:17:56 -0700 Subject: [PATCH] Temporarily ignore timeline dedupelication for p2p messags. --- model/message.go | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/model/message.go b/model/message.go index 566545e..e622a54 100644 --- a/model/message.go +++ b/model/message.go @@ -186,10 +186,18 @@ func (t *Timeline) Insert(mi *Message) int { // check that we haven't seen this message before (this has no impact on p2p messages, but is essential for // group messages) - idx, exists := t.signatureCache[base64.StdEncoding.EncodeToString(mi.Signature)] - if exists { - t.Messages[idx].Acknowledged = true - return idx + // FIXME: The below code now checks if the message has a signature. If it doesn't then skip duplication check. + // We do this because p2p messages right now do not have a signature, and so many p2p messages are not stored + // with a signature. In the future in hybrid groups this check will go away as all timelines will use the same + // underlying protocol. + // This is currently safe to do because p2p does not rely on signatures and groups will verify the signature of + // messages prior to generating an event to include them in the timeline. + if len(mi.Signature) != 0 { + idx, exists := t.signatureCache[base64.StdEncoding.EncodeToString(mi.Signature)] + if exists { + t.Messages[idx].Acknowledged = true + return idx + } } // update the message store