fix: handle non-url types in mastodon replies with hashtags

mauricerenck · Aug 30, 2024 · eaf6bad · eaf6bad
1 parent ee93c5d
commit eaf6bad
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/lib/Microformats.php b/lib/Microformats.php
@@ -20,7 +20,13 @@ public function returnArraySave($values)
     public function includesPageUrl(array|string $urls)
     {
         $urls = $this->returnArraySave($urls);
+        $url_validation_regex = "/^https?:\\/\\/(?:www\\.)?[-a-zA-Z0-9@:%._\\+~#=]{1,256}\\.[a-zA-Z0-9()]{1,6}\\b(?:[-a-zA-Z0-9()@:%_\\+.~#?&\\/=]*)$/";
+
         foreach ($urls as $url) {
+            if(preg_match($url_validation_regex, $url) !== 1) {
+                continue;
+            }
+
             $trimmedUrl = trim(Url::stripQuery($url));
             if ($trimmedUrl === $this->pageUrl) {
                 return true;

diff --git a/tests/lib/MicroformatsTest.php b/tests/lib/MicroformatsTest.php
@@ -556,6 +556,20 @@ public function testIncludesPageUrlWithParams()
         $this->assertTrue($result);
     }
 
+    /**
+     * @group microformats
+     * @testdox includesPageUrl - should handle mastodon tag
+     */
+    public function testIncludesPageUrlWithTags()
+    {
+        $urls = ['tag:uuid', 'https://indie-connector.tld?param=value'];
+
+        $microformats = new Microformats('https://indie-connector.tld');
+        $result = $microformats->includesPageUrl($urls);
+
+        $this->assertTrue($result);
+    }
+
     /**
      * @group microformats
      * @testdox includesBaseUrl - should find matching url