🚑 use correct method for mastodon posting (#2353)

Traewelling · Feb 11, 2024 · 539251c · 539251c
1 parent 59dae4d
commit 539251c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/app/Http/Controllers/Backend/Helper/StatusHelper.php b/app/Http/Controllers/Backend/Helper/StatusHelper.php
@@ -15,8 +15,8 @@ public function __construct(Status $status, bool $mastodon = false) {
         $this->mastodon = $mastodon;
     }
 
-    public static function getSocialText(Status $status): string {
-        $self = new self($status);
+    public static function getSocialText(Status $status, bool $mastodon = false): string {
+        $self = new self($status, $mastodon);
         return $self->generateSocialText();
     }
 

diff --git a/app/Http/Controllers/Backend/Social/MastodonController.php b/app/Http/Controllers/Backend/Social/MastodonController.php
@@ -151,8 +151,7 @@ public static function postStatus(Status $status, bool $shouldPostAsChain = fals
         }
 
         try {
-            $statusText     = (new StatusHelper($status, true))->getMastodonBody();
-            $statusText     .= ' ' . url("/status/{$status->id}");
+            $statusText     = StatusHelper::getSocialText($status, true);
             $mastodonDomain = MastodonServer::find($status->user->socialProfile->mastodon_server)->domain;
             Mastodon::domain($mastodonDomain)->token($status->user->socialProfile->mastodon_token);
 

diff --git a/app/Http/Controllers/Backend/Support/MentionHelper.php b/app/Http/Controllers/Backend/Support/MentionHelper.php
@@ -102,6 +102,10 @@ public static function getBodyWithMentionLinks(Status $status): string {
 
     public static function getMastodonStatus(Status $status): string {
         $body     = $status->body;
+        if (empty($body)) {
+            return '';
+        }
+
         $replaced = [];
         $mentions = $status->mentions;
         foreach ($mentions as $mention) {