From 67ae0e159f1285d043e926bc0d4a892b3a04f3ed Mon Sep 17 00:00:00 2001
From: unarist <m.unarist@gmail.com>
Date: Sun, 24 Nov 2019 12:17:53 +0000
Subject: [PATCH] =?UTF-8?q?ActivityPubResolver=E3=81=AFNote=E3=81=A0?=
 =?UTF-8?q?=E3=81=91=E5=87=A6=E7=90=86=E3=81=99=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/MetadataResolver/ActivityPubResolver.php  |  4 ++++
 app/MetadataResolver/MetadataResolver.php     | 19 +++++++++++--------
 .../UnsupportedContentException.php           | 12 ++++++++++++
 3 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 app/MetadataResolver/UnsupportedContentException.php

diff --git a/app/MetadataResolver/ActivityPubResolver.php b/app/MetadataResolver/ActivityPubResolver.php
index 7cf3e00..c0580c8 100644
--- a/app/MetadataResolver/ActivityPubResolver.php
+++ b/app/MetadataResolver/ActivityPubResolver.php
@@ -37,6 +37,10 @@ class ActivityPubResolver implements Resolver, Parser
         $activityOrObject = json_decode($json, true);
         $object = $activityOrObject['object'] ?? $activityOrObject;
 
+        if ($object['type'] !== 'Note') {
+            throw new UnsupportedContentException('Unsupported object type: ' . $object['type']);
+        }
+
         $metadata = new Metadata();
 
         $metadata->title = isset($object['attributedTo']) ? $this->getTitleFromActor($object['attributedTo']) : '';
diff --git a/app/MetadataResolver/MetadataResolver.php b/app/MetadataResolver/MetadataResolver.php
index bb2ec08..41869b8 100644
--- a/app/MetadataResolver/MetadataResolver.php
+++ b/app/MetadataResolver/MetadataResolver.php
@@ -48,16 +48,19 @@ class MetadataResolver implements Resolver
     {
         foreach ($this->rules as $pattern => $class) {
             if (preg_match($pattern, $url) === 1) {
-                /** @var Resolver $resolver */
-                $resolver = app($class);
+                try {
+                    /** @var Resolver $resolver */
+                    $resolver = app($class);
 
-                return $resolver->resolve($url);
+                    return $resolver->resolve($url);
+                } catch (UnsupportedContentException $e) {
+                }
             }
         }
 
-        $result = $this->resolveWithAcceptHeader($url);
-        if ($result !== null) {
-            return $result;
+        try {
+            return $this->resolveWithAcceptHeader($url);
+        } catch (UnsupportedContentException $e) {
         }
 
         if (isset($this->defaultResolver)) {
@@ -70,7 +73,7 @@ class MetadataResolver implements Resolver
         throw new \UnexpectedValueException('URL not matched.');
     }
 
-    public function resolveWithAcceptHeader(string $url): ?Metadata
+    public function resolveWithAcceptHeader(string $url): Metadata
     {
         try {
             // Rails等はAcceptに */* が入っていると、ブラウザの適当なAcceptヘッダだと判断して全部無視してしまう。
@@ -115,6 +118,6 @@ class MetadataResolver implements Resolver
             // 5xx は変なAcceptが原因かもしれない（？）ので無視してフォールバック
         }
 
-        return null;
+        throw new UnsupportedContentException();
     }
 }
diff --git a/app/MetadataResolver/UnsupportedContentException.php b/app/MetadataResolver/UnsupportedContentException.php
new file mode 100644
index 0000000..6ca6ed3
--- /dev/null
+++ b/app/MetadataResolver/UnsupportedContentException.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace App\MetadataResolver;
+
+use Exception;
+
+/**
+ * このResolverやParserが対応していないサイトであったことを表わします。
+ */
+class UnsupportedContentException extends Exception
+{
+}