"Connected before" should only appear if there have been actual messa…

…ges.
Freegle · Feb 8, 2022 · 209c003 · 209c003
1 parent 476061f
commit 209c003
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/include/chat/ChatRoom.php b/include/chat/ChatRoom.php
@@ -458,9 +458,18 @@ public function createConversation($user1, $user2, $checkonly = FALSE)
 
         if (count($chats) > 0) {
             # We have an existing chat.  That'll do nicely.
-            $id = $chats[0]['id'];
+            if ($checkonly) {
+                # Check if we have any messages.
+                $msgs = $this->dbhr->preQuery("SELECT COUNT(*) AS count FROM chat_messages WHERE chatid = ?;", [
+                    $chats[0]['id']
+                ]);
 
-            $this->ensureAppearInList($id);
+                $id = $msgs[0]['count'] ? $chats[0]['id'] : NULL;
+            } else {
+                # Return and bump.
+                $id = $chats[0]['id'];
+                $this->ensureAppearInList($id);
+            }
         } else if (!$checkonly) {
             # We don't have one.
             #