UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-23 13:33:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1926 from pixelfed/staging

Browse source 
Update StoryController
This commit is contained in:
daniel 2020-01-10 21:54:04 -07:00 committed by GitHub
commit 3ce9af33ee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Http/Controllers/StoryController.php
View file

@ -103,7 +103,7 @@ class StoryController extends Controller
abort_if(!config('instance.stories.enabled') || !$request->user(), 404); abort_if(!config('instance.stories.enabled') || !$request->user(), 404);
$profile = $request->user()->profile; $profile = $request->user()->profile;
$following = FollowerService::build()->profile($profile)->following(); $following = $profile->following->pluck('id')->toArray();
$stories = Story::with('profile') $stories = Story::with('profile')
->whereIn('profile_id', $following) ->whereIn('profile_id', $following)
@ -136,8 +136,7 @@ class StoryController extends Controller
if($id == $profile->id) { if($id == $profile->id) {
$publicOnly = true; $publicOnly = true;
} else { } else {
$following = FollowerService::build()->profile($profile)->following(); $publicOnly = (bool) !$profile->followedBy($authed);
$publicOnly = in_array($id, $following);
} }
$stories = Story::whereProfileId($id) $stories = Story::whereProfileId($id)
@ -173,8 +172,7 @@ class StoryController extends Controller
if($id == $authed->id) { if($id == $authed->id) {
$publicOnly = true; $publicOnly = true;
} else { } else {
$following = FollowerService::build()->profile($authed)->following(); $publicOnly = (bool) !$profile->followedBy($authed);
$publicOnly = in_array($id, $following);
} }
$stories = Story::whereProfileId($profile->id) $stories = Story::whereProfileId($profile->id)