Compare commits

...

2 Commits

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

View File

@ -120,7 +120,8 @@ bot.once("spawn", () => {
}
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
bot.addChatPattern("web", /\[WEB\] (\[.+\])?\s*([\w.]+): (.+)/, { parse: true })

View File

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