improvement: also use url of translation

Author: mauricerenck

lib/BlueskySender.php

@@ -22,7 +22,6 @@ public function __construct(
 
     public function sendPost($page)
     {
-
         if (!$this->enabled) {
             return false;
         }
@@ -50,8 +49,8 @@ public function sendPost($page)
         }
 
         try {
-            $pageUrl = $page->url();
-            $trimTextPosition = $this->calculatePostTextLength($page->url());
+            $pageUrl = $this->getPostUrl($page);
+            $trimTextPosition = $this->calculatePostTextLength($pageUrl);
             $language = 'en';
 
             $message = $this->getTextFieldContent($page, $trimTextPosition);
@@ -61,6 +60,10 @@ public function sendPost($page)
                 $language = $defaultLanguage->code();
             }
 
+            if ($this->forceLanguage !== false) {
+                $language = $this->forceLanguage;
+            }
+
             $bluesky = new BlueskyApi();
             $bluesky->auth($this->handle, $this->password);
 

lib/ExternalPostSender.php

@@ -10,6 +10,7 @@ public function __construct(
         public ?array $textfields = null,
         public ?string $imagefield = null,
         public ?string $forceLanguage = null,
+        public ?bool $usePermalinkUrl = null,
         private ?int $maxPostLength = null,
         public ?UrlChecks $urlChecks = null,
         public ?PageChecks $pageChecks = null
@@ -18,7 +19,8 @@ public function __construct(
 
         $this->textfields = $textfields ?? option('mauricerenck.indieConnector.post.textfields', ['description']);
         $this->imagefield = $imagefield ?? option('mauricerenck.indieConnector.post.imagefield', false);
-        $this->forceLanguage = $imagefield ?? option('mauricerenck.indieConnector.post.forceLanguage', false);
+        $this->forceLanguage = $forceLanguage ?? option('mauricerenck.indieConnector.post.forceLanguage', false);
+        $this->usePermalinkUrl = $usePermalinkUrl ?? option('mauricerenck.indieConnector.post.usePermalinkUrl', false);
         $this->maxPostLength = $maxPostLength ?? 300;
 
         $this->urlChecks = $urlChecks ?? new UrlChecks();
@@ -60,6 +62,17 @@ public function getTextFieldContent($page, $trimTextPosition)
         return Str::short($content['title'], $trimTextPosition);
     }
 
+    public function getPostUrl($page)
+    {
+        $url = $page->url($this->forceLanguage);
+
+        if ($this->usePermalinkUrl) {
+            $url = $page->permalink();
+        }
+
+        return $url;
+    }
+
     public function calculatePostTextLength(string $url)
     {
         $urlLength = Str::length($url);

lib/MastodonSender.php

@@ -67,8 +67,8 @@ public function sendPost($page)
         }
 
         try {
-            $pageUrl = $page->url();
-            $trimTextPosition = $this->calculatePostTextLength($page->url());
+            $pageUrl = $this->getPostUrl($page);
+            $trimTextPosition = $this->calculatePostTextLength($pageUrl);
 
             $message = $this->getTextFieldContent($page, $trimTextPosition);
             $message .= "\n" . $pageUrl;