StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-15 05:41:51 +00:00
Code Releases Activity

Fixes

Browse source
This commit is contained in:
Dragory 2020-10-16 02:13:54 +03:00
parent 3aada93a80
commit 76f7658763
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
7 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
backend/package-lock.json generated
View file

@ -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"

2
backend/package.json
View file

@ -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",

6
backend/src/plugins/Mutes/commands/MutesCmd.ts
View file

@ -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);
},
);

2
backend/src/plugins/ReactionRoles/events/AddReactionRoleEvt.ts
View file

@ -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

2
backend/src/plugins/Starboard/events/StarboardReactionAddEvt.ts
View file

@ -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) {

2
backend/src/plugins/Starboard/events/StarboardReactionRemoveEvts.ts
View file

@ -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);
},
});

6
backend/src/plugins/Utility/search.ts
View file

@ -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);
}
});