When receiving WebSocket chat comments that require user specific data, fetch new messages via REST call.

Signed-off-by: Jens Zalzala <jens@shakingearthdigital.com>

Author: anakin78z

app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt

@@ -315,6 +315,7 @@ data class ChatMessage(
         FEDERATED_USER_REMOVED,
         PHONE_ADDED,
         THREAD_CREATED,
+        THREAD_RENAMED,
         MESSAGE_PINNED,
         MESSAGE_UNPINNED
     }
@@ -323,6 +324,16 @@ data class ChatMessage(
         private const val TAG = "ChatMessage"
         private const val MILLIES: Long = 1000L
 
+        val SYSTEM_MESSAGE_TYPE_UNTRANSLATED: Set<SystemMessageType> = setOf(
+            SystemMessageType.REACTION,
+            SystemMessageType.REACTION_DELETED,
+            SystemMessageType.REACTION_REVOKED,
+            SystemMessageType.MESSAGE_DELETED,
+            SystemMessageType.MESSAGE_EDITED,
+            SystemMessageType.THREAD_CREATED,
+            SystemMessageType.THREAD_RENAMED,
+        )
+
         private const val REGEX_STRING_DEFAULT =
             """(\s|\n|^)(https?:\/\/)((?:[-A-Z0-9+_]+\.)+[-A-Z]+(?:\/[-A-Z0-9+&@#%?=~_|!:,.;()]*)*)(\s|\n|$)"""
     }

app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt

@@ -270,20 +270,27 @@ class OfflineFirstChatRepository @Inject constructor(
             delay(INSURANCE_REQUEST_DELAY)
             Log.d(TAG, "execute insurance request with latestKnownMessageIdFromSync: $latestKnownMessageIdFromSync")
 
-            var fieldMap = getFieldMap(
-                lookIntoFuture = true,
-                timeout = 0,
-                includeLastKnown = false,
-                lastKnown = latestKnownMessageIdFromSync.toInt(),
-                limit = 200
-            )
-            val networkParams = Bundle()
-            networkParams.putSerializable(BundleKeys.KEY_FIELD_MAP, fieldMap)
-
-            getAndPersistMessages(networkParams)
+            fetchNewMessages()
         }
     }
 
+    /**
+     * Fetches messages newer than latest known message
+     */
+    private suspend fun fetchNewMessages() {
+        var fieldMap = getFieldMap(
+            lookIntoFuture = true,
+            timeout = 0,
+            includeLastKnown = false,
+            lastKnown = latestKnownMessageIdFromSync.toInt(),
+            limit = 200
+        )
+        val networkParams = Bundle()
+        networkParams.putSerializable(BundleKeys.KEY_FIELD_MAP, fieldMap)
+
+        getAndPersistMessages(networkParams)
+    }
+
     override suspend fun loadMoreMessages(
         anchorMessageId: Long,
         direction: ChatMessageRepository.LoadMoreDirection,
@@ -594,6 +601,16 @@ class OfflineFirstChatRepository @Inject constructor(
         updateBlocks(newChatBlock)
     }
 
+    /**
+     * Returns true if all system messages do not require translation.
+     * Ignores other message types.
+     */
+    private fun isUntranslatedSystemMessage(messagesJson: List<ChatMessageJson>): Boolean =
+        messagesJson.all {
+            it.systemMessageType == ChatMessage.SystemMessageType.DUMMY ||
+                it.systemMessageType in ChatMessage.SYSTEM_MESSAGE_TYPE_UNTRANSLATED
+        }
+
     private suspend fun handleSystemMessagesThatAffectDatabase(messagesJson: List<ChatMessageJson>) {
         var hasPinnedMessageChange = false
         messagesJson.forEach { messageJson ->
@@ -1010,10 +1027,18 @@ class OfflineFirstChatRepository @Inject constructor(
         }
 
     override suspend fun onSignalingChatMessageReceived(chatMessages: List<ChatMessageJson>) {
+        // check if we need to get user specific data from the backend
+        if (!isUntranslatedSystemMessage(chatMessages) ||
+            chatMessages.any { it.messageParameters?.containsKey("file") == true }) {
+            Log.d(TAG, "onSignalingChatMessageReceived force data refresh")
+            fetchNewMessages()
+            return
+        }
+
         persistChatMessagesAndHandleSystemMessages(chatMessages, emitOnIncoming = true)
 
         // we assume that the signaling messages are on top of the latest chatblock and include them inside it.
-        // If for whatever reason the assume was not correct and there would be messages in between, the
+        // If for whatever reason the assumption was not correct and there would be messages in between, the
         // insurance request should fix this by adding the missing messages and updating the chatblocks.
         val latestChatBlock = chatBlocksDao.getLatestChatBlock(internalConversationId, threadId)
         latestChatBlock.first()?.apply {

app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt

@@ -73,6 +73,7 @@ import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.RECORDIN
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.RECORDING_STARTED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.RECORDING_STOPPED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.THREAD_CREATED
+import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.THREAD_RENAMED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.USER_ADDED
 import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.USER_REMOVED
 
@@ -147,6 +148,7 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter<ChatMessage.Syst
             "federated_user_removed" -> FEDERATED_USER_REMOVED
             "phone_added" -> PHONE_ADDED
             "thread_created" -> THREAD_CREATED
+            "thread_renamed" -> THREAD_RENAMED
             "message_pinned" -> MESSAGE_PINNED
             "message_unpinned" -> MESSAGE_UNPINNED
             else -> DUMMY