Merge branch 'master' into 'V12'

# Conflicts:
#   .gitignore
#   commands/admin/tag.js
#   commands/utility/taglist.js
#   listeners/message.js
#   package.json
This commit is contained in:
Loïc Bersier 2019-01-03 17:15:09 +00:00
commit b4cc73090b
4 changed files with 3126 additions and 9 deletions

1
.gitignore vendored
View file

@ -1,5 +1,4 @@
config.json
package-lock.json
.DS_Store
node_modules
node_modules\

52
README.md Normal file
View file

@ -0,0 +1,52 @@
# Haha Yes
A multi function discord bot.
## Getting Started
These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system.
### Prerequisites
You need to install the following
```
https://github.com/Automattic/node-canvas
https://github.com/tojocky/node-printer
```
### Installing
```
git clone https://gitlab.com/loicbersier/discordbot
cd discordbot
npm init -y
npm install
```
To run the bot either use pm2
```
npm install -g pm2
pm2 start index.js --name(insert name)
```
or node
```
node index.js
```
## Built With
* [Discord.JS](https://github.com/discordjs/discord.js) - The discord api used
* [Discord-Akairo](https://github.com/1Computer1/discord-akairo) - The framework used for Discord.JS
## Authors
* **Loïc Bersier**
## License
This project is licensed under the **GNU General Public License v2.0** License - see the [LICENSE](LICENSE) file for details
## Acknowledgments
* discord.JS team
* 1computer1 for discord-akairo
* Tina the Cyclops girl#0064 for inspiring me for making this bot

3074
package-lock.json generated Normal file

File diff suppressed because it is too large Load diff

View file

@ -2,15 +2,7 @@
"name": "hahayes",
"version": "2.1.0",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"dependencies": {
"@discordjs/uws": "^11.149.1",
"@google-cloud/text-to-speech": "^0.4.0",
"auto-reload": "^0.1.0",
"canvas": "^2.2.0",
"discord-akairo": "github:1Computer1/discord-akairo#master",