From ed739a4caeece7ac28a888d832e4cbf120ce065e Mon Sep 17 00:00:00 2001
From: isak <45620425+itsisak@users.noreply.github.com>
Date: Tue, 13 May 2025 11:32:25 +0200
Subject: [PATCH] Improve ApplicationPullRequestUpdateJob message (#5549)

---
 app/Jobs/ApplicationPullRequestUpdateJob.php | 29 ++++++++++----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/Jobs/ApplicationPullRequestUpdateJob.php b/app/Jobs/ApplicationPullRequestUpdateJob.php
index ef8e6efb6..57c0d66b2 100755
--- a/app/Jobs/ApplicationPullRequestUpdateJob.php
+++ b/app/Jobs/ApplicationPullRequestUpdateJob.php
@@ -37,22 +37,23 @@ class ApplicationPullRequestUpdateJob implements ShouldBeEncrypted, ShouldQueue
             }
             if ($this->status === ProcessStatus::CLOSED) {
                 $this->delete_comment();
-
                 return;
-            } elseif ($this->status === ProcessStatus::IN_PROGRESS) {
-                $this->body = "The preview deployment is in progress. 🟡\n\n";
-            } elseif ($this->status === ProcessStatus::FINISHED) {
-                $this->body = "The preview deployment is ready. 🟢\n\n";
-                if ($this->preview->fqdn) {
-                    $this->body .= "[Open Preview]({$this->preview->fqdn}) | ";
-                }
-            } elseif ($this->status === ProcessStatus::ERROR) {
-                $this->body = "The preview deployment failed. 🔴\n\n";
-            }
-            $this->build_logs_url = base_url()."/project/{$this->application->environment->project->uuid}/{$this->application->environment->name}/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}";
+            } 
+
+            $this->body = "**Preview of {$this->application->name}**\n\n";
+            $this->body .= match ($this->status) {
+                ProcessStatus::IN_PROGRESS => "🟡 Deployment in progress",
+                ProcessStatus::FINISHED => "🟢 Deployment is ready".($this->preview->fqdn ? " | [Open Preview]({$this->preview->fqdn})" : ''),
+                ProcessStatus::ERROR => "🔴 Deployment failed",
+                default => '',
+            };
+
+            $this->build_logs_url = base_url()."/project/{$this->application->environment->project->uuid}/environment/{$this->application->environment->uuid}/application/{$this->application->uuid}/deployment/{$this->deployment_uuid}";
+            $this->body .= " | [Open Build Logs]($this->build_logs_url)\n\n";
+
+            $serverTimezone = $this->application->destination->server->settings->server_timezone ?? 'CET';
+            $this->body .= "Last updated at: ".now($serverTimezone)->toDateTimeString()." ($serverTimezone)";
 
-            $this->body .= '[Open Build Logs]('.$this->build_logs_url.")\n\n\n";
-            $this->body .= 'Last updated at: '.now()->toDateTimeString().' CET';
             if ($this->preview->pull_request_issue_comment_id) {
                 $this->update_comment();
             } else {