fix namedesc parsing to support basically any character in the name.

nbd-wtf · Dec 8, 2022 · 52c7212 · 52c7212
1 parent ff6a08c
commit 52c7212
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/app/src/main/scala/HubActivity.scala b/app/src/main/scala/HubActivity.scala
@@ -101,11 +101,22 @@ object HubActivity {
   def itemsLength: Int =
     txInfos.size + paymentInfos.size + lnUrlPayLinks.size + relayedPreimageInfos.size
 
-  def getNameFromNameDesc(text: String): Option[String] =
-    """^\w+:  """.r.findFirstIn(text).map(prefix => prefix.split(":  ")(0))
+  def getNameFromNameDesc(text: String): Option[String] = {
+    val spl = text.split(":  ")
+    spl.size match {
+      case 1                       => None
+      case _ if spl.head.size < 30 => Some(spl.head)
+      case _                       => None
+    }
+  }
 
-  def expellNameFromNameDesc(text: String): String =
-    """^\w+:  """.r.split(text).last
+  def expellNameFromNameDesc(text: String): String = {
+    val spl = text.split(":  ")
+    spl.size match {
+      case 1 => text
+      case _ => spl.drop(1).mkString(": ")
+    }
+  }
 }
 
 class HubActivity