Show pinned posts first everywhere they appear

Fixes Hylozoic/hylo-evo#1416

Author: tibetsprague

CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [5.3.4] - 2023-02-14
+
+### Changed
+- Pinned posts now appear first in every context they are visible and regardless of the sort
+
 ## [5.3.3] - 2023-02-09
 
 ### Added

api/services/Search/util.js

@@ -139,8 +139,8 @@ export const filterAndSortPosts = curry((opts, q) => {
     q.whereRaw('locations.center && ST_MakeEnvelope(?, ?, ?, ?, 4326)', [boundingBox[0].lng, boundingBox[0].lat, boundingBox[1].lng, boundingBox[1].lat])
   }
 
-  if (sort === 'posts.updated_at' && showPinnedFirst) {
-    q.orderByRaw('groups_posts.pinned_at is null asc, groups_posts.pinned_at desc, posts.updated_at desc')
+  if (showPinnedFirst) {
+    q.orderByRaw(`groups_posts.pinned_at is null asc, groups_posts.pinned_at desc, ${sort || 'posts.updated_at'} ${order || (sortBy === 'order' ? 'asc' : 'desc')}`)
   } else if (sort) {
     q.orderBy(sort, order || (sortBy === 'order' ? 'asc' : 'desc'))
   }

package.json

@@ -5,7 +5,7 @@
   "author": "Tibet Sprague <tibet@hylo.com>",
   "license": "GNU AFFERO GENERAL PUBLIC LICENSE v3",
   "private": true,
-  "version": "5.3.3",
+  "version": "5.3.4",
   "repository": {
     "type": "git",
     "url": "git://github.com/Hylozoic/hylo-node.git"