chore: rename again

src/app/cache/useRehydrate.ts

@@ -6,7 +6,7 @@ import { fullfillMessage } from "../slices/message";
 import { fullfillChannelMsg } from "../slices/message.channel";
 import { fullfillUserMsg } from "../slices/message.user";
 import { fullfillChannels } from "../slices/channels";
-import { fullfillContacts } from "../slices/users";
+import { fullfillUsers } from "../slices/users";
 import { fullfillFootprint } from "../slices/footprint";
 import { fullfillFileMessage } from "../slices/message.file";
 import { fullfillUI } from "../slices/ui";
@@ -75,7 +75,7 @@ const useRehydrate = () => {
       })
     );
     batch(() => {
-      dispatch(fullfillContacts(rehydrateData.users));
+      dispatch(fullfillUsers(rehydrateData.users));
       dispatch(fullfillServer(rehydrateData.server));
       console.log("fullfill channels from indexedDB");
       dispatch(fullfillChannels(rehydrateData.channels));

src/app/listener.middleware/handler.users.ts

@@ -7,7 +7,7 @@ export default async function handler({ operation, data, payload }) {
     return;
   }
   switch (operation) {
-    case "fullfillContacts":
+    case "fullfillUsers":
       {
         const users = payload;
         await Promise.all(
@@ -38,13 +38,13 @@ export default async function handler({ operation, data, payload }) {
         );
       }
       break;
-    case "addContact":
+    case "addUser":
       {
         const { uid } = payload;
         await table.setItem(uid + "", payload);
       }
       break;
-    case "removeContact":
+    case "removeUser":
       {
         const id = payload;
         await table.removeItem(id + "");

src/app/services/user.ts

@@ -4,7 +4,7 @@ import { KEY_UID } from "../config";
 import baseQuery from "./base.query";
 import { resetAuthData } from "../slices/auth.data";
 import { updateMute } from "../slices/footprint";
-import { fullfillContacts } from "../slices/users";
+import { fullfillUsers } from "../slices/users";
 import BASE_URL, { ContentTypes } from "../config";
 import { onMessageSendStarted } from "./handlers";
 import handleChatMessage from "../../common/hook/useStreaming/chat.handler";
@@ -14,7 +14,7 @@ export const userApi = createApi({
   reducerPath: "userApi",
   baseQuery,
   endpoints: (builder) => ({
-    getContacts: builder.query({
+    getUsers: builder.query({
       query: () => ({ url: `user` }),
       transformResponse: (data: User[]) => {
         return data.map((user) => {
@@ -38,20 +38,20 @@ export const userApi = createApi({
             console.log("no matched user, redirect to login");
             dispatch(resetAuthData());
           } else {
-            const markedContacts = users.map((u) => {
+            const markedUsers = users.map((u) => {
               return u.uid == matchedUser.uid ? { ...u, online: true } : u;
             });
-            dispatch(fullfillContacts(markedContacts));
+            dispatch(fullfillUsers(markedUsers));
           }
         } catch {
           console.log("get user list error");
         }
       }
     }),
-    deleteContact: builder.query({
+    deleteUser: builder.query({
       query: (uid) => ({ url: `/admin/user/${uid}`, method: "DELETE" })
     }),
-    updateContact: builder.mutation({
+    updateUser: builder.mutation({
       query: ({ id, ...rest }) => ({
         url: `/admin/user/${id}`,
         body: rest,
@@ -127,12 +127,12 @@ export const userApi = createApi({
 
 export const {
   useLazyGetHistoryMessagesQuery,
-  useUpdateContactMutation,
+  useUpdateUserMutation,
   useUpdateMuteSettingMutation,
-  useLazyDeleteContactQuery,
+  useLazyDeleteUserQuery,
   useUpdateInfoMutation,
   useUpdateAvatarMutation,
-  useGetContactsQuery,
-  useLazyGetContactsQuery,
+  useGetUsersQuery,
+  useLazyGetUsersQuery,
   useSendMsgMutation
 } = userApi;

src/app/slices/users.ts

@@ -23,10 +23,10 @@ const usersSlice = createSlice({
   name: "users",
   initialState,
   reducers: {
-    resetContacts() {
+    resetUsers() {
       return initialState;
     },
-    fullfillContacts(state, action: PayloadAction<StoredUser[]>) {
+    fullfillUsers(state, action: PayloadAction<StoredUser[]>) {
       const users = action.payload || [];
       state.ids = users.map(({ uid }) => uid);
       state.byId = Object.fromEntries(
@@ -36,7 +36,7 @@ const usersSlice = createSlice({
         })
       );
     },
-    removeContact(state, action: PayloadAction<number>) {
+    removeUser(state, action: PayloadAction<number>) {
       const uid = action.payload;
       state.ids = state.ids.filter((i) => i != uid);
       delete state.byId[uid];
@@ -99,6 +99,6 @@ const usersSlice = createSlice({
   }
 });
 
-export const { resetContacts, fullfillContacts, updateUsersByLogs, updateUsersStatus } =
+export const { resetUsers, fullfillUsers, updateUsersByLogs, updateUsersStatus } =
   usersSlice.actions;
 export default usersSlice.reducer;