chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #1927 from pixelfed/staging 

Update StoryController
This commit is contained in:
daniel 2020-01-10 22:04:16 -07:00 committed by GitHub
parent 3ce9af33ee aba509fc6b
commit 99014fa13c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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);
$profile = $request->user()->profile;
if($id == $profile->id) {
$authed = $request->user()->profile;
$profile = Profile::findOrFail($id);
if($id == $authed->id) {
$publicOnly = true;
} else {
$publicOnly = (bool) !$profile->followedBy($authed);
$publicOnly = (bool) $profile->followedBy($authed);
}
$stories = Story::whereProfileId($id)
$stories = Story::whereProfileId($profile->id)
->orderBy('expires_at', 'desc')
->where('expires_at', '>', now())
->when(!$publicOnly, function($query, $publicOnly) {
@ -172,7 +173,7 @@ class StoryController extends Controller
if($id == $authed->id) {
$publicOnly = true;
} else {
$publicOnly = (bool) !$profile->followedBy($authed);
$publicOnly = (bool) $profile->followedBy($authed);
}
$stories = Story::whereProfileId($profile->id)