fix: allow different outputs for better backwards compatibility

Author: mauricerenck

lib/AvatarHandler.php

@@ -5,15 +5,16 @@
 class AvatarHandler
 {
 
-    public function __construct(private ?string $avatarReturnType = null, private ?string $avatarService = null)
+    public function __construct(private ?string $avatarReturnType = null, private ?string $avatarService = null, private ?bool $webmentionAvatars = null)
     {
         $this->avatarReturnType = $avatarReturnType ?? option('mauricerenck.komments.avatar.returnType', 'img');
         $this->avatarService = $avatarService ?? option('mauricerenck.komments.avatar.service', 'gravatar');
+        $this->webmentionAvatars = $avatarService ?? option('mauricerenck.komments.avatar.webmentionAvatars', true);
     }
 
-    public function getAvatar(string $authorGravatar, string $authorName): ?string
+    public function getAvatar(string $authorAvatarUrl, string $authorName): ?string
     {
-        $avatarString = $this->getAvatarByType($authorGravatar, $authorName);
+        $avatarString = $this->getAvatarByType($authorAvatarUrl, $authorName);
 
         if ($this->avatarService !== 'gravatar' && $this->avatarReturnType === 'svg') {
             return $avatarString;
@@ -24,17 +25,23 @@ public function getAvatar(string $authorGravatar, string $authorName): ?string
         }
 
         return <<<HTMLTAG
-            <img class="u-photo" src="$avatarString" alt="$authorName" />
+        <img class="u-photo" src="$avatarString" alt="$authorName" />
         HTMLTAG;
     }
 
-    public function getAvatarByType(string $authorGravatar, string $authorName): ?string
+    public function getAvatarByType(string $authorAvatarUrl, string $authorName): ?string
     {
         if ($this->avatarService === 'gravatar') {
-            return $authorGravatar;
+            return $authorAvatarUrl;
         }
 
-        if ($this->avatarReturnType) {
+        if ($this->avatarService !== 'gravatar' && $this->webmentionAvatars) {
+            if (strpos($authorAvatarUrl, 'gravatar.com') === false) {
+                return $authorAvatarUrl;
+            }
+        }
+
+        if ($this->avatarReturnType === 'svg') {
             return $this->author_initials_svg_data_uri($authorName)['svg'];
         }
 

tests/KommentsModerationTest.php

@@ -5,7 +5,7 @@
 
 final class KommentsModerationTest extends TestCaseMocked
 {
-    private $avatar = '<svg width="100" height="100" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg" class="komment-avatar-initials"> <style> .author-initials-bg { fill: var(--author-bg, #1391a4); } .author-initials-text { fill: var(--author-text, #fff); font-family: var(--author-font-family, system-ui, sans-serif); font-size: var(--author-font-size, 40px); font-weight: var(--author-font-weight, bold); dominant-baseline: middle; text-anchor: middle; text-transform: uppercase; } </style> <rect class="author-initials-bg" width="100" height="100"/> <text x="50" y="55" class="author-initials-text" dominant-baseline="middle" text-anchor="middle" >AN</text> </svg>';
+    private $avatar = '<img class="u-photo" src="https://api.dicebear.com/9.x/pixel-art/png?seed=AuthorName" alt="Author Name" />';
 
     public function setUp(): void
     {

vendor/composer/installed.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'mauricerenck/komments',
-        'pretty_version' => '3.1.1',
-        'version' => '3.1.1.0',
+        'pretty_version' => '3.2.1',
+        'version' => '3.2.1.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -29,8 +29,8 @@
             'dev_requirement' => false,
         ),
         'mauricerenck/komments' => array(
-            'pretty_version' => '3.1.1',
-            'version' => '3.1.1.0',
+            'pretty_version' => '3.2.1',
+            'version' => '3.2.1.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',