Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-05-23 00:06:15 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix check for external messages

Browse Source
This commit is contained in:
Cathy J. Fitzpatrick 2013-04-30 00:42:00 -06:00
parent 318db7bd30
commit d47de6b608
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
rooms.js
View File

@ -1035,10 +1035,6 @@ var BattleRoom = (function() {
};
BattleRoom.prototype.chat = function(user, message, socket) {
var cmd = '', target = '';
if (!(user.userid in this.users)) {
emit(socket, 'message', 'You can\'t send a message to this room without being in it.');
return;
}
if (message.length > MAX_MESSAGE_LENGTH && !user.can('ignorelimits')) {
emit(socket, 'message', "Your message is too long:\n\n"+message);
return;
@ -1063,6 +1059,11 @@ var BattleRoom = (function() {
}
}
if ((cmd === 'me') && !(user.userid in this.users)) {
emit(socket, 'message', 'You can\'t send a message to this room without being in it.');
return;
}
// Battle actions are actually just text commands that are handled in
// parseCommand(), which in turn often calls Simulator.prototype.sendFor().
// Sometimes the call to sendFor is done indirectly, by calling
@ -1103,6 +1104,10 @@ var BattleRoom = (function() {
this.addCmd('chat', user.name, '<<< Access denied.');
}
} else {
if (!(user.userid in this.users)) {
emit(socket, 'message', 'You can\'t send a message to this room without being in it.');
return;
}
this.battle.chat(user, message);
}
this.update();
@ -1388,10 +1393,6 @@ var ChatRoom = (function() {
};
ChatRoom.prototype.chat = function(user, message, socket) {
if (!message || !message.trim || !message.trim().length) return;
if (!(user.userid in this.users)) {
emit(socket, 'message', 'You can\'t send a message to this room without being in it.');
return;
}
if (message.substr(0,5) !== '/utm ' && message.substr(0,5) !== '/trn ' && message.length > MAX_MESSAGE_LENGTH && !user.can('ignorelimits')) {
emit(socket, 'message', "Your message is too long:\n\n"+message);
return;
@ -1417,6 +1418,11 @@ var ChatRoom = (function() {
}
}
if ((cmd === 'me') && !(user.userid in this.users)) {
emit(socket, 'message', 'You can\'t send a message to this room without being in it.');
return;
}
var parsedMessage = parseCommand(user, cmd, target, this, socket, message);
if (typeof parsedMessage === 'string') message = parsedMessage;
if (parsedMessage === false) {
@ -1441,6 +1447,10 @@ var ChatRoom = (function() {
this.add('|c|'+user.getIdentity()+'|<< Access denied.', true);
}
} else if (!user.muted) {
if (!(user.userid in this.users)) {
emit(socket, 'message', 'You can\'t send a message to this room without being in it.');
return;
}
this.add('|c|'+user.getIdentity()+'|'+message, true);
}
this.update();