Temprarily disable reply on pagination, made a small optimization to prefix handler
This commit is contained in:
parent
e44f5ba59d
commit
b6f28ece76
2 changed files with 10 additions and 8 deletions
|
@ -16,8 +16,9 @@ module.exports = async (client, cluster, worker, ipc, message) => {
|
||||||
|
|
||||||
let prefixCandidate;
|
let prefixCandidate;
|
||||||
if (message.channel.guild) {
|
if (message.channel.guild) {
|
||||||
if (collections.prefixCache.has(message.channel.guild.id)) {
|
const cachedPrefix = collections.prefixCache.get(message.channel.guild.id);
|
||||||
prefixCandidate = collections.prefixCache.get(message.channel.guild.id);
|
if (cachedPrefix) {
|
||||||
|
prefixCandidate = cachedPrefix;
|
||||||
} else {
|
} else {
|
||||||
let guildDB = message.channel.guild ? await database.getGuild(message.channel.guild.id) : null;
|
let guildDB = message.channel.guild ? await database.getGuild(message.channel.guild.id) : null;
|
||||||
if (message.channel.guild && !(guildDB && guildDB.disabled)) {
|
if (message.channel.guild && !(guildDB && guildDB.disabled)) {
|
||||||
|
|
|
@ -3,7 +3,7 @@ const MessageCollector = require("./awaitmessages.js");
|
||||||
|
|
||||||
module.exports = async (client, 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;
|
const manageMessages = message.channel.guild && message.channel.permissionsOf(client.user.id).has("manageMessages") ? true : false;
|
||||||
const options = {
|
/*const options = {
|
||||||
messageReference: {
|
messageReference: {
|
||||||
channelID: message.channel.id,
|
channelID: message.channel.id,
|
||||||
messageID: message.id,
|
messageID: message.id,
|
||||||
|
@ -13,9 +13,10 @@ module.exports = async (client, message, pages, timeout = 120000) => {
|
||||||
allowedMentions: {
|
allowedMentions: {
|
||||||
repliedUser: false
|
repliedUser: false
|
||||||
}
|
}
|
||||||
};
|
};*/
|
||||||
let page = 0;
|
let page = 0;
|
||||||
let currentPage = await client.createMessage(message.channel.id, Object.assign(pages[page], options));
|
//let currentPage = await client.createMessage(message.channel.id, Object.assign(pages[page], options));
|
||||||
|
let currentPage = await client.createMessage(message.channel.id, pages[page]);
|
||||||
if (pages.length > 1) {
|
if (pages.length > 1) {
|
||||||
const emojiList = ["◀", "🔢", "▶", "🗑"];
|
const emojiList = ["◀", "🔢", "▶", "🗑"];
|
||||||
for (const emoji of emojiList) {
|
for (const emoji of emojiList) {
|
||||||
|
@ -27,7 +28,7 @@ module.exports = async (client, message, pages, timeout = 120000) => {
|
||||||
switch (reaction.name) {
|
switch (reaction.name) {
|
||||||
case "◀":
|
case "◀":
|
||||||
page = page > 0 ? --page : pages.length - 1;
|
page = page > 0 ? --page : pages.length - 1;
|
||||||
currentPage = await currentPage.edit(Object.assign(pages[page], options));
|
currentPage = await currentPage.edit(pages[page]);
|
||||||
if (manageMessages) msg.removeReaction("◀", member.id);
|
if (manageMessages) msg.removeReaction("◀", member.id);
|
||||||
break;
|
break;
|
||||||
case "🔢":
|
case "🔢":
|
||||||
|
@ -50,7 +51,7 @@ module.exports = async (client, message, pages, timeout = 120000) => {
|
||||||
if (await client.getMessage(askMessage.channel.id, askMessage.id).catch(() => undefined)) askMessage.delete();
|
if (await client.getMessage(askMessage.channel.id, askMessage.id).catch(() => undefined)) askMessage.delete();
|
||||||
if (manageMessages) await response.delete();
|
if (manageMessages) await response.delete();
|
||||||
page = Number(response.content) - 1;
|
page = Number(response.content) - 1;
|
||||||
currentPage = await currentPage.edit(Object.assign(pages[page], options));
|
currentPage = await currentPage.edit(pages[page]);
|
||||||
if (manageMessages) msg.removeReaction("🔢", member.id);
|
if (manageMessages) msg.removeReaction("🔢", member.id);
|
||||||
});
|
});
|
||||||
}).catch(error => {
|
}).catch(error => {
|
||||||
|
@ -59,7 +60,7 @@ module.exports = async (client, message, pages, timeout = 120000) => {
|
||||||
break;
|
break;
|
||||||
case "▶":
|
case "▶":
|
||||||
page = page + 1 < pages.length ? ++page : 0;
|
page = page + 1 < pages.length ? ++page : 0;
|
||||||
currentPage = await currentPage.edit(Object.assign(pages[page], options));
|
currentPage = await currentPage.edit(pages[page]);
|
||||||
if (manageMessages) msg.removeReaction("▶", member.id);
|
if (manageMessages) msg.removeReaction("▶", member.id);
|
||||||
break;
|
break;
|
||||||
case "🗑":
|
case "🗑":
|
||||||
|
|
Loading…
Reference in a new issue