StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-10 20:35:02 +00:00
Code Releases Activity

Fix race conditions and duplicate stars in starboard

Browse source
This commit is contained in:
Dragory 2020-12-23 05:28:21 +02:00
parent 1484f6b9a7
commit e1e1854041
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
5 changed files with 63 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,8 @@ export const StarboardReactionAddEvt = starboardEvt({
categoryId: (msg.channel as TextChannel).parentID,
});
const boardLock = await pluginData.locks.acquire(`starboards`);
const applicableStarboards = Object.values(config.boards)
.filter(board => board.enabled)
// Can't star messages in the starboard channel itself
@ -59,8 +61,6 @@ export const StarboardReactionAddEvt = starboardEvt({
});
for (const starboard of applicableStarboards) {
const boardLock = await pluginData.locks.acquire(`starboards-channel-${starboard.channel_id}`);
// Save reaction into the database
await pluginData.state.starboardReactions.createStarboardReaction(msg.id, userId).catch(noop);
@ -92,8 +92,8 @@ export const StarboardReactionAddEvt = starboardEvt({
// Otherwise, if the star count exceeds the required star count, save the message to the starboard
await saveMessageToStarboard(pluginData, msg, starboard);
}
boardLock.unlock();
}
boardLock.unlock();
},
});

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

@ -4,7 +4,9 @@ export const StarboardReactionRemoveEvt = starboardEvt({
event: "messageReactionRemove",
async listener(meta) {
const boardLock = await meta.pluginData.locks.acquire(`starboards`);
await meta.pluginData.state.starboardReactions.deleteStarboardReaction(meta.args.message.id, meta.args.member.id);
boardLock.unlock();
},
});
@ -12,6 +14,8 @@ export const StarboardReactionRemoveAllEvt = starboardEvt({
event: "messageReactionRemoveAll",
async listener(meta) {
const boardLock = await meta.pluginData.locks.acquire(`starboards`);
await meta.pluginData.state.starboardReactions.deleteAllStarboardReactionsForMessageId(meta.args.message.id);
boardLock.unlock();
},
});

20
backend/src/plugins/Starboard/util/updateStarboardMessageStarCount.ts
View file

@ -2,6 +2,10 @@ import { Client, GuildTextableChannel, Message } from "eris";
import { noop } from "../../../utils";
import { createStarboardPseudoFooterForMessage } from "./createStarboardPseudoFooterForMessage";
import { TStarboardOpts } from "../types";
import Timeout = NodeJS.Timeout;
const DEBOUNCE_DELAY = 1000;
const debouncedUpdates: Record<string, Timeout> = {};
export async function updateStarboardMessageStarCount(
starboard: TStarboardOpts,
@ -10,8 +14,16 @@ export async function updateStarboardMessageStarCount(
starEmoji: string,
starCount: number,
) {
const embed = starboardMessage.embeds[0]!;
embed.fields!.shift(); // Remove pseudo footer
embed.fields!.push(createStarboardPseudoFooterForMessage(starboard, originalMessage, starEmoji, starCount)); // Create new pseudo footer
await starboardMessage.edit({ embed });
const key = `${originalMessage.id}-${starboardMessage.id}`;
if (debouncedUpdates[key]) {
clearTimeout(debouncedUpdates[key]);
}
debouncedUpdates[key] = setTimeout(() => {
delete debouncedUpdates[key];
const embed = starboardMessage.embeds[0]!;
embed.fields!.shift(); // Remove pseudo footer
embed.fields!.push(createStarboardPseudoFooterForMessage(starboard, originalMessage, starEmoji, starCount)); // Create new pseudo footer
starboardMessage.edit({ embed });
}, DEBOUNCE_DELAY);
}