Fix adding new reactions to existing messages (#143)

* fix adding new reactions to existing messages

* change order of steps to add new reaction

Author: eibex

.version

@@ -1 +1 @@
-3.5.1b
+3.5.2

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Reaction Light - Changelog
 
+### 3.5.2
+- Fix adding new reactions to reaction messages ([#142](https://github.com/eibex/reaction-light/issues/142) closed by [#143](https://github.com/eibex/reaction-light/pull/143) by [eibex](https://github.com/eibex))
+
 ### 3.5.1
 - Add ARM Docker build ([#141](https://github.com/eibex/reaction-light/issues/141))
 

cogs/message.py

@@ -650,15 +650,6 @@ async def edit_reaction(
             return
 
         if action == "add":
-            try:
-                # Check that the bot can actually use the emoji
-                await message_to_edit.add_reaction(reaction)
-            except disnake.HTTPException:
-                await inter.edit_original_message(
-                    content=self.bot.response.get("new-reactionrole-emoji-403", guild_id=inter.guild.id)
-                )
-                return
-
             try:
                 react = self.bot.db.add_reaction(message_to_edit.id, role.id, sanitize_emoji(reaction))
             except DatabaseError as error:
@@ -670,13 +661,34 @@ async def edit_reaction(
                 )
                 return
 
+            try:
+                # Try to add the reaction, this will fail if the bot cannot actually use the emoji
+                await message_to_edit.add_reaction(reaction)
+            except disnake.HTTPException:
+                await inter.edit_original_message(
+                    content=self.bot.response.get("new-reactionrole-emoji-403", guild_id=inter.guild.id)
+                )
+                try:
+                    # We remove the db entry since the edit failed
+                    react = self.bot.db.remove_reaction(message_to_edit.id, sanitize_emoji(reaction))
+                except DatabaseError as error:
+                    await self.bot.report(
+                        self.bot.response.get("db-error-add-reaction", guild_id=inter.guild.id).format(
+                            channel_mention=message_to_edit.channel.mention, exception=error
+                        ),
+                        inter.guild.id,
+                    )
+                    return
+                return
+
             if not react:
                 await inter.edit_original_message(
                     content=self.bot.response.get("reaction-edit-already-exists", guild_id=inter.guild.id)
                 )
                 return
 
             await inter.edit_original_message(content=self.bot.response.get("reaction-edit-add-success", guild_id=inter.guild.id))
+
         elif action == "remove":
             try:
                 await message_to_edit.clear_reaction(reaction)