diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Events.js | 29 | ||||
| -rw-r--r-- | src/Hastebin.js | 6 | ||||
| -rw-r--r-- | src/Troffman.js | 3 | ||||
| -rw-r--r-- | src/TroffmanDatabase.js | 25 | ||||
| -rw-r--r-- | src/cmd/debug.js | 2 | ||||
| -rw-r--r-- | src/cmd/troff.js | 1 |
6 files changed, 7 insertions, 59 deletions
diff --git a/src/Events.js b/src/Events.js index 94e5eae..f848495 100644 --- a/src/Events.js +++ b/src/Events.js @@ -1,11 +1,8 @@ -const { PlayerManager } = require('eris-lavalink'); -const { Op } = require('sequelize'); - module.exports = function Events(bot) { let r; bot.on('ready', async () => { - Logger.info(`Successfully connected as user ${bot.user.username}#${bot.user.discriminator}`); + console.log(`Successfully connected as user ${bot.user.username}#${bot.user.discriminator}`); r = new RegExp(`^(?:<@!?${bot.user.id}> +|-)\\b`); bot.editStatus('online', { @@ -15,13 +12,13 @@ module.exports = function Events(bot) { }); bot.on('error', (err, id) => { - Logger.error(`Error encountered on shard ${id}`); - Logger.error(err); + console.error(`Error encountered on shard ${id}`); + console.error(err); }); bot.on('messageCreate', async (msg) => { if (!r) { - Logger.error('Some real shit hapened : message matching regex hasn\'t been defined for some reason.'); + console.error('Some real shit hapened : message matching regex hasn\'t been defined for some reason.'); process.exit(); } @@ -32,26 +29,12 @@ module.exports = function Events(bot) { if (msg.author === bot.user) return; if (msg.channel.type !== 0) return; - /* - let important = msg.channel.guild.members.filter(m => m.permission.has('administrator')).map(m => m.id); - - important.push(msg.author.id); - - let user = await bot.db.Auser.findOne({ - where: { - userId: important, - }, - }); - let guild = await bot.db.Aguild.findOne({ where: { guildId: msg.channel.guild.id } }); - - if ((bot.config.sudoers && bot.config.sudoers.indexOf(msg.author.id) <= -1) && !user && !guild) return; */ - - Logger.debug(`Command '${msg.content}' issued`); + console.log(`Command '${msg.content}' issued`); let trimmedContent = content.trim(); let result = bot.handler.apply(trimmedContent, msg); if (Array.isArray(result)) { - bot.createMessage(msg.channel.id, `Missing permissions : ${result.join(', ')}`).catch(Logger.error); + bot.createMessage(msg.channel.id, `Missing permissions : ${result.join(', ')}`).catch(console.error); } }); }; diff --git a/src/Hastebin.js b/src/Hastebin.js deleted file mode 100644 index 1d7bae0..0000000 --- a/src/Hastebin.js +++ /dev/null @@ -1,6 +0,0 @@ -const superagent = require('superagent'); - -module.exports = async function hastebin(text) { - let res = await superagent.post('https://hasteb.in/documents').send(text); - return JSON.parse(res.text).key; -};
\ No newline at end of file diff --git a/src/Troffman.js b/src/Troffman.js index 2b8860c..34aab4f 100644 --- a/src/Troffman.js +++ b/src/Troffman.js @@ -5,7 +5,6 @@ const fs = require('fs'); const RegexFramework = require('./RegexFramework'); const Events = require('./Events'); const CommandLoader = require('./CommandLoader'); -const TroffmanDatabase = require('./TroffmanDatabase'); module.exports = class Troffman extends Eris { constructor(configPath, options) { @@ -26,10 +25,8 @@ module.exports = class Troffman extends Eris { this.config.sudoers = ['']; } this._ds = Array.from(this.config.sudoers); - this.db = new TroffmanDatabase(c.database); this.handler = new RegexFramework(); Events(this); CommandLoader(this); - this.db.sync(); } }; diff --git a/src/TroffmanDatabase.js b/src/TroffmanDatabase.js deleted file mode 100644 index 58e7608..0000000 --- a/src/TroffmanDatabase.js +++ /dev/null @@ -1,25 +0,0 @@ -const Sequelize = require('sequelize'); - -module.exports = class TroffmanDatabase extends Sequelize { - constructor(path) { - super('database', 'user', 'password', { - host: 'localhost', - dialect: 'sqlite', - logging: false, - storage: path, - }); - - this.Auser = this.define('ausers', { - userId: { - type: Sequelize.STRING, - unique: true, - }, - }); - this.Aguild = this.define('aguilds', { - guildId: { - type: Sequelize.STRING, - unique: true, - }, - }); - } -}; diff --git a/src/cmd/debug.js b/src/cmd/debug.js index 382b0b3..1cc5343 100644 --- a/src/cmd/debug.js +++ b/src/cmd/debug.js @@ -2,7 +2,7 @@ const mcs = require('node-mcstatus'); module.exports.loadModule = function loadModule(bot) { bot.handler.endpoint('^ping$', [], (match, message) => { - bot.createMessage(message.channel.id, 'Pong').catch(Logger.error); + bot.createMessage(message.channel.id, 'Pong').catch(console.error); }); bot.handler.endpoint('^server$', [], async (match, message) => { diff --git a/src/cmd/troff.js b/src/cmd/troff.js index 91090a5..5eb3407 100644 --- a/src/cmd/troff.js +++ b/src/cmd/troff.js @@ -1,6 +1,5 @@ const spawn = require('child_process').spawn; const fs = require('fs'); -const { ConsoleTransportOptions } = require('winston/lib/winston/transports'); /* \\"".fp - R cmunrm |