Merge branch 'master' of github.com:freescout-helpdesk/freescout into…

… dist
freescout-help-desk · Jan 6, 2024 · 885001e · 885001e
2 parents 7d035f5 + b2dae09
commit 885001e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/app/Console/Commands/FetchEmails.php b/app/Console/Commands/FetchEmails.php
@@ -605,7 +605,7 @@ public function processMessage($message, $message_id, $mailbox, $mailboxes, $ext
                 $body = $message->getTextBody() ?? '';
                 $body = htmlspecialchars($body);
             }
-            $body = $this->separateReply($body, $is_html, $is_reply, !$message_from_customer, ($message_from_customer ? $prev_thread->getMessageId($mailbox) : ''));
+            $body = $this->separateReply($body, $is_html, $is_reply, !$message_from_customer, (($message_from_customer && $prev_thread) ? $prev_thread->getMessageId($mailbox) : ''));
 
             // We have to fetch absolutely all emails, even with empty body.
             // if (!$body) {

diff --git a/app/Misc/Mail.php b/app/Misc/Mail.php
@@ -733,6 +733,11 @@ public static function fetchMessage($mailbox, $message_id, $message_date = null)
         foreach ($imap_folders as $folder_name) {
             try {
                 $folder = self::getImapFolder($client, $folder_name);
+
+                if (!$folder) {
+                    \Log::error('('.$mailbox->name.') Show Original - folder not found: '.$folder_name);
+                    continue;
+                }
                 // Message-ID: <[email protected]>
                 $query = $folder->query()
                     ->text('<'.$message_id.'>')
@@ -763,7 +768,7 @@ public static function fetchMessage($mailbox, $message_id, $message_date = null)
                     $query = $folder->query()->text('<'.$message_id.'>')->leaveUnread()->limit(1)->setCharset(null);
                     if ($message_date) {
                        $query->since($message_date->subDays(7));
-                       $query->before($message_date->addDays(7));
+                       $query->before($message_date->addDays(14));
                     }
                     $messages = $query->get();
                     $no_charset = true;

diff --git a/app/Thread.php b/app/Thread.php
@@ -1393,6 +1393,12 @@ public function fetchBody()
     {
         $message = \MailHelper::fetchMessage($this->conversation->mailbox, $this->message_id, $this->getMailDate());
 
+        // Try without limiting by date.
+        // https://github.com/freescout-helpdesk/freescout/issues/3658
+        if (!$message) {
+            $message = \MailHelper::fetchMessage($this->conversation->mailbox, $this->message_id);
+        }
+
         if (!$message) {
             return '';
         }