From 32c13d4c995b602fa841836c07615bddc4b77b4d Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Sun, 12 May 2024 17:44:32 -1000
Subject: [PATCH] fix: :bug: Fixes with not refreshing localStorage me value

---
 app.vue                          | 12 ++++++++++++
 components/composer/composer.vue | 10 +++++-----
 composables/CustomEmojis.ts      |  7 +++++++
 pages/oauth/consent.vue          |  3 +--
 4 files changed, 25 insertions(+), 7 deletions(-)
 create mode 100644 composables/CustomEmojis.ts

diff --git a/app.vue b/app.vue
index f0ee7fa..dd4df2e 100644
--- a/app.vue
+++ b/app.vue
@@ -22,6 +22,7 @@ const client = useMegalodon(tokenData);
 const instance = useInstance(client);
 const description = useExtendedDescription(client);
 const me = useMe();
+const customEmojis = useCustomEmojis(client);
 
 useSeoMeta({
     titleTemplate: (titleChunk) => {
@@ -82,6 +83,17 @@ watch(
     },
     { immediate: true },
 );
+
+// Refresh custom emojis and instance data and me on every reload
+if (tokenData.value) {
+    await client.value?.verifyAccountCredentials().then((res) => {
+        me.value = res.data;
+    });
+}
+
+client.value?.getInstanceCustomEmojis().then((res) => {
+    customEmojis.value = res.data;
+});
 </script>
 
 <style>
diff --git a/components/composer/composer.vue b/components/composer/composer.vue
index 1e10e20..4077f17 100644
--- a/components/composer/composer.vue
+++ b/components/composer/composer.vue
@@ -24,7 +24,7 @@
             </div>
         </div>
         <!-- Content warning textbox -->
-        <div v-if="cw !== null" class="mb-4">
+        <div v-if="cw" class="mb-4">
             <input type="text" v-model="cwContent" placeholder="Add a content warning"
                 class="w-full p-2 mt-1 text-sm prose prose-invert bg-dark-900 rounded focus:!ring-0 !ring-none !border-none !outline-none placeholder:text-zinc-500 appearance-none focus:!border-none focus:!outline-none" />
         </div>
@@ -45,7 +45,7 @@
             <ComposerButton title="Add a file">
                 <iconify-icon width="1.25rem" height="1.25rem" icon="tabler:file-upload" aria-hidden="true" />
             </ComposerButton>
-            <ComposerButton title="Add content warning" @click="cw = cw === null ? '' : null" :toggled="cw !== null">
+            <ComposerButton title="Add content warning" @click="cw = !cw" :toggled="cw">
                 <iconify-icon width="1.25rem" height="1.25rem" icon="tabler:rating-18-plus" aria-hidden="true" />
             </ComposerButton>
             <ButtonsPrimary :loading="submitting" @click="send" class="ml-auto rounded-full">
@@ -68,7 +68,7 @@ const { Control_Enter, Command_Enter, Control_Alt } = useMagicKeys();
 const respondingTo = ref<Status | null>(null);
 const respondingType = ref<"reply" | "quote" | null>(null);
 const me = useMe();
-const cw = ref(null as string | null);
+const cw = ref(false);
 const cwContent = ref("");
 const markdown = ref(true);
 
@@ -130,8 +130,8 @@ const send = async () => {
                 respondingType.value === "quote"
                     ? respondingTo.value?.id
                     : null,
-            spoiler_text: cw ? cwContent.value.trim() : undefined,
-            sensitive: !!cw,
+            spoiler_text: cw.value ? cwContent.value.trim() : undefined,
+            sensitive: cw.value,
         }),
     })
         .then(async (res) => {
diff --git a/composables/CustomEmojis.ts b/composables/CustomEmojis.ts
new file mode 100644
index 0000000..d0a0679
--- /dev/null
+++ b/composables/CustomEmojis.ts
@@ -0,0 +1,7 @@
+import type { Mastodon } from "megalodon";
+import type { Emoji } from "~/types/mastodon/emoji";
+
+export const useCustomEmojis = (client: MaybeRef<Mastodon | null>) => {
+    // Cache in localStorage
+    return useLocalStorage<Emoji[]>("lysand:custom_emojis", []);
+};
diff --git a/pages/oauth/consent.vue b/pages/oauth/consent.vue
index bd8f5cc..9294674 100644
--- a/pages/oauth/consent.vue
+++ b/pages/oauth/consent.vue
@@ -100,8 +100,7 @@ const redirect_uri = query.redirect_uri as string;
 const client_id = query.client_id;
 const scope = query.scope ? decodeURIComponent(query.scope as string) : "";
 
-const validUrlParameters =
-    application && redirect_uri && client_id && scope;
+const validUrlParameters = application && redirect_uri && client_id && scope;
 
 const oauthScopeText: Record<string, string> = {
     "rw:accounts": "$VERB your account information",