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

Update controllers, fixes #2906

Browse source
This commit is contained in:
Daniel Supernault 2021-09-10 21:44:29 -06:00
parent a1d7586be4
commit ac6b3f07de
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/Import/Instagram.php
View file

@ -15,10 +15,13 @@ use App\Jobs\ImportPipeline\ImportInstagram;
trait Instagram trait Instagram
{ {
public function instagram() public function instagram()
{ {
return view('settings.import.instagram.home'); if(config_cache('pixelfed.import.instagram.enabled') != true) {
} abort(404, 'Feature not enabled');
}
return view('settings.import.instagram.home');
}
public function instagramStart(Request $request) public function instagramStart(Request $request)
{ {

11
app/Http/Controllers/Import/Mastodon.php
View file

@ -6,8 +6,11 @@ use Illuminate\Http\Request;
trait Mastodon trait Mastodon
{ {
public function mastodon() public function mastodon()
{ {
return view('settings.import.mastodon.home'); if(config_cache('pixelfed.import.instagram.enabled') != true) {
} abort(404, 'Feature not enabled');
}
return view('settings.import.mastodon.home');
}
} }

4
app/Http/Controllers/ImportController.php
View file

@ -11,10 +11,6 @@ class ImportController extends Controller
public function __construct() public function __construct()
{ {
$this->middleware('auth'); $this->middleware('auth');
if(config_cache('pixelfed.import.instagram.enabled') != true) {
abort(404, 'Feature not enabled');
}
} }
} }

10
app/Http/Controllers/PollController.php
View file

@ -11,14 +11,10 @@ use App\Services\FollowerService;
class PollController extends Controller class PollController extends Controller
{ {
public function __construct()
{
abort_if(!config_cache('instance.polls.enabled'), 404);
}
public function getPoll(Request $request, $id) public function getPoll(Request $request, $id)
{ {
abort_if(!config_cache('instance.polls.enabled'), 404);
$poll = Poll::findOrFail($id); $poll = Poll::findOrFail($id);
$status = Status::findOrFail($poll->status_id); $status = Status::findOrFail($poll->status_id);
if($status->scope != 'public') { if($status->scope != 'public') {
@ -34,6 +30,8 @@ class PollController extends Controller
public function vote(Request $request, $id) public function vote(Request $request, $id)
{ {
abort_if(!config_cache('instance.polls.enabled'), 404);
abort_unless($request->user(), 403); abort_unless($request->user(), 403);
$this->validate($request, [ $this->validate($request, [