Compare commits

..

No commits in common. "10.0.0-release" and "v10.0.1" have entirely different histories.

9 changed files with 24 additions and 30 deletions

View file

@ -7,10 +7,6 @@ owobot is a Minecraft bot originally designed for [Kaboom](https://kaboom.pw/) a
- a command core, to run commands quickly
- a hashing system, to enable trusted users to securely run certain commands in chat
If you are not sure if this code is safe to run, you can read through every line of code. You can also see the commit history by clicking on the (n) commits button, to make sure nobody added any exploits to the code.
If you find any exploits, security issues, etc in the code, please send me an issue or pull request and I will try to respond to it whenever I see it.
## How to install?
1. Install [Node.js](https://nodejs.org/) for your operating system.

View file

@ -239,8 +239,8 @@ const displayServerList = function (c) {
module.exports = {
execute: function (c) {
let subcmd
if (c.args.length >= 1) subcmd = c.args[0].toLowerCase()
let subcmd;
if(c.args.length>=1) subcmd = c.args[0].toLowerCase();
if (subcmd === 'servers') subcmd = 'serverlist'
if (c.cmdName.toLowerCase() === 'serverinfo' || c.cmdName.toLowerCase() === 'specs') subcmd = 'server'
if (c.cmdName.toLowerCase() === 'serverlist' || c.cmdName.toLowerCase() === 'servers') subcmd = 'serverlist'

View file

@ -1,8 +1,8 @@
const { getMessage } = require('../util/lang.js')
module.exports = {
execute: (c) => {
let subcmd
if (c.args.length >= 1) subcmd = c.args.splice(0, 1)[0].toLowerCase()
let subcmd;
if(c.args.length>=1) subcmd = c.args.splice(0, 1)[0].toLowerCase();
switch (subcmd) {
case 'add': {
const rate = +(c.args.splice(0, 1)[0])

View file

@ -65,8 +65,8 @@ const printHelp = (c) => {
}
const printCmdHelp = (c) => {
let cmd
if (c.args.length >= 1) cmd = c.args[0].toLowerCase()
let cmd;
if(c.args.length>=1) cmd = c.args[0].toLowerCase();
if (!cmds[cmd] || (cmds[cmd].hidden && c.type !== 'console')) {
c.reply({ text: getMessage(c.lang, 'command.help.noCommand') })
return

View file

@ -17,8 +17,8 @@ module.exports = {
})
return
}
let subcmd
if (c.args.length >= 1) subcmd = c.args.splice(0, 1)[0].toLowerCase()
let subcmd;
if(c.args.length>=1) subcmd = c.args.splice(0, 1)[0].toLowerCase();
switch (subcmd) {
case 'set':{
const allowedKeys = ['colorPrimary', 'colorSecondary', 'lang']

View file

@ -32,18 +32,16 @@
"command.say.desc": "Sends a message to chat",
"command.settings.usage": " get|| set <key> <value>",
"command.settings.desc": "Set your user preferences",
"command.restart.usage": "",
"command.restart.desc": "Restart bot",
"command.stop.usage": "",
"command.stop.desc": "Stop bot",
"command.stop.desc": "Restart bot",
"command.template.usage": " <required> [optional]",
"command.template.desc": "Does nothing",
"command.test.usage": " [args...]",
"command.test.desc": "Chat parsing debugger command",
"command.tpr.usage": "",
"command.tpr.desc": "Teleport to a random location",
"command.validate.usage": " [args...]",
"command.validate.desc": "Check the hashing system",
"command.verify.usage": " [args...]",
"command.verify.desc": "Check the hashing system",
"command.about.author": "%s - a Minecraft bot made by %s for Kaboom and clones",
"command.about.version": "Version %s",
"command.about.preRelease": "This is a development version - there may be errors, and features may be changed or removed at any time. Please report any errors to the bot's developer.",

View file

@ -117,8 +117,8 @@ module.exports = {
b._client.on('system_chat', (data) => {
const json = parse1204(data.content)
if (json.translate === '%s %s %s') { // ChipmunkMod format
if (json.with && json.with[1] && json.with[2]) {
if(json.translate == '%s %s %s'){ // ChipmunkMod format
if(json.with && json.with[1] && json.with[2]){
const username = parsePlain(json.with[1])
const uuid = b.findUUID(username)
const nickname = b.findDisplayName(uuid)
@ -135,13 +135,13 @@ module.exports = {
b.emit('chat', {
json,
type: 'system',
uuid: '00000000-0000-0000-0000-000000000000',
message: '',
nickname: '',
username: ''
uuid: "00000000-0000-0000-0000-000000000000",
message: "",
nickname: "",
username: ""
})
}
} else if (json.extra && json.extra[4] && json.extra[3] && json.extra[5] && json.extra[4].text === ' » ') { // ChipmunkMod format - m_c_player
} else if(json.extra && json.extra[4] && json.extra[3] && json.extra[5] && json.extra[4].text == ' » '){ // ChipmunkMod format - m_c_player
const username = parsePlain(json.extra[3])
const uuid = b.findUUID(username)
const nickname = b.findDisplayName(uuid)
@ -181,19 +181,19 @@ module.exports = {
let username
let message
let uuid
if (json.translate === '%s %s %s') { // ChipmunkMod format
if (json.with && json.with[1] && json.with[2]) {
if(json.translate == '%s %s %s'){ // ChipmunkMod format
if(json.with && json.with[1] && json.with[2]){
username = parsePlain(json.with[1])
uuid = b.findUUID(username)
nickname = b.findDisplayName(uuid)
message = parsePlain(json.with[2].extra)
}
} else if (json.extra && json.extra[4] && json.extra[3] && json.extra[5] && json.extra[4].text === ' » ') { // ChipmunkMod format - m_c_player
} else if(json.extra && json.extra[4] && json.extra[3] && json.extra[5] && json.extra[4].text == ' » '){ // ChipmunkMod format - m_c_player
username = parsePlain(json.extra[3])
uuid = b.findUUID(username)
nickname = b.findDisplayName(uuid)
message = parsePlain(json.extra[5])
} else if (b.host.options.isVanilla && json.translate === 'chat.type.text') { // Servers without Extras chat
} else if (b.host.options.isVanilla && json.translate === 'chat.type.text') { // Servers without Extras chat
if (json.with && json.with.length >= 2) {
message = parsePlain(json.with[1])
username = parsePlain(json.with[0])

View file

@ -1,7 +1,7 @@
const index = require('../index.js')
const parse = require('../util/chatparse_console.js')
const settings = require('../settings.json')
const version = require('../version.json')
const version = require("../version.json")
class ConsoleCommand {
constructor (cmd, index2) {
this.send = () => {}

View file

@ -1,6 +1,6 @@
{
"botName": "owobot",
"botVersion": "10.0.3",
"botVersion": "10.0.1",
"botAuthor": "SundanceNanshan",
"isPreRelease": false,
"sourceURL": "https://code.chipmunk.land/7cc5c4f330d47060/owobot"