From 657c66c1f17f3e77e99a1e673f71c435ead3041b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Tue, 17 May 2022 23:25:15 -0600 Subject: [PATCH] Update AP Helpers, fix getSensitive and getScope missing parameters --- app/Util/ActivityPub/Helpers.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index b29d25aa..e24613e2 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -455,8 +455,8 @@ class Helpers { return DB::transaction(function() use($url, $profile, $activity, $reply_to, $id) { $ts = self::pluckval($activity['published']); - $scope = self::getScope($activity); - $cw = self::getSensitive($activity); + $scope = self::getScope($activity, $url); + $cw = self::getSensitive($activity, $url); $pid = is_object($profile) ? $profile->id : (is_array($profile) ? $profile['id'] : null); if(!$pid) { @@ -493,7 +493,7 @@ class Helpers { }); } - public static function getSensitive($activity) + public static function getSensitive($activity, $url) { $id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url); $url = isset($activity['url']) ? self::pluckval($activity['url']) : $id; @@ -527,7 +527,7 @@ class Helpers { return $reply_to; } - public static function getScope($activity) + public static function getScope($activity, $url) { $id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url); $url = isset($activity['url']) ? self::pluckval($activity['url']) : $id;