diff --git a/plugins/chat.js b/plugins/chat.js index c87e042..69ea555 100644 --- a/plugins/chat.js +++ b/plugins/chat.js @@ -18,7 +18,17 @@ function inject(bot) { bot.on('parsed_chat', (message, packet) => { try { const raw = message.toMotd().substring(0, 32767); - if (raw.match(/<.*§r> .*/g)) { + if (raw.match(/.* .*§r: §.*/g)) { + // if (packet.sender === '00000000-0000-0000-0000-000000000000') return; + const username = raw.replace(/.*?\[.*?\] /, '').replace(/:.*/g, '').replace(/§#....../gm, ''); + const message = raw.split('§r: ')[1].substr(2); + bot.emit('message', username, message, packet.sender); + } else if (raw.match(/.* .*: .*/g)) { + // if (packet.sender === '00000000-0000-0000-0000-000000000000') return; + const username = raw.replace(/.*?\[.*?\] /, '').replace(/:.*/g, '').replace(/§#....../gm, ''); + const message = raw.split(': ')[1]; + bot.emit('message', username, message, packet.sender); + } else if (raw.match(/<.*§r> .*/g)) { // if (packet.sender === '00000000-0000-0000-0000-000000000000') return; const username = raw.substr(3).split('§r>')[0]; @@ -31,16 +41,6 @@ function inject(bot) { const username = raw.substr(3).split('>')[0]; const message = raw.split('> ')[1]; - bot.emit('message', username, message, packet.sender); - } else if (raw.match(/.* .*§r: §.*/g)) { - // if (packet.sender === '00000000-0000-0000-0000-000000000000') return; - const username = raw.replace(/.*?\[.*?\] /, '').replace(/:.*/g, '').replace(/§#....../gm, ''); - const message = raw.split('§r: ')[1].substr(2); - bot.emit('message', username, message, packet.sender); - } else if (raw.match(/.* .*: .*/g)) { - // if (packet.sender === '00000000-0000-0000-0000-000000000000') return; - const username = raw.replace(/.*?\[.*?\] /, '').replace(/:.*/g, '').replace(/§#....../gm, ''); - const message = raw.split(': ')[1]; bot.emit('message', username, message, packet.sender); } else if (raw.match(/§.*§b: \/.*/g)) { const username = raw.split('§b: ')[0];