Merge branch 'main' into gallery

This commit is contained in:
believethehype
2024-07-01 22:40:31 +02:00
committed by GitHub
3 changed files with 4 additions and 1 deletions

View File

@@ -110,6 +110,7 @@ object NostrAccountDataSource : AmethystNostrDataSource("AccountData") {
AdvertisedRelayListEvent.KIND, AdvertisedRelayListEvent.KIND,
ChatMessageRelayListEvent.KIND, ChatMessageRelayListEvent.KIND,
SearchRelayListEvent.KIND, SearchRelayListEvent.KIND,
FileServersEvent.KIND,
PrivateOutboxRelayListEvent.KIND, PrivateOutboxRelayListEvent.KIND,
), ),
authors = listOf(account.userProfile().pubkeyHex), authors = listOf(account.userProfile().pubkeyHex),

View File

@@ -56,7 +56,7 @@ fun MediaServerEditField(
), ),
) { ) {
OutlinedTextField( OutlinedTextField(
label = { Text(text = stringRes(R.string.add_a_relay)) }, label = { Text(text = stringRes(R.string.add_a_nip96_server)) },
modifier = Modifier.weight(1f), modifier = Modifier.weight(1f),
value = url, value = url,
onValueChange = { url = it }, onValueChange = { url = it },

View File

@@ -943,4 +943,6 @@
<string name="http_status_507">Insufficient Storage - The server doesnt have enough storage to process the request successfully</string> <string name="http_status_507">Insufficient Storage - The server doesnt have enough storage to process the request successfully</string>
<string name="http_status_508">Loop Detected - The server detects an infinite loop while processing the request</string> <string name="http_status_508">Loop Detected - The server detects an infinite loop while processing the request</string>
<string name="http_status_511">Network Authentication Required - The client must be authenticated to access the network</string> <string name="http_status_511">Network Authentication Required - The client must be authenticated to access the network</string>
<string name="add_a_nip96_server">Add a NIP-96 Server</string>
</resources> </resources>