diff --git a/src/app/services/user.ts b/src/app/services/user.ts index 258f396e..5409905a 100644 --- a/src/app/services/user.ts +++ b/src/app/services/user.ts @@ -1,8 +1,6 @@ import { createApi } from "@reduxjs/toolkit/query/react"; // import toast from "react-hot-toast"; -import { KEY_UID } from "../config"; import baseQuery from "./base.query"; -import { resetAuthData } from "../slices/auth.data"; import { updateMute } from "../slices/footprint"; import { fillUsers } from "../slices/users"; import BASE_URL, { ContentTypes } from "../config"; @@ -30,21 +28,11 @@ export const userApi = createApi({ }); }, async onQueryStarted(data, { dispatch, queryFulfilled }) { - const local_uid = Number(localStorage.getItem(KEY_UID)); + // const local_uid = Number(localStorage.getItem(KEY_UID)); try { const { data: users } = await queryFulfilled; - const matchedUser = users.find((c) => c.uid == local_uid); - // console.log("wtf", users, matchedUser); - if (!matchedUser) { - // 用户已注销或被禁用 - // console.log("no matched user, redirect to login"); - dispatch(resetAuthData()); - } else { - const markedUsers = users.map((u) => { - return u.uid == matchedUser.uid ? { ...u, online: true } : u; - }); - dispatch(fillUsers(markedUsers)); - } + dispatch(fillUsers(users)); + // } } catch { console.log("get user list error"); } diff --git a/src/app/slices/users.ts b/src/app/slices/users.ts index 26df7e2c..6b0b845b 100644 --- a/src/app/slices/users.ts +++ b/src/app/slices/users.ts @@ -6,7 +6,7 @@ import { UserLog, UserState } from "../../types/sse"; export interface StoredUser extends User { online?: boolean; - avatar: string; + avatar?: string; } export interface State { diff --git a/src/types/user.ts b/src/types/user.ts index 36614658..0b974b71 100644 --- a/src/types/user.ts +++ b/src/types/user.ts @@ -9,7 +9,6 @@ export interface User { is_admin: boolean; avatar_updated_at: number; create_by: string; - avatar?: string; } export type UserStatus = "normal" | "frozen"; export type UserDevice = {