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

Update AdminApiController, fix postgres support

Browse source
This commit is contained in:
Daniel Supernault 2023-01-29 02:19:16 -07:00
parent 262db2778f
commit 84fb59d00a
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/Http/Controllers/Api/AdminApiController.php
View file

@ -33,7 +33,7 @@ class AdminApiController extends Controller
public function supported(Request $request) public function supported(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
return response()->json(['supported' => true]); return response()->json(['supported' => true]);
} }
@ -41,7 +41,8 @@ class AdminApiController extends Controller
public function getStats(Request $request) public function getStats(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$res = AdminStatsService::summary(); $res = AdminStatsService::summary();
$res['autospam_count'] = AccountInterstitial::whereType('post.autospam') $res['autospam_count'] = AccountInterstitial::whereType('post.autospam')
->whereNull('appeal_handled_at') ->whereNull('appeal_handled_at')
@ -52,7 +53,7 @@ class AdminApiController extends Controller
public function autospam(Request $request) public function autospam(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$appeals = AccountInterstitial::whereType('post.autospam') $appeals = AccountInterstitial::whereType('post.autospam')
->whereNull('appeal_handled_at') ->whereNull('appeal_handled_at')
@ -87,7 +88,7 @@ class AdminApiController extends Controller
public function autospamHandle(Request $request) public function autospamHandle(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$this->validate($request, [ $this->validate($request, [
'action' => 'required|in:dismiss,approve,dismiss-all,approve-all', 'action' => 'required|in:dismiss,approve,dismiss-all,approve-all',
@ -176,7 +177,7 @@ class AdminApiController extends Controller
public function modReports(Request $request) public function modReports(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$reports = Report::whereNull('admin_seen') $reports = Report::whereNull('admin_seen')
->orderBy('created_at','desc') ->orderBy('created_at','desc')
@ -222,7 +223,7 @@ class AdminApiController extends Controller
public function modReportHandle(Request $request) public function modReportHandle(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$this->validate($request, [ $this->validate($request, [
'action' => 'required|string', 'action' => 'required|string',
@ -280,7 +281,7 @@ class AdminApiController extends Controller
public function getConfiguration(Request $request) public function getConfiguration(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
abort_unless(config('instance.enable_cc'), 400); abort_unless(config('instance.enable_cc'), 400);
return collect([ return collect([
@ -323,7 +324,7 @@ class AdminApiController extends Controller
public function updateConfiguration(Request $request) public function updateConfiguration(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
abort_unless(config('instance.enable_cc'), 400); abort_unless(config('instance.enable_cc'), 400);
$this->validate($request, [ $this->validate($request, [
@ -385,7 +386,7 @@ class AdminApiController extends Controller
public function getUsers(Request $request) public function getUsers(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$q = $request->input('q'); $q = $request->input('q');
$sort = $request->input('sort', 'desc') === 'asc' ? 'asc' : 'desc'; $sort = $request->input('sort', 'desc') === 'asc' ? 'asc' : 'desc';
$res = User::whereNull('status') $res = User::whereNull('status')
@ -400,7 +401,7 @@ class AdminApiController extends Controller
public function getUser(Request $request) public function getUser(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$id = $request->input('user_id'); $id = $request->input('user_id');
$user = User::findOrFail($id); $user = User::findOrFail($id);
@ -419,7 +420,7 @@ class AdminApiController extends Controller
public function userAdminAction(Request $request) public function userAdminAction(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$this->validate($request, [ $this->validate($request, [
'id' => 'required', 'id' => 'required',
@ -494,7 +495,8 @@ class AdminApiController extends Controller
public function instances(Request $request) public function instances(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$this->validate($request, [ $this->validate($request, [
'q' => 'sometimes', 'q' => 'sometimes',
'sort' => 'sometimes|in:asc,desc', 'sort' => 'sometimes|in:asc,desc',
@ -531,7 +533,7 @@ class AdminApiController extends Controller
public function getInstance(Request $request) public function getInstance(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$id = $request->input('id'); $id = $request->input('id');
$res = Instance::findOrFail($id); $res = Instance::findOrFail($id);
@ -542,7 +544,7 @@ class AdminApiController extends Controller
public function moderateInstance(Request $request) public function moderateInstance(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$this->validate($request, [ $this->validate($request, [
'id' => 'required', 'id' => 'required',
@ -566,7 +568,7 @@ class AdminApiController extends Controller
public function refreshInstanceStats(Request $request) public function refreshInstanceStats(Request $request)
{ {
abort_if(!$request->user(), 404); abort_if(!$request->user(), 404);
abort_unless($request->user()->is_admin === 1, 404); abort_unless($request->user()->is_admin == 1, 404);
$this->validate($request, [ $this->validate($request, [
'id' => 'required', 'id' => 'required',