From 00ef57f58bf841170cacc93a9267ee3b760bfc3f Mon Sep 17 00:00:00 2001 From: Joe Dixon Date: Thu, 14 Apr 2022 09:52:49 +0100 Subject: [PATCH 1/2] Remove pinned status from recent scope --- app/Models/Article.php | 3 +-- tests/Integration/Models/ArticleTest.php | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Models/Article.php b/app/Models/Article.php index 4c8adfa66..6492829cd 100644 --- a/app/Models/Article.php +++ b/app/Models/Article.php @@ -270,8 +270,7 @@ public function scopeForTag(Builder $query, string $tag): Builder public function scopeRecent(Builder $query): Builder { - return $query->orderBy('is_pinned', 'desc') - ->orderBy('submitted_at', 'desc'); + return $query->orderBy('submitted_at', 'desc'); } public function scopePopular(Builder $query): Builder diff --git a/tests/Integration/Models/ArticleTest.php b/tests/Integration/Models/ArticleTest.php index 7e335aeec..5d0f23a87 100644 --- a/tests/Integration/Models/ArticleTest.php +++ b/tests/Integration/Models/ArticleTest.php @@ -68,7 +68,7 @@ $recentArticles = Article::recent()->get(); - expect($recentArticles[0]->title)->toEqual($articleThree->title); - expect($recentArticles[1]->title)->toEqual($articleOne->title); - expect($recentArticles[2]->title)->toEqual($articleTwo->title); + expect($recentArticles[0]->title)->toEqual($articleOne->title); + expect($recentArticles[1]->title)->toEqual($articleTwo->title); + expect($recentArticles[2]->title)->toEqual($articleThree->title); }); From adadc0bb90813be2e2f247cc19f2333c490ace10 Mon Sep 17 00:00:00 2001 From: Joe Dixon Date: Thu, 14 Apr 2022 09:53:34 +0100 Subject: [PATCH 2/2] Order RSS feed by most recent --- app/Models/Article.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Models/Article.php b/app/Models/Article.php index 6492829cd..450390962 100644 --- a/app/Models/Article.php +++ b/app/Models/Article.php @@ -327,6 +327,7 @@ public static function nextForSharing(): ?self public static function getFeedItems(): Collection { return self::published() + ->recent() ->paginate(self::FEED_PAGE_SIZE) ->getCollection(); }