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

Merge pull request #4326 from eitch/staging

Browse source 
[Fix] Don't count inactive accounts for registration blocking
This commit is contained in:
daniel 2023-04-24 03:33:55 -06:00 committed by GitHub
commit 85cdaf5f3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/Http/Controllers/Auth/RegisterController.php
View file

@ -180,7 +180,8 @@ class RegisterController extends Controller
} }
$limit = config('pixelfed.max_users'); $limit = config('pixelfed.max_users');
if($limit) { if($limit) {
abort_if($limit <= User::count(), 404); $count = User::where(function($q){ return $q->whereNull('status')->orWhereNotIn('status', ['deleted','delete']); })->count();
abort_if($limit <= $count, 404);
return view('auth.register'); return view('auth.register');
} else { } else {
return view('auth.register'); return view('auth.register');
@ -204,7 +205,7 @@ class RegisterController extends Controller
abort_if(BouncerService::checkIp($request->ip()), 404); abort_if(BouncerService::checkIp($request->ip()), 404);
} }
$count = User::count(); $count = User::where(function($q){ return $q->whereNull('status')->orWhereNotIn('status', ['deleted','delete']); })->count();
$limit = config('pixelfed.max_users'); $limit = config('pixelfed.max_users');
if(false == config_cache('pixelfed.open_registration') || $limit && $limit <= $count) { if(false == config_cache('pixelfed.open_registration') || $limit && $limit <= $count) {