From 51995c40194cc61191af94d0bebfd4ff950babee Mon Sep 17 00:00:00 2001
From: Andrea <andrea@avris.it>
Date: Wed, 6 Apr 2022 18:10:57 +0200
Subject: [PATCH] #303 easier moderation - direct link to locale

---
 components/AbuseReports.vue | 11 ++++++++---
 server/routes/admin.js      |  6 ++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/components/AbuseReports.vue b/components/AbuseReports.vue
index da96737e..8f47c49a 100644
--- a/components/AbuseReports.vue
+++ b/components/AbuseReports.vue
@@ -18,11 +18,16 @@
         <template v-slot:row="s"><template v-if="s && s.el.susUsername">
             <td>
                 <a :href="`https://pronouns.page/@${s.el.susUsername}`" target="_blank" rel="noopener">@{{s.el.susUsername}}</a>
+                <ul v-if="s.el.profiles" class="small list-inline">
+                    <li v-for="locale in s.el.profiles.split(',')" class="list-inline-item mt-2">
+                        <LocaleLink :locale="locale" :link="`/@${s.el.susUsername}`">{{ locales[locale].name }}</LocaleLink>
+                    </li>
+                </ul>
             </td>
             <td>
-                        <span v-if="s.el.isAutomatic" class="badge bg-info">
-                            Keyword found
-                        </span>
+                <span v-if="s.el.isAutomatic" class="badge bg-info">
+                    Keyword found
+                </span>
                 <a v-else :href="`https://pronouns.page/@${s.el.reporterUsername}`" target="_blank" rel="noopener">@{{s.el.reporterUsername}}</a>
                 <small>({{$datetime($ulidTime(s.el.id))}})</small>
             </td>
diff --git a/server/routes/admin.js b/server/routes/admin.js
index e5fbaa47..4c255bfc 100644
--- a/server/routes/admin.js
+++ b/server/routes/admin.js
@@ -189,11 +189,13 @@ router.get('/admin/reports', handleErrorAsync(async (req, res) => {
     }
 
     return res.json(await req.db.all(SQL`
-        SELECT reports.id, sus.username AS susUsername, reporter.username AS reporterUsername, reports.comment, reports.isAutomatic, reports.isHandled
+        SELECT reports.id, group_concat(p.locale) as profiles, sus.username AS susUsername, reporter.username AS reporterUsername, reports.comment, reports.isAutomatic, reports.isHandled
         FROM reports
         LEFT JOIN users sus ON reports.userId = sus.id
         LEFT JOIN users reporter ON reports.reporterId = reporter.id
-        ORDER BY reports.isHandled ASC, reports.id DESC
+        LEFT JOIN profiles p on sus.id = p.userId
+        GROUP BY reports.id
+        ORDER BY min(reports.isHandled) ASC, reports.id DESC
     `));
 }));