Merge pull request #5817 from pixelfed/staging

Update AppRegisterController

app/HashtagFollow.php

@@ -12,7 +12,7 @@ class HashtagFollow extends Model
     	'hashtag_id'
     ];
 
-    const MAX_LIMIT = 250;
+    const MAX_LIMIT = 25;
 
     public function hashtag()
     {

app/Http/Controllers/AppRegisterController.php

@@ -255,6 +255,7 @@ class AppRegisterController extends Controller
 
         $expiresAt = $tokenModel->expires_at ?? now()->addDays(config('instance.oauth.token_expiration', 356));
         $expiresIn = now()->diffInSeconds($expiresAt);
+        AppRegister::whereEmail($email)->delete();
 
         return response()->json([
             'status' => 'success',

app/Jobs/InstancePipeline/FetchNodeinfoPipeline.php

@@ -73,6 +73,7 @@ class FetchNodeinfoPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessin
                 $instance->user_count = Profile::whereDomain($instance->domain)->count();
                 $instance->nodeinfo_last_fetched = now();
                 $instance->last_crawled_at = now();
+                $instance->delivery_timeout = 0;
                 $instance->save();
             }
         } else {