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

Update DiscoverController, fixes #445

Browse source
This commit is contained in:
Daniel Supernault 2018-09-08 20:42:35 -06:00
parent 6704c93650
commit f0121d761a
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
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/DiscoverController.php
View file

@ -23,7 +23,6 @@ class DiscoverController extends Controller
$following = Follower::whereProfileId($pid) $following = Follower::whereProfileId($pid)
->pluck('following_id'); ->pluck('following_id');
$filtered = UserFilter::whereUserId($pid) $filtered = UserFilter::whereUserId($pid)
->whereFilterableType('App\Profile') ->whereFilterableType('App\Profile')
->whereIn('filter_type', ['mute', 'block']) ->whereIn('filter_type', ['mute', 'block'])
@ -36,10 +35,12 @@ class DiscoverController extends Controller
$people = Profile::inRandomOrder() $people = Profile::inRandomOrder()
->whereNotIn('id', $following) ->whereNotIn('id', $following)
->whereIsPrivate(false)
->take(3) ->take(3)
->get(); ->get();
$posts = Status::whereHas('media') $posts = Status::whereHas('media')
->whereVisibility('public')
->where('profile_id', '!=', $pid) ->where('profile_id', '!=', $pid)
->whereNotIn('profile_id', $following) ->whereNotIn('profile_id', $following)
->orderBy('created_at', 'desc') ->orderBy('created_at', 'desc')