From 76f76587633c27247ac650e29bc8dffef2446959 Mon Sep 17 00:00:00 2001 From: Dragory <2606411+Dragory@users.noreply.github.com> Date: Fri, 16 Oct 2020 02:13:54 +0300 Subject: [PATCH] Fixes --- backend/package-lock.json | 6 +++--- backend/package.json | 2 +- backend/src/plugins/Mutes/commands/MutesCmd.ts | 6 +++--- .../src/plugins/ReactionRoles/events/AddReactionRoleEvt.ts | 2 +- .../src/plugins/Starboard/events/StarboardReactionAddEvt.ts | 2 +- .../plugins/Starboard/events/StarboardReactionRemoveEvts.ts | 2 +- backend/src/plugins/Utility/search.ts | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/package-lock.json b/backend/package-lock.json index a940245c..b720929b 100644 --- a/backend/package-lock.json +++ b/backend/package-lock.json @@ -2371,9 +2371,9 @@ } }, "knub": { - "version": "30.0.0-beta.25", - "resolved": "https://registry.npmjs.org/knub/-/knub-30.0.0-beta.25.tgz", - "integrity": "sha512-eYXHL16yqKokMnVdAfGEP4qG+y2Zl/4q9EH0a13xEwyo4lJRAFX5nCU23+B41088uWWbcI2YRccHRLA5F2kwtA==", + "version": "30.0.0-beta.26", + "resolved": "https://registry.npmjs.org/knub/-/knub-30.0.0-beta.26.tgz", + "integrity": "sha512-DGKpdhUiuz9+ga19rx4UBX8uWe3oYWHf79Oqgr/auDZVggJhMHZTnpt2cGVhlyOlp7cP/YRjNTxk2LeJI2ZWQw==", "requires": { "knub-command-manager": "^8.1.2", "ts-essentials": "^6.0.7" diff --git a/backend/package.json b/backend/package.json index 5a81c24b..6ebabbb0 100644 --- a/backend/package.json +++ b/backend/package.json @@ -38,7 +38,7 @@ "humanize-duration": "^3.15.0", "io-ts": "^2.0.0", "js-yaml": "^3.13.1", - "knub": "^30.0.0-beta.25", + "knub": "^30.0.0-beta.26", "knub-command-manager": "^8.1.2", "last-commit-log": "^2.1.0", "lodash.chunk": "^4.2.0", diff --git a/backend/src/plugins/Mutes/commands/MutesCmd.ts b/backend/src/plugins/Mutes/commands/MutesCmd.ts index d03c0ec3..c2d53436 100644 --- a/backend/src/plugins/Mutes/commands/MutesCmd.ts +++ b/backend/src/plugins/Mutes/commands/MutesCmd.ts @@ -199,10 +199,10 @@ export const MutesCmd = mutesCmd({ const paginationReactionListener = pluginData.events.on( "messageReactionAdd", - ({ args: { message: rMsg, emoji, userID } }) => { + ({ args: { message: rMsg, emoji, member } }) => { if (!isFullMessage(rMsg)) return; if (rMsg.id !== listMessage.id) return; - if (userID !== msg.author.id) return; + if (member.id !== msg.author.id) return; if (!["⬅", "➡"].includes(emoji.name)) return; if (emoji.name === "⬅" && currentPage > 1) { @@ -211,7 +211,7 @@ export const MutesCmd = mutesCmd({ drawListPage(currentPage + 1); } - rMsg.removeReaction(emoji.name, userID).catch(noop); + rMsg.removeReaction(emoji.name, member.id).catch(noop); }, ); diff --git a/backend/src/plugins/ReactionRoles/events/AddReactionRoleEvt.ts b/backend/src/plugins/ReactionRoles/events/AddReactionRoleEvt.ts index 734b591a..296c5038 100644 --- a/backend/src/plugins/ReactionRoles/events/AddReactionRoleEvt.ts +++ b/backend/src/plugins/ReactionRoles/events/AddReactionRoleEvt.ts @@ -12,7 +12,7 @@ export const AddReactionRoleEvt = reactionRolesEvt({ const pluginData = meta.pluginData; const msg = meta.args.message as Message; const emoji = meta.args.emoji; - const userId = meta.args.userID; + const userId = meta.args.member.id; if (userId === pluginData.client.user.id) { // Don't act on own reactions diff --git a/backend/src/plugins/Starboard/events/StarboardReactionAddEvt.ts b/backend/src/plugins/Starboard/events/StarboardReactionAddEvt.ts index b97e8686..06731eb0 100644 --- a/backend/src/plugins/Starboard/events/StarboardReactionAddEvt.ts +++ b/backend/src/plugins/Starboard/events/StarboardReactionAddEvt.ts @@ -10,7 +10,7 @@ export const StarboardReactionAddEvt = starboardEvt({ const pluginData = meta.pluginData; let msg = meta.args.message as Message; - const userId = meta.args.userID; + const userId = meta.args.member.id; const emoji = meta.args.emoji; if (!msg.author) { diff --git a/backend/src/plugins/Starboard/events/StarboardReactionRemoveEvts.ts b/backend/src/plugins/Starboard/events/StarboardReactionRemoveEvts.ts index 5e15ab90..a42e5510 100644 --- a/backend/src/plugins/Starboard/events/StarboardReactionRemoveEvts.ts +++ b/backend/src/plugins/Starboard/events/StarboardReactionRemoveEvts.ts @@ -4,7 +4,7 @@ export const StarboardReactionRemoveEvt = starboardEvt({ event: "messageReactionRemove", async listener(meta) { - await meta.pluginData.state.starboardReactions.deleteStarboardReaction(meta.args.message.id, meta.args.userID); + await meta.pluginData.state.starboardReactions.deleteStarboardReaction(meta.args.message.id, meta.args.member.id); }, }); diff --git a/backend/src/plugins/Utility/search.ts b/backend/src/plugins/Utility/search.ts index 826ce922..311513f7 100644 --- a/backend/src/plugins/Utility/search.ts +++ b/backend/src/plugins/Utility/search.ts @@ -137,9 +137,9 @@ export async function displaySearch( searchMsg.addReaction("➡"); searchMsg.addReaction("🔄"); - const listenerFn = pluginData.events.on("messageReactionAdd", ({ args: { message: rMsg, emoji, userID } }) => { + const listenerFn = pluginData.events.on("messageReactionAdd", ({ args: { message: rMsg, emoji, member } }) => { if (rMsg.id !== searchMsg.id) return; - if (userID !== msg.author.id) return; + if (member.id !== msg.author.id) return; if (!["⬅", "➡", "🔄"].includes(emoji.name)) return; if (emoji.name === "⬅" && currentPage > 1) { @@ -151,7 +151,7 @@ export async function displaySearch( } if (isFullMessage(rMsg)) { - rMsg.removeReaction(emoji.name, userID); + rMsg.removeReaction(emoji.name, member.id); } });