diff --git a/app/Models/Article.php b/app/Models/Article.php index 4c8adfa66..450390962 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 @@ -328,6 +327,7 @@ public static function nextForSharing(): ?self public static function getFeedItems(): Collection { return self::published() + ->recent() ->paginate(self::FEED_PAGE_SIZE) ->getCollection(); } 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); });