CHANGE: Merged remote and local branches

utils/commands.py

@@ -25,7 +25,7 @@ async def quote(bot: object, *quote: str) -> str:
 
     if 'http' in quote and 'discord' in quote and not quote[-4:] == '.png':
         return await bot.send("- _Check your link, dumbass! You're trying to quote an image from a message, but you're quoting the message itself!_\n"\
-            "(Make sure to copy the link for the image by clicking on it, right-clicking the image and then clicking on \"Save Link\"")
+            '(Make sure to copy the link for the image by clicking on it, right-clicking the image and then clicking on "Save Link")')
 
     try:
         user = bot.author.name
@@ -75,15 +75,15 @@ async def by_id(bot, _id: int=None) -> str:
     syntax = "`--qid <quote id>`"
     
     if not _id:
-        return await bot.send("_If you don't tell me the ID, how the fuck do you expect me to quote it to you!?_\n(The correct syntax is " + syntax + ")")
+        return await bot.send(f"_If you don't tell me the ID, how the fuck do you expect me to quote it to you!?_\n(The correct syntax is {syntax}")
 
     if not isinstance(_id, int):
-        return await bot.send("_Don't fuck with me, you asshole. The ID needs to be an interger!_\n(The correct syntax is " + syntax + ")")
+        return await bot.send(f"_Don't fuck with me, you asshole. The ID needs to be an interger!_\n(The correct syntax is {syntax}")
 
     quote = get_by_id(_id)
 
     if not quote:
-        return await bot.send("_Wrong ID, sucker!_\n(There's no such quote with id " + _id + ")")
+        return await bot.send(f"_Wrong ID, sucker!_\n(There's no such quote with id {_id}")
 
     try:
         # To image links.
@@ -108,15 +108,15 @@ async def delete_quote(bot, _id: int=None) -> str:
             "(You don't have the necessary role for this command)")
     
     if not _id:
-        return await bot.send("_If you don't tell me the ID, how the fuck do you expect me to delete it to you!?_\n(The correct syntax is " + syntax + ")")
+        return await bot.send(f"_If you don't tell me the ID, how the fuck do you expect me to delete it to you!?_\n(The correct syntax is {syntax}")
 
     if not isinstance(_id, int):
-        return await bot.send("_Don't fuck with me, you asshole. The ID needs to be an interger!_\n(The correct syntax is " + syntax + ")")
+        return await bot.send(f"_Don't fuck with me, you asshole. The ID needs to be an interger!_\n(The correct syntax is {syntax}")
 
     quote = get_by_id(_id)
     
     if not quote:
-        return await bot.send("_Wrong ID, sucker!_\n(There's no such quote with id " + _id)
+        return await bot.send(f"_Wrong ID, sucker!_\n(There's no such quote with id {_id}")
 
     try:
         if not remove_quote(_id):