delthas: 1 Fix clearing webpush targets after any MARKREAD 4 files changed, 19 insertions(+), 7 deletions(-)
This is addressed by "Truncate message times to the second when using the FS message store".
Copy & paste the following snippet into your terminal to import this patchset into git:
curl -s https://lists.sr.ht/~emersion/soju-dev/patches/36351/mbox | git am -3Learn more about email & git
Previously, we would clear webpush targets after any MARKREAD. Consider the following scenario (ignore any typos, this is crafted by hand): <<< @time=2020-01-01T00:00:00Z PRIVMSG #foo :hi mark! <<< @time=2020-01-02T00:00:00Z PRIVMSG #foo :hi again mark! >>> MARKREAD #foo timestamp=2020-01-01T00:00:00Z >>> MARKREAD #foo timestamp=2020-01-02T00:00:00Z The push target was previously cleared on the first MARKREAD, which means that the second MARKREAD was never broadcast to Firebase, and all devices would keep the "hi again mark!" notification indefinitely. This changes the webpush target map so that we store a timestamp of the last highlight we sent. We only clear the push target when sending a MARKREAD that is at or after the last message. --- Addressed the forEach comment. As for reading msg.Tags["time"], we always set it if it is not already set, at the start of the handleMessageRegistered function; so this should work even when the upstream doesn't support server-time. downstream.go | 4 +++- irc.go | 14 +++++++++++--- upstream.go | 4 +++- user.go | 4 ++-- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/downstream.go b/downstream.go index 12dcaff..d8b9c4f 100644 --- a/downstream.go +++ b/downstream.go @@ -2818,7 +2818,9 @@ func (dc *downstreamConn) handleMessageRegistered(ctx context.Context, msg *irc. if broadcast && network.pushTargets.Has(target) { // TODO: only broadcast if draft/read-marker has been negotiated - network.pushTargets.Del(target) + if !r.Timestamp.Before(network.pushTargets.Get(target)) { + network.pushTargets.Del(target) + } go network.broadcastWebPush(&irc.Message{ Command: "MARKREAD", Params: []string{target, timestampStr}, diff --git a/irc.go b/irc.go index bb17d64..33bd192 100644 --- a/irc.go +++ b/irc.go @@ -459,10 +459,18 @@ func (cm *monitorCasemapMap) ForEach(f func(name string, online bool)) { } } -type casemapSet struct{ casemapMap } +type pushTargetCasemapMap struct{ casemapMap } -func (cs *casemapSet) Add(name string) { - cs.set(name, nil) +func (cm *pushTargetCasemapMap) Get(name string) (last time.Time) { + if v := cm.get(name); v == nil { + return time.Time{} + } else { + return v.(time.Time) + } +} + +func (cm *pushTargetCasemapMap) Set(name string, last time.Time) { + cm.set(name, last) } func isWordBoundary(r rune) bool { diff --git a/upstream.go b/upstream.go index e1030a2..180da98 100644 --- a/upstream.go +++ b/upstream.go @@ -551,7 +551,9 @@ func (uc *upstreamConn) handleMessage(ctx context.Context, msg *irc.Message) err if highlight || uc.isOurNick(target) { go uc.network.broadcastWebPush(msg) - uc.network.pushTargets.Add(bufferName) + if timestamp, err := time.Parse(xirc.ServerTimeLayout, string(msg.Tags["time"])); err == nil { + uc.network.pushTargets.Set(bufferName, timestamp) + } } uc.produce(bufferName, msg, downstreamID) diff --git a/user.go b/user.go index 7468483..3c8dd9a 100644 --- a/user.go +++ b/user.go @@ -139,7 +139,7 @@ type network struct { conn *upstreamConn channels channelCasemapMap delivered deliveredStore - pushTargets casemapSet + pushTargets pushTargetCasemapMap lastError error casemap casemapping } @@ -160,7 +160,7 @@ func newNetwork(user *user, record *database.Network, channels []database.Channe stopped: make(chan struct{}), channels: m, delivered: newDeliveredStore(), - pushTargets: casemapSet{newCasemapMap()}, + pushTargets: pushTargetCasemapMap{newCasemapMap()}, casemap: casemapRFC1459, } } base-commit: 926dcb37ac688171edd2a18cf77b3b1f64a541ef -- 2.17.1
This comment still hasn't been addressed: