chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #2569 from pixelfed/staging 

Staging
This commit is contained in:
daniel 2021-01-14 18:54:40 -07:00 committed by GitHub
parent acf04b6b63 36a722aa3c
commit 91b7c043be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Api/ApiV1Controller.php
View File

@ -1435,6 +1435,7 @@ class ApiV1Controller extends Controller
$limit = $request->input('limit') ?? 3; $limit = $request->input('limit') ?? 3;
$user = $request->user(); $user = $request->user();
if($user) {
$key = 'user:last_active_at:id:'.$user->id; $key = 'user:last_active_at:id:'.$user->id;
$ttl = now()->addMinutes(5); $ttl = now()->addMinutes(5);
Cache::remember($key, $ttl, function() use($user) { Cache::remember($key, $ttl, function() use($user) {
@ -1442,6 +1443,7 @@ class ApiV1Controller extends Controller
$user->save(); $user->save();
return; return;
}); });
}
if($min || $max) { if($min || $max) {
$dir = $min ? '>' : '<'; $dir = $min ? '>' : '<';

5
app/Jobs/InboxPipeline/InboxValidator.php
View File

@ -80,7 +80,8 @@ class InboxValidator implements ShouldQueue
$headers, $headers,
$payload, $payload,
$actor, $actor,
$hash $hash,
$profile
) { ) {
$key = 'ap:inbox:actor-delete-exists:' . $hash; $key = 'ap:inbox:actor-delete-exists:' . $hash;
$actorDelete = Cache::remember($key, now()->addMinutes(15), function() use($actor) { $actorDelete = Cache::remember($key, now()->addMinutes(15), function() use($actor) {
@ -89,7 +90,7 @@ class InboxValidator implements ShouldQueue
->exists(); ->exists();
}); });
if($actorDelete) { if($actorDelete) {
if($this->verifySignature($headers, $payload) == true) { if($this->verifySignature($headers, $profile, $payload) == true) {
Cache::set($key, false); Cache::set($key, false);
$profile = Profile::whereNotNull('domain') $profile = Profile::whereNotNull('domain')
->whereNull('status') ->whereNull('status')