From 03198f9107daf86b5fa87121224234b80b4fa377 Mon Sep 17 00:00:00 2001
From: Avris <andre@avris.it>
Date: Sat, 24 Jul 2021 19:43:17 +0200
Subject: [PATCH] #229 notify about abuse reports

---
 locale/pl/config.suml  |  2 +-
 routes/admin.vue       |  4 ++--
 server/notify.js       |  5 +++--
 server/routes/admin.js | 13 ++++++++++++-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/locale/pl/config.suml b/locale/pl/config.suml
index a145c27c..50d81d48 100644
--- a/locale/pl/config.suml
+++ b/locale/pl/config.suml
@@ -705,7 +705,7 @@ links:
                     To nie jest pocisk, jaki myślicie że jest.
                 - >
                     Nie „autorszcza”, a „autorza”. Można sprawdzić, jakich form używamy:
-                    słownik, który krytykujecie jest {/slowniki/neutratywy#autor=na wyciągnięcie ręki}!
+                    słownik, który krytykujecie, jest {/slowniki/neutratywy#autor=na wyciągnięcie ręki}!
                 - >
                     W skrócie: krótki akapit zajawkowy jest naszpikowany manipulacją, sugeruje jakobyśmy nienawidziły polszczyzny,
                     wkłada słowa w nasze usta i demonstruje brak riserczu na temat, na który piszecie.
diff --git a/routes/admin.vue b/routes/admin.vue
index 6d73f5da..346abde4 100644
--- a/routes/admin.vue
+++ b/routes/admin.vue
@@ -113,13 +113,13 @@
 
                 <template v-slot:row="s"><template v-if="s">
                     <td>
-                        <a :href="`https://pronouns.page/${s.el.susUsername}`" target="_blank" rel="noopener">@{{s.el.susUsername}}</a>
+                        <a :href="`https://pronouns.page/@${s.el.susUsername}`" target="_blank" rel="noopener">@{{s.el.susUsername}}</a>
                     </td>
                     <td>
                         <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>
+                        <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>
                     <td class="small">
diff --git a/server/notify.js b/server/notify.js
index e1db2f87..10c134b1 100644
--- a/server/notify.js
+++ b/server/notify.js
@@ -13,7 +13,7 @@ const isGranted = (user, locale, area) => {
             return true;
         }
         const [ permissionLocale, permissionArea ] = permission.split('-');
-        if ((permissionLocale === '*' || permissionLocale === locale) && (permissionArea === '*' || permissionArea === area)) {
+        if ((permissionLocale === '*' || permissionLocale === locale || locale === null) && (permissionArea === '*' || permissionArea === area)) {
             return true;
         }
     }
@@ -28,6 +28,7 @@ async function notify() {
         ...(await db.all(`SELECT 'nouns' as type, locale, count(*) as c FROM nouns WHERE approved = 0 AND deleted=0 GROUP BY locale`)),
         ...(await db.all(`SELECT 'inclusive' as type, locale, count(*) as c FROM inclusive WHERE approved = 0 AND deleted=0 GROUP BY locale`)),
         ...(await db.all(`SELECT 'sources' as type, locale, count(*) as c FROM sources WHERE approved = 0 AND deleted=0 GROUP BY locale`)),
+        ...(await db.all(`SELECT 'reports' as type, null as locale, count(*) as c FROM reports WHERE isHandled = 0`)),
     ];
     if (!awaitingModeration.length) {
         console.log('No entries awaiting moderation');
@@ -44,7 +45,7 @@ async function notify() {
                 if (awaitingModerationGrouped[admin.email] === undefined) {
                     awaitingModerationGrouped[admin.email] = {};
                 }
-                awaitingModerationGrouped[admin.email][m.locale + '-' + m.type] = m.c;
+                awaitingModerationGrouped[admin.email][(m.locale || '*') + '-' + m.type] = m.c;
             }
         }
         count += m.c;
diff --git a/server/routes/admin.js b/server/routes/admin.js
index 1b35cfc8..f0306086 100644
--- a/server/routes/admin.js
+++ b/server/routes/admin.js
@@ -130,10 +130,21 @@ router.post('/admin/ban/:username', handleErrorAsync(async (req, res) => {
         return res.status(401).json({error: 'Unauthorised'});
     }
 
+    const user = await req.db.get(SQL`SELECT id FROM users WHERE usernameNorm = ${normalise(req.params.username)}`);
+    if (!user) {
+        return res.status(400).json({error: 'No such user'});
+    }
+
     await req.db.get(SQL`
         UPDATE users
         SET bannedReason = ${req.body.reason || null} 
-        WHERE usernameNorm = ${normalise(req.params.username)}
+        WHERE id = ${user.id}
+    `);
+
+    await req.db.get(SQL`
+        UPDATE reports
+        SET isHandled = 1 
+        WHERE userId = ${user.id}
     `);
 
     return res.json(true);