Merge pull request #33 from takke/add_aturi

Add `ATUri`
uakihir0 · Mar 4, 2024 · ec09338 · ec09338
2 parents dfecfa1 + 74cd3df
commit ec09338
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 16 deletions.
diff --git a/core/src/commonMain/kotlin/work/socialhub/kbsky/util/ATUri.kt b/core/src/commonMain/kotlin/work/socialhub/kbsky/util/ATUri.kt
@@ -0,0 +1,7 @@
+package work.socialhub.kbsky.util
+
+/**
+ * ATProtocol URI
+ * at://{did}/{recordType}/{key}
+ */
+data class ATUri(val did: String, val recordType: String, val rkey: String)
diff --git a/core/src/commonMain/kotlin/work/socialhub/kbsky/util/ATUriParser.kt b/core/src/commonMain/kotlin/work/socialhub/kbsky/util/ATUriParser.kt
@@ -5,40 +5,44 @@ package work.socialhub.kbsky.util
  * at://{did}/{recordType}/{key}
  */
 object ATUriParser {
+
     /**
-     * Parse the URI of the record to get the DID.
+     * Parse the URI of the record.
      */
-    fun getDid(uri: String): String {
-        return uri
+    fun parse(uri: String): ATUri {
+        val array = uri
             .split("://".toRegex())
             .dropLastWhile { it.isEmpty() }
             .toTypedArray()[1]
             .split("/".toRegex())
             .dropLastWhile { it.isEmpty() }
-            .toTypedArray()[0]
+            .toTypedArray()
+
+        return ATUri(
+            array.getOrNull(0) ?: "",
+            array.getOrNull(1) ?: "",
+            array.getOrNull(2) ?: ""
+        )
+    }
+
+    /**
+     * Parse the URI of the record to get the DID.
+     */
+    fun getDid(uri: String): String {
+        return parse(uri).did
     }
 
     /**
      * Parse the URI of the record to get the RecordType.
      */
     fun getRecordType(uri: String): String {
-        return uri.split("://".toRegex())
-            .dropLastWhile { it.isEmpty() }
-            .toTypedArray()[1]
-            .split("/".toRegex())
-            .dropLastWhile { it.isEmpty() }
-            .toTypedArray()[1]
+        return parse(uri).recordType
     }
 
     /**
      * Parse the URI of the record to get the rkey.
      */
     fun getRKey(uri: String): String {
-        return uri.split("://".toRegex())
-            .dropLastWhile { it.isEmpty() }
-            .toTypedArray()[1]
-            .split("/".toRegex())
-            .dropLastWhile { it.isEmpty() }
-            .toTypedArray()[2]
+        return parse(uri).rkey
     }
 }