this should fix some bugs
This commit is contained in:
parent
44385282e8
commit
132696b330
@ -29,18 +29,18 @@ class HomeController extends Controller
|
|||||||
$notes = [];
|
$notes = [];
|
||||||
if (request ()->get ("users") == "all")
|
if (request ()->get ("users") == "all")
|
||||||
{
|
{
|
||||||
$users = Actor::latest ()->take (8)->get ();
|
$users = Actor::latest ()->take (10)->get ();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$users = User::latest ()->take (8)->get ();
|
$users = User::latest ()->take (10)->get ();
|
||||||
}
|
}
|
||||||
|
|
||||||
$popular_hashtags = Hashtag::withCount ("get_notes")->orderBy ("get_notes_count", "desc")->take (16)->get ()->shuffle ();
|
$popular_hashtags = Hashtag::withCount ("get_notes")->orderBy ("get_notes_count", "desc")->take (16)->get ()->shuffle ();
|
||||||
|
|
||||||
if (request ()->get ("posts") == "latest")
|
if (request ()->get ("posts") == "latest")
|
||||||
{
|
{
|
||||||
$notes = Note::latest ()->where ("in_reply_to", null)->take (8)->get ();
|
$notes = Note::latest ()->where ("in_reply_to", null)->take (10)->get ();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -96,7 +96,7 @@ class HomeController extends Controller
|
|||||||
$local_users = User::where ("name", "like", "%$query%")->get ();
|
$local_users = User::where ("name", "like", "%$query%")->get ();
|
||||||
$actors = Actor::where ("name", "like", "%$query%")->orWhere ("preferredUsername", "like", "%$query%")->get ();
|
$actors = Actor::where ("name", "like", "%$query%")->orWhere ("preferredUsername", "like", "%$query%")->get ();
|
||||||
|
|
||||||
$users = $local_users->merge ($actors);
|
$users = $local_users->merge ($actors)->take (10);
|
||||||
$hashtags = Hashtag::withCount ("get_notes")->where ("name", "like", "%$query%")->orderBy ("get_notes_count", "desc")->take (16)->get ()->shuffle ();
|
$hashtags = Hashtag::withCount ("get_notes")->where ("name", "like", "%$query%")->orderBy ("get_notes_count", "desc")->take (16)->get ()->shuffle ();
|
||||||
$posts = Note::where ("content", "like", "%$query%")->paginate (10);
|
$posts = Note::where ("content", "like", "%$query%")->paginate (10);
|
||||||
|
|
||||||
|
@ -47,7 +47,7 @@ else
|
|||||||
</b>
|
</b>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
@if ($display_post->in_reply_to)
|
@if ($display_post->in_reply_to && $display_post->get_parent ()->first ())
|
||||||
<small>
|
<small>
|
||||||
In response to
|
In response to
|
||||||
<a href="{{ route ('posts.show', [ 'note' => $display_post->get_parent ()->first ()->id ]) }}">this post</a>
|
<a href="{{ route ('posts.show', [ 'note' => $display_post->get_parent ()->first ()->id ]) }}">this post</a>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user