cache webfinger lookups

1 files changed, 3 insertions, 23 deletions

diff --git a/Digitigrade/Model/Actor.php b/Digitigrade/Model/Actor.php
index 946265e..3c416ee 100644
--- a/Digitigrade/Model/Actor.php
+++ b/Digitigrade/Model/Actor.php
@@ -4,8 +4,6 @@ namespace Digitigrade\Model;
 use Digitigrade\RemoteFetchable;
 
 class Actor extends FetchableModel implements \JsonSerializable {
-    public const REL_URI = "https://pawpub.entities.org.uk/rel/actor.html";
-
     public ?int $id;
     public string $uri;
     public bool $isLocal = false;
@@ -42,27 +40,9 @@ class Actor extends FetchableModel implements \JsonSerializable {
             }
             $acct = "acct:$acct";
         }
+
         // fetch it
-        $domain = explode('@', $acct, 2)[1];
-        $data = @file_get_contents("https://$domain/.well-known/webfinger?resource=$acct",
-            context: stream_context_create([
-                'http' => ['header' => 'Accept: application/jrd+json, application/json']
-            ])
-        );
-        if ($data === false)
-            return null;
-        $data = json_decode($data);
-        if ($data === null)
-            return null;
-        // find the right link
-        if (!isset($data->links))
-            return null;
-        $matching = array_filter($data->links, function (\stdClass $linkObj) {
-            return $linkObj->rel == self::REL_URI;
-        });
-        if (count($matching) == 0)
-            return null;
-        return self::findByUri($matching[0]->href, $autoSave, $forceRefetch);
+        return ActorWebfinger::findByAcct($acct, $autoSave, $forceRefetch)->actor;
     }
 
     public function jsonSerialize(): array {
@@ -87,4 +67,4 @@ class Actor extends FetchableModel implements \JsonSerializable {
     public function hydrate() {
         $this->endpoints = ActorEndpoints::findWhere('actor_id = ?', [$this->id]);
     }
-}
\ No newline at end of file
+}