Merge branch 'master' into pre

store/index.ts

@@ -35,7 +35,7 @@ function combineMessages(
 ) {
 ) {
     const set = new Set<number>();
     const set = new Set<number>();
     const items: Message[] = [];
     const items: Message[] = [];
-    for (const item of [...items1, ...items2]) {
+    for (const item of [...(items1 || []), ...(items2 || [])]) {
         if (item.chat_id !== chat) {
         if (item.chat_id !== chat) {
             continue;
             continue;
         }
         }
@@ -232,8 +232,8 @@ export default {
                 );
                 );
                 const withdraw = hasWithdraw
                 const withdraw = hasWithdraw
                     ? newItems
                     ? newItems
-                          .filter((i) => i.type === MessageType.Withdraw)
-                          .map((i) => +i.msg)
+                        .filter((i) => i.type === MessageType.Withdraw)
+                        .map((i) => +i.msg)
                     : [];
                     : [];
                 const filterout = withdraw.length
                 const filterout = withdraw.length
                     ? newItems.filter((i) => !withdraw.includes(i.id))
                     ? newItems.filter((i) => !withdraw.includes(i.id))
@@ -376,7 +376,7 @@ export default {
                 state[ChatStore.STATE_CHAT_SENDING_MESSAGES] = [...current];
                 state[ChatStore.STATE_CHAT_SENDING_MESSAGES] = [...current];
             }
             }
         },
         },
-        [ChatStore.MUTATION_SAVE_CURRENT_CHAT_INPUTING]: (function () {
+        [ChatStore.MUTATION_SAVE_CURRENT_CHAT_INPUTING]: (function() {
             const setTimeoutId: { [key: string]: number } = {};
             const setTimeoutId: { [key: string]: number } = {};
             return (
             return (
                 state: ChatStoreState,
                 state: ChatStoreState,
@@ -993,7 +993,7 @@ export default {
 
 
             commit(
             commit(
                 ChatStore.MUTATION_SAVE_CURRENT_CHAT_MEMBERS,
                 ChatStore.MUTATION_SAVE_CURRENT_CHAT_MEMBERS,
-                unique(newChatMembers, function (item, all) {
+                unique(newChatMembers, function(item, all) {
                     return all.findIndex((k) => k.eid === item.eid);
                     return all.findIndex((k) => k.eid === item.eid);
                 })
                 })
             );
             );
@@ -1250,8 +1250,8 @@ export default {
                             p.read_count = option.all
                             p.read_count = option.all
                                 ? p.total_read_count
                                 ? p.total_read_count
                                 : option.readed
                                 : option.readed
-                                ? option.readed
-                                : p.read_count + 1;
+                                    ? option.readed
+                                    : p.read_count + 1;
                         }
                         }
                     }
                     }
                 } else {
                 } else {
@@ -1260,8 +1260,8 @@ export default {
                         p.read_count = option.all
                         p.read_count = option.all
                             ? p.total_read_count
                             ? p.total_read_count
                             : option.readed
                             : option.readed
-                            ? option.readed
-                            : p.read_count + 1;
+                                ? option.readed
+                                : p.read_count + 1;
                     }
                     }
                 }
                 }
             }
             }