highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-09 21:02:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Avoids triggering the Notification bubble when the live event is simply updated.

Browse Source
This commit is contained in:
Vitor Pamplona
2023-07-07 14:40:07 -04:00
parent 293b023add
commit 9c7265565e
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/DiscoverLiveFeedFilter.kt
View File

@@ -62,7 +62,7 @@ open class DiscoverLiveFeedFilter(val account: Account) : AdditiveFeedFilter<Not
compareBy( compareBy(
{ convertStatusToOrder((it.event as? LiveActivitiesEvent)?.status()) }, { convertStatusToOrder((it.event as? LiveActivitiesEvent)?.status()) },
{ counter.countFollowsThatParticipateOn(it, followingKeySet) }, { counter.countFollowsThatParticipateOn(it, followingKeySet) },
{ it.createdAt() }, { (it.event as? LiveActivitiesEvent)?.starts() ?: it.createdAt() },
{ it.idHex } { it.idHex }
) )
).reversed() ).reversed()

11
app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt
View File

@@ -14,6 +14,7 @@ import com.vitorpamplona.amethyst.R
import com.vitorpamplona.amethyst.model.Account import com.vitorpamplona.amethyst.model.Account
import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.model.Note
import com.vitorpamplona.amethyst.service.checkNotInMainThread import com.vitorpamplona.amethyst.service.checkNotInMainThread
import com.vitorpamplona.amethyst.service.model.LiveActivitiesEvent
import com.vitorpamplona.amethyst.service.model.PrivateDmEvent import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
import com.vitorpamplona.amethyst.ui.dal.AdditiveFeedFilter import com.vitorpamplona.amethyst.ui.dal.AdditiveFeedFilter
import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
@@ -205,7 +206,15 @@ object DiscoverLatestItem : LatestItem() {
val newestItem = updateNewestItem(newNotes, account, DiscoverLiveNowFeedFilter(account)) 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
} }
} }