From 155e960f54a4d5547e31795190f1d2b1ee7cac22 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Wed, 29 Apr 2020 13:31:47 -0600 Subject: [PATCH] Update AP helpers, update user agent --- app/Util/ActivityPub/Helpers.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Util/ActivityPub/Helpers.php b/app/Util/ActivityPub/Helpers.php index f98647e97..c2a7a6da3 100644 --- a/app/Util/ActivityPub/Helpers.php +++ b/app/Util/ActivityPub/Helpers.php @@ -181,9 +181,11 @@ class Helpers { public static function zttpUserAgent() { + $version = config('pixelfed.version'); + $url = config('app.url'); return [ 'Accept' => 'application/activity+json', - 'User-Agent' => 'PixelfedBot - https://pixelfed.org', + 'User-Agent' => "(Pixelfed/{$version}; +{$url})", ]; } @@ -236,10 +238,6 @@ class Helpers { $activity = ['object' => $res]; } - if(isset($activity['object']['content']) == false) { - abort(400, 'Invalid object'); - } - $scope = 'private'; $cw = isset($res['sensitive']) ? (bool) $res['sensitive'] : false;