From cdda7248a2d8675bf37a9f10368d6e16c62e695c Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Thu, 17 Jun 2021 22:24:15 +0200
Subject: [PATCH] try potential optimisation of SSR in profiles

---
 routes/profile.vue | 26 +++++++++++++++-----------
 server/index.js    |  5 +++--
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/routes/profile.vue b/routes/profile.vue
index ed77868d3..7ab430c32 100644
--- a/routes/profile.vue
+++ b/routes/profile.vue
@@ -1,5 +1,10 @@
 <template>
     <div v-if="profile">
+        <ClientOnly>
+        <div slot="placeholder" class="my-5 text-center">
+            <Spinner size="5rem"/>
+        </div>
+
         <div class="mb-3 d-flex justify-content-between flex-column flex-md-row">
             <h2 class="text-nowrap">
                 <Avatar :user="profile"/>
@@ -31,17 +36,15 @@
             </div>
         </div>
 
-        <client-only>
-            <section v-if="$isGranted('users') && profile.bannedReason">
-                <div class="alert alert-warning">
-                    <p class="h4">
-                        <Icon v="ban"/>
-                        {{$t('ban.banned')}}
-                    </p>
-                    <p class="mb-0">{{profile.bannedReason}}</p>
-                </div>
-            </section>
-        </client-only>
+        <section v-if="$isGranted('users') && profile.bannedReason">
+            <div class="alert alert-warning">
+                <p class="h4">
+                    <Icon v="ban"/>
+                    {{$t('ban.banned')}}
+                </p>
+                <p class="mb-0">{{profile.bannedReason}}</p>
+            </div>
+        </section>
 
         <section v-if="profile.age ||profile.description.trim().length">
             <p v-for="line in profile.description.split('\n')" class="mb-1">
@@ -140,6 +143,7 @@
         <section>
             <Share/>
         </section>
+        </ClientOnly>
     </div>
     <div v-else-if="Object.keys(profiles).length">
         <h2 class="text-nowrap mb-3">
diff --git a/server/index.js b/server/index.js
index aa26ec0f5..53bf966ee 100644
--- a/server/index.js
+++ b/server/index.js
@@ -32,11 +32,12 @@ app.use(async function (req, res, next) {
         req.isGranted = (area, locale = global.config.locale) => req.user && isGranted(req.user, locale, area);
         req.db = await dbConnection();
         res.on('finish', async () => {
-            await req.db.close();
+            try {
+                await req.db.close();
+            } catch {}
         });
         next();
     } catch (err) {
-        console.log('aaa', err);
         next(err);
     }
 });