diff --git a/amethyst/src/main/res/values-pl-rPL/strings.xml b/amethyst/src/main/res/values-pl-rPL/strings.xml index 183489745..44a145136 100644 --- a/amethyst/src/main/res/values-pl-rPL/strings.xml +++ b/amethyst/src/main/res/values-pl-rPL/strings.xml @@ -378,6 +378,7 @@ Domyślne zakładki Twoje domyślne zakładki obsługiwane przez większość klientów Projekty + Ankiety Prywatne Zakładki Publiczne zakładki Dodaj do prywatnych zakładek @@ -723,6 +724,7 @@ Otwórz Odczyt Zapis + RTT Sieć Typ Obsługiwane Nipy @@ -1663,6 +1665,8 @@ brak wydarzeń Eksplorator Bitcoin (OTS) wydarzeń + wydarzenia od Ciebie + wydarzenia dla Ciebie DMs profile lista transmiterów wysyłających @@ -1778,8 +1782,46 @@ Zarządzaj %1$s Wczytywanie funkcji zarządzania transmiterem… + Nie można połączyć się z panelem zarządzania transmiterem Brak dostępnych metod zarządzania Ignoruj + Użytkownicy + Wydarzenia + Typy + Adresy IP + Ustawienia + Zbanowani użytkownicy + Brak zbanowanych użytkowników + Uprawnieni użytkownicy + Brak uprawnionych użytkowników + Kolejka do moderacji + Brak wydarzeń wymagających moderacji + Zbanowane wydarzenia + Brak zbanowanych wydarzeń + Dozwolone typy + Brak dozwolonych typów + Zablokowane adresy IP + Brak zablokowanych adresów IP + Dodaj + Usuń + Zezwól + Banuj + Banuj klucz publiczny + Aprobuj klucz publiczny + Zbanuj wydarzenie + Aprobuj typ + Blokuj IP + Klucz publiczny (hex) + ID wydarzenia (hex) + Numer typu + Adres IP + Powód (Opcjonalne) + Potwierdź + Anuluj + Zastosuj + Nazwa transmitera + Opis transmitera + Adres ikony transmitera Zarządzaj Transmiterem Zarządzaj diff --git a/build.gradle b/build.gradle index ae3903522..f065a2b44 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ allprojects { target 'src/**/*.kt' ktlint() - licenseHeaderFile rootProject.file('.spotless/copyright.kt'), "package|import|class|object|sealed|open|interface|abstract " + licenseHeaderFile rootProject.file('.spotless/copyright.kt'), "@file:|package|import|class|object|sealed|open|interface|abstract " } groovyGradle { diff --git a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/NostrSignerExternal.kt b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/NostrSignerExternal.kt index 5f5c98e24..64551b128 100644 --- a/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/NostrSignerExternal.kt +++ b/quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip55AndroidSigner/client/NostrSignerExternal.kt @@ -83,6 +83,7 @@ class NostrSignerExternal( val result = backgroundQuery.sign(unsignedEvent) ?: foregroundQuery.sign(unsignedEvent) if (result is SignerResult.RequestAddressed.Successful) { + @Suppress("UNCHECKED_CAST") (result.result.event as? T)?.let { return it } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/GalleryListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/GalleryListEvent.kt index 0c90339f6..64ef18092 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/GalleryListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/experimental/profileGallery/GalleryListEvent.kt @@ -38,6 +38,7 @@ class GalleryListEvent( content: String, sig: HexKey, ) : PrivateTagArrayEvent(id, pubKey, createdAt, KIND, tags, content, sig) { + @Suppress("DEPRECATION") companion object { const val KIND = 10011 const val ALT = "Profile Gallery" diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip19Bech32/entities/NNote.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip19Bech32/entities/NNote.kt index eb26b7f7b..deb564d2b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip19Bech32/entities/NNote.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip19Bech32/entities/NNote.kt @@ -36,6 +36,7 @@ data class NNote( return NNote(bytes.toHexKey()) } + @Suppress("DEPRECATION") fun create(eventId: HexKey): String = eventId.hexToByteArray().toNote() } } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/reply/GitReplyEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/reply/GitReplyEvent.kt index 7e6bd2f43..a738bccec 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/reply/GitReplyEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/reply/GitReplyEvent.kt @@ -115,6 +115,7 @@ class GitReplyEvent( fun rootIssueOrPatch() = tags.lastNotNullOfOrNull(MarkedETag::parseRootId) + @Suppress("DEPRECATION") companion object { const val KIND = 1622 const val ALT_DESCRIPTION = "A Git Reply" diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/reply/TagArrayBuilderExt.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/reply/TagArrayBuilderExt.kt index 7fb8e9a7a..8c816d0ff 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/reply/TagArrayBuilderExt.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip34Git/reply/TagArrayBuilderExt.kt @@ -32,12 +32,17 @@ import com.vitorpamplona.quartz.nip34Git.issue.GitIssueEvent import com.vitorpamplona.quartz.nip34Git.patch.GitPatchEvent import com.vitorpamplona.quartz.nip34Git.repository.GitRepositoryEvent +@Suppress("DEPRECATION") fun TagArrayBuilder.repository(rep: ATag) = addUnique(rep.toATagArray()) +@Suppress("DEPRECATION") fun TagArrayBuilder.repository(rep: EventHintBundle) = addUnique(rep.toATag().toATagArray()) +@Suppress("DEPRECATION") fun TagArrayBuilder.patch(rep: EventHintBundle) = addUnique(rep.toMarkedETag(MarkedETag.MARKER.ROOT).toTagArray()) +@Suppress("DEPRECATION") fun TagArrayBuilder.issue(rep: EventHintBundle) = addUnique(rep.toMarkedETag(MarkedETag.MARKER.ROOT).toTagArray()) +@Suppress("DEPRECATION") fun TagArrayBuilder.notify(list: List) = pTags(list) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentCommentEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentCommentEvent.kt index f14fff342..8b0f8b15b 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentCommentEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip35Torrents/TorrentCommentEvent.kt @@ -111,6 +111,7 @@ class TorrentCommentEvent( fun torrentIds() = tags.firstNotNullOfOrNull(MarkedETag::parseRootId) ?: tags.firstNotNullOfOrNull(ETag::parseId) + @Suppress("DEPRECATION") companion object { const val KIND = 2004 const val ALT_DESCRIPTION = "Comment for a Torrent file" diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip44Encryption/crypto/ChaCha20Core.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip44Encryption/crypto/ChaCha20Core.kt index 66b7e677a..ef58a6541 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip44Encryption/crypto/ChaCha20Core.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip44Encryption/crypto/ChaCha20Core.kt @@ -32,10 +32,10 @@ package com.vitorpamplona.quartz.nip44Encryption.crypto */ object ChaCha20Core { // "expand 32-byte k" as little-endian integers - private const val SIGMA0 = 0x61707865.toInt() - private const val SIGMA1 = 0x3320646e.toInt() - private const val SIGMA2 = 0x79622d32.toInt() - private const val SIGMA3 = 0x6b206574.toInt() + private const val SIGMA0 = 0x61707865 + private const val SIGMA1 = 0x3320646e + private const val SIGMA2 = 0x79622d32 + private const val SIGMA3 = 0x6b206574 /** * ChaCha20 quarter round (RFC 8439 §2.1). diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/signer/NostrSignerRemote.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/signer/NostrSignerRemote.kt index 27d2f4a50..2163b42e8 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/signer/NostrSignerRemote.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip46RemoteSigner/signer/NostrSignerRemote.kt @@ -121,6 +121,7 @@ class NostrSignerRemote( ) if (result is SignerResult.RequestAddressed.Successful) { + @Suppress("UNCHECKED_CAST") (result.result.event as? T)?.let { return it } diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/labeledBookmarkList/LabeledBookmarkListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/labeledBookmarkList/LabeledBookmarkListEvent.kt index 9df73ae26..6d4e03c82 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/labeledBookmarkList/LabeledBookmarkListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/labeledBookmarkList/LabeledBookmarkListEvent.kt @@ -73,6 +73,7 @@ class LabeledBookmarkListEvent( fun title() = tags.firstNotNullOfOrNull(TitleTag::parse) + @Suppress("DEPRECATION") fun titleOrName() = title() ?: name() fun description() = tags.firstNotNullOfOrNull(DescriptionTag::parse) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/peopleList/PeopleListEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/peopleList/PeopleListEvent.kt index 717ad787f..42e696d9a 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/peopleList/PeopleListEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip51Lists/peopleList/PeopleListEvent.kt @@ -64,6 +64,7 @@ class PeopleListEvent( @Deprecated("NIP-51 has deprecated name. Use title instead", ReplaceWith("title()")) fun name() = tags.firstNotNullOfOrNull(NameTag::parse) + @Suppress("DEPRECATION") fun titleOrName() = title() ?: name() fun title() = tags.firstNotNullOfOrNull(TitleTag::parse) diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip56Reports/ReportEvent.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip56Reports/ReportEvent.kt index 19d222530..95f6b87c6 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip56Reports/ReportEvent.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip56Reports/ReportEvent.kt @@ -18,6 +18,8 @@ * 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. */ +@file:Suppress("DEPRECATION") + package com.vitorpamplona.quartz.nip56Reports import androidx.compose.runtime.Immutable diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/utils/EventFactory.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/utils/EventFactory.kt index cc54631a6..9601b25ac 100644 --- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/utils/EventFactory.kt +++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/utils/EventFactory.kt @@ -18,6 +18,8 @@ * 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. */ +@file:Suppress("DEPRECATION", "UNCHECKED_CAST") + package com.vitorpamplona.quartz.utils import com.vitorpamplona.quartz.experimental.attestations.attestation.AttestationEvent diff --git a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip96FileStorage/info/ServerInfoParser.jvmAndroid.kt b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip96FileStorage/info/ServerInfoParser.jvmAndroid.kt index 2cab60bb6..e66485fe9 100644 --- a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip96FileStorage/info/ServerInfoParser.jvmAndroid.kt +++ b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip96FileStorage/info/ServerInfoParser.jvmAndroid.kt @@ -21,7 +21,6 @@ package com.vitorpamplona.quartz.nip96FileStorage.info import java.net.URI -import java.net.URL actual fun makeAbsoluteIfRelativeUrl( baseUrl: String, @@ -32,7 +31,7 @@ actual fun makeAbsoluteIfRelativeUrl( if (apiUrl.isAbsolute) { potentiallyRelativeUrl } else { - URL(URL(baseUrl), potentiallyRelativeUrl).toString() + URI(baseUrl).resolve(potentiallyRelativeUrl).toString() } } catch (e: Exception) { potentiallyRelativeUrl