GH-126 Move fetching original messages to its own utility

mdziekon · Oct 26, 2020 · a730ada · a730ada
1 parent 74f7e55
commit a730ada
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 41 deletions.
diff --git a/messages.php b/messages.php
@@ -429,47 +429,9 @@
                 }
 
                 $messagesCopyIds = Messages\Utils\getMessagesCopyIds($MsgCache);
-                $copyOriginalMessages = [];
-
-                if (!empty($messagesCopyIds)) {
-                    $getMassMessagesQuery = (
-                        "SELECT " .
-                        "`m`.*, `u`.`username`, `u`.`authlevel` " .
-                        "FROM {{table}} as `m` " .
-                        "LEFT JOIN " .
-                        "`{{prefix}}users` AS `u` " .
-                        "ON `u`.`id` = `m`.`id_sender` " .
-                        "WHERE " .
-                        "`m`.`id` IN (" . implode(', ', $messagesCopyIds) . ") " .
-                        ";"
-                    );
-
-                    $getMassMessagesResult = doquery($getMassMessagesQuery, 'messages');
-
-                    while ($copyOriginalMessage = $getMassMessagesResult->fetch_assoc()) {
-                        $messageId = $copyOriginalMessage['id'];
-
-                        $copyOriginalMessages[$messageId] = [];
-                        $messageRef = &$copyOriginalMessages[$messageId];
-
-                        if (Messages\Utils\isSystemSentMessage($copyOriginalMessage)) {
-                            $messageRef = [
-                                'from' => $copyOriginalMessage['from'],
-                                'subject' => $_Lang['msg_const']['subjects']['019'],
-                                'text' => sprintf($_Lang['msg_const']['msgs']['err3'], $messageId),
-                            ];
-
-                            continue;
-                        }
-
-                        $messageRef = Messages\Utils\_buildTypedUserMessageDetails(
-                            $copyOriginalMessage,
-                            [
-                                'copyOriginalMessagesStorage' => [],
-                            ]
-                        );
-                    }
-                }
+                $copyOriginalMessages = Messages\Utils\fetchOriginalMessagesForRefSystem([
+                    'originalMessageIds' => $messagesCopyIds,
+                ]);
 
                 foreach ($MsgCache as $CurMess) {
                     $parseMSG = [

diff --git a/modules/messages/_includes.php b/modules/messages/_includes.php
@@ -16,6 +16,7 @@
     include($includePath . './utils/buildMessageDetails.utils.php');
     include($includePath . './utils/createReplyMessageSubject.utils.php');
     include($includePath . './utils/fetchFormDataForReply.utils.php');
+    include($includePath . './utils/fetchOriginalMessagesForRefSystem.utils.php');
     include($includePath . './utils/fetchRecipientDataByUserId.utils.php');
     include($includePath . './utils/fetchRecipientDataByUsername.utils.php');
     include($includePath . './utils/fetchUserMessages.utils.php');

diff --git a/modules/messages/utils/fetchOriginalMessagesForRefSystem.utils.php b/modules/messages/utils/fetchOriginalMessagesForRefSystem.utils.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace UniEngine\Engine\Modules\Messages\Utils;
+
+use UniEngine\Engine\Modules\Messages;
+
+function fetchOriginalMessagesForRefSystem($params) {
+    global $_Lang;
+
+    $originalMessageIds = $params['originalMessageIds'];
+
+    $messagesById = [];
+
+    if (empty($originalMessageIds)) {
+        return $messagesById;
+    }
+
+    $getMassMessagesQuery = (
+        "SELECT " .
+        "`m`.*, `u`.`username`, `u`.`authlevel` " .
+        "FROM {{table}} as `m` " .
+        "LEFT JOIN " .
+        "`{{prefix}}users` AS `u` " .
+        "ON `u`.`id` = `m`.`id_sender` " .
+        "WHERE " .
+        "`m`.`id` IN (" . implode(', ', $originalMessageIds) . ") " .
+        ";"
+    );
+
+    $getMassMessagesResult = doquery($getMassMessagesQuery, 'messages');
+
+    while ($copyOriginalMessage = $getMassMessagesResult->fetch_assoc()) {
+        $messageId = $copyOriginalMessage['id'];
+
+        if (Messages\Utils\isSystemSentMessage($copyOriginalMessage)) {
+            $messageObject = [
+                'from' => $copyOriginalMessage['from'],
+                'subject' => $_Lang['msg_const']['subjects']['019'],
+                'text' => sprintf($_Lang['msg_const']['msgs']['err3'], $messageId),
+            ];
+
+            $messagesById[$messageId] = $messageObject;
+
+            continue;
+        }
+
+        $messageObject = Messages\Utils\_buildTypedUserMessageDetails(
+            $copyOriginalMessage,
+            [
+                'copyOriginalMessagesStorage' => [],
+            ]
+        );
+
+        $messagesById[$messageId] = $messageObject;
+    }
+
+    return $messagesById;
+}
+
+?>