Merge pull request #2569 from pixelfed/staging

Staging

app/Http/Controllers/Api/ApiV1Controller.php

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

app/Jobs/InboxPipeline/InboxValidator.php

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