nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Remove 1 indentation level from uriToRoute()

Browse Source
This commit is contained in:
Chemaclass
2023-03-03 23:26:35 +01:00
parent b35a59372c
commit fd58da2a93
1 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/vitorpamplona/amethyst/service/Nip19.kt
+36 -37
View File
@@ -14,47 +14,46 @@ class Nip19 {
enum class Type { enum class Type {
USER, NOTE, RELAY, ADDRESS USER, NOTE, RELAY, ADDRESS
} }
data class Return(val type: Type, val hex: String) data class Return(val type: Type, val hex: String)
fun uriToRoute(uri: String?): Return? { fun uriToRoute(uri: String?): Return? {
try { try {
val key = uri?.removePrefix("nostr:") val key = uri?.removePrefix("nostr:") ?: return null
if (key != null) { val bytes = key.bechToBytes()
val bytes = key.bechToBytes() if (key.startsWith("npub")) {
if (key.startsWith("npub")) { return Return(Type.USER, bytes.toHexKey())
return Return(Type.USER, bytes.toHexKey()) }
} if (key.startsWith("note")) {
if (key.startsWith("note")) { return Return(Type.NOTE, bytes.toHexKey())
return Return(Type.NOTE, bytes.toHexKey()) }
} if (key.startsWith("nprofile")) {
if (key.startsWith("nprofile")) { val tlv = parseTLV(bytes)
val tlv = parseTLV(bytes) val hex = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toHexKey()
val hex = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toHexKey() if (hex != null)
if (hex != null) return Return(Type.USER, hex)
return Return(Type.USER, hex) }
} if (key.startsWith("nevent")) {
if (key.startsWith("nevent")) { val tlv = parseTLV(bytes)
val tlv = parseTLV(bytes) val hex = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toHexKey()
val hex = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toHexKey() if (hex != null)
if (hex != null) return Return(Type.USER, hex)
return Return(Type.USER, hex) }
} if (key.startsWith("nrelay")) {
if (key.startsWith("nrelay")) { val tlv = parseTLV(bytes)
val tlv = parseTLV(bytes) val relayUrl = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toString(Charsets.UTF_8)
val relayUrl = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toString(Charsets.UTF_8) if (relayUrl != null)
if (relayUrl != null) return Return(Type.RELAY, relayUrl)
return Return(Type.RELAY, relayUrl) }
} if (key.startsWith("naddr")) {
if (key.startsWith("naddr")) { val tlv = parseTLV(bytes)
val tlv = parseTLV(bytes) val d = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toString(Charsets.UTF_8)
val d = tlv.get(NIP19TLVTypes.SPECIAL.id)?.get(0)?.toString(Charsets.UTF_8) val relay = tlv.get(NIP19TLVTypes.RELAY.id)?.get(0)?.toString(Charsets.UTF_8)
val relay = tlv.get(NIP19TLVTypes.RELAY.id)?.get(0)?.toString(Charsets.UTF_8) val author = tlv.get(NIP19TLVTypes.AUTHOR.id)?.get(0)?.toHexKey()
val author = tlv.get(NIP19TLVTypes.AUTHOR.id)?.get(0)?.toHexKey() val kind = tlv.get(NIP19TLVTypes.KIND.id)?.get(0)?.let { toInt32(it) }
val kind = tlv.get(NIP19TLVTypes.KIND.id)?.get(0)?.let { toInt32(it) } if (d != null)
if (d != null) return Return(Type.ADDRESS, "$kind:$author:$d")
return Return(Type.ADDRESS, "$kind:$author:$d")
}
} }
} catch (e: Throwable) { } catch (e: Throwable) {
println("Issue trying to Decode NIP19 ${uri}: ${e.message}") println("Issue trying to Decode NIP19 ${uri}: ${e.message}")
@@ -84,7 +83,7 @@ fun parseTLV(data: ByteArray): Map<Byte, List<ByteArray>> {
val t = rest[0] val t = rest[0]
val l = rest[1] val l = rest[1]
val v = rest.sliceArray(IntRange(2, (2 + l) - 1)) val v = rest.sliceArray(IntRange(2, (2 + l) - 1))
rest = rest.sliceArray(IntRange(2 + l, rest.size-1)) rest = rest.sliceArray(IntRange(2 + l, rest.size - 1))
if (v.size < l) continue if (v.size < l) continue
if (!result.containsKey(t)) { if (!result.containsKey(t)) {