murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Class commands, improved sharding, and many other changes (#88)

Browse source 
* Load commands recursively

* Sort commands

* Missed a couple of spots

* missed even more spots apparently

* Ported commands in "fun" category to new class-based format, added babel eslint plugin

* Ported general commands, removed old/unneeded stuff, replaced moment with day, many more fixes I lost track of

* Missed a spot

* Removed unnecessary abort-controller package, add deprecation warning for mongo database

* Added imagereload, clarified premature end message

* Fixed docker-compose path issue, added total bot uptime to stats, more fixes for various parts

* Converted image commands into classes, fixed reload, ignore another WS event, cleaned up command handler and image runner

* Converted music/soundboard commands to class format

* Cleanup unnecessary logs

* awful tag command class port

* I literally somehow just learned that you can leave out the constructor in classes

* Pass client directly to commands/events, cleaned up command handler

* Migrated bot to eris-sharder, fixed some error handling stuff

* Remove unused modules

* Fixed type returning

* Switched back to Eris stable

* Some fixes and cleanup

* might wanna correct this

* Implement image command ratelimiting

* Added Bot token prefix, added imagestats, added running endpoint to API
This commit is contained in:
Essem 2021-04-12 11:16:12 -05:00 • committed by GitHub
parent ff8a24d0e8
commit 40223ec8b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
291 changed files with 5296 additions and 5171 deletions
Download patch file Download diff file Expand all files Collapse all files

3
utils/pagination/awaitmessages.js
View file

@ -1,9 +1,8 @@
// eris doesn't come with an awaitMessages method by default, so we make our own
const EventEmitter = require("events").EventEmitter;
const client = require("../client.js");
class MessageCollector extends EventEmitter {
constructor(channel, filter, options = {}) {
constructor(client, channel, filter, options = {}) {
super();
this.filter = filter;
this.channel = channel;

5
utils/pagination/awaitreactions.js
View file

@ -1,9 +1,8 @@
// eris doesn't come with an awaitReactions method by default, so we make our own
const EventEmitter = require("events").EventEmitter;
const client = require("../client.js");
class ReactionCollector extends EventEmitter {
constructor(message, filter, options = {}) {
constructor(client, message, filter, options = {}) {
super();
this.filter = filter;
this.message = message;
@ -20,7 +19,7 @@ class ReactionCollector extends EventEmitter {
if (this.message.id !== message.id) return false;
if (this.filter(message, emoji, member)) {
this.collected.push({ message: message, emoji: emoji, member: member });
this.emit("reaction", await client.getMessage(message.channel.id, message.id), emoji, member);
this.emit("reaction", await this.bot.getMessage(message.channel.id, message.id), emoji, member);
if (this.collected.length >= this.options.maxMatches) this.stop("maxMatches");
return true;
}

15
utils/pagination/pagination.js
View file

@ -1,8 +1,7 @@
const ReactionCollector = require("./awaitreactions.js");
const MessageCollector = require("./awaitmessages.js");
const client = require("../client.js");
module.exports = async (message, pages, timeout = 120000) => {
module.exports = async (client, message, pages, timeout = 120000) => {
const manageMessages = message.channel.guild && message.channel.permissionsOf(client.user.id).has("manageMessages") ? true : false;
let page = 0;
let currentPage = await message.channel.createMessage(pages[page]);
@ -10,18 +9,18 @@ module.exports = async (message, pages, timeout = 120000) => {
for (const emoji of emojiList) {
await currentPage.addReaction(emoji);
}
const reactionCollector = new ReactionCollector(currentPage, (message, reaction, member) => emojiList.includes(reaction.name) && !member.bot, { time: timeout });
const reactionCollector = new ReactionCollector(client, currentPage, (message, reaction, member) => emojiList.includes(reaction.name) && !member.bot, { time: timeout });
reactionCollector.on("reaction", async (msg, reaction, member) => {
if (member.id === message.author.id) {
if (member === message.author.id) {
switch (reaction.name) {
case "◀":
page = page > 0 ? --page : pages.length - 1;
currentPage = await currentPage.edit(pages[page]);
if (manageMessages) msg.removeReaction("◀", member.id);
if (manageMessages) msg.removeReaction("◀", member);
break;
case "🔢":
message.channel.createMessage(`${message.author.mention}, what page do you want to jump to?`).then(askMessage => {
const messageCollector = new MessageCollector(askMessage.channel, (response) => response.author.id === message.author.id && !isNaN(response.content) && Number(response.content) <= pages.length && Number(response.content) > 0, {
const messageCollector = new MessageCollector(client, askMessage.channel, (response) => response.author.id === message.author.id && !isNaN(response.content) && Number(response.content) <= pages.length && Number(response.content) > 0, {
time: timeout,
maxMatches: 1
});
@ -30,7 +29,7 @@ module.exports = async (message, pages, timeout = 120000) => {
if (manageMessages) await response.delete();
page = Number(response.content) - 1;
currentPage = await currentPage.edit(pages[page]);
if (manageMessages) msg.removeReaction("🔢", member.id);
if (manageMessages) msg.removeReaction("🔢", member);
});
}).catch(error => {
throw error;
@ -39,7 +38,7 @@ module.exports = async (message, pages, timeout = 120000) => {
case "▶":
page = page + 1 < pages.length ? ++page : 0;
currentPage = await currentPage.edit(pages[page]);
if (manageMessages) msg.removeReaction("▶", member.id);
if (manageMessages) msg.removeReaction("▶", member);
break;
case "🗑":
reactionCollector.emit("end");