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

Merge pull request #1936 from pixelfed/staging 

Update StoryController, fix postgres bug
This commit is contained in:
daniel 2020-01-14 21:51:30 -07:00 committed by GitHub
parent 2c4894d4dd 8360aa4827
commit 0adf959a74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/StoryController.php
View File

@ -104,11 +104,12 @@ class StoryController extends Controller
$profile = $request->user()->profile;
$following = $profile->following->pluck('id')->toArray();
$groupBy = config('database.default') == 'pgsql' ? 'id' : 'profile_id';
$stories = Story::with('profile')
->whereIn('profile_id', $following)
->where('expires_at', '>', now())
->groupBy('profile_id')
->groupBy($groupBy)
->orderByDesc('expires_at')
->take(9)
->get()