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

Simplifies comparison for Channels via Hex code instead of objects

Browse Source
This commit is contained in:
Vitor Pamplona
2023-04-18 08:41:59 -04:00
parent 78c9974036
commit 38e18cf0a7
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt
View File

@@ -53,13 +53,14 @@ open class Note(val idHex: String) {
open fun idNote() = id().toNote() open fun idNote() = id().toNote()
open fun idDisplayNote() = idNote().toShortenHex() open fun idDisplayNote() = idNote().toShortenHex()
fun channel(): Channel? { fun channelHex(): HexKey? {
val channelHex = return (event as? ChannelMessageEvent)?.channel()
(event as? ChannelMessageEvent)?.channel() ?: (event as? ChannelMetadataEvent)?.channel()
?: (event as? ChannelMetadataEvent)?.channel() ?: (event as? ChannelCreateEvent)?.id
?: (event as? ChannelCreateEvent)?.id }
return channelHex?.let { LocalCache.checkGetOrCreateChannel(it) } fun channel(): Channel? {
return channelHex()?.let { LocalCache.checkGetOrCreateChannel(it) }
} }
open fun address(): ATag? = null open fun address(): ATag? = null

6
app/src/main/java/com/vitorpamplona/amethyst/ui/dal/GlobalFeedFilter.kt
View File

@@ -9,7 +9,7 @@ object GlobalFeedFilter : FeedFilter<Note>() {
lateinit var account: Account lateinit var account: Account
override fun feed(): List<Note> { override fun feed(): List<Note> {
val followChannels = account.followingChannels() val followChannels = account.followingChannels
val followUsers = account.followingKeySet() val followUsers = account.followingKeySet()
val now = System.currentTimeMillis() / 1000 val now = System.currentTimeMillis() / 1000
@@ -19,7 +19,7 @@ object GlobalFeedFilter : FeedFilter<Note>() {
it.event is BaseTextNoteEvent && it.replyTo.isNullOrEmpty() it.event is BaseTextNoteEvent && it.replyTo.isNullOrEmpty()
} }
.filter { .filter {
val channel = it.channel() val channel = it.channelHex()
// does not show events already in the public chat list // does not show events already in the public chat list
(channel == null || channel !in followChannels) && (channel == null || channel !in followChannels) &&
// does not show people the user already follows // does not show people the user already follows
@@ -38,7 +38,7 @@ object GlobalFeedFilter : FeedFilter<Note>() {
it.event is LongTextNoteEvent && it.replyTo.isNullOrEmpty() it.event is LongTextNoteEvent && it.replyTo.isNullOrEmpty()
} }
.filter { .filter {
val channel = it.channel() val channel = it.channelHex()
// does not show events already in the public chat list // does not show events already in the public chat list
(channel == null || channel !in followChannels) && (channel == null || channel !in followChannels) &&
// does not show people the user already follows // does not show people the user already follows