rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Move channel register/delete reload logic to message bus

Browse source
This commit is contained in:
Calvin Montgomery 2017-08-15 18:55:36 -07:00
parent d16cfb7328
commit 791a712a68
3 changed files with 64 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/web/account.js
View file

@ -268,18 +268,10 @@ async function handleNewChannel(req, res) {
Logger.eventlog.log("[channel] " + user.name + "@" +
req.realIP +
" registered channel " + name);
var sv = Server.getServer();
if (sv.isChannelLoaded(name)) {
var chan = sv.getChannel(name);
var users = Array.prototype.slice.call(chan.users);
users.forEach(function (u) {
u.kick("Channel reloading");
});
globalMessageBus.emit('ChannelRegistered', {
channel: name
});
if (!chan.dead) {
chan.emit("empty");
}
}
channels.push({
name: name
});
@ -338,19 +330,11 @@ async function handleDeleteChannel(req, res) {
req.realIP + " deleted channel " +
name);
}
var sv = Server.getServer();
if (sv.isChannelLoaded(name)) {
var chan = sv.getChannel(name);
chan.clearFlag(require("../flags").C_REGISTERED);
var users = Array.prototype.slice.call(chan.users);
users.forEach(function (u) {
u.kick("Channel reloading");
});
if (!chan.dead) {
chan.emit("empty");
}
}
globalMessageBus.emit('ChannelDeleted', {
channel: name
});
db.channels.listUserChannels(user.name, function (err2, channels) {
sendPug(res, "account-channels", {
channels: err2 ? [] : channels,