Merge pull request #19 from Blackhawk-TA/v1.3.0-beta

v1.3.0

node.js.yml → .github/workflows/node.js.yml

@@ -16,7 +16,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [8.x, 10.x, 12.x, 14.x]
+        node-version: [12.x, 14.x]
 
     steps:
     - uses: actions/checkout@v2

Dockerfile

@@ -0,0 +1,16 @@
+FROM ubuntu:20.04
+
+# Copy project
+COPY ./ ./dynoBot
+WORKDIR ./dynoBot
+
+# Install dependencies
+RUN apt-get update
+RUN apt-get install build-essential curl -y
+RUN curl -sL https://deb.nodesource.com/setup_12.x | bash -
+RUN apt-get install nodejs -y
+RUN apt-get install lua5.3 -y
+RUN npm install
+
+# Start project
+RUN npm start

README.md

@@ -1,6 +1,7 @@
 # dynoBot
 [![license](http://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Blackhawk-TA/dynoBot/blob/master/LICENSE.md)
-[![Build Status](https://travis-ci.com/Blackhawk-TA/dynoBot.svg?branch=master)](https://travis-ci.com/Blackhawk-TA/dynoBot)
+[![Node Version](https://img.shields.io/github/package-json/node/Blackhawk-TA/dynoBot.svg?color=brightgreen)](https://github.com/Blackhawk-TA/dynoBot/tree/master)
+![build](https://github.com/Blackhawk-TA/dynoBot/workflows/build/badge.svg)
 [![github](https://img.shields.io/github/release/Blackhawk-TA/dynoBot.svg?color=brightgreen)](https://github.com/Blackhawk-TA/dynoBot/releases)
 [![github](https://img.shields.io/github/package-json/v/Blackhawk-TA/dynoBot.svg?color=brightgreen)](https://github.com/Blackhawk-TA/dynoBot/tree/master)
 
@@ -42,10 +43,10 @@ Alternatively you can take a look at the [commands.json](https://github.com/Blac
 
 ### How can I use the bot for my own discord server?
 It's quite simple, first of all you need nodejs and optionally python3 for python modules and lua for lua modules.
-After the installation, clone this repository and run `npm install` within the `dynoBot` folder. It should install all required dependencies. 
+After the installation, clone this repository and run `npm install` within the `dynoBot` folder. It should install all required dependencies.
 
 Once that's done, you'll have to add the `security.json` file within the directory `dynoBot/cfg`.
-It should look like this: 
+It should look like this:
 ```json
 {
 	"token": "your discord bot token"
@@ -54,7 +55,7 @@ It should look like this:
 
 **IMPORTANT: When you fork this project, don't upload the security.json to your repository. This would allow others to steal your discord token.**
 
- 
+
 If you want to use the Wolfram|Alpha module, you'll need their API key in the security.json as well.
 You can request a free Wolfram|Alpha API key [here](https://products.wolframalpha.com/api/).
 

cfg/commands.json

@@ -18,7 +18,7 @@
 		}, {
 			"group": "basic",
 			"type": "js",
-			"regex": "(.*)\\s?help|commands",
+			"regex": "^(\\w*)\\s?help$|commands$",
 			"help": "help / <command-group (rcon, schedule, basic, etc.)> help",
 			"path": "src/core/core-modules/showCommands.js"
 		}, {
@@ -242,6 +242,18 @@
 			"regex": "shuffle( mode)? (on|off)",
 			"help": "shuffle on/off",
 			"path": "src/js-modules/voice/shuffle.js"
+		}, {
+			"group": "voice",
+			"type": "js",
+			"regex": "autoplay (on|off)",
+			"help": "autoplay on/off",
+			"path": "src/js-modules/voice/autoplay.js"
+		}, {
+			"group": "voice",
+			"type": "js",
+			"regex": "^(clear|empty|delete) playlist$",
+			"help": "clear playlist",
+			"path": "src/js-modules/voice/clearPlaylist.js"
 		}
 	]
 }

main.js

@@ -67,7 +67,7 @@ Bot.onEvent("ready", () => {
 				}
 			}
 		} catch (err) {
-			console.error(`${new Date().toLocaleString()}: ${err}`);
+			console.error(`${new Date().toLocaleString()}: main.js: ${err}`);
 		}
 	});
 });