yetangitu/pixelfed
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update ActivityPub Outbox, fixes #2100

Browse source
This commit is contained in:
Daniel Supernault 2020-04-11 22:12:28 -06:00
parent f5e4e468a2
commit c84cee5ae0
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
2 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -80,9 +80,19 @@ class FederationController extends Controller
abort_if(!config('federation.activitypub.enabled'), 404);
abort_if(!config('federation.activitypub.outbox'), 404);
$res = Outbox::get($username);
$profile = Profile::whereNull('domain')
->whereNull('status')
->whereIsPrivate(false)
->whereUsername($username)
->firstOrFail();
return response(json_encode($res))->header('Content-Type', 'application/activity+json');
$key = 'ap:outbox:latest_10:pid:' . $profile->id;
$ttl = now()->addMinutes(15);
$res = Cache::remember($key, $ttl, function() use($profile) {
return Outbox::get($profile);
});
return response(json_encode($res, JSON_UNESCAPED_SLASHES))->header('Content-Type', 'application/activity+json');
}
public function userInbox(Request $request, $username)