Merge tag v2.7.32 into develop

Author: roadiz-ci

src/MediaFinders/AbstractApplePodcastEmbedFinder.php

@@ -107,6 +107,16 @@ public function getSource(array &$options = []): string
         return $this->embedId;
     }
 
+    #[\Override]
+    public function getPublicUri(): ?string
+    {
+        if (1 === preg_match(static::$idPattern, $this->embedId, $matches)) {
+            return 'https://podcasts.apple.com/'.$matches['path'];
+        }
+
+        return null;
+    }
+
     #[\Override]
     public function getShortType(): string
     {

src/MediaFinders/AbstractDailymotionEmbedFinder.php

@@ -152,4 +152,16 @@ public function getSource(array &$options = []): string
 
         return 'https://geo.dailymotion.com/player.html?'.http_build_query($queryString);
     }
+
+    #[\Override]
+    public function getPublicUri(): ?string
+    {
+        if (1 === preg_match(static::$idPattern, $this->embedId, $matches)) {
+            $embedId = $matches['id'];
+        } else {
+            $embedId = $this->embedId;
+        }
+
+        return 'https://www.dailymotion.com/video/'.$embedId;
+    }
 }

src/MediaFinders/AbstractDeezerEmbedFinder.php

@@ -164,6 +164,19 @@ public function getSource(array &$options = []): string
         return $baseUri.'?'.http_build_query($queryString);
     }
 
+    #[\Override]
+    public function getPublicUri(): ?string
+    {
+        if (preg_match(static::$realIdPattern, $this->embedId, $matches)) {
+            return 'https://www.deezer.com/'.$this->embedId;
+        }
+        if (preg_match(static::$idPattern, $this->embedId, $matches)) {
+            return 'https://www.deezer.com/'.$matches['type'].'/'.$matches['id'];
+        }
+
+        return null;
+    }
+
     #[\Override]
     protected function areDuplicatesAllowed(): bool
     {

src/MediaFinders/AbstractEmbedFinder.php

@@ -115,6 +115,15 @@ public function getSource(array &$options = []): string
         return '';
     }
 
+    /**
+     * Get the original public media URL (permalink), not the iframe/embed source.
+     */
+    #[\Override]
+    public function getPublicUri(): ?string
+    {
+        return null;
+    }
+
     /**
      * Crawl an embed API to get a Json feed.
      */

src/MediaFinders/AbstractMixcloudEmbedFinder.php

@@ -130,6 +130,12 @@ public function getSource(array &$options = []): string
         return 'https://www.mixcloud.com/widget/iframe/?'.http_build_query($queryString);
     }
 
+    #[\Override]
+    public function getPublicUri(): ?string
+    {
+        return $this->embedId;
+    }
+
     #[\Override]
     protected function areDuplicatesAllowed(): bool
     {

src/MediaFinders/AbstractPodEducEmbedFinder.php

@@ -155,4 +155,10 @@ public function getSource(array &$options = []): string
 
         return $this->embedId.'?'.http_build_query($queryString);
     }
+
+    #[\Override]
+    public function getPublicUri(): ?string
+    {
+        return $this->embedId;
+    }
 }

src/MediaFinders/AbstractSoundcloudEmbedFinder.php

@@ -149,6 +149,14 @@ public function getSource(array &$options = []): string
         return 'https://w.soundcloud.com/player/?'.http_build_query($queryString);
     }
 
+    #[\Override]
+    public function getPublicUri(): ?string
+    {
+        // getFeed() mutates $embedId to an api.soundcloud.com URL,
+        // so prefer the original public URL captured in $embedUrl.
+        return $this->embedUrl ?? $this->embedId;
+    }
+
     #[\Override]
     protected function areDuplicatesAllowed(): bool
     {

src/MediaFinders/AbstractSpotifyEmbedFinder.php

@@ -139,6 +139,19 @@ public function getSource(array &$options = []): string
         return $this->embedId;
     }
 
+    #[\Override]
+    public function getPublicUri(): ?string
+    {
+        if (preg_match(static::$realIdPattern, $this->embedId, $matches)) {
+            return 'https://open.spotify.com/'.$this->embedId;
+        }
+        if (preg_match(static::$idPattern, $this->embedId, $matches)) {
+            return 'https://open.spotify.com/'.$matches['type'].'/'.$matches['id'];
+        }
+
+        return null;
+    }
+
     #[\Override]
     protected function areDuplicatesAllowed(): bool
     {

src/MediaFinders/AbstractTedEmbedFinder.php

@@ -98,4 +98,10 @@ public function getSource(array &$options = []): string
 
         return $this->embedId;
     }
+
+    #[\Override]
+    public function getPublicUri(): ?string
+    {
+        return $this->embedId;
+    }
 }

src/MediaFinders/AbstractVimeoEmbedFinder.php

@@ -177,4 +177,10 @@ public function getSource(array &$options = []): string
 
         return 'https://player.vimeo.com/video/'.$this->embedId.'?'.http_build_query($queryString);
     }
+
+    #[\Override]
+    public function getPublicUri(): ?string
+    {
+        return 'https://vimeo.com/'.$this->embedId;
+    }
 }