yetangitu/pixelfed
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add MediaBlocklist feature

Browse source
This commit is contained in:
Daniel Supernault 2020-07-26 22:05:52 -06:00
parent c2d194af1d
commit ba1f7e7e2c
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
7 changed files with 206 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/Http/Controllers/Admin/AdminMediaController.php
View file

@ -5,6 +5,7 @@ namespace App\Http\Controllers\Admin;
use DB, Cache;
use App\{
Media,
MediaBlocklist,
Profile,
Status
};
@ -21,8 +22,8 @@ trait AdminMediaController
'nullable',
'string',
'min:1',
'max:4',
Rule::in(['grid','list'])
'max:13',
Rule::in(['grid','list', 'banned', 'addbanned'])
],
'search' => 'nullable|string|min:1|max:20'
]);
@ -34,9 +35,14 @@ trait AdminMediaController
->whereIn('profile_id', $profiles)
->orWhere('mime', $request->input('search'))
->paginate(12);
} else {
$media = Media::whereHas('status')->with('status')->orderby('id', 'desc')->paginate(12);
return view('admin.media.home', compact('media'));
}
if($request->input('layout') == 'banned') {
$media = MediaBlocklist::latest()->paginate(12);
return view('admin.media.home', compact('media'));
}
$media = Media::whereHas('status')->with('status')->orderby('id', 'desc')->paginate(12);
return view('admin.media.home', compact('media'));
}