From a2a21497760cea1acbc86bab067b46377c658d1e Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Sat, 27 Apr 2024 21:54:13 -1000
Subject: [PATCH] fix: :bug: Don't auto mention yourself when replying/quoting
 yourself

---
 app.vue                            | 17 ++++++++++++++---
 components/composer/composer.vue   |  7 +++++--
 components/sidebars/navigation.vue |  4 +++-
 composables/Me.ts                  |  8 ++++++++
 composables/Megalodon.ts           |  5 +----
 5 files changed, 31 insertions(+), 10 deletions(-)
 create mode 100644 composables/Me.ts

diff --git a/app.vue b/app.vue
index b81e7a8..625e7f3 100644
--- a/app.vue
+++ b/app.vue
@@ -15,11 +15,12 @@ useServerSeoMeta({
 provideHeadlessUseId(() => useId());
 
 const code = useRequestURL().searchParams.get("code");
+const appData = useAppData();
+const tokenData = useTokenData();
+const client = useMegalodon(tokenData);
+const me = useMe();
 
 if (code) {
-    const client = useMegalodon();
-    const appData = useAppData();
-    const tokenData = useTokenData();
     if (appData.value) {
         client.value
             ?.fetchAccessToken(
@@ -40,6 +41,16 @@ if (code) {
             });
     }
 }
+
+watch(tokenData, async () => {
+    if (tokenData.value && !me.value) {
+        const response = await client.value?.verifyAccountCredentials()
+
+        if (response?.data) {
+            me.value = response.data;
+        }
+    }
+}, { immediate: true })
 </script>
 
 <style>
diff --git a/components/composer/composer.vue b/components/composer/composer.vue
index 0802885..237768d 100644
--- a/components/composer/composer.vue
+++ b/components/composer/composer.vue
@@ -40,19 +40,22 @@ const { input: content } = useTextareaAutosize({
 const { Control_Enter, Command_Enter } = useMagicKeys();
 const respondingTo = ref<Status | null>(null);
 const respondingType = ref<"reply" | "quote" | null>(null);
+const me = useMe();
 
 onMounted(() => {
     useListen("composer:reply", (note: Status) => {
         respondingTo.value = note;
         respondingType.value = "reply";
-        content.value = `@${note.account.acct} `;
+        if (note.account.id !== me.value?.id)
+            content.value = `@${note.account.acct} `;
         textarea.value?.focus();
     });
 
     useListen("composer:quote", (note: Status) => {
         respondingTo.value = note;
         respondingType.value = "quote";
-        content.value = `@${note.account.acct} `;
+        if (note.account.id !== me.value?.id)
+            content.value = `@${note.account.acct} `;
         textarea.value?.focus();
     });
 });
diff --git a/components/sidebars/navigation.vue b/components/sidebars/navigation.vue
index 742cb76..009a609 100644
--- a/components/sidebars/navigation.vue
+++ b/components/sidebars/navigation.vue
@@ -71,6 +71,7 @@ const loadingAuth = ref(false);
 const appData = useAppData();
 const tokenData = useTokenData();
 const client = useMegalodon();
+const me = useMe();
 
 const compose = () => {
     useEvent("composer:open");
@@ -124,8 +125,9 @@ const signOut = async () => {
             tokenData.value.access_token,
             tokenData.value.access_token,
         )
-        .catch(() => {});
+        .catch(() => { });
 
     tokenData.value = null;
+    me.value = null;
 };
 </script>
\ No newline at end of file
diff --git a/composables/Me.ts b/composables/Me.ts
new file mode 100644
index 0000000..28f2872
--- /dev/null
+++ b/composables/Me.ts
@@ -0,0 +1,8 @@
+import { StorageSerializers } from "@vueuse/core";
+import type { Account } from "~/types/mastodon/account";
+
+export const useMe = () => {
+    return useLocalStorage<Account | null>("lysand:me", null, {
+        serializer: StorageSerializers.object,
+    });
+};
diff --git a/composables/Megalodon.ts b/composables/Megalodon.ts
index dff794b..0f71d23 100644
--- a/composables/Megalodon.ts
+++ b/composables/Megalodon.ts
@@ -10,9 +10,6 @@ export const useMegalodon = (
 
     return computed(
         () =>
-            new Mastodon(
-                useBaseUrl().value,
-                ref(tokenData).value?.access_token,
-            ),
+            new Mastodon(useBaseUrl().value, toValue(tokenData)?.access_token),
     );
 };