Merge pull request #9 from KevinCaires/qidr

Last changes for the night

motd

@@ -5,7 +5,7 @@
 █  ▄    █    ▄▄▄█    ▄▄▄█  ▄   ██   █▄▄▄█    ▄▄▄█
 █ █ █   █   █▄▄▄█   █▄▄▄█ █▄█   █       █   █▄▄▄ 
 █▄█  █▄▄█▄▄▄▄▄▄▄█▄▄▄▄▄▄▄█▄▄▄▄▄▄▄█▄▄▄▄▄▄▄█▄▄▄▄▄▄▄█
-Neeble version: 2022.08.18b
+Neeble version: 2022.08.19
 You can help the development of neeble in
 https://github.com/KevinCaires/neeble
 Thank you!

utils/commands.py

@@ -29,11 +29,13 @@ async def quote(bot: object, *quote: str) -> str:
 
     try:
         user = bot.author.name
-        set_quote(user, quote)
+        qtid = set_quote(user, quote)
     except Exception as ex:
+        if ex.args[0].find("Duplicate") != -1:
+            return await bot.send("There's already a quote from that same person, with that exact match!")
         return await bot.send(f'{ex.args}\n_What the fuck are you doing?_')
     else:
-        return await bot.send('Done:\n`%s`' % quote)
+        return await bot.send("Done: `" + quote + "` ID: `" + str(qtid) + "`")
 
 
 @client.command(aliases=['rq'])

utils/database.py

@@ -58,16 +58,20 @@ def migrate() -> None:
         logger.error(ex.args)
 
 
-def set_quote(user: str, quote: str) -> None:
+def set_quote(user: str, quote: str) -> int:
     """
     Set a quote into database.
     """
+
+    qt = Quotes(quote=quote, user=user,)
+    qtid = 0
     with Session(SQLACHEMY) as session:
-        session.add(Quotes(
+        session.add(qt)
-            quote=quote,
+        session.flush()
-            user=user,
+        session.refresh(qt)
-        ))
+        qtid = qt.id
         session.commit()
+    return qtid
 
 
 def get_quotes(ids: list) -> tuple: