DRY get current Account

src/components/compose.jsx

@@ -13,6 +13,7 @@ import emojifyText from '../utils/emojify-text';
 import openCompose from '../utils/open-compose';
 import states from '../utils/states';
 import store from '../utils/store';
+import { getCurrentAccount } from '../utils/store-utils';
 import useDebouncedCallback from '../utils/useDebouncedCallback';
 import visibilityIconsMap from '../utils/visibility-icons-map';
 
@@ -80,18 +81,13 @@ function Compose({
   console.warn('RENDER COMPOSER');
   const [uiState, setUIState] = useState('default');
 
-  const accounts = store.local.getJSON('accounts');
+  const currentAccount = getCurrentAccount();
-  const currentAccount = store.session.get('currentAccount');
+  const currentAccountInfo = currentAccount.info;
-  const currentAccountInfo = accounts.find(
-    (a) => a.info.id === currentAccount,
-  ).info;
 
   const configuration = useMemo(() => {
     try {
       const instances = store.local.getJSON('instances');
-      const currentInstance = accounts
+      const currentInstance = currentAccount.instanceURL.toLowerCase();
-        .find((a) => a.info.id === currentAccount)
-        .instanceURL.toLowerCase();
       const config = instances[currentInstance].configuration;
       console.log(config);
       return config;
@@ -269,7 +265,7 @@ function Compose({
     }
 
     // check if status contains only "@acct", if replying
-    const isSelf = replyToStatus?.account.id === currentAccount;
+    const isSelf = replyToStatus?.account.id === currentAccountInfo.id;
     const hasOnlyAcct =
       replyToStatus && value.trim() === `@${replyToStatus.account.acct}`;
     // TODO: check for mentions, or maybe just generic "@username<space>", including multiple mentions like "@username1<space>@username2<space>"

src/compose.jsx

@@ -7,7 +7,7 @@ import { render } from 'preact';
 import { useEffect, useState } from 'preact/hooks';
 
 import Compose from './components/compose';
-import store from './utils/store';
+import { getCurrentAccount } from './utils/store-utils';
 import useTitle from './utils/useTitle';
 
 if (window.opener) {
@@ -18,12 +18,7 @@ if (window.opener) {
   if (window.masto) return;
   console.warn('window.masto not found. Trying to log in...');
   try {
-    const accounts = store.local.getJSON('accounts') || [];
+    const { instanceURL, accessToken } = getCurrentAccount();
-    const currentAccount = store.session.get('currentAccount');
-    const account =
-      accounts.find((a) => a.info.id === currentAccount) || accounts[0];
-    const instanceURL = account.instanceURL;
-    const accessToken = account.accessToken;
     window.masto = await login({
       url: `https://${instanceURL}`,
       accessToken,

src/pages/status.jsx

@@ -16,6 +16,7 @@ import htmlContentLength from '../utils/html-content-length';
 import shortenNumber from '../utils/shorten-number';
 import states, { saveStatus } from '../utils/states';
 import store from '../utils/store';
+import { getCurrentAccount } from '../utils/store-utils';
 import useDebouncedCallback from '../utils/useDebouncedCallback';
 import useScroll from '../utils/useScroll';
 import useTitle from '../utils/useTitle';
@@ -206,11 +207,7 @@ function StatusPage({ id }) {
     // Delete the cache for the context
     (async () => {
       try {
-        const accounts = store.local.getJSON('accounts') || [];
+        const { instanceURL } = getCurrentAccount();
-        const currentAccount = store.session.get('currentAccount');
-        const account =
-          accounts.find((a) => a.info.id === currentAccount) || accounts[0];
-        const instanceURL = account.instanceURL;
         const contextURL = `https://${instanceURL}/api/v1/statuses/${id}/context`;
         console.log('Clear cache', contextURL);
         const apiCache = await caches.open('api');

src/utils/store-utils.js

@@ -0,0 +1,9 @@
+import store from './store';
+
+export function getCurrentAccount() {
+  const accounts = store.local.getJSON('accounts') || [];
+  const currentAccount = store.session.get('currentAccount');
+  const account =
+    accounts.find((a) => a.info.id === currentAccount) || accounts[0];
+  return account;
+}