From 9bd668df32a745c2e6e9b0b2c23a2d359a36c3eb Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Thu, 24 Feb 2022 10:20:40 +0100
Subject: [PATCH] improve moderation UI

- add missing icons
- add links to fedi user and event
- clean resource creation date
---
 components/admin/Moderation.vue   | 17 ++++++++++++-----
 plugins/filters.js                |  3 +++
 server/api/controller/resource.js |  4 +++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/components/admin/Moderation.vue b/components/admin/Moderation.vue
index e48422bc..8d025f21 100644
--- a/components/admin/Moderation.vue
+++ b/components/admin/Moderation.vue
@@ -10,6 +10,7 @@
             :items-per-page='5'
             :search='instancesFilter'
             :hide-default-footer='instances.length<5'
+            :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }'
             dense :headers='instancesHeader'
             @click:row='instanceSelected')
             template(v-slot:item.blocked="{ item }")
@@ -22,6 +23,7 @@
             :items-per-page='5'
             :search='usersFilter'
             :hide-default-footer='users.length<5'
+            :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }'
             dense :headers='usersHeader')
             template(v-slot:item.blocked="{ item }")
               v-icon(@click='toggleUserBlock(item)' v-text='item.blocked ? mdiCheckboxIntermediate : mdiCheckboxBlankOutline')
@@ -31,13 +33,16 @@
         v-data-table(:items='resources' dense
           :headers='resourcesHeader'
           :hide-default-footer='resources.length<10'
-          :items-per-page='10')
+          :items-per-page='10'
+          :footer-props='{ prevIcon: mdiChevronLeft, nextIcon: mdiChevronRight }')
           template(v-slot:item.content='{ item }')
             span(v-html='item.data.content')
+          template(v-slot:item.created='{ item }')
+            span {{item.created | dateFormat('lll')}}
           template(v-slot:item.user='{ item }')
-            span {{item.ap_user.preferredUsername}}
+            a(:href='item.ap_user.url || item.ap_user.ap_id' target='_blank') {{item.ap_user.preferredUsername}}
           template(v-slot:item.event='{ item }')
-            span {{item.event.title}}
+            nuxt-link(:to='`/event/${item.event.slug || item.event.id}`') {{item.event.title}}
           template(v-slot:item.actions='{ item }')
             v-menu(offset-y)
               template(v-slot:activator="{ on }")
@@ -56,13 +61,15 @@
 <script>
 import { mapState, mapActions } from 'vuex'
 import get from 'lodash/get'
-import { mdiDelete, mdiEye, mdiEyeOff, mdiDotsVertical, mdiCheckboxIntermediate, mdiCheckboxBlankOutline } from '@mdi/js'
+import { mdiDelete, mdiEye, mdiEyeOff, mdiDotsVertical, mdiCheckboxIntermediate,
+mdiCheckboxBlankOutline, mdiChevronLeft, mdiChevronRight } from '@mdi/js'
 
 export default {
   name: 'Moderation',
   data () {
     return {
-      mdiDelete, mdiEye, mdiEyeOff, mdiDotsVertical, mdiCheckboxIntermediate, mdiCheckboxBlankOutline,
+      mdiDelete, mdiEye, mdiEyeOff, mdiDotsVertical, mdiCheckboxIntermediate,
+      mdiCheckboxBlankOutline, mdiChevronLeft, mdiChevronRight,
       instances: [],
       resources: [],
       users: [],
diff --git a/plugins/filters.js b/plugins/filters.js
index 5a9aac16..8147ac9d 100644
--- a/plugins/filters.js
+++ b/plugins/filters.js
@@ -3,6 +3,8 @@ import dayjs from 'dayjs'
 import relativeTime from 'dayjs/plugin/relativeTime'
 import utc from 'dayjs/plugin/utc'
 import timezone from 'dayjs/plugin/timezone'
+import localizedFormat from 'dayjs/plugin/localizedFormat'
+
 
 import 'dayjs/locale/it'
 import 'dayjs/locale/es'
@@ -15,6 +17,7 @@ import 'dayjs/locale/fr'
 dayjs.extend(relativeTime)
 dayjs.extend(utc)
 dayjs.extend(timezone)
+dayjs.extend(localizedFormat)
 
 export default ({ app, store }) => {
   // set timezone to instance_timezone!!
diff --git a/server/api/controller/resource.js b/server/api/controller/resource.js
index f905e78d..2d854de2 100644
--- a/server/api/controller/resource.js
+++ b/server/api/controller/resource.js
@@ -35,9 +35,11 @@ const resourceController = {
       },
       event: {
         id: r.event.id,
-        title: r.event.title
+        title: r.event.title,
+        slug: r.event.slug
       },
       ap_user: {
+        url: get(r, 'ap_user.object.url', ''),
         ap_id: get(r, 'ap_user.ap_id', ''),
         preferredUsername: get(r, 'ap_user.object.preferredUsername', '')
       }