From 2d540919cb6d884c53f734ffcab1dcd4984fd7d8 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 7 Jan 2021 20:52:50 -0700
Subject: [PATCH] Update AP Helpers

---
 app/Util/ActivityPub/Helpers.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php
index 205ba7bf5..e50b5d81b 100644
--- a/app/Util/ActivityPub/Helpers.php
+++ b/app/Util/ActivityPub/Helpers.php
@@ -247,10 +247,13 @@ class Helpers {
 				->whereUri($url)
 				->orWhere('object_url', $url)
 				->first();
+
 			if($cached) {
 				return $cached;
 			}
+
 			$res = self::fetchFromUrl($url);
+			
 			if(!$res || empty($res)) {
 				return;
 			}
@@ -308,13 +311,15 @@ class Helpers {
 				} 
 			}
 
-			if(!self::validateUrl($activity['id']) ||
+			$id = isset($res['id']) ? $res['id'] : $url;
+
+			if(!self::validateUrl($id) ||
 			   !self::validateUrl($activity['object']['attributedTo'])
 			) {
 				return;
 			}
 
-			$idDomain = parse_url($activity['id'], PHP_URL_HOST);
+			$idDomain = parse_url($id, PHP_URL_HOST);
 			$urlDomain = parse_url($url, PHP_URL_HOST);
 			$actorDomain = parse_url($activity['object']['attributedTo'], PHP_URL_HOST);
 
@@ -334,12 +339,12 @@ class Helpers {
 				$reply_to = null;
 			}
 			$ts = is_array($res['published']) ? $res['published'][0] : $res['published'];
-			$status = DB::transaction(function() use($profile, $res, $url, $ts, $reply_to, $cw, $scope) {
+			$status = DB::transaction(function() use($profile, $res, $url, $ts, $reply_to, $cw, $scope, $id) {
 				$status = new Status;
 				$status->profile_id = $profile->id;
 				$status->url = isset($res['url']) ? $res['url'] : $url;
 				$status->uri = isset($res['url']) ? $res['url'] : $url;
-				$status->object_url = isset($activity['id']) ? $activity['id'] : $url;
+				$status->object_url = $id;
 				$status->caption = strip_tags($res['content']);
 				$status->rendered = Purify::clean($res['content']);
 				$status->created_at = Carbon::parse($ts);