Compare commits

..

No commits in common. "f8f668456630e70f041c269c044c64aae3740c07" and "02a858bf48b98c42f91ac577e3049edf4604dfb7" have entirely different histories.

6 changed files with 3006 additions and 3169 deletions

View file

@ -1,4 +1,5 @@
const { Command } = require('discord-akairo'); const { Command } = require('discord-akairo');
const userBlacklist = require('../../models').userBlacklist;
const Blacklists = require('../../models').Blacklists; const Blacklists = require('../../models').Blacklists;
class userBlacklistCommand extends Command { class userBlacklistCommand extends Command {

View file

@ -58,7 +58,7 @@ class FeedbackCommand extends Command {
channel.send({embed: Embed}); channel.send({embed: Embed});
message.channel.send('Your feedback has been sent! Don\'t forget to have dm open if you want to get an answer from the dev!'); message.channel.send('Your feedback has been sent!');
} }
} }

View file

@ -23,7 +23,7 @@ class hahaYesClient extends AkairoClient {
}, { }, {
partials: ['MESSAGE'], partials: ['MESSAGE'],
disableMentions: 'everyone', disableMentions: 'everyone',
intents: intents ws: { intents: intents }
}); });
this.commandHandler = new CommandHandler(this, { this.commandHandler = new CommandHandler(this, {

View file

@ -23,7 +23,7 @@ fs
return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js'); return (file.indexOf('.') !== 0) && (file !== basename) && (file.slice(-3) === '.js');
}) })
.forEach(file => { .forEach(file => {
const model = require(path.join(__dirname, file))(sequelize, Sequelize.DataTypes) const model = sequelize['import'](path.join(__dirname, file));
db[model.name] = model; db[model.name] = model;
}); });

6126
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -3,50 +3,50 @@
"version": "3.0.0", "version": "3.0.0",
"main": "index.js", "main": "index.js",
"dependencies": { "dependencies": {
"@discordjs/opus": "^0.4.0",
"@google-cloud/text-to-speech": "^3.1.3",
"4chan-boards": "^2.0.1", "4chan-boards": "^2.0.1",
"@discordjs/opus": "^0.3.3",
"@google-cloud/text-to-speech": "^2.3.0",
"asciify-image": "^0.1.6", "asciify-image": "^0.1.6",
"axios": "^0.21.1", "axios": "^0.19.2",
"bufferutil": "^4.0.3", "bufferutil": "^4.0.2",
"canvas": "^2.7.0", "canvas": "^2.6.0",
"capture-website": "^1.4.0", "capture-website": "^0.8.2",
"cheerio": "^1.0.0-rc.5", "cheerio": "^1.0.0-rc.3",
"cleverbot-free": "^1.0.5", "cleverbot-free": "^1.0.4",
"discord-akairo": "github:1Computer1/discord-akairo#master", "discord-akairo": "github:1Computer1/discord-akairo#master",
"discord.js": "github:discordjs/discord.js#master", "discord.js": "github:discordjs/discord.js#master",
"erlpack": "github:discordapp/erlpack", "erlpack": "github:discordapp/erlpack",
"file-type": "^16.3.0", "file-type": "^14.6.2",
"fluent-ffmpeg": "^2.1.2", "fluent-ffmpeg": "^2.1.2",
"gm": "^1.23.1", "gm": "^1.23.1",
"grpc": "^1.24.6", "grpc": "^1.24.4",
"handbrake-js": "^5.0.2", "handbrake-js": "^5.0.2",
"jimp": "^0.16.1", "jimp": "^0.10.3",
"libsodium-wrappers": "^0.7.9", "libsodium-wrappers": "^0.7.6",
"md5-file": "^5.0.0", "md5-file": "^5.0.0",
"meta-extractor": "^2.0.0", "meta-extractor": "^1.5.2",
"mkdirp": "^1.0.4", "mkdirp": "^0.5.5",
"mysql2": "^2.2.5", "mysql2": "^1.7.0",
"node-fetch": "^2.6.1", "node-fetch": "^2.6.1",
"node-opus": "^0.3.3", "node-opus": "^0.3.3",
"safe-regex": "^2.1.1", "safe-regex": "^2.1.1",
"sequelize": "^6.5.0", "sequelize": "^5.22.3",
"sqlite3": "^5.0.2", "sqlite3": "^4.2.0",
"superagent": "^6.1.0", "superagent": "^4.1.0",
"turndown": "^7.0.0", "turndown": "^5.0.3",
"twit": "^2.2.11", "twit": "^2.2.11",
"utf-8-validate": "^5.0.4", "utf-8-validate": "^5.0.3",
"youtube-dl": "^1.13.1", "youtube-dl": "^1.13.1",
"ytdl-core": "^4.5.0", "ytdl-core": "^0.29.7",
"ytpplus-node": "git+https://git@github.com/loicbersier/ytpplus-node.git", "ytpplus-node": "git+https://git@github.com/loicbersier/ytpplus-node.git",
"zlib-sync": "^0.1.7" "zlib-sync": "^0.1.7"
}, },
"devDependencies": { "devDependencies": {
"eslint": "^7.22.0", "eslint": "^5.16.0",
"eslint-config-standard": "^16.0.2", "eslint-config-standard": "^12.0.0",
"eslint-plugin-import": "^2.22.1", "eslint-plugin-import": "^2.22.1",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^8.0.1",
"eslint-plugin-promise": "^4.3.1", "eslint-plugin-promise": "^4.2.1",
"eslint-plugin-standard": "^4.1.0" "eslint-plugin-standard": "^4.1.0"
}, },
"repository": { "repository": {