Merge pull request #3994 from pixelfed/staging

Update AP helpers
This commit is contained in:
daniel 2022-12-23 22:23:42 -07:00 committed by GitHub
commit 7a75271569
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -458,7 +458,6 @@ class Helpers {
$reply_to = self::getReplyTo($activity); $reply_to = self::getReplyTo($activity);
return DB::transaction(function() use($url, $profile, $activity, $reply_to, $id) {
$ts = self::pluckval($activity['published']); $ts = self::pluckval($activity['published']);
$scope = self::getScope($activity, $url); $scope = self::getScope($activity, $url);
$cw = self::getSensitive($activity, $url); $cw = self::getSensitive($activity, $url);
@ -513,7 +512,6 @@ class Helpers {
IncrementPostCount::dispatch($pid)->onQueue('low'); IncrementPostCount::dispatch($pid)->onQueue('low');
return $status; return $status;
});
} }
public static function getSensitive($activity, $url) public static function getSensitive($activity, $url)
@ -739,7 +737,6 @@ class Helpers {
return; return;
} }
$profile = DB::transaction(function() use($domain, $webfinger, $res) {
$instance = Instance::updateOrCreate([ $instance = Instance::updateOrCreate([
'domain' => $domain 'domain' => $domain
]); ]);
@ -773,10 +770,6 @@ class Helpers {
$profile->last_fetched_at = now(); $profile->last_fetched_at = now();
$profile->save(); $profile->save();
return $profile; return $profile;
});
return $profile;
} }
public static function profileFetch($url) public static function profileFetch($url)