From 4b268fa581745338afb2895e6c2de57b089ab661 Mon Sep 17 00:00:00 2001
From: Avris <andre@avris.it>
Date: Sat, 3 Jul 2021 13:19:43 +0200
Subject: [PATCH] [nouns][terms][inclusive] fix sorting

---
 components/InclusiveDictionary.vue |  4 ++--
 components/TermsDictionary.vue     |  6 ++++--
 server/routes/inclusive.js         | 11 +++++------
 server/routes/terms.js             | 14 ++++++--------
 src/helpers.js                     | 13 +++++++++++++
 5 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/components/InclusiveDictionary.vue b/components/InclusiveDictionary.vue
index 46412cb4..875e136f 100644
--- a/components/InclusiveDictionary.vue
+++ b/components/InclusiveDictionary.vue
@@ -179,7 +179,7 @@
 
 <script>
     import { InclusiveEntry } from "~/src/classes";
-    import { buildDict, clearUrl } from "../src/helpers";
+    import { buildDict, clearUrl, clearLinkedText } from "../src/helpers";
     import hash from "../plugins/hash";
 
     export default {
@@ -268,7 +268,7 @@
                         if (!a.approved && b.approved) {
                             return -1;
                         }
-                        return a.insteadOf.toLowerCase().localeCompare(b.insteadOf.toLowerCase());
+                        return clearLinkedText(a.insteadOf.toLowerCase()).localeCompare(clearLinkedText(b.insteadOf.toLowerCase()));
                     });
                     for (let w of sorted) {
                         yield [w.id, new InclusiveEntry(w)];
diff --git a/components/TermsDictionary.vue b/components/TermsDictionary.vue
index 0f006e22..81c81908 100644
--- a/components/TermsDictionary.vue
+++ b/components/TermsDictionary.vue
@@ -128,7 +128,7 @@
 
 <script>
     import { TermsEntry } from "~/src/classes";
-    import { buildDict, clearUrl } from "../src/helpers";
+    import { buildDict, clearUrl, clearLinkedText } from "../src/helpers";
     import hash from "../plugins/hash";
 
     export default {
@@ -217,7 +217,9 @@
                         if (!a.approved && b.approved) {
                             return -1;
                         }
-                        return a.term.toLowerCase().localeCompare(b.term.toLowerCase());
+                        return clearLinkedText(a.term.toLowerCase()).localeCompare(
+                            clearLinkedText(b.term.toLowerCase())
+                        );
                     });
                     for (let w of sorted) {
                         yield [w.id, new TermsEntry(w)];
diff --git a/server/routes/inclusive.js b/server/routes/inclusive.js
index 5fef4e11..f345252e 100644
--- a/server/routes/inclusive.js
+++ b/server/routes/inclusive.js
@@ -1,7 +1,7 @@
 import { Router } from 'express';
 import SQL from 'sql-template-strings';
 import {ulid} from "ulid";
-import {isTroll, handleErrorAsync} from "../../src/helpers";
+import {isTroll, handleErrorAsync, sortClearedLinkedText} from "../../src/helpers";
 import { caches } from "../../src/cache";
 
 const approve = async (db, id) => {
@@ -25,20 +25,19 @@ const router = Router();
 
 router.get('/inclusive', handleErrorAsync(async (req, res) => {
     return res.json(await caches.inclusive.fetch(async () => {
-        return await req.db.all(SQL`
+        return sortClearedLinkedText(await req.db.all(SQL`
             SELECT i.*, u.username AS author FROM inclusive i
             LEFT JOIN users u ON i.author_id = u.id
             WHERE i.locale = ${global.config.locale}
             AND i.approved >= ${req.isGranted('inclusive') ? 0 : 1}
             AND i.deleted = 0
-            ORDER BY i.approved, i.insteadOf
-        `);
+        `), 'insteadOf');
     }));
 }));
 
 router.get('/inclusive/search/:term', handleErrorAsync(async (req, res) => {
     const term = '%' + req.params.term + '%';
-    return res.json(await req.db.all(SQL`
+    return res.json(sortClearedLinkedText(await req.db.all(SQL`
         SELECT i.*, u.username AS author FROM inclusive i
         LEFT JOIN users u ON i.author_id = u.id
         WHERE i.locale = ${global.config.locale}
@@ -46,7 +45,7 @@ router.get('/inclusive/search/:term', handleErrorAsync(async (req, res) => {
         AND i.deleted = 0
         AND (i.insteadOf like ${term} OR i.say like ${term})
         ORDER BY i.approved, i.insteadOf
-    `));
+    `), 'insteadOf'));
 }));
 
 router.post('/inclusive/submit', handleErrorAsync(async (req, res) => {
diff --git a/server/routes/terms.js b/server/routes/terms.js
index b49109f9..2690fe71 100644
--- a/server/routes/terms.js
+++ b/server/routes/terms.js
@@ -1,7 +1,7 @@
 import { Router } from 'express';
 import SQL from 'sql-template-strings';
 import {ulid} from "ulid";
-import {isTroll, handleErrorAsync} from "../../src/helpers";
+import {isTroll, handleErrorAsync, sortClearedLinkedText} from "../../src/helpers";
 import { caches } from "../../src/cache";
 
 const approve = async (db, id) => {
@@ -24,29 +24,27 @@ const approve = async (db, id) => {
 const router = Router();
 
 router.get('/terms', handleErrorAsync(async (req, res) => {
-    return res.json(await caches.terms.fetch(() => {
-        return req.db.all(SQL`
+    return res.json(await caches.terms.fetch(async () => {
+        return sortClearedLinkedText(await req.db.all(SQL`
             SELECT i.*, u.username AS author FROM terms i
             LEFT JOIN users u ON i.author_id = u.id
             WHERE i.locale = ${global.config.locale}
             AND i.approved >= ${req.isGranted('terms') ? 0 : 1}
             AND i.deleted = 0
-            ORDER BY i.term
-        `);
+        `), 'term');
     }));
 }));
 
 router.get('/terms/search/:term', handleErrorAsync(async (req, res) => {
     const term = '%' + req.params.term + '%';
-    return res.json(await req.db.all(SQL`
+    return res.json(sortClearedLinkedText(await req.db.all(SQL`
         SELECT i.*, u.username AS author FROM terms i
         LEFT JOIN users u ON i.author_id = u.id
         WHERE i.locale = ${global.config.locale}
         AND i.approved >= ${req.isGranted('terms') ? 0 : 1}
         AND i.deleted = 0
         AND (i.term like ${term} OR i.original like ${term})
-        ORDER BY i.term
-    `));
+    `)), 'term');
 }));
 
 router.post('/terms/submit', handleErrorAsync(async (req, res) => {
diff --git a/src/helpers.js b/src/helpers.js
index 13eb77f2..e469c305 100644
--- a/src/helpers.js
+++ b/src/helpers.js
@@ -194,3 +194,16 @@ export const isGranted = (user, locale, area) => {
 export const handleErrorAsync = func => (req, res, next) => {
     func(req, res, next).catch((error) => next(error));
 };
+
+export const clearLinkedText = (text) => {
+    return text
+        .replace(/{[^}=]+=([^}=]+)}/g, '$1')
+        .replace(/{([^}=]+)}/g, '$1')
+        .replace(/[„”"']/g, '')
+    ;
+}
+
+export const sortClearedLinkedText = (items, key) => {
+    items.sort((a, b) => clearLinkedText(a[key].toLowerCase()).localeCompare(clearLinkedText(b[key].toLowerCase())))
+    return items;
+}