Force client disconnect, fix userlist bug

This commit is contained in:
calzoneman 2013-04-11 11:30:20 -05:00
parent 0b1a27a131
commit a9b3319e3d
4 changed files with 12 additions and 13 deletions

View file

@ -200,7 +200,7 @@ Channel.prototype.banIP = function(actor, receiver) {
return false; return false;
this.ipbans[receiver.ip] = [receiver.name, actor.name]; this.ipbans[receiver.ip] = [receiver.name, actor.name];
receiver.socket.disconnect(); receiver.socket.disconnect(true);
this.broadcastBanlist(); this.broadcastBanlist();
this.logger.log(receiver.ip + " (" + receiver.name + ") was banned by " + actor.name); this.logger.log(receiver.ip + " (" + receiver.name + ") was banned by " + actor.name);
@ -260,7 +260,7 @@ Channel.prototype.userJoin = function(user) {
// GTFO // GTFO
if(user.ip in this.ipbans && this.ipbans[user.ip] != null) { if(user.ip in this.ipbans && this.ipbans[user.ip] != null) {
this.logger.log("--- Kicking " + user.ip + " - banned"); this.logger.log("--- Kicking " + user.ip + " - banned");
user.socket.disconnect(); user.socket.disconnect(true);
return; return;
} }
@ -317,7 +317,6 @@ Channel.prototype.userLeave = function(user) {
// Their socket might already be dead, so wrap in a try-catch // Their socket might already be dead, so wrap in a try-catch
try { try {
user.socket.leave(this.name); user.socket.leave(this.name);
user.socket.destroy();
} }
catch(e) {} catch(e) {}

View file

@ -55,7 +55,7 @@ function handleKick(chan, user, args) {
if(kickee.socket.disconnected) { if(kickee.socket.disconnected) {
chan.userLeave(kickee); chan.userLeave(kickee);
} }
kickee.socket.disconnect(); kickee.socket.disconnect(true);
} }
} }
} }

View file

@ -9,7 +9,7 @@ The above copyright notice and this permission notice shall be included in all c
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
const VERSION = "1.1.4"; const VERSION = "1.1.5";
var fs = require("fs"); var fs = require("fs");
var Logger = require("./logger.js"); var Logger = require("./logger.js");

View file

@ -135,7 +135,7 @@ function initCallbacks() {
}); });
socket.on("userlist", function(data) { socket.on("userlist", function(data) {
$(".userlist_item").each(function() { this.remove(); }); $(".userlist_item").each(function() { $(this).remove(); });
for(var i = 0; i < data.length; i++) { for(var i = 0; i < data.length; i++) {
addUser(data[i].name, data[i].rank, data[i].leader); addUser(data[i].name, data[i].rank, data[i].leader);
} }