e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use immer

Browse source
This commit is contained in:
Ken-Håvard Lieng 2018-04-25 05:36:27 +02:00
parent 7f755d2a83
commit 4f72e164d7
33 changed files with 1236 additions and 1153 deletions
Download patch file Download diff file Expand all files Collapse all files

10
client/src/js/modules/socket.js
View file

@ -9,7 +9,7 @@ import {
} from 'state/messages';
import { reconnect } from 'state/servers';
import { select } from 'state/tab';
import { normalizeChannel } from 'utils';
import { find, normalizeChannel } from 'utils';
function withReason(message, reason) {
return message + (reason ? ` (${reason})` : '');
@ -18,9 +18,9 @@ function withReason(message, reason) {
function findChannels(state, server, user) {
const channels = [];
state.channels.get(server).forEach((channel, channelName) => {
if (channel.get('users').find(u => u.nick === user)) {
channels.push(channelName);
Object.keys(state.channels[server]).forEach(channel => {
if (find(state.channels[server][channel].users, u => u.nick === user)) {
channels.push(channel);
}
});
@ -49,7 +49,7 @@ export default function handleSocket({
const tab = state.tab.selected;
const [joinedChannel] = channels;
if (tab.server && tab.name) {
const { nick } = state.servers.get(tab.server);
const { nick } = state.servers[tab.server];
if (
tab.server === server &&
nick === user &&