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

Fixes read status between others and the logged in user

Browse Source
This commit is contained in:
Vitor Pamplona
2024-05-31 16:54:18 -04:00
parent 3a9637ccb9
commit 1bbcb97d54
1 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt
View File

@@ -243,9 +243,13 @@ class Account(
val nip65RelaySet = (nip65RelayList.note.event as? AdvertisedRelayListEvent)?.relays() val nip65RelaySet = (nip65RelayList.note.event as? AdvertisedRelayListEvent)?.relays()
val privateOutboxRelaySet = (privateOutBox.note.event as? PrivateOutboxRelayListEvent)?.relays() ?: emptySet() val privateOutboxRelaySet = (privateOutBox.note.event as? PrivateOutboxRelayListEvent)?.relays() ?: emptySet()
// ------
// DMs
// ------
var mappedRelaySet = var mappedRelaySet =
baseRelaySet.map { baseRelaySet.map {
if (newDMRelaySet.contains(it.url) == true) { if (newDMRelaySet.contains(it.url)) {
Relay(it.url, true, true, it.activeTypes + FeedType.PRIVATE_DMS) Relay(it.url, true, true, it.activeTypes + FeedType.PRIVATE_DMS)
} else { } else {
it it
@@ -253,29 +257,37 @@ class Account(
} }
newDMRelaySet.forEach { newUrl -> newDMRelaySet.forEach { newUrl ->
if (mappedRelaySet.filter { it.url == newUrl }.isEmpty()) { if (mappedRelaySet.none { it.url == newUrl }) {
mappedRelaySet = mappedRelaySet + Relay(newUrl, true, true, setOf(FeedType.PRIVATE_DMS)) mappedRelaySet = mappedRelaySet + Relay(newUrl, true, true, setOf(FeedType.PRIVATE_DMS))
} }
} }
// ------
// SEARCH
// ------
mappedRelaySet = mappedRelaySet =
mappedRelaySet.map { mappedRelaySet.map {
if (searchRelaySet.contains(it.url) == true) { if (searchRelaySet.contains(it.url)) {
Relay(it.url, true, false, it.activeTypes + FeedType.PRIVATE_DMS) Relay(it.url, true, false, it.activeTypes + FeedType.SEARCH)
} else { } else {
it it
} }
} }
searchRelaySet.forEach { newUrl -> searchRelaySet.forEach { newUrl ->
if (mappedRelaySet.filter { it.url == newUrl }.isEmpty()) { if (mappedRelaySet.none { it.url == newUrl }) {
mappedRelaySet = mappedRelaySet + Relay(newUrl, true, false, setOf(FeedType.SEARCH)) mappedRelaySet = mappedRelaySet + Relay(newUrl, true, false, setOf(FeedType.SEARCH))
} }
} }
// --------------
// PRIVATE OUTBOX
// --------------
mappedRelaySet = mappedRelaySet =
mappedRelaySet.map { mappedRelaySet.map {
if (privateOutboxRelaySet.contains(it.url) == true) { if (privateOutboxRelaySet.contains(it.url)) {
Relay(it.url, true, true, it.activeTypes + setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS)) Relay(it.url, true, true, it.activeTypes + setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS))
} else { } else {
it it
@@ -283,14 +295,18 @@ class Account(
} }
privateOutboxRelaySet.forEach { newUrl -> privateOutboxRelaySet.forEach { newUrl ->
if (mappedRelaySet.filter { it.url == newUrl }.isEmpty()) { if (mappedRelaySet.none { it.url == newUrl }) {
mappedRelaySet = mappedRelaySet + Relay(newUrl, true, true, setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS)) mappedRelaySet = mappedRelaySet + Relay(newUrl, true, true, setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS))
} }
} }
// --------------
// PRIVATE OUTBOX
// --------------
mappedRelaySet = mappedRelaySet =
mappedRelaySet.map { mappedRelaySet.map {
if (localRelayServers.contains(it.url) == true) { if (localRelayServers.contains(it.url)) {
Relay(it.url, true, true, it.activeTypes + setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS)) Relay(it.url, true, true, it.activeTypes + setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS))
} else { } else {
it it
@@ -298,30 +314,32 @@ class Account(
} }
localRelayServers.forEach { newUrl -> localRelayServers.forEach { newUrl ->
if (mappedRelaySet.filter { it.url == newUrl }.isEmpty()) { if (mappedRelaySet.none { it.url == newUrl }) {
mappedRelaySet = mappedRelaySet + Relay(newUrl, true, true, setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS)) mappedRelaySet = mappedRelaySet + Relay(newUrl, true, true, setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS, FeedType.GLOBAL, FeedType.PRIVATE_DMS))
} }
} }
// --------------
// NIP-65 Public Inbox/Outbox
// --------------
mappedRelaySet = mappedRelaySet =
mappedRelaySet.map { relay -> mappedRelaySet.map { relay ->
val nip65setup = nip65RelaySet?.firstOrNull { relay.url == it.relayUrl } val nip65setup = nip65RelaySet?.firstOrNull { relay.url == it.relayUrl }
if (nip65setup != null) { if (nip65setup != null) {
val read = nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ
val write = nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ val write = nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || nip65setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ
Relay(relay.url, read, write, relay.activeTypes + setOf(FeedType.FOLLOWS, FeedType.GLOBAL, FeedType.PUBLIC_CHATS)) Relay(relay.url, true, relay.write || write, relay.activeTypes + setOf(FeedType.FOLLOWS, FeedType.GLOBAL, FeedType.PUBLIC_CHATS))
} else { } else {
relay relay
} }
} }
nip65RelaySet?.forEach { newNip65Setup -> nip65RelaySet?.forEach { newNip65Setup ->
if (mappedRelaySet.filter { it.url == newNip65Setup.relayUrl }.isEmpty()) { if (mappedRelaySet.none { it.url == newNip65Setup.relayUrl }) {
val read = newNip65Setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || newNip65Setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ
val write = newNip65Setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || newNip65Setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ val write = newNip65Setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.BOTH || newNip65Setup.type == AdvertisedRelayListEvent.AdvertisedRelayType.READ
mappedRelaySet = mappedRelaySet + Relay(newNip65Setup.relayUrl, read, write, setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS)) mappedRelaySet = mappedRelaySet + Relay(newNip65Setup.relayUrl, true, write, setOf(FeedType.FOLLOWS, FeedType.PUBLIC_CHATS))
} }
} }