Extract room name from permalink

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -123,7 +123,8 @@ class ChatRoomPresenter @Inject constructor(
             view.onRoomUpdated(canPost, chatIsBroadcast)
             loadMessages(roomId, roomType)
             chatRoomMessage?.let { messageHelper.messageIdFromPermalink(it) }?.let { messageId ->
-                citeMessage(roomName, messageHelper.roomTypeFromPermalink(chatRoomMessage)!!, messageId, true)
+                val name = messageHelper.roomNameFromPermalink(chatRoomMessage)
+                citeMessage(name!!, messageHelper.roomTypeFromPermalink(chatRoomMessage)!!, messageId, true)
             }
         }
     }

app/src/main/java/chat/rocket/android/helper/MessageHelper.kt

@@ -30,8 +30,17 @@ class MessageHelper @Inject constructor(
 
     fun messageIdFromPermalink(permalink: String): String? {
         PERMALINK_REGEX.find(permalink.trim())?.let {
-            if (it.groupValues.size == 4) {
-                return it.groupValues[3]
+            if (it.groupValues.size == 5) {
+                return it.groupValues[MESSAGE_ID]
+            }
+        }
+        return null
+    }
+
+    fun roomNameFromPermalink(permalink: String): String? {
+        PERMALINK_REGEX.find(permalink.trim())?.let {
+            if (it.groupValues.size == 5) {
+                return it.groupValues[ROOM_NAME]
             }
         }
         return null
@@ -39,8 +48,8 @@ class MessageHelper @Inject constructor(
 
     fun roomTypeFromPermalink(permalink: String): String? {
         PERMALINK_REGEX.find(permalink.trim())?.let {
-            if (it.groupValues.size == 4) {
-                val type = it.groupValues[2]
+            if (it.groupValues.size == 5) {
+                val type = it.groupValues[ROOM_TYPE]
                 return when(type) {
                     "group" -> "p"
                     "channel" -> "c"
@@ -54,6 +63,9 @@ class MessageHelper @Inject constructor(
     }
 
     companion object {
-        val PERMALINK_REGEX = "(?:__|[*#])|\\[(.+?)\\]\\(.+?//.+?/(.+)/.+\\?.*=(.*)\\)".toRegex()
+        private const val ROOM_TYPE = 2
+        private const val ROOM_NAME = 3
+        private const val MESSAGE_ID = 4
+        val PERMALINK_REGEX = "(?:__|[*#])|\\[(.+?)\\]\\(.+?//.+?/(.+)/(.+)\\?.*=(.*)\\)".toRegex()
     }
 }
\ No newline at end of file