StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly order reaction roles

Browse source
This commit is contained in:
Dark 2021-06-06 02:41:06 +02:00
parent 7124898568
commit 43c23263f0
No known key found for this signature in database
GPG key ID: 384C4B4F5B1E25A8
7 changed files with 41 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backend/src/plugins/ReactionRoles/commands/InitReactionRolesCmd.ts
View file

@ -103,6 +103,7 @@ export const InitReactionRolesCmd = reactionRolesCmd({
const progressMessage = msg.channel.send("Adding reaction roles...");
// Save the new reaction roles to the database
let pos = 0;
for (const pair of emojiRolePairs) {
await pluginData.state.reactionRoles.add(
args.message.channel.id,
@ -110,7 +111,9 @@ export const InitReactionRolesCmd = reactionRolesCmd({
pair[0],
pair[1],
args.exclusive,
pos,
);
pos++;
}
// Apply the reactions themselves

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

@ -61,7 +61,7 @@ export const AddReactionRoleEvt = reactionRolesEvt({
setTimeout(() => {
pluginData.state.reactionRemoveQueue.add(async () => {
const wait = sleep(1500);
await meta.args.reaction.remove().catch(noop);
await meta.args.reaction.users.remove(userId).catch(noop);
await wait;
});
}, 1500);

10
backend/src/plugins/ReactionRoles/util/applyReactionRoleReactionsToMessage.ts
View file

@ -71,18 +71,16 @@ export async function applyReactionRoleReactionsToMessage(
emojisToAdd.push(CLEAR_ROLES_EMOJI);
for (const rawEmoji of emojisToAdd) {
const emoji = isSnowflake(rawEmoji) ? `foo:${rawEmoji}` : rawEmoji;
try {
await targetMessage.reactions.add(emoji);
await sleep(1250); // Make sure we don't hit rate limits
await targetMessage.react(rawEmoji);
await sleep(750); // Make sure we don't hit rate limits
} catch (e) {
if (isDiscordRESTError(e)) {
if (e.code === 10014) {
pluginData.state.reactionRoles.removeFromMessage(messageId, rawEmoji);
errors.push(`Unknown emoji: ${emoji}`);
errors.push(`Unknown emoji: ${rawEmoji}`);
logs.log(LogType.BOT_ALERT, {
body: `Could not add unknown reaction role emoji ${emoji} to message ${channelId}/${messageId}`,
body: `Could not add unknown reaction role emoji ${rawEmoji} to message ${channelId}/${messageId}`,
});
continue;
} else if (e.code === 50013) {