mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-10 00:34:50 +00:00
Update DiscoverController
This commit is contained in:
parent
25a71a9f5f
commit
4fe46723ee
1 changed files with 29 additions and 1 deletions
|
@ -3,10 +3,12 @@
|
|||
namespace App\Http\Controllers;
|
||||
|
||||
use App\{
|
||||
DiscoverCategory,
|
||||
Follower,
|
||||
Hashtag,
|
||||
Profile,
|
||||
Status,
|
||||
StatusHashtag,
|
||||
UserFilter
|
||||
};
|
||||
use Auth, DB, Cache;
|
||||
|
@ -28,7 +30,7 @@ class DiscoverController extends Controller
|
|||
{
|
||||
$this->validate($request, [
|
||||
'page' => 'nullable|integer|min:1|max:10',
|
||||
]);
|
||||
]);
|
||||
|
||||
$tag = Hashtag::with('posts')
|
||||
->withCount('posts')
|
||||
|
@ -51,4 +53,30 @@ class DiscoverController extends Controller
|
|||
|
||||
return view('discover.tags.show', compact('tag', 'posts'));
|
||||
}
|
||||
|
||||
public function showCategory(Request $request, $slug)
|
||||
{
|
||||
$tag = DiscoverCategory::whereActive(true)
|
||||
->whereSlug($slug)
|
||||
->firstOrFail();
|
||||
|
||||
// todo refactor this mess
|
||||
$tagids = $tag->hashtags->pluck('id')->toArray();
|
||||
$sids = StatusHashtag::whereIn('hashtag_id', $tagids)->orderByDesc('status_id')->take(500)->pluck('status_id')->toArray();
|
||||
$posts = Status::whereIn('id', $sids)->whereNull('uri')->whereType('photo')->whereNull('in_reply_to_id')->whereNull('reblog_of_id')->orderByDesc('created_at')->paginate(21);
|
||||
$tag->posts_count = $tag->posts()->count();
|
||||
return view('discover.tags.category', compact('tag', 'posts'));
|
||||
}
|
||||
|
||||
public function showPersonal(Request $request)
|
||||
{
|
||||
$profile = Auth::user()->profile;
|
||||
// todo refactor this mess
|
||||
$tags = Hashtag::whereHas('posts')->orderByRaw('rand()')->take(5)->get();
|
||||
$following = $profile->following->pluck('id');
|
||||
$following = $following->push($profile->id)->toArray();
|
||||
$posts = Status::withCount(['likes','comments'])->whereNotIn('profile_id', $following)->whereHas('media')->whereType('photo')->orderByDesc('created_at')->paginate(21);
|
||||
$posts->post_count = Status::whereNotIn('profile_id', $following)->whereHas('media')->whereType('photo')->count();
|
||||
return view('discover.personal', compact('posts', 'tags'));
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue