UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-29 17:53:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update StoryController

Browse source
This commit is contained in:
Daniel Supernault 2020-01-10 22:03:51 -07:00
parent 71f6cbb5a6
commit aba509fc6b
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,14 +132,15 @@ 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; $authed = $request->user()->profile;
if($id == $profile->id) { $profile = Profile::findOrFail($id);
if($id == $authed->id) {
$publicOnly = true; $publicOnly = true;
} else { } else {
$publicOnly = (bool) !$profile->followedBy($authed); $publicOnly = (bool) $profile->followedBy($authed);
} }
$stories = Story::whereProfileId($id) $stories = Story::whereProfileId($profile->id)
->orderBy('expires_at', 'desc') ->orderBy('expires_at', 'desc')
->where('expires_at', '>', now()) ->where('expires_at', '>', now())
->when(!$publicOnly, function($query, $publicOnly) { ->when(!$publicOnly, function($query, $publicOnly) {
@ -172,7 +173,7 @@ class StoryController extends Controller
if($id == $authed->id) { if($id == $authed->id) {
$publicOnly = true; $publicOnly = true;
} else { } else {
$publicOnly = (bool) !$profile->followedBy($authed); $publicOnly = (bool) $profile->followedBy($authed);
} }
$stories = Story::whereProfileId($profile->id) $stories = Story::whereProfileId($profile->id)