[stable] agree, disagree, loading cleanup for consistency

app.py

@@ -68,10 +68,8 @@ async def commands(ctx):
     except Exception as e:
         print(f"Error: unable to help :(")   
 #---------------------------------------------------------------------------------------------------------------------------------------------   
-async def safetychecks(ctx):
-    emoji_guild = ctx.guild  
-    failure_emoji_id = 1098628957521313892
-    failure_emoji = discord.utils.get(emoji_guild.emojis, id=failure_emoji_id)  
+async def safetychecks(ctx): 
+    failure_emoji = '<:disagree:1098628957521313892>' 
     try:
         if ctx.author.bot:
             print(f"Error: The bot is not allowed to use its own commands.")
@@ -136,7 +134,7 @@ async def deepfloydifdemo(ctx):
         await thread.send(f'https://cdn.discordapp.com/attachments/932563860597121054/1113483403258499142/image.png')
     except Exception as e:
         print(f"Error: {e}")
-        await ctx.message.add_reaction('❌')
+        await ctx.message.add_reaction('<:disagree:1098628957521313892>')
 #---------------------------------------------------------------------------------------------------------------------------------------------- 
 @bot.command()
 async def jojodemo(ctx):
@@ -147,7 +145,7 @@ async def jojodemo(ctx):
         await thread.send(f'https://cdn.discordapp.com/attachments/932563860597121054/1113492260294770778/image.png')
     except Exception as e:
         print(f"Error: {e}")
-        await ctx.message.add_reaction('❌')
+        await ctx.message.add_reaction('<:disagree:1098628957521313892>')
 #----------------------------------------------------------------------------------------------------------------------------------------------         
 # jojo ✅
 @bot.command()
@@ -175,16 +173,16 @@ async def jojo(ctx):
 
                 #testing animated
                 # <a:hugging_spin:1102656012621713488>
-                await ctx.message.add_reaction('✅') # img + face    
+                await ctx.message.add_reaction('<:agree:1098629085955113011>') # img + face    
                 await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
             else: # no image
                 await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
-                await ctx.message.add_reaction('❌') 
+                await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
                 await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
     except Exception as e: # no generation / img + no face
         print(f"Error: {e}")
         await thread.send(f"{ctx.author.mention} Error: {e}")
-        await ctx.message.add_reaction('❌')  
+        await ctx.message.add_reaction('<:disagree:1098628957521313892>')  
         await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
         
 #---------------------------------------------------------------------------------------------------------------------------------------------- 
@@ -193,7 +191,7 @@ async def jojo(ctx):
 async def disney(ctx):
     try:
         if await safetychecks(ctx): #✅
-            await ctx.message.add_reaction('⏳') 
+            await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
             thread = await ctx.message.create_thread(name=f'{ctx.author} disney Thread')         
             if ctx.message.attachments:
                 await thread.send(f'{ctx.author.mention} Generating images in thread, can take ~1 minute...')  
@@ -201,17 +199,17 @@ async def disney(ctx):
                 style = 'Disney'
                 im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, 'disney')
                 await thread.send(f'{ctx.author.mention} Here is the {style} version of it', file=discord.File(im))
-                await ctx.message.add_reaction('✅') # img + face 
-                await ctx.message.remove_reaction('⏳', bot.user)
+                await ctx.message.add_reaction('<:agree:1098629085955113011>') # img + face 
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
             else: # no image
                 await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
-                await ctx.message.add_reaction('❌') 
-                await ctx.message.remove_reaction('⏳', bot.user)
+                await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
     except Exception as e: # no generation / img + no face
         print(f"Error: {e}")
         await thread.send(f"{ctx.author.mention} Error: {e}")
-        await ctx.message.add_reaction('❌') 
-        await ctx.message.remove_reaction('⏳', bot.user)
+        await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
+        await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
         
 #---------------------------------------------------------------------------------------------------------------------------------------------- 
 # Spider-Verse ✅
