From 0ed06ee68fecc60cbbd74ff8f418174b6f4b7b4c Mon Sep 17 00:00:00 2001
From: Natty <natty.sh.git@gmail.com>
Date: Mon, 6 Nov 2023 00:55:18 +0100
Subject: [PATCH] Frontend: Fixed reactions and invalid access

---
 .../frontend/client/src/components/MkModal.vue    |  4 ++--
 .../client/src/components/MkReactionsViewer.vue   |  2 +-
 .../client/src/components/global/MkPageHeader.vue | 15 ++-------------
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/fe_calckey/frontend/client/src/components/MkModal.vue b/fe_calckey/frontend/client/src/components/MkModal.vue
index 628a2e0..aa6bb01 100644
--- a/fe_calckey/frontend/client/src/components/MkModal.vue
+++ b/fe_calckey/frontend/client/src/components/MkModal.vue
@@ -19,7 +19,7 @@
         @after-enter="onOpened"
     >
         <FocusTrap
-            v-model:active="isActive"
+            v-model:active="manualShowing != null ? manualShowing : showing"
             :return-focus-on-deactivate="!noReturnFocus"
         >
             <div
@@ -77,7 +77,7 @@
 </template>
 
 <script lang="ts" setup>
-import { nextTick, onMounted, watch, provide, onUnmounted } from "vue";
+import { nextTick, onMounted, onUnmounted, provide, watch } from "vue";
 import * as os from "@/os";
 import { isTouchUsing } from "@/scripts/touch";
 import { defaultStore } from "@/store";
diff --git a/fe_calckey/frontend/client/src/components/MkReactionsViewer.vue b/fe_calckey/frontend/client/src/components/MkReactionsViewer.vue
index 10def9d..b852e4c 100644
--- a/fe_calckey/frontend/client/src/components/MkReactionsViewer.vue
+++ b/fe_calckey/frontend/client/src/components/MkReactionsViewer.vue
@@ -6,7 +6,7 @@
                 : Object.entries(note.reactions)"
             :key="magReactionPairToLegacy(r)[0]"
             :reaction="magReactionPairToLegacy(r)[0]"
-            :url="'url' in r[0] ? r[0]['url'] : undefined"
+            :url="typeof r[0]['url'] !== 'undefined' ? r[0]['url'] : undefined"
             :count="magReactionPairToLegacy(r)[1]"
             :is-initial="initialReactions.has(magReactionPairToLegacy(r)[0])"
             :note="note"
diff --git a/fe_calckey/frontend/client/src/components/global/MkPageHeader.vue b/fe_calckey/frontend/client/src/components/global/MkPageHeader.vue
index 2c049e8..15eb877 100644
--- a/fe_calckey/frontend/client/src/components/global/MkPageHeader.vue
+++ b/fe_calckey/frontend/client/src/components/global/MkPageHeader.vue
@@ -91,7 +91,7 @@
             </nav>
         </template>
         <div class="buttons right">
-            <template v-if="metadata.avatar">
+            <template v-if="metadata?.avatar">
                 <MkFollowButton
                     v-if="narrow"
                     :user="metadata.avatar"
@@ -121,21 +121,10 @@
 </template>
 
 <script lang="ts" setup>
-import {
-    computed,
-    onMounted,
-    onUnmounted,
-    ref,
-    inject,
-    watch,
-    shallowReactive,
-    nextTick,
-    reactive,
-} from "vue";
+import { inject, nextTick, onMounted, onUnmounted, ref, watch } from "vue";
 import MkFollowButton from "@/components/MkFollowButton.vue";
 import { popupMenu } from "@/os";
 import { scrollToTop } from "@/scripts/scroll";
-import { globalEvents } from "@/events";
 import { injectPageMetadata } from "@/scripts/page-metadata";
 import { $i, openAccountMenu as openAccountMenu_ } from "@/account";
 import { i18n } from "@/i18n";