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

Moving aTag check to the ATag class

Browse Source
This commit is contained in:
Vitor Pamplona
2023-03-07 13:53:03 -05:00
parent 1919dc5c81
commit 9720fdfce9
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
View File

@@ -77,7 +77,7 @@ object LocalCache {
} }
fun checkGetOrCreateNote(key: String): Note? { fun checkGetOrCreateNote(key: String): Note? {
if (key.startsWith("naddr1") || key.contains(":")) { if (ATag.isATag(key)) {
return checkGetOrCreateAddressableNote(key) return checkGetOrCreateAddressableNote(key)
} }
return try { return try {

4
app/src/main/java/com/vitorpamplona/amethyst/service/model/ATag.kt
View File

@@ -34,6 +34,10 @@ data class ATag(val kind: Int, val pubKeyHex: String, val dTag: String, val rela
} }
companion object { companion object {
fun isATag(key: String): Boolean {
return key.startsWith("naddr1") || key.contains(":")
}
fun parse(address: String, relay: String?): ATag? { fun parse(address: String, relay: String?): ATag? {
return if (address.startsWith("naddr") || address.startsWith("nostr:naddr")) return if (address.startsWith("naddr") || address.startsWith("nostr:naddr"))
parseNAddr(address) parseNAddr(address)