Adds an indexer relay list
This commit is contained in:
@@ -60,6 +60,8 @@ import com.vitorpamplona.amethyst.model.nip51Lists.geohashLists.GeohashListDecry
|
|||||||
import com.vitorpamplona.amethyst.model.nip51Lists.geohashLists.GeohashListState
|
import com.vitorpamplona.amethyst.model.nip51Lists.geohashLists.GeohashListState
|
||||||
import com.vitorpamplona.amethyst.model.nip51Lists.hashtagLists.HashtagListDecryptionCache
|
import com.vitorpamplona.amethyst.model.nip51Lists.hashtagLists.HashtagListDecryptionCache
|
||||||
import com.vitorpamplona.amethyst.model.nip51Lists.hashtagLists.HashtagListState
|
import com.vitorpamplona.amethyst.model.nip51Lists.hashtagLists.HashtagListState
|
||||||
|
import com.vitorpamplona.amethyst.model.nip51Lists.indexerRelays.IndexerRelayListDecryptionCache
|
||||||
|
import com.vitorpamplona.amethyst.model.nip51Lists.indexerRelays.IndexerRelayListState
|
||||||
import com.vitorpamplona.amethyst.model.nip51Lists.muteList.MuteListDecryptionCache
|
import com.vitorpamplona.amethyst.model.nip51Lists.muteList.MuteListDecryptionCache
|
||||||
import com.vitorpamplona.amethyst.model.nip51Lists.muteList.MuteListState
|
import com.vitorpamplona.amethyst.model.nip51Lists.muteList.MuteListState
|
||||||
import com.vitorpamplona.amethyst.model.nip51Lists.searchRelays.SearchRelayListDecryptionCache
|
import com.vitorpamplona.amethyst.model.nip51Lists.searchRelays.SearchRelayListDecryptionCache
|
||||||
@@ -247,6 +249,9 @@ class Account(
|
|||||||
val broadcastRelayListDecryptionCache = BroadcastRelayListDecryptionCache(signer)
|
val broadcastRelayListDecryptionCache = BroadcastRelayListDecryptionCache(signer)
|
||||||
val broadcastRelayList = BroadcastRelayListState(signer, cache, broadcastRelayListDecryptionCache, scope, settings)
|
val broadcastRelayList = BroadcastRelayListState(signer, cache, broadcastRelayListDecryptionCache, scope, settings)
|
||||||
|
|
||||||
|
val indexerRelayListDecryptionCache = IndexerRelayListDecryptionCache(signer)
|
||||||
|
val indexerRelayList = IndexerRelayListState(signer, cache, indexerRelayListDecryptionCache, scope, settings)
|
||||||
|
|
||||||
val blockedRelayListDecryptionCache = BlockedRelayListDecryptionCache(signer)
|
val blockedRelayListDecryptionCache = BlockedRelayListDecryptionCache(signer)
|
||||||
val blockedRelayList = BlockedRelayListState(signer, cache, blockedRelayListDecryptionCache, scope, settings)
|
val blockedRelayList = BlockedRelayListState(signer, cache, blockedRelayListDecryptionCache, scope, settings)
|
||||||
|
|
||||||
@@ -293,7 +298,7 @@ class Account(
|
|||||||
|
|
||||||
// Follows Relays
|
// Follows Relays
|
||||||
val followOutboxes = FollowListOutboxRelays(kind3FollowList, blockedRelayList, cache, scope)
|
val followOutboxes = FollowListOutboxRelays(kind3FollowList, blockedRelayList, cache, scope)
|
||||||
val followPlusAllMine = MergedFollowPlusMineRelayListsState(followOutboxes, nip65RelayList, privateStorageRelayList, localRelayList, trustedRelayList, broadcastRelayList, scope)
|
val followPlusAllMine = MergedFollowPlusMineRelayListsState(followOutboxes, nip65RelayList, privateStorageRelayList, localRelayList, trustedRelayList, broadcastRelayList, indexerRelayList, scope)
|
||||||
|
|
||||||
// keeps a cache of the outbox relays for each author
|
// keeps a cache of the outbox relays for each author
|
||||||
val followsPerRelay = FollowsPerOutboxRelay(kind3FollowList, blockedRelayList, cache, scope).flow
|
val followsPerRelay = FollowsPerOutboxRelay(kind3FollowList, blockedRelayList, cache, scope).flow
|
||||||
@@ -871,7 +876,7 @@ class Account(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun sendLiterallyEverywhere(event: Event) {
|
fun sendLiterallyEverywhere(event: Event) {
|
||||||
client.send(event, outboxRelays.flow.value + client.relayStatusFlow().value.available)
|
client.send(event, outboxRelays.flow.value + indexerRelayList.flow.value + client.relayStatusFlow().value.available)
|
||||||
cache.justConsumeMyOwnEvent(event)
|
cache.justConsumeMyOwnEvent(event)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1719,6 +1724,8 @@ class Account(
|
|||||||
|
|
||||||
suspend fun saveSearchRelayList(searchRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(searchRelayList.saveRelayList(searchRelays))
|
suspend fun saveSearchRelayList(searchRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(searchRelayList.saveRelayList(searchRelays))
|
||||||
|
|
||||||
|
suspend fun saveIndexerRelayList(trustedRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(indexerRelayList.saveRelayList(trustedRelays))
|
||||||
|
|
||||||
suspend fun saveBroadcastRelayList(trustedRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(broadcastRelayList.saveRelayList(trustedRelays))
|
suspend fun saveBroadcastRelayList(trustedRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(broadcastRelayList.saveRelayList(trustedRelays))
|
||||||
|
|
||||||
suspend fun saveTrustedRelayList(trustedRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(trustedRelayList.saveRelayList(trustedRelays))
|
suspend fun saveTrustedRelayList(trustedRelays: List<NormalizedRelayUrl>) = sendMyPublicAndPrivateOutbox(trustedRelayList.saveRelayList(trustedRelays))
|
||||||
|
|||||||
@@ -84,6 +84,8 @@ val DefaultDMRelayList = listOf(Constants.auth, Constants.oxchat, Constants.nos)
|
|||||||
|
|
||||||
val DefaultSearchRelayList = setOf(Constants.band, Constants.wine, Constants.where, Constants.nostoday)
|
val DefaultSearchRelayList = setOf(Constants.band, Constants.wine, Constants.where, Constants.nostoday)
|
||||||
|
|
||||||
|
val DefaultIndexerRelayList = setOf(Constants.purplepages, Constants.coracle, Constants.userkinds)
|
||||||
|
|
||||||
val DefaultSignerPermissions =
|
val DefaultSignerPermissions =
|
||||||
listOf(
|
listOf(
|
||||||
Permission(CommandType.SIGN_EVENT, RelayAuthEvent.KIND),
|
Permission(CommandType.SIGN_EVENT, RelayAuthEvent.KIND),
|
||||||
|
|||||||
@@ -43,6 +43,10 @@ object Constants {
|
|||||||
val auth = RelayUrlNormalizer.normalize("wss://auth.nostr1.com")
|
val auth = RelayUrlNormalizer.normalize("wss://auth.nostr1.com")
|
||||||
val oxchat = RelayUrlNormalizer.normalize("wss://relay.0xchat.com")
|
val oxchat = RelayUrlNormalizer.normalize("wss://relay.0xchat.com")
|
||||||
|
|
||||||
|
val purplepages = RelayUrlNormalizer.normalize("wss://purplepag.es")
|
||||||
|
val coracle = RelayUrlNormalizer.normalize("wss://indexer.coracle.social")
|
||||||
|
val userkinds = RelayUrlNormalizer.normalize("wss://user.kindpag.es")
|
||||||
|
|
||||||
val eventFinderRelays = setOf(band, wine, damus, primal, mom, nos, bitcoiner, oxtr, fmtwiz, bg)
|
val eventFinderRelays = setOf(band, wine, damus, primal, mom, nos, bitcoiner, oxtr, fmtwiz, bg)
|
||||||
|
|
||||||
val defaultSearchRelaySet = setOf(band, wine, where)
|
val defaultSearchRelaySet = setOf(band, wine, where)
|
||||||
|
|||||||
@@ -139,6 +139,7 @@ import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
|
|||||||
import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
|
import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
|
import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
|
||||||
import com.vitorpamplona.quartz.nip52Calendar.CalendarDateSlotEvent
|
import com.vitorpamplona.quartz.nip52Calendar.CalendarDateSlotEvent
|
||||||
@@ -958,6 +959,12 @@ object LocalCache : ILocalCache {
|
|||||||
wasVerified: Boolean,
|
wasVerified: Boolean,
|
||||||
) = consumeBaseReplaceable(event, relay, wasVerified)
|
) = consumeBaseReplaceable(event, relay, wasVerified)
|
||||||
|
|
||||||
|
private fun consume(
|
||||||
|
event: IndexerRelayListEvent,
|
||||||
|
relay: NormalizedRelayUrl?,
|
||||||
|
wasVerified: Boolean,
|
||||||
|
) = consumeBaseReplaceable(event, relay, wasVerified)
|
||||||
|
|
||||||
private fun consume(
|
private fun consume(
|
||||||
event: BroadcastRelayListEvent,
|
event: BroadcastRelayListEvent,
|
||||||
relay: NormalizedRelayUrl?,
|
relay: NormalizedRelayUrl?,
|
||||||
@@ -2760,6 +2767,7 @@ object LocalCache : ILocalCache {
|
|||||||
is GitRepositoryEvent -> consume(event, relay, wasVerified)
|
is GitRepositoryEvent -> consume(event, relay, wasVerified)
|
||||||
is HashtagListEvent -> consume(event, relay, wasVerified)
|
is HashtagListEvent -> consume(event, relay, wasVerified)
|
||||||
is HighlightEvent -> consume(event, relay, wasVerified)
|
is HighlightEvent -> consume(event, relay, wasVerified)
|
||||||
|
is IndexerRelayListEvent -> consume(event, relay, wasVerified)
|
||||||
is InteractiveStoryPrologueEvent -> consume(event, relay, wasVerified)
|
is InteractiveStoryPrologueEvent -> consume(event, relay, wasVerified)
|
||||||
is InteractiveStorySceneEvent -> consume(event, relay, wasVerified)
|
is InteractiveStorySceneEvent -> consume(event, relay, wasVerified)
|
||||||
is InteractiveStoryReadingStateEvent -> consume(event, relay, wasVerified)
|
is InteractiveStoryReadingStateEvent -> consume(event, relay, wasVerified)
|
||||||
|
|||||||
+29
@@ -0,0 +1,29 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2025 Vitor Pamplona
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
* this software and associated documentation files (the "Software"), to deal in
|
||||||
|
* the Software without restriction, including without limitation the rights to use,
|
||||||
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
|
||||||
|
* Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
* subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package com.vitorpamplona.amethyst.model.nip51Lists.indexerRelays
|
||||||
|
|
||||||
|
import com.vitorpamplona.amethyst.model.nip51Lists.relayLists.GenericRelayListCache
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
|
||||||
|
|
||||||
|
class IndexerRelayListDecryptionCache(
|
||||||
|
signer: NostrSigner,
|
||||||
|
) : GenericRelayListCache<IndexerRelayListEvent>(signer)
|
||||||
+88
@@ -0,0 +1,88 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2025 Vitor Pamplona
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
* this software and associated documentation files (the "Software"), to deal in
|
||||||
|
* the Software without restriction, including without limitation the rights to use,
|
||||||
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
|
||||||
|
* Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
* subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package com.vitorpamplona.amethyst.model.nip51Lists.indexerRelays
|
||||||
|
|
||||||
|
import com.vitorpamplona.amethyst.model.AccountSettings
|
||||||
|
import com.vitorpamplona.amethyst.model.AddressableNote
|
||||||
|
import com.vitorpamplona.amethyst.model.LocalCache
|
||||||
|
import com.vitorpamplona.amethyst.model.Note
|
||||||
|
import com.vitorpamplona.amethyst.model.NoteState
|
||||||
|
import com.vitorpamplona.amethyst.model.nip51Lists.indexerRelays.IndexerRelayListDecryptionCache
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.flow.SharingStarted
|
||||||
|
import kotlinx.coroutines.flow.StateFlow
|
||||||
|
import kotlinx.coroutines.flow.flowOn
|
||||||
|
import kotlinx.coroutines.flow.map
|
||||||
|
import kotlinx.coroutines.flow.onStart
|
||||||
|
import kotlinx.coroutines.flow.stateIn
|
||||||
|
|
||||||
|
class IndexerRelayListState(
|
||||||
|
val signer: NostrSigner,
|
||||||
|
val cache: LocalCache,
|
||||||
|
val decryptionCache: IndexerRelayListDecryptionCache,
|
||||||
|
val scope: CoroutineScope,
|
||||||
|
val settings: AccountSettings,
|
||||||
|
) {
|
||||||
|
fun getIndexerRelayListAddress() = IndexerRelayListEvent.createAddress(signer.pubKey)
|
||||||
|
|
||||||
|
fun getIndexerRelayListNote(): AddressableNote = cache.getOrCreateAddressableNote(getIndexerRelayListAddress())
|
||||||
|
|
||||||
|
fun getIndexerRelayListFlow(): StateFlow<NoteState> = getIndexerRelayListNote().flow().metadata.stateFlow
|
||||||
|
|
||||||
|
fun getIndexerRelayList(): IndexerRelayListEvent? = getIndexerRelayListNote().event as? IndexerRelayListEvent
|
||||||
|
|
||||||
|
suspend fun normalizeIndexerRelayListWithBackup(note: Note): Set<NormalizedRelayUrl> {
|
||||||
|
val event = note.event as? IndexerRelayListEvent
|
||||||
|
return event?.let { decryptionCache.relays(it) } ?: emptySet()
|
||||||
|
}
|
||||||
|
|
||||||
|
val flow =
|
||||||
|
getIndexerRelayListFlow()
|
||||||
|
.map { normalizeIndexerRelayListWithBackup(it.note) }
|
||||||
|
.onStart { emit(normalizeIndexerRelayListWithBackup(getIndexerRelayListNote())) }
|
||||||
|
.flowOn(Dispatchers.Default)
|
||||||
|
.stateIn(
|
||||||
|
scope,
|
||||||
|
SharingStarted.Eagerly,
|
||||||
|
emptySet(),
|
||||||
|
)
|
||||||
|
|
||||||
|
suspend fun saveRelayList(indexerRelays: List<NormalizedRelayUrl>): IndexerRelayListEvent {
|
||||||
|
val relayListForIndexer = getIndexerRelayList()
|
||||||
|
|
||||||
|
return if (relayListForIndexer != null && relayListForIndexer.tags.isNotEmpty()) {
|
||||||
|
IndexerRelayListEvent.updateRelayList(
|
||||||
|
earlierVersion = relayListForIndexer,
|
||||||
|
relays = indexerRelays,
|
||||||
|
signer = signer,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
IndexerRelayListEvent.create(
|
||||||
|
relays = indexerRelays,
|
||||||
|
signer = signer,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+5
@@ -24,6 +24,7 @@ import com.vitorpamplona.amethyst.model.edits.PrivateStorageRelayListState
|
|||||||
import com.vitorpamplona.amethyst.model.localRelays.LocalRelayListState
|
import com.vitorpamplona.amethyst.model.localRelays.LocalRelayListState
|
||||||
import com.vitorpamplona.amethyst.model.nip02FollowLists.FollowListOutboxRelays
|
import com.vitorpamplona.amethyst.model.nip02FollowLists.FollowListOutboxRelays
|
||||||
import com.vitorpamplona.amethyst.model.nip51Lists.broadcastRelays.BroadcastRelayListState
|
import com.vitorpamplona.amethyst.model.nip51Lists.broadcastRelays.BroadcastRelayListState
|
||||||
|
import com.vitorpamplona.amethyst.model.nip51Lists.indexerRelays.IndexerRelayListState
|
||||||
import com.vitorpamplona.amethyst.model.nip51Lists.trustedRelays.TrustedRelayListState
|
import com.vitorpamplona.amethyst.model.nip51Lists.trustedRelays.TrustedRelayListState
|
||||||
import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState
|
import com.vitorpamplona.amethyst.model.nip65RelayList.Nip65RelayListState
|
||||||
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
|
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
|
||||||
@@ -43,6 +44,7 @@ class MergedFollowPlusMineRelayListsState(
|
|||||||
val localRelayList: LocalRelayListState,
|
val localRelayList: LocalRelayListState,
|
||||||
val trustedRelayList: TrustedRelayListState,
|
val trustedRelayList: TrustedRelayListState,
|
||||||
val broadcastRelayList: BroadcastRelayListState,
|
val broadcastRelayList: BroadcastRelayListState,
|
||||||
|
val indexerRelayList: IndexerRelayListState,
|
||||||
val scope: CoroutineScope,
|
val scope: CoroutineScope,
|
||||||
) {
|
) {
|
||||||
fun mergeLists(lists: Array<Set<NormalizedRelayUrl>>): Set<NormalizedRelayUrl> = lists.reduce { acc, set -> acc + set }
|
fun mergeLists(lists: Array<Set<NormalizedRelayUrl>>): Set<NormalizedRelayUrl> = lists.reduce { acc, set -> acc + set }
|
||||||
@@ -57,6 +59,7 @@ class MergedFollowPlusMineRelayListsState(
|
|||||||
localRelayList.flow,
|
localRelayList.flow,
|
||||||
trustedRelayList.flow,
|
trustedRelayList.flow,
|
||||||
broadcastRelayList.flow,
|
broadcastRelayList.flow,
|
||||||
|
indexerRelayList.flow,
|
||||||
),
|
),
|
||||||
::mergeLists,
|
::mergeLists,
|
||||||
).onStart {
|
).onStart {
|
||||||
@@ -70,6 +73,7 @@ class MergedFollowPlusMineRelayListsState(
|
|||||||
localRelayList.flow.value,
|
localRelayList.flow.value,
|
||||||
trustedRelayList.flow.value,
|
trustedRelayList.flow.value,
|
||||||
broadcastRelayList.flow.value,
|
broadcastRelayList.flow.value,
|
||||||
|
indexerRelayList.flow.value,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
@@ -86,6 +90,7 @@ class MergedFollowPlusMineRelayListsState(
|
|||||||
localRelayList.flow.value,
|
localRelayList.flow.value,
|
||||||
trustedRelayList.flow.value,
|
trustedRelayList.flow.value,
|
||||||
broadcastRelayList.flow.value,
|
broadcastRelayList.flow.value,
|
||||||
|
indexerRelayList.flow.value,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|||||||
+2
@@ -33,6 +33,7 @@ import com.vitorpamplona.quartz.nip38UserStatus.StatusEvent
|
|||||||
import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
|
import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
|
import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
|
import com.vitorpamplona.quartz.nip78AppData.AppSpecificDataEvent
|
||||||
@@ -57,6 +58,7 @@ val AccountInfoAndListsFromKeyKinds2 =
|
|||||||
BlockedRelayListEvent.KIND,
|
BlockedRelayListEvent.KIND,
|
||||||
TrustedRelayListEvent.KIND,
|
TrustedRelayListEvent.KIND,
|
||||||
BroadcastRelayListEvent.KIND,
|
BroadcastRelayListEvent.KIND,
|
||||||
|
IndexerRelayListEvent.KIND,
|
||||||
)
|
)
|
||||||
|
|
||||||
val AmethystMetadataKinds = listOf(AppSpecificDataEvent.KIND)
|
val AmethystMetadataKinds = listOf(AppSpecificDataEvent.KIND)
|
||||||
|
|||||||
+2
@@ -30,6 +30,7 @@ import com.vitorpamplona.quartz.nip17Dm.settings.ChatMessageRelayListEvent
|
|||||||
import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
|
import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
|
import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip96FileStorage.config.FileServersEvent
|
import com.vitorpamplona.quartz.nip96FileStorage.config.FileServersEvent
|
||||||
@@ -51,6 +52,7 @@ val BasicAccountInfoKinds2 =
|
|||||||
BlockedRelayListEvent.KIND,
|
BlockedRelayListEvent.KIND,
|
||||||
TrustedRelayListEvent.KIND,
|
TrustedRelayListEvent.KIND,
|
||||||
BroadcastRelayListEvent.KIND,
|
BroadcastRelayListEvent.KIND,
|
||||||
|
IndexerRelayListEvent.KIND,
|
||||||
)
|
)
|
||||||
|
|
||||||
fun filterBasicAccountInfoFromKeys(
|
fun filterBasicAccountInfoFromKeys(
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ import com.vitorpamplona.amethyst.ui.note.types.DisplayBlockedRelayList
|
|||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayBroadcastRelayList
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayBroadcastRelayList
|
||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayDMRelayList
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayDMRelayList
|
||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayFollowList
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayFollowList
|
||||||
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayIndexerRelayList
|
||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayNIP65RelayList
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayNIP65RelayList
|
||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayPeopleList
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayPeopleList
|
||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayRelaySet
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayRelaySet
|
||||||
@@ -189,6 +190,7 @@ import com.vitorpamplona.quartz.nip51Lists.followList.FollowListEvent
|
|||||||
import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
|
import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
|
import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
|
||||||
import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent
|
import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent
|
||||||
@@ -656,6 +658,7 @@ private fun RenderNoteRow(
|
|||||||
is SearchRelayListEvent -> DisplaySearchRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
is SearchRelayListEvent -> DisplaySearchRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
||||||
is BlockedRelayListEvent -> DisplayBlockedRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
is BlockedRelayListEvent -> DisplayBlockedRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
||||||
is TrustedRelayListEvent -> DisplayTrustedRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
is TrustedRelayListEvent -> DisplayTrustedRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
||||||
|
is IndexerRelayListEvent -> DisplayIndexerRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
||||||
is BroadcastRelayListEvent -> DisplayBroadcastRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
is BroadcastRelayListEvent -> DisplayBroadcastRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
||||||
is PinListEvent -> RenderPinListEvent(baseNote, backgroundColor, accountViewModel, nav)
|
is PinListEvent -> RenderPinListEvent(baseNote, backgroundColor, accountViewModel, nav)
|
||||||
is EmojiPackEvent -> RenderEmojiPack(baseNote, true, backgroundColor, accountViewModel)
|
is EmojiPackEvent -> RenderEmojiPack(baseNote, true, backgroundColor, accountViewModel)
|
||||||
|
|||||||
@@ -234,6 +234,27 @@ fun DisplayTrustedRelayList(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun DisplayIndexerRelayList(
|
||||||
|
baseNote: Note,
|
||||||
|
backgroundColor: MutableState<Color>,
|
||||||
|
accountViewModel: AccountViewModel,
|
||||||
|
nav: INav,
|
||||||
|
) {
|
||||||
|
val relays by accountViewModel.account.indexerRelayListDecryptionCache.observeDecryptedRelayList(baseNote).collectAsStateWithLifecycle(
|
||||||
|
accountViewModel.account.indexerRelayListDecryptionCache.fastStartValueForRelayList(baseNote),
|
||||||
|
)
|
||||||
|
|
||||||
|
DisplayRelaySet(
|
||||||
|
relays,
|
||||||
|
stringRes(id = R.string.indexer_relays_title),
|
||||||
|
null,
|
||||||
|
backgroundColor,
|
||||||
|
accountViewModel,
|
||||||
|
nav,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun DisplayBroadcastRelayList(
|
fun DisplayBroadcastRelayList(
|
||||||
baseNote: Note,
|
baseNote: Note,
|
||||||
|
|||||||
+39
@@ -41,6 +41,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
|||||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||||
import com.vitorpamplona.amethyst.R
|
import com.vitorpamplona.amethyst.R
|
||||||
import com.vitorpamplona.amethyst.model.DefaultDMRelayList
|
import com.vitorpamplona.amethyst.model.DefaultDMRelayList
|
||||||
|
import com.vitorpamplona.amethyst.model.DefaultIndexerRelayList
|
||||||
import com.vitorpamplona.amethyst.model.DefaultSearchRelayList
|
import com.vitorpamplona.amethyst.model.DefaultSearchRelayList
|
||||||
import com.vitorpamplona.amethyst.ui.navigation.navs.INav
|
import com.vitorpamplona.amethyst.ui.navigation.navs.INav
|
||||||
import com.vitorpamplona.amethyst.ui.navigation.topbars.SavingTopBar
|
import com.vitorpamplona.amethyst.ui.navigation.topbars.SavingTopBar
|
||||||
@@ -54,6 +55,8 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.connected.ConnectedR
|
|||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.connected.renderConnectedItems
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.connected.renderConnectedItems
|
||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.dm.DMRelayListViewModel
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.dm.DMRelayListViewModel
|
||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.dm.renderDMItems
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.dm.renderDMItems
|
||||||
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.indexer.IndexerRelayListViewModel
|
||||||
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.indexer.renderIndexerItems
|
||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.local.LocalRelayListViewModel
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.local.LocalRelayListViewModel
|
||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.local.renderLocalItems
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.local.renderLocalItems
|
||||||
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.nip37.PrivateOutboxRelayListViewModel
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.nip37.PrivateOutboxRelayListViewModel
|
||||||
@@ -86,6 +89,7 @@ fun AllRelayListScreen(
|
|||||||
val localViewModel: LocalRelayListViewModel = viewModel()
|
val localViewModel: LocalRelayListViewModel = viewModel()
|
||||||
val connectedViewModel: ConnectedRelayListViewModel = viewModel()
|
val connectedViewModel: ConnectedRelayListViewModel = viewModel()
|
||||||
val broadcastViewModel: BroadcastRelayListViewModel = viewModel()
|
val broadcastViewModel: BroadcastRelayListViewModel = viewModel()
|
||||||
|
val indexerViewModel: IndexerRelayListViewModel = viewModel()
|
||||||
|
|
||||||
dmViewModel.init(accountViewModel)
|
dmViewModel.init(accountViewModel)
|
||||||
nip65ViewModel.init(accountViewModel)
|
nip65ViewModel.init(accountViewModel)
|
||||||
@@ -96,6 +100,7 @@ fun AllRelayListScreen(
|
|||||||
blockedViewModel.init(accountViewModel)
|
blockedViewModel.init(accountViewModel)
|
||||||
trustedViewModel.init(accountViewModel)
|
trustedViewModel.init(accountViewModel)
|
||||||
broadcastViewModel.init(accountViewModel)
|
broadcastViewModel.init(accountViewModel)
|
||||||
|
indexerViewModel.init(accountViewModel)
|
||||||
|
|
||||||
LaunchedEffect(accountViewModel) {
|
LaunchedEffect(accountViewModel) {
|
||||||
dmViewModel.load()
|
dmViewModel.load()
|
||||||
@@ -107,6 +112,7 @@ fun AllRelayListScreen(
|
|||||||
blockedViewModel.load()
|
blockedViewModel.load()
|
||||||
trustedViewModel.load()
|
trustedViewModel.load()
|
||||||
broadcastViewModel.load()
|
broadcastViewModel.load()
|
||||||
|
indexerViewModel.load()
|
||||||
}
|
}
|
||||||
|
|
||||||
MappedAllRelayListView(
|
MappedAllRelayListView(
|
||||||
@@ -119,6 +125,7 @@ fun AllRelayListScreen(
|
|||||||
blockedViewModel,
|
blockedViewModel,
|
||||||
trustedViewModel,
|
trustedViewModel,
|
||||||
broadcastViewModel,
|
broadcastViewModel,
|
||||||
|
indexerViewModel,
|
||||||
accountViewModel,
|
accountViewModel,
|
||||||
nav,
|
nav,
|
||||||
)
|
)
|
||||||
@@ -136,6 +143,7 @@ fun MappedAllRelayListView(
|
|||||||
blockedViewModel: BlockedRelayListViewModel,
|
blockedViewModel: BlockedRelayListViewModel,
|
||||||
trustedViewModel: TrustedRelayListViewModel,
|
trustedViewModel: TrustedRelayListViewModel,
|
||||||
broadcastViewModel: BroadcastRelayListViewModel,
|
broadcastViewModel: BroadcastRelayListViewModel,
|
||||||
|
indexerViewModel: IndexerRelayListViewModel,
|
||||||
accountViewModel: AccountViewModel,
|
accountViewModel: AccountViewModel,
|
||||||
newNav: INav,
|
newNav: INav,
|
||||||
) {
|
) {
|
||||||
@@ -149,6 +157,7 @@ fun MappedAllRelayListView(
|
|||||||
val localFeedState by localViewModel.relays.collectAsStateWithLifecycle()
|
val localFeedState by localViewModel.relays.collectAsStateWithLifecycle()
|
||||||
val connectedRelays by connectedViewModel.relays.collectAsStateWithLifecycle()
|
val connectedRelays by connectedViewModel.relays.collectAsStateWithLifecycle()
|
||||||
val broadcastRelays by broadcastViewModel.relays.collectAsStateWithLifecycle()
|
val broadcastRelays by broadcastViewModel.relays.collectAsStateWithLifecycle()
|
||||||
|
val indexerRelays by indexerViewModel.relays.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
Scaffold(
|
Scaffold(
|
||||||
topBar = {
|
topBar = {
|
||||||
@@ -163,6 +172,7 @@ fun MappedAllRelayListView(
|
|||||||
trustedViewModel.clear()
|
trustedViewModel.clear()
|
||||||
blockedViewModel.clear()
|
blockedViewModel.clear()
|
||||||
broadcastViewModel.clear()
|
broadcastViewModel.clear()
|
||||||
|
indexerViewModel.clear()
|
||||||
newNav.popBack()
|
newNav.popBack()
|
||||||
},
|
},
|
||||||
onPost = {
|
onPost = {
|
||||||
@@ -174,6 +184,7 @@ fun MappedAllRelayListView(
|
|||||||
trustedViewModel.create()
|
trustedViewModel.create()
|
||||||
blockedViewModel.create()
|
blockedViewModel.create()
|
||||||
broadcastViewModel.create()
|
broadcastViewModel.create()
|
||||||
|
indexerViewModel.create()
|
||||||
newNav.popBack()
|
newNav.popBack()
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
@@ -240,6 +251,17 @@ fun MappedAllRelayListView(
|
|||||||
}
|
}
|
||||||
renderBroadcastItems(broadcastRelays, broadcastViewModel, accountViewModel, newNav)
|
renderBroadcastItems(broadcastRelays, broadcastViewModel, accountViewModel, newNav)
|
||||||
|
|
||||||
|
item {
|
||||||
|
SettingsCategoryWithButton(
|
||||||
|
stringRes(R.string.indexer_section),
|
||||||
|
stringRes(R.string.indexer_section_explainer),
|
||||||
|
SettingsCategorySpacingModifier,
|
||||||
|
) {
|
||||||
|
ResetIndexerRelays(indexerViewModel)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
renderIndexerItems(indexerRelays, indexerViewModel, accountViewModel, newNav)
|
||||||
|
|
||||||
item {
|
item {
|
||||||
SettingsCategoryWithButton(
|
SettingsCategoryWithButton(
|
||||||
stringRes(R.string.search_section),
|
stringRes(R.string.search_section),
|
||||||
@@ -307,6 +329,23 @@ fun ResetSearchRelays(postViewModel: SearchRelayListViewModel) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun ResetIndexerRelays(postViewModel: IndexerRelayListViewModel) {
|
||||||
|
OutlinedButton(
|
||||||
|
onClick = {
|
||||||
|
postViewModel.deleteAll()
|
||||||
|
DefaultIndexerRelayList.forEach {
|
||||||
|
postViewModel.addRelay(
|
||||||
|
relaySetupInfoBuilder(it),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
postViewModel.loadRelayDocuments()
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
Text(stringRes(R.string.default_relays))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun ResetDMRelays(postViewModel: DMRelayListViewModel) {
|
fun ResetDMRelays(postViewModel: DMRelayListViewModel) {
|
||||||
OutlinedButton(
|
OutlinedButton(
|
||||||
|
|||||||
+81
@@ -0,0 +1,81 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2025 Vitor Pamplona
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
* this software and associated documentation files (the "Software"), to deal in
|
||||||
|
* the Software without restriction, including without limitation the rights to use,
|
||||||
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
|
||||||
|
* Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
* subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.indexer
|
||||||
|
|
||||||
|
import androidx.compose.foundation.layout.Row
|
||||||
|
import androidx.compose.foundation.layout.Spacer
|
||||||
|
import androidx.compose.foundation.lazy.LazyColumn
|
||||||
|
import androidx.compose.foundation.lazy.LazyListScope
|
||||||
|
import androidx.compose.foundation.lazy.itemsIndexed
|
||||||
|
import androidx.compose.runtime.Composable
|
||||||
|
import androidx.compose.runtime.getValue
|
||||||
|
import androidx.compose.ui.Alignment
|
||||||
|
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||||
|
import com.vitorpamplona.amethyst.ui.navigation.navs.INav
|
||||||
|
import com.vitorpamplona.amethyst.ui.navigation.navs.rememberExtendedNav
|
||||||
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
|
||||||
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.common.BasicRelaySetupInfo
|
||||||
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.common.BasicRelaySetupInfoDialog
|
||||||
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.common.RelayUrlEditField
|
||||||
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.common.relaySetupInfoBuilder
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.FeedPadding
|
||||||
|
import com.vitorpamplona.amethyst.ui.theme.StdVertSpacer
|
||||||
|
|
||||||
|
@Composable
|
||||||
|
fun IndexerRelayList(
|
||||||
|
postViewModel: IndexerRelayListViewModel,
|
||||||
|
accountViewModel: AccountViewModel,
|
||||||
|
onClose: () -> Unit,
|
||||||
|
nav: INav,
|
||||||
|
) {
|
||||||
|
val feedState by postViewModel.relays.collectAsStateWithLifecycle()
|
||||||
|
|
||||||
|
val newNav = rememberExtendedNav(nav, onClose)
|
||||||
|
|
||||||
|
Row(verticalAlignment = Alignment.CenterVertically) {
|
||||||
|
LazyColumn(
|
||||||
|
contentPadding = FeedPadding,
|
||||||
|
) {
|
||||||
|
renderIndexerItems(feedState, postViewModel, accountViewModel, newNav)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun LazyListScope.renderIndexerItems(
|
||||||
|
feedState: List<BasicRelaySetupInfo>,
|
||||||
|
postViewModel: IndexerRelayListViewModel,
|
||||||
|
accountViewModel: AccountViewModel,
|
||||||
|
nav: INav,
|
||||||
|
) {
|
||||||
|
itemsIndexed(feedState, key = { _, item -> "Indexer" + item.relay }) { index, item ->
|
||||||
|
BasicRelaySetupInfoDialog(
|
||||||
|
item,
|
||||||
|
onDelete = { postViewModel.deleteRelay(item) },
|
||||||
|
accountViewModel = accountViewModel,
|
||||||
|
nav,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
item {
|
||||||
|
Spacer(modifier = StdVertSpacer)
|
||||||
|
RelayUrlEditField { postViewModel.addRelay(relaySetupInfoBuilder(it)) }
|
||||||
|
}
|
||||||
|
}
|
||||||
+34
@@ -0,0 +1,34 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2025 Vitor Pamplona
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
* this software and associated documentation files (the "Software"), to deal in
|
||||||
|
* the Software without restriction, including without limitation the rights to use,
|
||||||
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
|
||||||
|
* Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
* subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.indexer
|
||||||
|
|
||||||
|
import com.vitorpamplona.amethyst.ui.screen.loggedIn.relays.common.BasicRelaySetupInfoModel
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
|
||||||
|
|
||||||
|
class IndexerRelayListViewModel : BasicRelaySetupInfoModel() {
|
||||||
|
override fun getRelayList(): List<NormalizedRelayUrl>? =
|
||||||
|
account.indexerRelayList.flow.value
|
||||||
|
.toList()
|
||||||
|
|
||||||
|
override suspend fun saveRelayList(urlList: List<NormalizedRelayUrl>) {
|
||||||
|
account.saveIndexerRelayList(urlList)
|
||||||
|
}
|
||||||
|
}
|
||||||
+4
@@ -122,6 +122,7 @@ import com.vitorpamplona.amethyst.ui.note.types.DisplayBlockedRelayList
|
|||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayBroadcastRelayList
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayBroadcastRelayList
|
||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayDMRelayList
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayDMRelayList
|
||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayFollowList
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayFollowList
|
||||||
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayIndexerRelayList
|
||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayNIP65RelayList
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayNIP65RelayList
|
||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayPeopleList
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayPeopleList
|
||||||
import com.vitorpamplona.amethyst.ui.note.types.DisplayRelaySet
|
import com.vitorpamplona.amethyst.ui.note.types.DisplayRelaySet
|
||||||
@@ -210,6 +211,7 @@ import com.vitorpamplona.quartz.nip51Lists.followList.FollowListEvent
|
|||||||
import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
|
import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
|
import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
|
||||||
import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent
|
import com.vitorpamplona.quartz.nip53LiveActivities.chat.LiveActivitiesChatMessageEvent
|
||||||
@@ -605,6 +607,8 @@ private fun FullBleedNoteCompose(
|
|||||||
DisplayBlockedRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
DisplayBlockedRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
||||||
} else if (noteEvent is TrustedRelayListEvent) {
|
} else if (noteEvent is TrustedRelayListEvent) {
|
||||||
DisplayTrustedRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
DisplayTrustedRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
||||||
|
} else if (noteEvent is IndexerRelayListEvent) {
|
||||||
|
DisplayIndexerRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
||||||
} else if (noteEvent is BroadcastRelayListEvent) {
|
} else if (noteEvent is BroadcastRelayListEvent) {
|
||||||
DisplayBroadcastRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
DisplayBroadcastRelayList(baseNote, backgroundColor, accountViewModel, nav)
|
||||||
} else if (noteEvent is FhirResourceEvent) {
|
} else if (noteEvent is FhirResourceEvent) {
|
||||||
|
|||||||
@@ -1094,7 +1094,11 @@
|
|||||||
|
|
||||||
<string name="broadcast_relays_title">Broadcast Relays</string>
|
<string name="broadcast_relays_title">Broadcast Relays</string>
|
||||||
<string name="broadcast_section">Broadcast Relays</string>
|
<string name="broadcast_section">Broadcast Relays</string>
|
||||||
<string name="broadcast_section_explainer">Relays that specialize in pushing your notes to all of the other relays. Amethyst will add this relay to all new events made by you</string>
|
<string name="broadcast_section_explainer">Relays that specialize in pushing your notes to all of the other relays, like sendit.nosflare.com. Amethyst will add this relay to all new events made by you</string>
|
||||||
|
|
||||||
|
<string name="indexer_relays_title">Indexer Relays</string>
|
||||||
|
<string name="indexer_section">Indexer Relays</string>
|
||||||
|
<string name="indexer_section_explainer">Relays that specialize in hosting everyone\'s metadata and relay lists, like purplepag.es. Amethyst will use these relays to find users that are not in your lists.</string>
|
||||||
|
|
||||||
<string name="blocked_relays_title">Blocked Relays</string>
|
<string name="blocked_relays_title">Blocked Relays</string>
|
||||||
<string name="blocked_section">Blocked Relays</string>
|
<string name="blocked_section">Blocked Relays</string>
|
||||||
|
|||||||
@@ -83,6 +83,7 @@ import com.vitorpamplona.quartz.nip51Lists.muteList.MuteListEvent
|
|||||||
import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
|
import com.vitorpamplona.quartz.nip51Lists.peopleList.PeopleListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
|
import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
|
||||||
import com.vitorpamplona.quartz.nip52Calendar.CalendarDateSlotEvent
|
import com.vitorpamplona.quartz.nip52Calendar.CalendarDateSlotEvent
|
||||||
@@ -233,6 +234,7 @@ class EventFactory {
|
|||||||
HashtagListEvent.KIND -> HashtagListEvent(id, pubKey, createdAt, tags, content, sig)
|
HashtagListEvent.KIND -> HashtagListEvent(id, pubKey, createdAt, tags, content, sig)
|
||||||
HighlightEvent.KIND -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
|
HighlightEvent.KIND -> HighlightEvent(id, pubKey, createdAt, tags, content, sig)
|
||||||
HTTPAuthorizationEvent.KIND -> HTTPAuthorizationEvent(id, pubKey, createdAt, tags, content, sig)
|
HTTPAuthorizationEvent.KIND -> HTTPAuthorizationEvent(id, pubKey, createdAt, tags, content, sig)
|
||||||
|
IndexerRelayListEvent.KIND -> IndexerRelayListEvent(id, pubKey, createdAt, tags, content, sig)
|
||||||
InteractiveStoryPrologueEvent.KIND -> InteractiveStoryPrologueEvent(id, pubKey, createdAt, tags, content, sig)
|
InteractiveStoryPrologueEvent.KIND -> InteractiveStoryPrologueEvent(id, pubKey, createdAt, tags, content, sig)
|
||||||
InteractiveStorySceneEvent.KIND -> InteractiveStorySceneEvent(id, pubKey, createdAt, tags, content, sig)
|
InteractiveStorySceneEvent.KIND -> InteractiveStorySceneEvent(id, pubKey, createdAt, tags, content, sig)
|
||||||
InteractiveStoryReadingStateEvent.KIND -> InteractiveStoryReadingStateEvent(id, pubKey, createdAt, tags, content, sig)
|
InteractiveStoryReadingStateEvent.KIND -> InteractiveStoryReadingStateEvent(id, pubKey, createdAt, tags, content, sig)
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ class NostrSignerSync(
|
|||||||
toPublicKey: HexKey,
|
toPublicKey: HexKey,
|
||||||
): String {
|
): String {
|
||||||
if (keyPair.privKey == null) throw SignerExceptions.ReadOnlyException()
|
if (keyPair.privKey == null) throw SignerExceptions.ReadOnlyException()
|
||||||
|
if (plaintext.isBlank()) return ""
|
||||||
|
|
||||||
return Nip04.encrypt(
|
return Nip04.encrypt(
|
||||||
plaintext,
|
plaintext,
|
||||||
@@ -102,6 +103,7 @@ class NostrSignerSync(
|
|||||||
toPublicKey: HexKey,
|
toPublicKey: HexKey,
|
||||||
): String {
|
): String {
|
||||||
if (keyPair.privKey == null) throw SignerExceptions.ReadOnlyException()
|
if (keyPair.privKey == null) throw SignerExceptions.ReadOnlyException()
|
||||||
|
if (plaintext.isBlank()) return ""
|
||||||
|
|
||||||
return Nip44
|
return Nip44
|
||||||
.encrypt(
|
.encrypt(
|
||||||
|
|||||||
+3
-2
@@ -66,7 +66,7 @@ class BroadcastRelayListEvent(
|
|||||||
|
|
||||||
fun createAddressATag(pubKey: HexKey): ATag = ATag(KIND, pubKey, "", null)
|
fun createAddressATag(pubKey: HexKey): ATag = ATag(KIND, pubKey, "", null)
|
||||||
|
|
||||||
fun createAddressTag(pubKey: HexKey): String = Address.Companion.assemble(KIND, pubKey, "")
|
fun createAddressTag(pubKey: HexKey): String = Address.assemble(KIND, pubKey, "")
|
||||||
|
|
||||||
suspend fun updateRelayList(
|
suspend fun updateRelayList(
|
||||||
earlierVersion: BroadcastRelayListEvent,
|
earlierVersion: BroadcastRelayListEvent,
|
||||||
@@ -75,8 +75,9 @@ class BroadcastRelayListEvent(
|
|||||||
createdAt: Long = TimeUtils.now(),
|
createdAt: Long = TimeUtils.now(),
|
||||||
): BroadcastRelayListEvent {
|
): BroadcastRelayListEvent {
|
||||||
val newRelayList = relays.map { RelayTag.assemble(it) }
|
val newRelayList = relays.map { RelayTag.assemble(it) }
|
||||||
|
println("AABBCC 1 ${earlierVersion.content}")
|
||||||
val privateTags = earlierVersion.privateTags(signer) ?: throw SignerExceptions.UnauthorizedDecryptionException()
|
val privateTags = earlierVersion.privateTags(signer) ?: throw SignerExceptions.UnauthorizedDecryptionException()
|
||||||
|
println("AABBCC 2 ${privateTags.size}")
|
||||||
val publicTags = earlierVersion.tags.remove(RelayTag::match)
|
val publicTags = earlierVersion.tags.remove(RelayTag::match)
|
||||||
val newPrivateTags = privateTags.remove(RelayTag::notMatch).plus(newRelayList)
|
val newPrivateTags = privateTags.remove(RelayTag::notMatch).plus(newRelayList)
|
||||||
|
|
||||||
|
|||||||
+121
@@ -0,0 +1,121 @@
|
|||||||
|
/**
|
||||||
|
* Copyright (c) 2025 Vitor Pamplona
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
* this software and associated documentation files (the "Software"), to deal in
|
||||||
|
* the Software without restriction, including without limitation the rights to use,
|
||||||
|
* copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
|
||||||
|
* Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
* subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in all
|
||||||
|
* copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||||
|
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||||
|
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
||||||
|
* AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||||
|
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
package com.vitorpamplona.quartz.nip51Lists.relayLists
|
||||||
|
|
||||||
|
import androidx.compose.runtime.Immutable
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.core.HexKey
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.core.TagArrayBuilder
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.relay.normalizer.NormalizedRelayUrl
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.signers.NostrSigner
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.signers.NostrSignerSync
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.signers.SignerExceptions
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.signers.eventTemplate
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.tags.addressables.ATag
|
||||||
|
import com.vitorpamplona.quartz.nip01Core.tags.addressables.Address
|
||||||
|
import com.vitorpamplona.quartz.nip31Alts.AltTag
|
||||||
|
import com.vitorpamplona.quartz.nip31Alts.alt
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.encryption.PrivateTagsInContent
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.encryption.signNip51List
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.tags.RelayTag
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.tags.indexerRelays
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.tags.relays
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.remove
|
||||||
|
import com.vitorpamplona.quartz.utils.TimeUtils
|
||||||
|
import kotlin.collections.plus
|
||||||
|
|
||||||
|
@Immutable
|
||||||
|
class IndexerRelayListEvent(
|
||||||
|
id: HexKey,
|
||||||
|
pubKey: HexKey,
|
||||||
|
createdAt: Long,
|
||||||
|
tags: Array<Array<String>>,
|
||||||
|
content: String,
|
||||||
|
sig: HexKey,
|
||||||
|
) : PrivateTagArrayEvent(id, pubKey, createdAt, KIND, tags, content, sig) {
|
||||||
|
fun publicRelays() = tags.relays()
|
||||||
|
|
||||||
|
suspend fun decryptPrivateRelays(signer: NostrSigner) = privateTags(signer)?.relays()
|
||||||
|
|
||||||
|
suspend fun decryptRelays(signer: NostrSigner): List<NormalizedRelayUrl> = publicRelays() + (decryptPrivateRelays(signer) ?: emptyList())
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
const val KIND = 10087
|
||||||
|
const val ALT = "Broadcasting relays from this author"
|
||||||
|
val TAGS = arrayOf(AltTag.assemble(ALT))
|
||||||
|
|
||||||
|
fun createAddress(pubKey: HexKey): Address = Address(KIND, pubKey, "")
|
||||||
|
|
||||||
|
fun createAddressATag(pubKey: HexKey): ATag = ATag(KIND, pubKey, "", null)
|
||||||
|
|
||||||
|
fun createAddressTag(pubKey: HexKey): String = Address.Companion.assemble(KIND, pubKey, "")
|
||||||
|
|
||||||
|
suspend fun updateRelayList(
|
||||||
|
earlierVersion: IndexerRelayListEvent,
|
||||||
|
relays: List<NormalizedRelayUrl>,
|
||||||
|
signer: NostrSigner,
|
||||||
|
createdAt: Long = TimeUtils.now(),
|
||||||
|
): IndexerRelayListEvent {
|
||||||
|
val newRelayList = relays.map { RelayTag.assemble(it) }
|
||||||
|
val privateTags = earlierVersion.privateTags(signer) ?: throw SignerExceptions.UnauthorizedDecryptionException()
|
||||||
|
|
||||||
|
val publicTags = earlierVersion.tags.remove(RelayTag::match)
|
||||||
|
val newPrivateTags = privateTags.remove(RelayTag::notMatch).plus(newRelayList)
|
||||||
|
|
||||||
|
return signer.signNip51List(createdAt, KIND, publicTags, newPrivateTags)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun create(
|
||||||
|
relays: List<NormalizedRelayUrl>,
|
||||||
|
signer: NostrSigner,
|
||||||
|
createdAt: Long = TimeUtils.now(),
|
||||||
|
): IndexerRelayListEvent {
|
||||||
|
val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray()
|
||||||
|
return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun create(
|
||||||
|
relays: List<NormalizedRelayUrl>,
|
||||||
|
signer: NostrSignerSync,
|
||||||
|
createdAt: Long = TimeUtils.now(),
|
||||||
|
): IndexerRelayListEvent {
|
||||||
|
val privateTagArray = relays.map { RelayTag.assemble(it) }.toTypedArray()
|
||||||
|
return signer.signNip51List(createdAt, KIND, TAGS, privateTagArray)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun build(
|
||||||
|
publicRelays: List<NormalizedRelayUrl> = emptyList(),
|
||||||
|
privateRelays: List<NormalizedRelayUrl> = emptyList(),
|
||||||
|
signer: NostrSigner,
|
||||||
|
createdAt: Long = TimeUtils.now(),
|
||||||
|
initializer: TagArrayBuilder<IndexerRelayListEvent>.() -> Unit = {},
|
||||||
|
) = eventTemplate<IndexerRelayListEvent>(
|
||||||
|
kind = KIND,
|
||||||
|
description = PrivateTagsInContent.encryptNip44(privateRelays.map { RelayTag.assemble(it) }.toTypedArray(), signer),
|
||||||
|
createdAt = createdAt,
|
||||||
|
) {
|
||||||
|
alt(ALT)
|
||||||
|
indexerRelays(publicRelays)
|
||||||
|
|
||||||
|
initializer()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
@@ -27,6 +27,7 @@ import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
|
|||||||
import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent
|
import com.vitorpamplona.quartz.nip51Lists.PrivateTagArrayEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BlockedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.BroadcastRelayListEvent
|
||||||
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.IndexerRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
import com.vitorpamplona.quartz.nip51Lists.relayLists.TrustedRelayListEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
|
import com.vitorpamplona.quartz.nip51Lists.relaySets.RelaySetEvent
|
||||||
import com.vitorpamplona.quartz.nip51Lists.tags.NameTag
|
import com.vitorpamplona.quartz.nip51Lists.tags.NameTag
|
||||||
@@ -42,6 +43,8 @@ fun TagArrayBuilder<TrustedRelayListEvent>.trustedRelays(relays: List<Normalized
|
|||||||
|
|
||||||
fun TagArrayBuilder<BroadcastRelayListEvent>.broadcastRelays(relays: List<NormalizedRelayUrl>) = addAll(relays.map { RelayTag.assemble(it) })
|
fun TagArrayBuilder<BroadcastRelayListEvent>.broadcastRelays(relays: List<NormalizedRelayUrl>) = addAll(relays.map { RelayTag.assemble(it) })
|
||||||
|
|
||||||
|
fun TagArrayBuilder<IndexerRelayListEvent>.indexerRelays(relays: List<NormalizedRelayUrl>) = addAll(relays.map { RelayTag.assemble(it) })
|
||||||
|
|
||||||
fun TagArrayBuilder<PrivateOutboxRelayListEvent>.privateRelays(relays: List<NormalizedRelayUrl>) = addAll(relays.map { RelayTag.assemble(it) })
|
fun TagArrayBuilder<PrivateOutboxRelayListEvent>.privateRelays(relays: List<NormalizedRelayUrl>) = addAll(relays.map { RelayTag.assemble(it) })
|
||||||
|
|
||||||
fun TagArrayBuilder<RelaySetEvent>.relaySet(relays: List<NormalizedRelayUrl>) = addAll(relays.map { RelayTag.assemble(it) })
|
fun TagArrayBuilder<RelaySetEvent>.relaySet(relays: List<NormalizedRelayUrl>) = addAll(relays.map { RelayTag.assemble(it) })
|
||||||
|
|||||||
+4
@@ -96,6 +96,8 @@ class NostrSignerExternal(
|
|||||||
plaintext: String,
|
plaintext: String,
|
||||||
toPublicKey: HexKey,
|
toPublicKey: HexKey,
|
||||||
): String {
|
): String {
|
||||||
|
if (plaintext.isBlank()) return ""
|
||||||
|
|
||||||
val result = backgroundQuery.nip04Encrypt(plaintext, toPublicKey) ?: foregroundQuery.nip04Encrypt(plaintext, toPublicKey)
|
val result = backgroundQuery.nip04Encrypt(plaintext, toPublicKey) ?: foregroundQuery.nip04Encrypt(plaintext, toPublicKey)
|
||||||
|
|
||||||
if (result is SignerResult.RequestAddressed.Successful<EncryptionResult>) {
|
if (result is SignerResult.RequestAddressed.Successful<EncryptionResult>) {
|
||||||
@@ -124,6 +126,8 @@ class NostrSignerExternal(
|
|||||||
plaintext: String,
|
plaintext: String,
|
||||||
toPublicKey: HexKey,
|
toPublicKey: HexKey,
|
||||||
): String {
|
): String {
|
||||||
|
if (plaintext.isBlank()) return ""
|
||||||
|
|
||||||
val result = backgroundQuery.nip44Encrypt(plaintext, toPublicKey) ?: foregroundQuery.nip44Encrypt(plaintext, toPublicKey)
|
val result = backgroundQuery.nip44Encrypt(plaintext, toPublicKey) ?: foregroundQuery.nip44Encrypt(plaintext, toPublicKey)
|
||||||
|
|
||||||
if (result is SignerResult.RequestAddressed.Successful<EncryptionResult>) {
|
if (result is SignerResult.RequestAddressed.Successful<EncryptionResult>) {
|
||||||
|
|||||||
Reference in New Issue
Block a user