harmacist/darkwire.io
1
0
Fork 0
mirror of https://github.com/darkwire/darkwire.io.git synced 2025-07-19 19:14:53 +00:00
Code Issues Projects Releases Wiki Activity

Better checking of username colors, throw error on blank slash commands

Browse Source
This commit is contained in:
Dan Seripap 2016-02-26 00:36:54 -05:00
parent 0d9b41bb3a
commit 10b1e9c012
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/js/chat.js
View File

@ -29,7 +29,10 @@ export default class Chat {
let usernameContainer = $('<span/>')
.text(matchedUsernames[i])
.css('color', this.getUsernameColor(matchedUsernames[i]));
message = message.replace(matchedUsernames[i], usernameContainer.prop('outerHTML'));
// Match only the username
let matchedUsernameOnly = new RegExp('(' + matchedUsernames[i] + ')(?![^<]*>|[^<>]*<\/)', 'gm');
message = message.replace(matchedUsernameOnly, usernameContainer.prop('outerHTML'));
}
}
@ -51,7 +54,7 @@ export default class Chat {
checkIfUsername(words) {
let matchedUsernames = [];
this.darkwire.users.forEach((user) => {
let usernameMatch = new RegExp('^' + user.username + '$', 'g');
let usernameMatch = new RegExp('^' + user.username + '$');
for (let i = 0; i < words.length; i++) {
let exactMatch = words[i].match(usernameMatch) || false;
let usernameInMemory = this.usernamesInMemory.indexOf(words[i]) > -1;
@ -241,7 +244,7 @@ export default class Chat {
if (commandToTrigger) {
expectedParams = commandToTrigger.paramaters.length;
if (expectedParams && trigger.params.length > expectedParams || expectedParams && trigger.params.length < expectedParams) {
if (!commandToTrigger.multple && trigger.params.length < 1) {
if ((!commandToTrigger.multple && trigger.params.length < 1) || (trigger.params.length >= 1 && trigger.params[0] === '')) {
return this.log('Missing or too many paramater. Usage: ' + commandToTrigger.usage, {error: true});
}
}

2
src/js/main.js
View File

@ -104,7 +104,7 @@ $(function() {
socket.on('user update', (data) => {
darkwire.updateUser(data).then((oldUsername) => {
chat.log(oldUsername + ' changed name to ' + data.username);
chat.log(oldUsername + ' <span>changed name to</span> ' + data.username);
renderParticipantsList();
});
});