Commit c43e70d0 by Sixong.Zhu

Merge branch 'pre' into release

parents 12d5177a 1d314e61
Showing with 3 additions and 3 deletions
......@@ -35,7 +35,7 @@ function combineMessages(
) {
const set = new Set<number>();
const items: Message[] = [];
for (const item of [...items1, ...items2]) {
for (const item of [...(items1 || []), ...(items2 || [])]) {
if (item.chat_id !== chat) {
continue;
}
......@@ -376,7 +376,7 @@ export default {
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 } = {};
return (
state: ChatStoreState,
......@@ -993,7 +993,7 @@ export default {
commit(
ChatStore.MUTATION_SAVE_CURRENT_CHAT_MEMBERS,
unique(newChatMembers, function (item, all) {
unique(newChatMembers, function(item, all) {
return all.findIndex((k) => k.eid === item.eid);
})
);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment