UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-18 04:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix typos

Browse source
This commit is contained in:
Daniel Supernault 2024-09-09 01:29:29 -06:00
parent b37f8067e5
commit 375137bf75
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/Jobs/MovePipeline/UnfollowLegacyAccountMovePipeline.php
View file

@ -85,19 +85,6 @@ class UnfollowLegacyAccountMovePipeline implements ShouldQueue
throw new Exception('Invalid move accounts'); throw new Exception('Invalid move accounts');
} }
$activity = [
'@context' => 'https://www.w3.org/ns/activitystreams',
'type' => 'Undo',
'id' => null,
'actor' => null,
'object' => [
'type' => 'Follow',
'id' => null,
'object' => $actor,
'actor' => null,
],
];
$version = config('pixelfed.version'); $version = config('pixelfed.version');
$appUrl = config('app.url'); $appUrl = config('app.url');
$userAgent = "(Pixelfed/{$version}; +{$appUrl})"; $userAgent = "(Pixelfed/{$version}; +{$appUrl})";
@ -113,13 +100,28 @@ class UnfollowLegacyAccountMovePipeline implements ShouldQueue
->where('followers.following_id', $actorAccount['id']) ->where('followers.following_id', $actorAccount['id'])
->whereNotNull('profiles.user_id') ->whereNotNull('profiles.user_id')
->whereNull('profiles.deleted_at') ->whereNull('profiles.deleted_at')
->select('profiles.id', 'profiles.user_id', 'profiles.username', 'profiles.private_key') ->select('profiles.id', 'profiles.user_id', 'profiles.username', 'profiles.private_key', 'profiles.status')
->chunkById(100, function ($followers) use ($activity, $addlHeaders, $targetInbox, $targetPid) { ->chunkById(100, function ($followers) use ($actor, $addlHeaders, $targetInbox, $targetPid) {
$client = new Client([ $client = new Client([
'timeout' => config('federation.activitypub.delivery.timeout'), 'timeout' => config('federation.activitypub.delivery.timeout'),
]); ]);
$requests = function ($followers) use ($client, $activity, $addlHeaders, $targetInbox, $targetPid) { $requests = function ($followers) use ($client, $actor, $addlHeaders, $targetInbox, $targetPid) {
$activity = [
'@context' => 'https://www.w3.org/ns/activitystreams',
'type' => 'Undo',
'id' => null,
'actor' => null,
'object' => [
'type' => 'Follow',
'id' => null,
'object' => $actor,
'actor' => null,
],
];
foreach ($followers as $follower) { foreach ($followers as $follower) {
if (! $follower->private_key || ! $follower->username || ! $follower->user_id || $follower->status === 'delete') {
continue;
}
$permalink = 'https://'.config('pixelfed.domain.app').'/users/'.$follower->username; $permalink = 'https://'.config('pixelfed.domain.app').'/users/'.$follower->username;
$activity['id'] = $permalink.'#follow/'.$targetPid.'/undo'; $activity['id'] = $permalink.'#follow/'.$targetPid.'/undo';
$activity['actor'] = $permalink; $activity['actor'] = $permalink;