@@ -219,7 +217,7 @@ async def disney(ctx):
 async def spidey(ctx):
     try:
         if await safetychecks(ctx): #✅ 
-            await ctx.message.add_reaction('⏳') 
+            await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
             thread = await ctx.message.create_thread(name=f'{ctx.author} spider-verse Thread')         
             if ctx.message.attachments:
                 await thread.send(f'{ctx.author.mention} Generating images in thread, can take ~1 minute...')  
@@ -227,17 +225,17 @@ async def spidey(ctx):
                 style = 'Spider-Verse'
                 im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, style)
                 await thread.send(f'{ctx.author.mention} Here is the {style} version of it', file=discord.File(im))
-                await ctx.message.add_reaction('✅') # img + face    
-                await ctx.message.remove_reaction('⏳', bot.user)                
+                await ctx.message.add_reaction('<:agree:1098629085955113011>') # img + face    
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)                
             else: # no image
                 await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
-                await ctx.message.add_reaction('❌')  
-                await ctx.message.remove_reaction('⏳', bot.user)
+                await ctx.message.add_reaction('<:disagree:1098628957521313892>')  
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
     except Exception as e: # no generation / img + no face
         print(f"Error: {e}")
         await thread.send(f"{ctx.author.mention} Error: {e}")
-        await ctx.message.add_reaction('❌') 
-        await ctx.message.remove_reaction('⏳', bot.user)
+        await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
+        await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
         
 #---------------------------------------------------------------------------------------------------------------------------------------------- 
 # sketch ✅
@@ -245,7 +243,7 @@ async def spidey(ctx):
 async def sketch(ctx):
     try:    
         if await safetychecks(ctx): #✅
-            await ctx.message.add_reaction('⏳') 
+            await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
             thread = await ctx.message.create_thread(name=f'{ctx.author} sketch Thread')         
             if ctx.message.attachments:
                 await thread.send(f'{ctx.author.mention} Generating images in thread, can take ~1 minute...')  
@@ -253,17 +251,17 @@ async def sketch(ctx):
                 #style = 'sketch'
                 im = await asyncio.get_running_loop().run_in_executor(None, jojogan.predict, attachment.url, 'sketch')
                 await thread.send(f'{ctx.author.mention} Here is the sketch version of it', file=discord.File(im))
-                await ctx.message.add_reaction('✅') # img + face 
-                await ctx.message.remove_reaction('⏳', bot.user)                
+                await ctx.message.add_reaction('<:agree:1098629085955113011>') # img + face 
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)                
             else: # no image
                 await thread.send(f"{ctx.author.mention} No attachments to be found...Can't animify dat! Try sending me an image 😉")
-                await ctx.message.add_reaction('❌') 
-                await ctx.message.remove_reaction('⏳', bot.user)
+                await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
+                await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
     except Exception as e: # no generation / img + no face
         print(f"Error: {e}")
         await thread.send(f"{ctx.author.mention} Error: {e}")
-        await ctx.message.add_reaction('❌') 
-        await ctx.message.remove_reaction('⏳', bot.user)
+        await ctx.message.add_reaction('<:disagree:1098628957521313892>') 
+        await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
 #----------------------------------------------------------------------------------------------------------------------------------------------
 # deepfloydif stage 1 generation ✅
 def inference(prompt):
@@ -300,13 +298,10 @@ async def react1234(reaction_emojis, combined_image_dfif):
 # Stage 1 ✅
 @bot.command()
 async def deepfloydif(ctx, *, prompt: str):
-    emoji_guild = ctx.guild  
-    failure_emoji_id = 1098628957521313892
-    failure_emoji = discord.utils.get(emoji_guild.emojis, id=failure_emoji_id)
     try:
         try:
             if await safetychecks(ctx): #✅
