fix pinned announcement not showing in latest

Author: tdjsnelling

api/src/controllers/announcement.js

@@ -225,6 +225,45 @@ export const getPinnedAnnouncements = async (req, res, next) => {
   }
 }
 
+export const getLatestAnnouncement = async (req, res, next) => {
+  try {
+    const [announcement] = await Announcement.aggregate([
+      {
+        $sort: { created: -1 },
+      },
+      {
+        $limit: 1,
+      },
+      {
+        $lookup: {
+          from: 'users',
+          as: 'createdBy',
+          let: { userId: '$createdBy' },
+          pipeline: [
+            {
+              $match: { $expr: { $eq: ['$_id', '$$userId'] } },
+            },
+            {
+              $project: {
+                username: 1,
+              },
+            },
+          ],
+        },
+      },
+      {
+        $unwind: {
+          path: '$createdBy',
+          preserveNullAndEmptyArrays: true,
+        },
+      },
+    ])
+    res.json(announcement)
+  } catch (e) {
+    next(e)
+  }
+}
+
 export const deleteAnnouncement = async (req, res, next) => {
   try {
     if (req.userRole !== 'admin') {

api/src/routes/announcement.js

@@ -8,13 +8,15 @@ import {
   getAnnouncements,
   getPinnedAnnouncements,
   pinAnnouncement,
+  getLatestAnnouncement,
 } from '../controllers/announcement'
 
 const router = express.Router()
 
 export default () => {
   router.post('/new', createAnnouncement)
   router.get('/pinned', getPinnedAnnouncements)
+  router.get('/latest', getLatestAnnouncement)
   router.get('/:slug', fetchAnnouncement)
   router.get('/page/:page', getAnnouncements)
   router.delete('/:slug', deleteAnnouncement)

client/components/List.js

@@ -91,7 +91,7 @@ const List = ({ data = [], columns = [], ...rest }) => {
                         width="100%"
                         display="flex"
                         alignItems="center"
-                        textAlign={col.rightAlign ? ['left', 'right'] : 'left'}
+                        textAlign={col.rightAlign ? 'right' : 'left'}
                         _css={{
                           overflow: 'hidden',
                           '> *': {

client/pages/index.js

@@ -168,12 +168,12 @@ export const getServerSideProps = withAuthServerSideProps(
       const latestTorrents = await latestTorrentsRes.json()
 
       const latestAnnouncementRes = await fetch(
-        `${SQ_API_URL}/announcements/page/0?count=1`,
+        `${SQ_API_URL}/announcements/latest`,
         {
           headers: fetchHeaders,
         }
       )
-      const [latestAnnouncement] = await latestAnnouncementRes.json()
+      const latestAnnouncement = await latestAnnouncementRes.json()
 
       const verifiedRes = await fetch(`${SQ_API_URL}/account/get-verified`, {
         headers: fetchHeaders,