From b3e63242b23a95bc99ce59bd9982d2b8adc1da03 Mon Sep 17 00:00:00 2001 From: Guangcong Luo Date: Sat, 10 Sep 2016 15:57:32 -0400 Subject: [PATCH] Support |c|USER|/log MESSAGE The new /log syntax is analogous to /me and /announce Doing it this way makes it easier to support by bots, and also makes it not highlight the initiator but still highlight others which is usually desired. Closes #760 --- js/battledata.js | 2 ++ js/client-chat.js | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/js/battledata.js b/js/battledata.js index 0a0712984..fce464139 100644 --- a/js/battledata.js +++ b/js/battledata.js @@ -457,6 +457,8 @@ var Tools = { ]; case 'announce': return '
' + timestamp + '' + clickableName + ': ' + Tools.parseMessage(target) + '
'; + case 'log': + return '
' + timestamp + '' + Tools.parseMessage(target) + '
'; case 'data-pokemon': var buf = '
  • '; var template = Tools.getTemplate(target); diff --git a/js/client-chat.js b/js/client-chat.js index 719fa5fec..605c255cb 100644 --- a/js/client-chat.js +++ b/js/client-chat.js @@ -1445,9 +1445,11 @@ this.subtleNotifyOnce(); } - if (message.substr(0, 4) === '/me ' || message.substr(0, 5) === '/mee') { - Storage.logChat(this.id, '* ' + name + (message.substr(0, 4) === '/me ' ? ' ' : '') + message); - } else if (message.substr(0, 10) === '/announce ' || message.substr(0, 1) !== '/') { + if (message.slice(0, 4) === '/me ' || message.slice(0, 5) === '/mee') { + Storage.logChat(this.id, '* ' + name + (message.slice(0, 4) === '/me ' ? ' ' : '') + message); + } else if (message.slice(0, 5) === '/log ') { + Storage.logChat(this.id, '' + message.slice(5)); + } else { Storage.logChat(this.id, '' + name + ': ' + message); } },