feat: handle new indieconnector types

mauricerenck · Jul 23, 2024 · d6696b5 · d6696b5
1 parent 553d0b2
commit d6696b5
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 14 deletions.
diff --git a/components/hooks.php b/components/hooks.php
@@ -18,11 +18,7 @@
         $kommentReceiver->storeData($newEntry, $targetPage);
     },
     'indieConnector.webmention.received' => function ($webmention, $targetPage) {
-        if (!option('mauricerenck.komments.enable-webmention-support')) {
-            return;
-        }
-
-        if (!option('mauricerenck.komments.debug')) {
+        if (!option('mauricerenck.komments.debug', false)) {
             $time = time();
             file_put_contents('webmentionhook.' . $time . '.json', json_encode($webmention));
         }

diff --git a/index.js b/index.js
diff --git a/utils/receiveKomment.php b/utils/receiveKomment.php
@@ -60,13 +60,39 @@ public function createKomment($webmention, $spamlevel = 0, $isVerified = false,
             'published' => $webmention['published'],
             'komment' => $this->setKomment($webmention['content']),
             'quote' => (isset($webmention['quote'])) ? $this->setKomment($webmention['quote']) : null,
-            'kommentType' => $webmention['type'],
+            'kommentType' => $this->convertWebmentionTypes($webmention['type']),
             'status' => $this->setStatus($webmention['type'], $publishComments),
             'spamlevel' => $spamlevel,
             'verified' => $isVerified
         ];
     }
 
+    public function convertWebmentionTypes($type) {
+
+        $oldTypes = ['LIKE', 'REPOST', 'BOOKMARK', 'REPLY', 'RSVP', 'MENTION', 'INVITE', 'KOMMENT'];
+
+        if(in_array($type, $oldTypes)) { return $type; }
+
+        switch($type) {
+            case 'like-of':
+                return 'LIKE';
+            case 'repost-of':
+                return 'REPOST';
+            case 'bookmark-of':
+                return 'BOOKMARK';
+            case 'in-reply-to':
+                return 'REPLY';
+            case 'rsvp':
+                return 'RSVP';
+            case 'mention-of':
+                return 'MENTION';
+            case 'invite':
+                return 'INVITE';
+            default:
+                return 'KOMMENT';
+        }
+    }
+
     public function getAuthorData(array $author) {
         return [
             'name' => $author['name'] ?? null,
@@ -87,16 +113,16 @@ public function getPageFromUrl(string $url)
                 $targetPage = page(site()->homePageId());
             } elseif (!$targetPage = page($path)) {
                 $targetPage = page(kirby()->router()->call($path));
-    
+
                 if ($targetPage->isErrorPage()) {
                     return null;
                 }
             }
-    
+
             if (is_null($targetPage)) {
                 return null;
             }
-    
+
             return $targetPage;
         }
 

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'mauricerenck/komments',
-        'pretty_version' => '2.0.3',
-        'version' => '2.0.3.0',
+        'pretty_version' => '2.0.5',
+        'version' => '2.0.5.0',
         'reference' => NULL,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -29,8 +29,8 @@
             'dev_requirement' => false,
         ),
         'mauricerenck/komments' => array(
-            'pretty_version' => '2.0.3',
-            'version' => '2.0.3.0',
+            'pretty_version' => '2.0.5',
+            'version' => '2.0.5.0',
             'reference' => NULL,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',