From 60b3d3b0ed8ccc556fe765998591d3c49d529a67 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Fri, 3 Nov 2023 19:04:01 +0100
Subject: [PATCH] Comment applied

---
 components/nav/NavFooter.vue                |  2 +-
 components/settings/SettingsAbout.vue       |  8 +++-----
 server/api/[server]/extended_description.ts | 14 --------------
 3 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 server/api/[server]/extended_description.ts

diff --git a/components/nav/NavFooter.vue b/components/nav/NavFooter.vue
index f50c9fe661..5447140600 100644
--- a/components/nav/NavFooter.vue
+++ b/components/nav/NavFooter.vue
@@ -34,7 +34,7 @@ function toggleDark() {
       </CommonTooltip>
     </div>
     <div>
-      <NuxtLink to="/about" target="_blank">
+      <NuxtLink to="/about">
         About
       </NuxtLink>
       &middot;
diff --git a/components/settings/SettingsAbout.vue b/components/settings/SettingsAbout.vue
index 6234f06d1a..6ed58990b8 100644
--- a/components/settings/SettingsAbout.vue
+++ b/components/settings/SettingsAbout.vue
@@ -1,12 +1,12 @@
 <script setup lang="js">
-const content = (await $fetch(`/api/${publicServer.value}/extended_description`)).content
+const content = (await $fetch(`https://${publicServer.value}/api/v1/instance/extended_description`)).content
 const instance = await useMastoClient().v2.instance.fetch()
 
 const { t } = useI18n()
 
 const subtitle = t('about.subtitle')
 const administered_by = t('about.administered_by')
-const contact = t('about.contact', [instance.contact.email])
+const contact = t('about.contact', [`<a href="mailto:${instance.contact.email}">${instance.contact.email}</a>`])
 const server_rules = t('about.server_rules')
 const footer_about = t('about.footer_about')
 const footer_profiles_directory = t('about.footer_privacy_notice')
@@ -34,9 +34,7 @@ const footer_view_code = t('about.footer_view_code', [instance.version])
 
       <AccountCard :account="instance.contact.account" />
 
-      <div p-t-2>
-        {{ contact }}
-      </div>
+      <div p-t-2 class="content-rich" v-html="contact" />
     </div>
 
     <div m-b-5 b-t-1px p-t-5 class="content-rich" v-html="content" />
diff --git a/server/api/[server]/extended_description.ts b/server/api/[server]/extended_description.ts
deleted file mode 100644
index f3bb2e734f..0000000000
--- a/server/api/[server]/extended_description.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-export default defineEventHandler(async (event) => {
-  try {
-    const { server } = getRouterParams(event)
-
-    const data = await fetch(
-      `https://${server}/api/v1/instance/extended_description`,
-    ).then(response => response.json())
-    return data
-  }
-  catch (err) {
-    console.warn(err)
-    return []
-  }
-})