Skip to content

[Feature] increase menu load speed when no emoji change beetween two pages #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

[Feature] increase menu load speed when no emoji change beetween two pages #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
942fcfa
Feat : Increase speed of menu when no reaction change
mrsolarius Jul 29, 2021
b278287
Build the modification
mrsolarius Jul 29, 2021
0430438
Merge branch 'eilex:main' into feature/increase-speed
mrsolarius Jul 29, 2021
0630c26
Refactor : Update dependency to generate doc
mrsolarius Aug 1, 2021
eca2df2
Refactor : Can delete one reaction at the time so simplify to not run…
mrsolarius Aug 1, 2021
58f5b32
Build code generation
mrsolarius Aug 1, 2021
3b95ba6
DOC : version update
mrsolarius Aug 1, 2021
3c166e2
Refactor : no need to typescript in direct dependency
mrsolarius Aug 1, 2021
07771fa
Doc : update auto generated docs
mrsolarius Aug 1, 2021
6c05a5e
Doc : update auto generated docs
mrsolarius Aug 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dist/discord_embed_menu.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export declare class DiscordEmbedMenu extends EventEmitter {
mention: boolean;
keepUserReactionOnStop: boolean;
loadingMessage: string;
private reactionsChanged;
private isDM;
private userTag;
currentPage: DiscordEmbedMenuPage;
Expand Down
24 changes: 13 additions & 11 deletions dist/discord_embed_menu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ class DiscordEmbedMenu extends events_1.EventEmitter {
this.mention = mention;
this.keepUserReactionOnStop = keepUserReactionOnStop;
this.loadingMessage = loadingMessage ? loadingMessage : DiscordEmbedMenu.LOADING_MESSAGE;
this.reactionsChanged = true;
this.isDM = !this.channel || this.channel.type === 'dm';
this.userTag = '<@' + this.user.id + '>';
this.pages = [];
Expand Down Expand Up @@ -57,11 +58,11 @@ class DiscordEmbedMenu extends events_1.EventEmitter {
async stop() {
this.stopReactions(false);
if (this.menu && this.keepUserReactionOnStop) {
this.menu.reactions.cache.array().forEach(async (reaction) => {
for (const reaction of this.menu.reactions.cache.array()) {
if (this.menu && this.menu.client && this.menu.client.user) {
await reaction.users.remove(this.menu.client.user.id);
}
});
}
}
else if (!this.isDM) {
return await this.clearReactions();
Expand Down Expand Up @@ -118,7 +119,8 @@ class DiscordEmbedMenu extends events_1.EventEmitter {
}
}
this.stopReactions(true);
await this.addReactions();
if (this.reactionsChanged)
await this.addReactions();
this.awaitReactions();
await this.menu.edit(content, { embed: this.currentPage.content });
this.emit('page-changed', this.pageIndex, this.currentPage);
Expand Down Expand Up @@ -146,11 +148,11 @@ class DiscordEmbedMenu extends events_1.EventEmitter {
this.reactionCollector = this.menu.createReactionCollector((_reaction, user) => {
return this.menu != null && this.menu.client != null && this.menu.client.user != null && user.id != this.menu.client.user.id;
}, this.timeout ? { idle: this.timeout } : undefined);
let reactionsChanged;
this.reactionsChanged = undefined;
this.reactionCollector.on('end', (reactions) => {
if (!this.isDM) {
if (reactions) {
if (reactionsChanged) {
if (this.reactionsChanged) {
return this.clearReactions();
}
else if (this.menu) {
Expand All @@ -176,30 +178,30 @@ class DiscordEmbedMenu extends events_1.EventEmitter {
if (typeof this.currentPage.reactions[reactionName] === 'function') {
// this this flag is not true then the clearReaction() at ligne 188 will be never call when try to change page
// also test when no page change it works too
reactionsChanged = true;
this.reactionsChanged = true;
return this.currentPage.reactions[reactionName](this);
}
switch (this.currentPage.reactions[reactionName]) {
case 'first': {
reactionsChanged = JSON.stringify(this.menu.reactions.cache.keyArray()) != JSON.stringify(Object.keys(this.pages[0].reactions));
this.reactionsChanged = JSON.stringify(this.menu.reactions.cache.keyArray()) != JSON.stringify(Object.keys(this.pages[0].reactions));
this.setPage(0);
break;
}
case 'last': {
reactionsChanged = JSON.stringify(this.menu.reactions.cache.keyArray()) != JSON.stringify(Object.keys(this.pages[this.pages.length - 1].reactions));
this.reactionsChanged = JSON.stringify(this.menu.reactions.cache.keyArray()) != JSON.stringify(Object.keys(this.pages[this.pages.length - 1].reactions));
this.setPage(this.pages.length - 1);
break;
}
case 'previous': {
if (this.pageIndex > 0) {
reactionsChanged = JSON.stringify(this.menu.reactions.cache.keyArray()) != JSON.stringify(Object.keys(this.pages[this.pageIndex - 1].reactions));
this.reactionsChanged = JSON.stringify(this.menu.reactions.cache.keyArray()) != JSON.stringify(Object.keys(this.pages[this.pageIndex - 1].reactions));
this.setPage(this.pageIndex - 1);
}
break;
}
case 'next': {
if (this.pageIndex < this.pages.length - 1) {
reactionsChanged = JSON.stringify(this.menu.reactions.cache.keyArray()) != JSON.stringify(Object.keys(this.pages[this.pageIndex + 1].reactions));
this.reactionsChanged = JSON.stringify(this.menu.reactions.cache.keyArray()) != JSON.stringify(Object.keys(this.pages[this.pageIndex + 1].reactions));
this.setPage(this.pageIndex + 1);
}
break;
Expand All @@ -213,7 +215,7 @@ class DiscordEmbedMenu extends events_1.EventEmitter {
break;
}
default: {
reactionsChanged = JSON.stringify(this.menu.reactions.cache.keyArray()) != JSON.stringify(Object.keys(this.pages.find(p => p.name === this.currentPage.reactions[reactionName]).reactions));
this.reactionsChanged = JSON.stringify(this.menu.reactions.cache.keyArray()) != JSON.stringify(Object.keys(this.pages.find(p => p.name === this.currentPage.reactions[reactionName]).reactions));
this.setPage(this.pages.findIndex(p => p.name === this.currentPage.reactions[reactionName]));
break;
}
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/js/search.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading