Merge remote-tracking branch 'upstream/main' into refactor/typescript

# Conflicts: # src/app/services/server.ts # src/common/component/GoogleLoginButton.tsx # src/common/utils.tsx
2022-06-28 10:10:56 +08:00
parent 2a3535ea13 aa7c740bcf
commit 30a49921e1
47 changed files with 513 additions and 355 deletions
@@ -219,7 +219,7 @@ export default function useStreaming() {
                const { gid, ...rest } = data;
                dispatch(
                  updateChannel({
-                    id: gid,
+                    gid,
                    ...rest
                  })
                );
@@ -233,7 +233,7 @@ export default function useStreaming() {
                dispatch(
                  updateChannel({
                    operation: "add_member",
-                    id: gid,
+                    gid,
                    members: uids
                  })
                );
@@ -242,13 +242,13 @@ export default function useStreaming() {
            case "user_leaved_group":
              {
                const { gid, uid: uids } = data;
-                if (uids.findIndex((id) => id == loginUid) > -1) {
+                if (uids.findIndex((uid) => uid == loginUid) > -1) {
                  dispatch(removeChannel(gid));
                } else {
                  dispatch(
                    updateChannel({
                      operation: "remove_member",
-                      id: gid,
+                      gid,
                      members: uids
                    })
                  );