Merge pull request #658 from pinkary-project/feat/optimize-feeds

pinkary-project · Sep 22, 2024 · 9d8484f · 9d8484f
2 parents 296f576 + a02b745
commit 9d8484f
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/app/Queries/Feeds/QuestionsFollowingFeed.php b/app/Queries/Feeds/QuestionsFollowingFeed.php
@@ -36,8 +36,7 @@ public function builder(): Builder
                 'root as showRoot' => $followQueryClosure,
                 'parent as showParent' => $followQueryClosure,
             ])
-            ->withAggregate('to as username', 'username')
-            ->withAggregate('parent as grand_parent_id', 'parent_id')
+            ->with('root.to:username,id', 'root:id,to_id', 'parent:id,parent_id')
             ->whereNotNull('answer')
             ->where('is_reported', false)
             ->where('is_ignored', false)

diff --git a/app/Queries/Feeds/RecentQuestionsFeed.php b/app/Queries/Feeds/RecentQuestionsFeed.php
@@ -39,8 +39,7 @@ public function builder(): Builder
                 })->orderByDesc('updated_at');
             }, function (Builder $query): void {
                 $query->addSelect('root_id', 'parent_id')
-                    ->withAggregate('to as username', 'username')
-                    ->withAggregate('parent as grand_parent_id', 'parent_id')
+                    ->with('root.to:username,id', 'root:id,to_id', 'parent:id,parent_id')
                     ->where(function (Builder $query): void {
                         $query->whereNull('root_id')
                             ->orHas('root');

diff --git a/app/Queries/Feeds/TrendingQuestionsFeed.php b/app/Queries/Feeds/TrendingQuestionsFeed.php
@@ -42,14 +42,18 @@ public function builder(): Builder
         $maxDaysSincePosted = self::MAX_DAYS_SINCE_POSTED;
 
         return Question::query()
-            ->withCount('likes', 'children')
-            ->orderByRaw(<<<SQL
-                (((likes_count * {$likesBias} + 1.0) * (children_count * {$commentsBias} + 1.0))
-                / (strftime('%s') - strftime('%s', answer_created_at) + {$timeBias} + 1.0)) desc
-                SQL,
-            )
-            ->where('is_reported', false)
-            ->where('is_ignored', false)
-            ->where('answer_created_at', '>=', now()->subDays($maxDaysSincePosted));
+            ->select('id')
+            ->from(
+                Question::query()
+                    ->withCount('likes', 'children')
+                    ->orderByRaw(<<<SQL
+                        (((likes_count * {$likesBias} + 1.0) * (children_count * {$commentsBias} + 1.0))
+                        / (strftime('%s') - strftime('%s', answer_created_at) + {$timeBias} + 1.0)) desc
+                    SQL)
+                    ->where('is_reported', false)
+                    ->where('is_ignored', false)
+                    ->where('answer_created_at', '>=', now()->subDays($maxDaysSincePosted)),
+                'trending_questions'
+            );
     }
 }
diff --git a/resources/views/components/thread.blade.php b/resources/views/components/thread.blade.php
@@ -6,7 +6,7 @@
     'username' => null,
 ])
 
-<div wire:key="thread-{{ $questionId.'-'.$rootId.'-'.$parentId }}">
+<div wire:key="thread-inner-{{ $questionId.'-'.$rootId.'-'.$parentId }}">
     @if ($rootId !== null)
         <livewire:questions.show
             :questionId="$rootId"
@@ -20,7 +20,7 @@
                 <x-post-divider wire:key="divider-{{ $parentId }}" />
             @else
                 <x-post-divider
-                    :link="route('questions.show', ['username' => $username, 'question' => $questionId])"
+                    :link="route('questions.show', ['username' => $username, 'question' => $rootId])"
                     :text="'View more comments...'"
                     wire:key="divider-{{ $parentId }}"
                 />

diff --git a/resources/views/livewire/feed.blade.php b/resources/views/livewire/feed.blade.php
@@ -11,10 +11,10 @@
                 @else
                     <x-thread
                         :rootId="$question->root_id"
-                        :grandParentId="$question->grand_parent_id"
+                        :grandParentId="$question->parent?->parent_id"
                         :parentId="$question->parent_id"
                         :questionId="$question->id"
-                        :username="$question->username"
+                        :username="$question->root?->to->username"
                     />
                 @endif
             </div>

diff --git a/resources/views/livewire/home/questions-following.blade.php b/resources/views/livewire/home/questions-following.blade.php
@@ -10,10 +10,10 @@
             @foreach ($followingQuestions as $question)
                 <x-thread
                     :rootId="$question->showRoot ? $question->root_id : null"
-                    :grandParentId="$question->grand_parent_id"
+                    :grandParentId="$question->parent?->parent_id"
                     :parentId="$question->showParent ? $question->parent_id : null"
                     :questionId="$question->id"
-                    :username="$question->username"
+                    :username="$question->root?->to->username"
                 />
             @endforeach