UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2025-01-31 00:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix GroupController, move groups enabled check to each method to fix route:list

Browse source
This commit is contained in:
Daniel Supernault 2025-01-26 00:03:41 -07:00
parent 3109e6a1ab
commit f260572e72
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/Http/Controllers/GroupController.php
View file

@ -27,11 +27,11 @@ class GroupController extends GroupFederationController
public function __construct() public function __construct()
{ {
$this->middleware('auth'); $this->middleware('auth');
abort_unless(config('groups.enabled'), 404);
} }
public function index(Request $request) public function index(Request $request)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
return view('layouts.spa'); return view('layouts.spa');
@ -39,6 +39,7 @@ class GroupController extends GroupFederationController
public function home(Request $request) public function home(Request $request)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
return view('layouts.spa'); return view('layouts.spa');
@ -46,6 +47,7 @@ class GroupController extends GroupFederationController
public function show(Request $request, $id, $path = false) public function show(Request $request, $id, $path = false)
{ {
abort_unless(config('groups.enabled'), 404);
$group = Group::find($id); $group = Group::find($id);
if (! $group || $group->status) { if (! $group || $group->status) {
@ -61,6 +63,7 @@ class GroupController extends GroupFederationController
public function showStatus(Request $request, $gid, $sid) public function showStatus(Request $request, $gid, $sid)
{ {
abort_unless(config('groups.enabled'), 404);
$group = Group::find($gid); $group = Group::find($gid);
$pid = optional($request->user())->profile_id ?? false; $pid = optional($request->user())->profile_id ?? false;
@ -81,6 +84,7 @@ class GroupController extends GroupFederationController
public function getGroup(Request $request, $id) public function getGroup(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
$group = Group::whereNull('status')->findOrFail($id); $group = Group::whereNull('status')->findOrFail($id);
$pid = optional($request->user())->profile_id ?? false; $pid = optional($request->user())->profile_id ?? false;
@ -91,6 +95,7 @@ class GroupController extends GroupFederationController
public function showStatusLikes(Request $request, $id, $sid) public function showStatusLikes(Request $request, $id, $sid)
{ {
abort_unless(config('groups.enabled'), 404);
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
$user = $request->user(); $user = $request->user();
$pid = $user->profile_id; $pid = $user->profile_id;
@ -114,6 +119,7 @@ class GroupController extends GroupFederationController
public function groupSettings(Request $request, $id) public function groupSettings(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
@ -125,6 +131,7 @@ class GroupController extends GroupFederationController
public function joinGroup(Request $request, $id) public function joinGroup(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
abort_if($group->isMember($pid), 404); abort_if($group->isMember($pid), 404);
@ -159,6 +166,7 @@ class GroupController extends GroupFederationController
public function updateGroup(Request $request, $id) public function updateGroup(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
$this->validate($request, [ $this->validate($request, [
'description' => 'nullable|max:500', 'description' => 'nullable|max:500',
'membership' => 'required|in:all,local,private', 'membership' => 'required|in:all,local,private',
@ -257,11 +265,14 @@ class GroupController extends GroupFederationController
protected function toJson($group, $pid = false) protected function toJson($group, $pid = false)
{ {
abort_unless(config('groups.enabled'), 404);
return GroupService::get($group->id, $pid); return GroupService::get($group->id, $pid);
} }
public function groupLeave(Request $request, $id) public function groupLeave(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
@ -281,6 +292,7 @@ class GroupController extends GroupFederationController
public function cancelJoinRequest(Request $request, $id) public function cancelJoinRequest(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
@ -299,6 +311,7 @@ class GroupController extends GroupFederationController
public function metaBlockSearch(Request $request, $id) public function metaBlockSearch(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
@ -332,6 +345,7 @@ class GroupController extends GroupFederationController
public function reportCreate(Request $request, $id) public function reportCreate(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
@ -368,7 +382,7 @@ class GroupController extends GroupFederationController
'You already reported this' 'You already reported this'
); );
$report = new GroupReport(); $report = new GroupReport;
$report->group_id = $group->id; $report->group_id = $group->id;
$report->profile_id = $pid; $report->profile_id = $pid;
$report->type = $type; $report->type = $type;
@ -399,6 +413,7 @@ class GroupController extends GroupFederationController
public function reportAction(Request $request, $id) public function reportAction(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
@ -477,6 +492,7 @@ class GroupController extends GroupFederationController
public function getMemberInteractionLimits(Request $request, $id) public function getMemberInteractionLimits(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
@ -492,6 +508,7 @@ class GroupController extends GroupFederationController
public function updateMemberInteractionLimits(Request $request, $id) public function updateMemberInteractionLimits(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
@ -553,6 +570,7 @@ class GroupController extends GroupFederationController
public function showProfile(Request $request, $id, $pid) public function showProfile(Request $request, $id, $pid)
{ {
abort_unless(config('groups.enabled'), 404);
$group = Group::find($id); $group = Group::find($id);
if (! $group || $group->status) { if (! $group || $group->status) {
@ -564,6 +582,7 @@ class GroupController extends GroupFederationController
public function showProfileByUsername(Request $request, $id, $pid) public function showProfileByUsername(Request $request, $id, $pid)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
if (! $request->user()) { if (! $request->user()) {
return redirect("/{$pid}"); return redirect("/{$pid}");
@ -597,6 +616,7 @@ class GroupController extends GroupFederationController
public function groupInviteLanding(Request $request, $id) public function groupInviteLanding(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort(404, 'Not yet implemented'); abort(404, 'Not yet implemented');
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
@ -605,6 +625,7 @@ class GroupController extends GroupFederationController
public function groupShortLinkRedirect(Request $request, $hid) public function groupShortLinkRedirect(Request $request, $hid)
{ {
abort_unless(config('groups.enabled'), 404);
$gid = HashidService::decode($hid); $gid = HashidService::decode($hid);
$group = Group::findOrFail($gid); $group = Group::findOrFail($gid);
@ -613,6 +634,7 @@ class GroupController extends GroupFederationController
public function groupInviteClaim(Request $request, $id) public function groupInviteClaim(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
$group = GroupService::get($id); $group = GroupService::get($id);
abort_if(! $group || empty($group), 404); abort_if(! $group || empty($group), 404);
@ -621,6 +643,7 @@ class GroupController extends GroupFederationController
public function groupMemberInviteCheck(Request $request, $id) public function groupMemberInviteCheck(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
@ -636,6 +659,7 @@ class GroupController extends GroupFederationController
public function groupMemberInviteAccept(Request $request, $id) public function groupMemberInviteAccept(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
$group = Group::findOrFail($id); $group = Group::findOrFail($id);
@ -661,6 +685,7 @@ class GroupController extends GroupFederationController
public function groupMemberInviteDecline(Request $request, $id) public function groupMemberInviteDecline(Request $request, $id)
{ {
abort_unless(config('groups.enabled'), 404);
abort_if(! $request->user(), 404); abort_if(! $request->user(), 404);
$pid = $request->user()->profile_id; $pid = $request->user()->profile_id;
$group = Group::findOrFail($id); $group = Group::findOrFail($id);