YunoHost-Apps/pixelfed_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/pixelfed_ynh.git synced 2024-09-03 20:06:04 +02:00
Code Issues Activity Actions

Merge pull request #1936 from pixelfed/staging

Browse source 
Update StoryController, fix postgres bug
This commit is contained in:
daniel 2020-01-14 21:51:30 -07:00 • committed by GitHub
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; $profile = $request->user()->profile;
$following = $profile->following->pluck('id')->toArray(); $following = $profile->following->pluck('id')->toArray();
$groupBy = config('database.default') == 'pgsql' ? 'id' : 'profile_id';
$stories = Story::with('profile') $stories = Story::with('profile')
->whereIn('profile_id', $following) ->whereIn('profile_id', $following)
->where('expires_at', '>', now()) ->where('expires_at', '>', now())
->groupBy('profile_id') ->groupBy($groupBy)
->orderByDesc('expires_at') ->orderByDesc('expires_at')
->take(9) ->take(9)
->get() ->get()