From 0f08c49df40f77e90e4b5ef7604c74631065faa3 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Sat, 15 Jun 2019 17:51:36 +0300 Subject: Fix bumping unloaded rooms in room list when receiving messages --- matrix/matrix.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'matrix') diff --git a/matrix/matrix.go b/matrix/matrix.go index 8c19b24..1a75f96 100644 --- a/matrix/matrix.go +++ b/matrix/matrix.go @@ -315,7 +315,7 @@ func (c *Container) HandleMessage(source EventSource, evt *mautrix.Event) { debug.Printf("Failed to add event %s to history: %v", evt.ID, err) } - if !c.config.AuthCache.InitialSyncDone || !room.Loaded() { + if !c.config.AuthCache.InitialSyncDone { room.LastReceivedMessage = time.Unix(evt.Timestamp/1000, evt.Timestamp%1000*1000) return } @@ -328,6 +328,17 @@ func (c *Container) HandleMessage(source EventSource, evt *mautrix.Event) { return } + if !room.Loaded() { + pushRules := c.PushRules().GetActions(room, evt).Should() + shouldNotify := pushRules.Notify || !pushRules.NotifySpecified + if !shouldNotify { + room.LastReceivedMessage = time.Unix(evt.Timestamp/1000, evt.Timestamp%1000*1000) + room.AddUnread(evt.ID, shouldNotify, pushRules.Highlight) + mainView.Bump(room) + return + } + } + // TODO switch to roomView.AddEvent message := roomView.ParseEvent(evt) if message != nil { -- cgit v1.2.3