jay/angram
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: jay:5b3804893b3ff6e71c1f277b93661b6ae107051b
Branches Tags
jay:master
jay:cover
jay:nogameplay
...
compare: jay:cbb105fe49675c08c62cc33f1b41b747d99ef1cc
Branches Tags
jay:master
jay:cover
jay:nogameplay

2 Commits
5b3804893b ... cbb105fe49

Author SHA1 Message Date
jay
cbb105fe49 fix(command): 🚸 make bot address regex (prefix) more lenient 
Should also accept server commands now on address
 2021-05-03 07:20:33 +05:00
jay
356f83e39b fix(command): 👽 fix whisper event api change with an extra parameter 
Whisper also now includes who it was whispered to
 2021-05-03 07:14:45 +05:00
2 changed files with 6 additions and 5 deletions
Show Stats Expand all files Collapse all files

3
lib/index.js
View File

@ -120,7 +120,8 @@ bot.once("spawn", () => {
} }
cfg.plugins = plugins cfg.plugins = plugins
cfg.botAddressRegex = new RegExp(`^${bot.username} (${cfg.botAddressPrefix}.+)`) // cfg.botAddressPrefix = ${bot.username.substr(-2,2)}
cfg.botAddressRegex = new RegExp(`^${bot.username}:? (/|${cfg.botAddressPrefix}.+)`)
// FIXME leaks every load, so adding here instead of command.js to load only once // FIXME leaks every load, so adding here instead of command.js to load only once
bot.addChatPattern("web", /\[WEB\] (\[.+\])?\s*([\w.]+): (.+)/, { parse: true }) bot.addChatPattern("web", /\[WEB\] (\[.+\])?\s*([\w.]+): (.+)/, { parse: true })

8
lib/plugins/command.js
View File

@ -27,12 +27,12 @@ function checkItemExists(name) {
} }
const events = { const events = {
whisper: function command_whisper(username, message) { whisper: function command_whisper(username, _botusername, message, ...history) {
if ([bot.username, "me"].includes(username)) return if ([bot.username, "me"].includes(username)) return // whisper back from server (afk msges, etc)
if (/^gossip/.test(message)) return if (/^gossip/.test(message)) return
if (username === cfg.admin) { if (username === cfg.admin) {
console.info("whispered command", _botusername, message)
message = message.replace("\\", "@") message = message.replace("\\", "@")
console.info("whispered command", message)
if (message.startsWith(cfg.botAddressPrefix)) { if (message.startsWith(cfg.botAddressPrefix)) {
command(username, message) command(username, message)
} else { } else {
@ -41,7 +41,7 @@ const events = {
} }
} else { } else {
bot.whisper(cfg.admin, `gossip ${username}: ${message}`) bot.whisper(cfg.admin, `gossip ${username}: ${message}`)
console.info(username, "whispered", message) console.info(username, "whispered", _botusername, message)
} }
} }
, chat: command , chat: command