Properly order reaction roles

backend/src/data/GuildReactionRoles.ts

@@ -24,6 +24,9 @@ export class GuildReactionRoles extends BaseGuildRepository {
         guild_id: this.guildId,
         message_id: messageId,
       },
+      order: {
+        order: "ASC",
+      },
     });
   }
 
@@ -50,7 +53,14 @@ export class GuildReactionRoles extends BaseGuildRepository {
     await this.reactionRoles.delete(criteria);
   }
 
-  async add(channelId: string, messageId: string, emoji: string, roleId: string, exclusive?: boolean) {
+  async add(
+    channelId: string,
+    messageId: string,
+    emoji: string,
+    roleId: string,
+    exclusive?: boolean,
+    position?: number,
+  ) {
     await this.reactionRoles.insert({
       guild_id: this.guildId,
       channel_id: channelId,
@@ -58,6 +68,7 @@ export class GuildReactionRoles extends BaseGuildRepository {
       emoji,
       role_id: roleId,
       is_exclusive: Boolean(exclusive),
+      order: position,
     });
   }
 }

backend/src/data/entities/ReactionRole.ts

@@ -21,4 +21,6 @@ export class ReactionRole {
   @Column() role_id: string;
 
   @Column() is_exclusive: boolean;
+
+  @Column() order: number;
 }

backend/src/index.ts

@@ -164,7 +164,7 @@ connect().then(async () => {
     intents: [
       // Privileged
       Intents.FLAGS.GUILD_MEMBERS,
-      // "guildPresences",
+      // Intents.FLAGS.GUILD_PRESENCES,
       Intents.FLAGS.GUILD_MESSAGE_TYPING,
 
       // Regular

backend/src/migrations/1622939525343-OrderReactionRoles.ts

@@ -0,0 +1,18 @@
+import { MigrationInterface, QueryRunner, TableColumn } from "typeorm";
+
+export class OrderReactionRoles1622939525343 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.addColumn(
+      "reaction_roles",
+      new TableColumn({
+        name: "order",
+        type: "int",
+        isNullable: true,
+      }),
+    );
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.dropColumn("reaction_roles", "order");
+  }
+}

backend/src/plugins/ReactionRoles/commands/InitReactionRolesCmd.ts

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

backend/src/plugins/ReactionRoles/events/AddReactionRoleEvt.ts

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

backend/src/plugins/ReactionRoles/util/applyReactionRoleReactionsToMessage.ts

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