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

Add fallback for message checking, add link to privacy policy in info

Browse source
This commit is contained in:
Essem 2022-03-19 23:22:35 -05:00
parent 9e64dfa3c3
commit a438fe26df
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
classes/imageCommand.js
View file

@ -112,7 +112,7 @@ class ImageCommand extends Command {
if (e === "No available servers") return "I can't seem to contact the image servers, they might be down or still trying to start up. Please wait a little bit."; if (e === "No available servers") return "I can't seem to contact the image servers, they might be down or still trying to start up. Please wait a little bit.";
throw e; throw e;
} finally { } finally {
if (status && status.channel.messages.has(status.id)) await status.delete(); if (status && (status.channel.messages ? status.channel.messages.has(status.id) : await this.client.getMessage(status.channel.id, status.id).catch(() => undefined))) await status.delete();
runningCommands.delete(this.message.author.id); runningCommands.delete(this.message.author.id);
} }

4
commands/general/info.js
View file

@ -39,6 +39,10 @@ class InfoCommand extends Command {
name: "💻 Source Code:", name: "💻 Source Code:",
value: "[Click here!](https://github.com/esmBot/esmBot)" value: "[Click here!](https://github.com/esmBot/esmBot)"
}, },
{
name: "🛡️ Privacy Policy:",
value: "[Click here!](https://projectlounge.pw/esmBot/privacy.html)"
},
{ {
name: "🐦 Twitter:", name: "🐦 Twitter:",
value: "[Click here!](https://twitter.com/esmBot_)" value: "[Click here!](https://twitter.com/esmBot_)"

8
utils/pagination/pagination.js
View file

@ -121,7 +121,7 @@ export default async (client, message, pages, timeout = 120000) => {
dropdownCollector.on("interaction", async (response) => { dropdownCollector.on("interaction", async (response) => {
if (response.data.custom_id !== "seekDropdown") return; if (response.data.custom_id !== "seekDropdown") return;
try { try {
if (askMessage.channel.messages.has(askMessage.id)) await askMessage.delete(); if (askMessage.channel.messages ? askMessage.channel.messages.has(askMessage.id) : await client.getMessage(askMessage.channel.id, askMessage.id).catch(() => undefined)) await askMessage.delete();
} catch { } catch {
// no-op // no-op
} }
@ -133,7 +133,7 @@ export default async (client, message, pages, timeout = 120000) => {
dropdownCollector.once("end", async () => { dropdownCollector.once("end", async () => {
if (ended) return; if (ended) return;
try { try {
if (askMessage.channel.messages.has(askMessage.id)) await askMessage.delete(); if (askMessage.channel.messages ? askMessage.channel.messages.has(askMessage.id) : await client.getMessage(askMessage.channel.id, askMessage.id).catch(() => undefined)) await askMessage.delete();
} catch { } catch {
// no-op // no-op
} }
@ -146,7 +146,7 @@ export default async (client, message, pages, timeout = 120000) => {
case "delete": case "delete":
await interaction.deferUpdate(); await interaction.deferUpdate();
interactionCollector.emit("end"); interactionCollector.emit("end");
if (currentPage.channel.messages.has(currentPage.id)) await currentPage.delete(); if (currentPage.channel.messages ? currentPage.channel.messages.has(currentPage.id) : await client.getMessage(currentPage.channel.id, currentPage.id).catch(() => undefined)) await currentPage.delete();
return; return;
default: default:
break; break;
@ -158,7 +158,7 @@ export default async (client, message, pages, timeout = 120000) => {
for (const index of components.components[0].components.keys()) { for (const index of components.components[0].components.keys()) {
components.components[0].components[index].disabled = true; components.components[0].components[index].disabled = true;
} }
if (currentPage.channel.messages.has(currentPage.id)) { if (currentPage.channel.messages ? currentPage.channel.messages.has(currentPage.id) : await client.getMessage(currentPage.channel.id, currentPage.id).catch(() => undefined)) {
await currentPage.edit(components); await currentPage.edit(components);
} }
}); });