Merge pull request #17 from ecency/bugfix/users

Bugfix/users
ecency · Sep 19, 2024 · 13389fc · 13389fc
2 parents 69d7af3 + c76ac5c
commit 13389fc
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 5 deletions.
diff --git a/src/api/queries/get-account-full-query.ts b/src/api/queries/get-account-full-query.ts
@@ -7,7 +7,7 @@ export const getAccountFullQuery = (username?: string) =>
     queryKey: [QueryIdentifiers.GET_ACCOUNT_FULL, username],
     queryFn: async () => {
       if (!username) {
-        return;
+        return null;
       }
       const response = await getAccount(username);
       let follow_stats: AccountFollowStats | undefined;

diff --git a/src/app/[...slugs]/_profile-components/profile-info/index.tsx b/src/app/[...slugs]/_profile-components/profile-info/index.tsx
@@ -97,7 +97,7 @@ export function ProfileInfo({ account }: Props) {
   return (
     <span className="profile-info">
       <StyledTooltip
-        content={isLoaded && <ProfileInfoContent account={account} rcAccount={rcAccount} />}
+        content={isLoaded ? <ProfileInfoContent account={account} rcAccount={rcAccount} /> : <></>}
       >
         {isLoaded ? <UilInfo width={20} height={20} /> : <Spinner className="w-3.5 h-3.5" />}
       </StyledTooltip>

diff --git a/src/app/client-init.tsx b/src/app/client-init.tsx
@@ -11,11 +11,13 @@ export function ClientInit() {
   const setActiveUser = useGlobalStore((state) => state.setActiveUser);
   const updateActiveUser = useGlobalStore((state) => state.updateActiveUser);
   const initKeychain = useGlobalStore((state) => state.initKeychain);
+  const loadUsers = useGlobalStore((state) => state.loadUsers);
 
   const { data } = getAccountFullQuery(activeUser?.username).useClientQuery();
 
   useMount(() => {
     initI18next();
+    loadUsers();
 
     const activeUsername = ls.get("active_user") ?? Cookies.get("active_user");
     if (activeUsername) {

diff --git a/src/core/global-store/initialization/client-init.ts b/src/core/global-store/initialization/client-init.ts
@@ -14,7 +14,7 @@ export const useClientGlobalStore = create(
   combine(INITIAL_STATE, (set, getState, store) => ({
     ...createUiActions(set, getState),
     ...createGlobalActions(set, getState),
-    ...createUsersActions(),
+    ...createUsersActions(set, getState),
     ...createAuthenticationActions(set, getState),
     ...createSigningKeyActions(set, getState),
     ...createNotificationsActions(set, getState)

diff --git a/src/core/global-store/initialization/server-init.ts b/src/core/global-store/initialization/server-init.ts
@@ -21,7 +21,7 @@ const getServerStore = () =>
     combine(INITIAL_STATE, (set, getState, store) => ({
       ...createUiActions(set, getState),
       ...createGlobalActions(set, getState),
-      ...createUsersActions(),
+      ...createUsersActions(set, getState),
       ...createAuthenticationActions(set, getState),
       ...createSigningKeyActions(set, getState),
       ...createNotificationsActions(set, getState)

diff --git a/src/core/global-store/modules/users-module.ts b/src/core/global-store/modules/users-module.ts
@@ -8,8 +8,23 @@ export function createUsersState() {
   };
 }
 
-export function createUsersActions() {
+type State = ReturnType<typeof createUsersState>;
+
+export function createUsersActions(set: (state: Partial<State>) => void, getState: () => State) {
   return {
+    loadUsers: () =>
+      set({
+        users: ls.getByPrefix("user_").map((x) => {
+          const u = decodeObj(x) as User;
+          return {
+            username: u.username,
+            refreshToken: "",
+            accessToken: "",
+            expiresIn: u.expiresIn,
+            postingKey: u.postingKey
+          };
+        })
+      }),
     addUser: (user: User) => {
       ls.set(`user_${user.username}`, encodeObj(user));
       ls.getByPrefix("user_").map((x) => {

diff --git a/src/styles/_base.scss b/src/styles/_base.scss
@@ -10,6 +10,7 @@ html {
 
 body {
   min-width: 280px;
+  overflow-x: hidden;
 
   .full-height {
     position: absolute;