From 7037379c8b69bdf24fb1699740a96da9a372fb85 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Sat, 20 Aug 2022 11:06:39 +0200
Subject: [PATCH] [pl][blog] expose relevant posts on /neutratywy and
 /osobatywy

---
 components/BlogEntriesList.vue | 26 +++++++++++++++++++++++---
 locale/pl/nouns/neutratywy.vue |  4 ++++
 locale/pl/nouns/osobatywy.vue  |  4 ++++
 server/routes/blog.js          | 24 ++++++++++++++++--------
 4 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/components/BlogEntriesList.vue b/components/BlogEntriesList.vue
index bac9f189f..db75c70b3 100644
--- a/components/BlogEntriesList.vue
+++ b/components/BlogEntriesList.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="columnist-wall row">
-        <div v-for="post in posts" class="columnist-column col-12 col-sm-6 col-md-4 mb-3">
+        <div v-for="post in postsFull" class="columnist-column col-12 col-sm-6 col-md-4 mb-3">
             <div class="card shadow">
                 <nuxt-link v-if="post.hero" :to="generateLink(post.slug)" class="">
                     <img :src="post.hero" class="w-100"/>
@@ -47,15 +47,35 @@
                 }
             }
 
-            return { shortcuts };
+            return {
+                shortcuts,
+                postsFull: [],
+            };
         },
-        mounted() {
+        async mounted() {
+            this.postsFull = await this.loadFullPosts(this.posts);
+
+            console.log(this.postsFull);
+
             if (!process.client) { return; }
 
             const columnist = new Columnist(this.$el);
             columnist.start();
         },
         methods: {
+            async loadFullPosts(posts) {
+                if (!posts.length) {
+                    return [];
+                }
+                if (typeof(posts[0]) === 'object') {
+                    return posts;
+                }
+                return await this.$axios.$get(`/blog`, {
+                    params: {
+                        slugs: posts,
+                    },
+                })
+            },
             generateLink(slug) {
                 return this.shortcuts[slug] !== undefined
                     ? `/${this.shortcuts[slug]}`
diff --git a/locale/pl/nouns/neutratywy.vue b/locale/pl/nouns/neutratywy.vue
index e2c368ff4..3ecdf6236 100644
--- a/locale/pl/nouns/neutratywy.vue
+++ b/locale/pl/nouns/neutratywy.vue
@@ -18,6 +18,10 @@
             </figure>
         </div>
 
+        <section>
+            <BlogEntriesList :posts="['etymologia-odmiana-neutratywów', 'neutratywy-zdrobnienia']"/>
+        </section>
+
         <details class="border mb-3">
             <summary class="bg-light p-3">
                 <h4 class="h5 d-inline"><T>nouns.neuterNouns.extended.header</T></h4>
diff --git a/locale/pl/nouns/osobatywy.vue b/locale/pl/nouns/osobatywy.vue
index 0bf0fed5c..6b1ee4261 100644
--- a/locale/pl/nouns/osobatywy.vue
+++ b/locale/pl/nouns/osobatywy.vue
@@ -13,6 +13,10 @@
             <p><Share :title="$t('nouns.personNouns.header')"/></p>
         </div>
 
+        <section>
+            <BlogEntriesList :posts="['krótka-notka-o-osobatywach', 'osobatywy-nie-takie-straszne']"/>
+        </section>
+
         <details open class="border mb-3">
             <summary class="bg-light p-3">
                 <h4 class="h5 d-inline"><T>nouns.examples</T></h4>
diff --git a/server/routes/blog.js b/server/routes/blog.js
index 5e43e2902..5c1acda5f 100644
--- a/server/routes/blog.js
+++ b/server/routes/blog.js
@@ -66,18 +66,26 @@ router.get('/blog', handleErrorAsync(async (req, res) => {
         return posts;
     })
 
-    if (req.query.shortcuts !== undefined) {
-        const postsShortcuts = [];
-        if (global.config.blog && global.config.blog.shortcuts) {
-            for (let slug of Object.values(global.config.blog.shortcuts)) {
-                postsShortcuts.push(posts.filter(p => p.slug === slug)[0])
+    return res.json(posts.filter(post => {
+        if (req.query.shortcuts !== undefined) {
+            if (!global.config.blog || !global.config.blog.shortcuts) {
+                return false;
+            }
+
+            if (!Object.values(global.config.blog.shortcuts).includes(post.slug)) {
+                return false;
             }
         }
 
-        return res.json(postsShortcuts);
-    }
+        if (req.query.slugs !== undefined) {
+            const slugs = Array.isArray(req.query.slugs) ? req.query.slugs : [req.query.slugs];
+            if (!slugs.includes(post.slug)) {
+                return false;
+            }
+        }
 
-    return res.json(posts);
+        return true;
+    }));
 }));
 
 export default router;