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

reaction_roles: handle errors when adding reactions gracefully

Browse source
This commit is contained in:
Dragory 2020-08-01 23:47:12 +03:00
parent 85bca9bc92
commit 57316b142a
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
2 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts
View file

@ -9,6 +9,7 @@ import { InitReactionRolesCmd } from "./commands/InitReactionRolesCmd";
import { RefreshReactionRolesCmd } from "./commands/RefreshReactionRolesCmd"; import { RefreshReactionRolesCmd } from "./commands/RefreshReactionRolesCmd";
import { ClearReactionRolesCmd } from "./commands/ClearReactionRolesCmd"; import { ClearReactionRolesCmd } from "./commands/ClearReactionRolesCmd";
import { AddReactionRoleEvt } from "./events/AddReactionRoleEvt"; import { AddReactionRoleEvt } from "./events/AddReactionRoleEvt";
import { LogsPlugin } from "../Logs/LogsPlugin";
const MIN_AUTO_REFRESH = 1000 * 60 * 15; // 15min minimum, let's not abuse the API const MIN_AUTO_REFRESH = 1000 * 60 * 15; // 15min minimum, let's not abuse the API
@ -35,6 +36,7 @@ export const ReactionRolesPlugin = zeppelinPlugin<ReactionRolesPluginType>()("re
prettyName: "Reaction roles", prettyName: "Reaction roles",
}, },
dependencies: [LogsPlugin],
configSchema: ConfigSchema, configSchema: ConfigSchema,
defaultOptions, defaultOptions,

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

@ -4,6 +4,8 @@ import { ReactionRole } from "src/data/entities/ReactionRole";
import { TextChannel } from "eris"; import { TextChannel } from "eris";
import { isDiscordRESTError, sleep, isSnowflake } from "src/utils"; import { isDiscordRESTError, sleep, isSnowflake } from "src/utils";
import { logger } from "src/logger"; import { logger } from "src/logger";
import { LogsPlugin } from "../../Logs/LogsPlugin";
import { LogType } from "../../../data/LogType";
const CLEAR_ROLES_EMOJI = "❌"; const CLEAR_ROLES_EMOJI = "❌";
@ -40,17 +42,26 @@ export async function applyReactionRoleReactionsToMessage(
} }
// Remove old reactions, if any // Remove old reactions, if any
const removeSleep = sleep(1250);
await targetMessage.removeReactions(); await targetMessage.removeReactions();
await removeSleep;
// Add reaction role reactions // Add reaction role reactions
for (const rr of reactionRoles) { for (const rr of reactionRoles) {
const emoji = isSnowflake(rr.emoji) ? `foo:${rr.emoji}` : rr.emoji; const emoji = isSnowflake(rr.emoji) ? `foo:${rr.emoji}` : rr.emoji;
const sleepTime = sleep(1250); // Make sure we only add 1 reaction per ~second so as not to hit rate limits try {
await targetMessage.addReaction(emoji); await targetMessage.addReaction(emoji);
await sleepTime; } catch (e) {
if (isDiscordRESTError(e) && e.code === 10014) {
pluginData.state.reactionRoles.removeFromMessage(messageId, rr.emoji);
const logs = pluginData.getPlugin(LogsPlugin);
logs.log(LogType.BOT_ALERT, {
body: `Could not add unknown reaction role emoji ${emoji} to message ${channelId}/${messageId}`,
});
continue;
}
throw e;
}
} }
// Add the "clear reactions" button // Add the "clear reactions" button