-                await ctx.message.add_reaction('⏳') 
+                await ctx.message.add_reaction('<a:loading:1114111677990981692>') 
                 dfif_command_message_id = ctx.message.id # we will use this in some magic later on
                 thread = await ctx.message.create_thread(name=f'{ctx.author} DeepfloydIF Image Upscaling Thread ')
                 # create thread -> send new message inside thread + combined_image -> add reactions -> dfif2
@@ -328,8 +323,8 @@ async def deepfloydif(ctx, *, prompt: str):
             print(f"Error: {e}")
             thread = await ctx.message.create_thread(name=f'DFIF1 Error')
             await thread.send(f"{ctx.author.mention} Error during stage 1 pre-generation.")
-            await ctx.message.remove_reaction('⏳', bot.user)
-            await ctx.message.add_reaction(failure_emoji)
+            await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
+            await ctx.message.add_reaction('<:disagree:1098628957521313892>')
             
         #generation✅-------------------------------------------------------
         try:
@@ -350,8 +345,8 @@ async def deepfloydif(ctx, *, prompt: str):
             print(f"Error: {e}")
             thread = await ctx.message.create_thread(name=f'Generation Error')
             await thread.send(f"{ctx.author.mention} Error during stage 1 generation.")
-            await ctx.message.remove_reaction('⏳', bot.user)
-            await ctx.message.add_reaction(failure_emoji)            
+            await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
+            await ctx.message.add_reaction('<:disagree:1098628957521313892>')            
         #posting images✅----------------------------------------------------------------    
         try:
             #await thread.send(f'✅combining images...') 
@@ -408,16 +403,16 @@ async def deepfloydif(ctx, *, prompt: str):
             print(f"Error: {e}")
             thread = await ctx.message.create_thread(name=f'Posting Error')
             await thread.send(f"{ctx.author.mention} Encountered error while posting combined image in thread.")
-            await ctx.message.remove_reaction('⏳', bot.user)
-            await ctx.message.add_reaction(failure_emoji)
+            await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
+            await ctx.message.add_reaction('<:disagree:1098628957521313892>')
             
     #deepfloydif try/except
     except Exception as e:
         print(f"Error: {e}")
         thread = await ctx.message.create_thread(name=f'deepfloydif Error')
         await thread.send(f"{ctx.author.mention} Overall error with deepfloydif.")
-        await ctx.message.remove_reaction('⏳', bot.user)
-        await ctx.message.add_reaction(failure_emoji)
+        await ctx.message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
+        await ctx.message.add_reaction('<:disagree:1098628957521313892>')
 
 #----------------------------------------------------------------------------------------------------------------------------
 # Stage 2 ✅
@@ -448,8 +443,8 @@ async def dfif2(index: int, stage_1_result_path, thread, dfif_command_message_id
         success_emoji = discord.utils.get(emoji_guild.emojis, id=success_emoji_id)
         parent_channel = thread.parent
         dfif_command_message = await parent_channel.fetch_message(dfif_command_message_id)
-        await dfif_command_message.add_reaction(success_emoji)
-        await dfif_command_message.remove_reaction('⏳', bot.user)
+        await dfif_command_message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
+        await dfif_command_message.add_reaction('<:agree:1098629085955113011>')
 
     except Exception as e:
         print(f"Error: {e}")
@@ -459,8 +454,8 @@ async def dfif2(index: int, stage_1_result_path, thread, dfif_command_message_id
         failure_emoji = discord.utils.get(emoji_guild.emojis, id=failure_emoji_id)
         parent_channel = thread.parent
         dfif_command_message = await parent_channel.fetch_message(dfif_command_message_id)
-        await dfif_command_message.add_reaction(failure_emoji)  
-        await dfif_command_message.remove_reaction('⏳', bot.user)
+        await dfif_command_message.remove_reaction('<a:loading:1114111677990981692>', bot.user)
+        await dfif_command_message.add_reaction('<:disagree:1098628957521313892>')  
         await thread.send(f"Error during stage 2 upscaling.") 
 #----------------------------------------------------------------------------------------------------------------------------
 # react detector for stage 2 ✅