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

Improve error routing, fix dm tab not opening

Browse Source
This commit is contained in:
Ken-Håvard Lieng 2020-06-21 05:13:38 +02:00
parent 1c996822cd
commit ca23b3ded8
4 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
assets/bindata.go
View File

File diff suppressed because one or more lines are too long

12
client/js/modules/socket.js
View File

@ -112,6 +112,18 @@ export default function handleSocket({
}, },
error({ network, target, message }) { error({ network, target, message }) {
const state = getState();
const tab = state.tab.selected;
if (network === tab.network) {
// Print it in the current channel if the error happened on
// the current network
target = tab.name;
} else if (!state.channels[network]?.[target]) {
// Print it the network tab if the target does not exist
target = null;
}
dispatch( dispatch(
addMessage({ content: message, type: 'error' }, network, target) addMessage({ content: message, type: 'error' }, network, target)
); );

8
client/js/state/privateChats.js
View File

@ -1,4 +1,5 @@
import sortBy from 'lodash/sortBy'; import sortBy from 'lodash/sortBy';
import { isChannel } from 'utils';
import createReducer from 'utils/createReducer'; import createReducer from 'utils/createReducer';
import { updateSelection } from './tab'; import { updateSelection } from './tab';
import * as actions from './actions'; import * as actions from './actions';
@ -39,9 +40,10 @@ export default createReducer(
}); });
}, },
[actions.socket.PM](state, action) { [actions.ADD_MESSAGE](state, { message }) {
if (action.from.indexOf('.') === -1) { const { network, from } = message;
open(state, action.network, action.from); if (from !== network && !isChannel(from)) {
open(state, network, from);
} }
}, },

15
server/irc_handler.go
View File

@ -105,19 +105,16 @@ func (i *ircHandler) run() {
} }
func (i *ircHandler) dispatchMessage(msg *irc.Message) { func (i *ircHandler) dispatchMessage(msg *irc.Message) {
if msg.Command[0] == '4' && !isExcludedError(msg.Command) { if (msg.Command[0] == '4' || msg.Command[0] == '5') &&
len(msg.Params) > 1 &&
!isExcludedError(msg.Command) {
err := IRCError{ err := IRCError{
Network: i.client.Host(), Network: i.client.Host(),
Message: msg.LastParam(), Message: strings.Join(msg.Params[1:], " "),
} }
if len(msg.Params) > 2 { if isChannel(msg.Params[1]) {
for i := 1; i < len(msg.Params); i++ { err.Target = msg.Params[1]
if isChannel(msg.Params[i]) {
err.Target = msg.Params[i]
break
}
}
} }
i.state.sendJSON("error", err) i.state.sendJSON("error", err)