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

Fixed speed frame removal delay bug, allow extending pagination timeout

Browse source
This commit is contained in:
Essem 2022-02-06 01:12:04 -06:00
parent 26741e8c6c
commit 7536352858
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
4 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
utils/pagination/awaitinteractions.js
View file

@ -8,11 +8,12 @@ class InteractionCollector extends EventEmitter {
this.type = type;
this.ended = false;
this.bot = client;
this.timeout = timeout;
this.listener = async (interaction) => {
await this.verify(interaction);
};
this.bot.on("interactionCreate", this.listener);
setTimeout(() => this.stop("time"), timeout);
this.end = setTimeout(() => this.stop("time"), timeout);
}
async verify(interaction) {
@ -22,6 +23,11 @@ class InteractionCollector extends EventEmitter {
return true;
}
extend() {
clearTimeout(this.end);
this.end = setTimeout(() => this.stop("time"), this.timeout);
}
stop(reason) {
if (this.ended) return;
this.ended = true;

4
utils/pagination/pagination.js
View file

@ -1,4 +1,3 @@
import MessageCollector from "./awaitmessages.js";
import InteractionCollector from "./awaitinteractions.js";
import { ComponentInteraction } from "eris";
@ -73,11 +72,13 @@ export default async (client, message, pages, timeout = 120000) => {
await interaction.deferUpdate();
page = page > 0 ? --page : pages.length - 1;
currentPage = await currentPage.edit(Object.assign(pages[page], options));
interactionCollector.extend();
break;
case "forward":
await interaction.deferUpdate();
page = page + 1 < pages.length ? ++page : 0;
currentPage = await currentPage.edit(Object.assign(pages[page], options));
interactionCollector.extend();
break;
case "jump":
await interaction.deferUpdate();
@ -86,6 +87,7 @@ export default async (client, message, pages, timeout = 120000) => {
newComponents.components[0].components[index].disabled = true;
}
currentPage = await currentPage.edit(newComponents);
interactionCollector.extend();
const jumpComponents = {
components: [{
type: 1,