From 2147c215d29b7bcfcebf1e097132d2923bef5ccf Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 24 Dec 2018 21:29:16 -0700 Subject: [PATCH] Update AP Helpers --- app/Util/ActivityPub/Helpers.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index 2da8c09f8..72a92ded1 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -281,11 +281,11 @@ class Helpers { public static function profileFirstOrNew($url, $runJobs = false) { $res = self::fetchProfileFromUrl($url); - $domain = parse_url($res['url'], PHP_URL_HOST); + $domain = parse_url($res['id'], PHP_URL_HOST); $username = $res['preferredUsername']; $remoteUsername = "@{$username}@{$domain}"; - $profile = Profile::whereRemoteUrl($res['url'])->first(); + $profile = Profile::whereRemoteUrl($res['id'])->first(); if(!$profile) { $profile = new Profile; $profile->domain = $domain; @@ -295,7 +295,7 @@ class Helpers { $profile->sharedInbox = isset($res['endpoints']) && isset($res['endpoints']['sharedInbox']) ? $res['endpoints']['sharedInbox'] : null; $profile->inbox_url = $res['inbox']; $profile->outbox_url = $res['outbox']; - $profile->remote_url = $res['url']; + $profile->remote_url = $res['id']; $profile->public_key = $res['publicKey']['publicKeyPem']; $profile->key_id = $res['publicKey']['id']; $profile->save();