From 9c7265565e6462e9c96b1d7ea3c86e11d19ba9b6 Mon Sep 17 00:00:00 2001
From: Vitor Pamplona <vitor@vitorpamplona.com>
Date: Fri, 7 Jul 2023 14:40:07 -0400
Subject: [PATCH] Avoids triggering the Notification bubble when the live event
 is simply updated.

---
 .../amethyst/ui/dal/DiscoverLiveFeedFilter.kt         |  2 +-
 .../vitorpamplona/amethyst/ui/navigation/Routes.kt    | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverLiveFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverLiveFeedFilter.kt
index 88a05d32a..15514754c 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverLiveFeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverLiveFeedFilter.kt
@@ -62,7 +62,7 @@ open class DiscoverLiveFeedFilter(val account: Account) : AdditiveFeedFilter<Not
             compareBy(
                 { convertStatusToOrder((it.event as? LiveActivitiesEvent)?.status()) },
                 { counter.countFollowsThatParticipateOn(it, followingKeySet) },
-                { it.createdAt() },
+                { (it.event as? LiveActivitiesEvent)?.starts() ?: it.createdAt() },
                 { it.idHex }
             )
         ).reversed()
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt
index a1a8399ba..eec35833e 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt
@@ -14,6 +14,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
+import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
 import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.ui.dal.AdditiveFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
@@ -205,7 +206,15 @@ object DiscoverLatestItem : LatestItem() {
 
         val newestItem = updateNewestItem(newNotes, account, DiscoverLiveNowFeedFilter(account))
 
-        return (newestItem?.createdAt() ?: 0) > lastTime
+        val noteEvent = newestItem?.event
+
+        val dateToUse = if (noteEvent is LiveActivitiesEvent) {
+            noteEvent.starts() ?: newestItem.createdAt()
+        } else {
+            newestItem?.createdAt()
+        }
+
+        return (dateToUse ?: 0) > lastTime
     }
 }