nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes lack of reactions on video feeds

Browse Source
This commit is contained in:
Vitor Pamplona
2024-12-02 15:31:59 -05:00
parent 16cf3c850a
commit 0dcce5a987
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/dal/VideoFeedFilter.kt
+13 -4
View File
@@ -22,9 +22,11 @@ package com.vitorpamplona.amethyst.ui.dal
import com.vitorpamplona.amethyst.commons.richtext.RichTextParser.Companion.isImageOrVideoUrl import com.vitorpamplona.amethyst.commons.richtext.RichTextParser.Companion.isImageOrVideoUrl
import com.vitorpamplona.amethyst.model.Account import com.vitorpamplona.amethyst.model.Account
import com.vitorpamplona.amethyst.model.AddressableNote
import com.vitorpamplona.amethyst.model.LocalCache import com.vitorpamplona.amethyst.model.LocalCache
import com.vitorpamplona.amethyst.model.Note import com.vitorpamplona.amethyst.model.Note
import com.vitorpamplona.amethyst.service.SUPPORTED_VIDEO_FEED_MIME_TYPES_SET import com.vitorpamplona.amethyst.service.SUPPORTED_VIDEO_FEED_MIME_TYPES_SET
import com.vitorpamplona.quartz.events.AddressableEvent
import com.vitorpamplona.quartz.events.FileHeaderEvent import com.vitorpamplona.quartz.events.FileHeaderEvent
import com.vitorpamplona.quartz.events.FileStorageHeaderEvent import com.vitorpamplona.quartz.events.FileStorageHeaderEvent
import com.vitorpamplona.quartz.events.MuteListEvent import com.vitorpamplona.quartz.events.MuteListEvent
@@ -48,7 +50,10 @@ class VideoFeedFilter(
val notes = val notes =
LocalCache.notes.filterIntoSet { _, it -> LocalCache.notes.filterIntoSet { _, it ->
acceptableEvent(it, params) acceptableEvent(it, params)
} } +
LocalCache.addressables.filterIntoSet { _, it ->
acceptableEvent(it, params)
}
return sort(notes) return sort(notes)
} }
@@ -62,10 +67,14 @@ class VideoFeedFilter(
} }
fun acceptableEvent( fun acceptableEvent(
it: Note, note: Note,
params: FilterByListParams, params: FilterByListParams,
): Boolean { ): Boolean {
val noteEvent = it.event val noteEvent = note.event
if (noteEvent is AddressableEvent && note !is AddressableNote) {
return false
}
return ( return (
(noteEvent is FileHeaderEvent && noteEvent.hasUrl() && (noteEvent.urls().any { isImageOrVideoUrl(it) } || noteEvent.isOneOf(SUPPORTED_VIDEO_FEED_MIME_TYPES_SET))) || (noteEvent is FileHeaderEvent && noteEvent.hasUrl() && (noteEvent.urls().any { isImageOrVideoUrl(it) } || noteEvent.isOneOf(SUPPORTED_VIDEO_FEED_MIME_TYPES_SET))) ||
@@ -75,7 +84,7 @@ class VideoFeedFilter(
noteEvent is PictureEvent noteEvent is PictureEvent
) && ) &&
params.match(noteEvent) && params.match(noteEvent) &&
(params.isHiddenList || account.isAcceptable(it)) (params.isHiddenList || account.isAcceptable(note))
} }
fun buildFilterParams(account: Account): FilterByListParams = fun buildFilterParams(account: Account): FilterByListParams =