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

Merge pull request #3766 from pixelfed/staging

Browse source 
Update FederationController
This commit is contained in:
daniel 2022-11-14 01:40:55 -07:00 committed by GitHub
commit af7dd6ca49
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/Http/Controllers/FederationController.php
View file

@ -96,17 +96,18 @@ class FederationController extends Controller
abort_if(!config_cache('federation.activitypub.enabled'), 404); abort_if(!config_cache('federation.activitypub.enabled'), 404);
abort_if(!config('federation.activitypub.outbox'), 404); abort_if(!config('federation.activitypub.outbox'), 404);
$profile = Profile::whereNull('domain') // $profile = Profile::whereNull('domain')
->whereNull('status') // ->whereNull('status')
->whereIsPrivate(false) // ->whereIsPrivate(false)
->whereUsername($username) // ->whereUsername($username)
->firstOrFail(); // ->firstOrFail();
$key = 'ap:outbox:latest_10:pid:' . $profile->id; // $key = 'ap:outbox:latest_10:pid:' . $profile->id;
$ttl = now()->addMinutes(15); // $ttl = now()->addMinutes(15);
$res = Cache::remember($key, $ttl, function() use($profile) { // $res = Cache::remember($key, $ttl, function() use($profile) {
return Outbox::get($profile); // return Outbox::get($profile);
}); // });
$res = [];
return response(json_encode($res, JSON_UNESCAPED_SLASHES))->header('Content-Type', 'application/activity+json'); return response(json_encode($res, JSON_UNESCAPED_SLASHES))->header('Content-Type', 'application/activity+json');
} }
@ -124,6 +125,7 @@ class FederationController extends Controller
if(!isset($obj['id'])) { if(!isset($obj['id'])) {
return; return;
} }
usleep(5000);
$lockKey = 'pf:ap:del-lock:' . hash('sha256', $obj['id']); $lockKey = 'pf:ap:del-lock:' . hash('sha256', $obj['id']);
if( isset($obj['actor']) && if( isset($obj['actor']) &&
isset($obj['object']) && isset($obj['object']) &&
@ -140,6 +142,15 @@ class FederationController extends Controller
Cache::put($lockKey, 1, 3600); Cache::put($lockKey, 1, 3600);
dispatch(new DeleteWorker($headers, $payload))->onQueue('delete'); dispatch(new DeleteWorker($headers, $payload))->onQueue('delete');
} else { } else {
if(!isset($obj['id'])) {
return;
}
usleep(5000);
$lockKey = 'pf:ap:user-inbox:activity:' . hash('sha256', $obj['id']);
if(Cache::get($lockKey) !== null) {
return;
}
Cache::put($lockKey, 1, 3600);
dispatch(new InboxValidator($username, $headers, $payload))->onQueue('high'); dispatch(new InboxValidator($username, $headers, $payload))->onQueue('high');
} }
return; return;