bot.py

@@ -1,9 +1,8 @@
 import simplematrixbotlib as botLibrary
 import json
 import fetch
-import time
 
-version = "0.3.0"
+version = "0.2.0"
 
 print("Imag/quotes bot version " + version)
 print("Loading config…")
@@ -23,7 +22,6 @@ else:
 
 print("Logging in…")
 credentials = botLibrary.Creds(config['matrix']['server'], config['matrix']['userid'], config['matrix']['password'])
-admin = config['bot']['admin']
 bot = botLibrary.Bot(credentials)
 PREFIX = "!q"
 print("Logged in.")
@@ -35,27 +33,29 @@ async def help_message(room, message):
             and match.command("help")):
         return
     if debugMode == False:
-        message = (f"""Help
+        message = (f"""
+        Help
         ============================
         A work-in-progress Python rewrite of the original quotes bot, aiming for a mostly complete remake.
             {PREFIX} help - show this message
             {PREFIX} get - fetch a image from the defined instance
             {PREFIX} source - send a link to the source code
             {PREFIX} version - show the bot version
-{PREFIX} die - kills the bot (only admins can do this!)""")
+        """)
     else:
-        message = (f"""Help
+        message = (f"""
+        Help
         ============================
         A work-in-progress Python rewrite of the original quotes bot, aiming for a mostly complete remake.
             {PREFIX} help - show this message
             {PREFIX} get - fetch a image from the defined instance
             {PREFIX} source - send a link to the source code
             {PREFIX} version - show the bot version
-{PREFIX} die - kills the bot (only admins can do this!)
 
         ---
 
-NOTE: Debug mode is on. Output will be more verbose.""")
+        NOTE: Debug mode is on. Output will be more verbose.
+        """)
 
 
     await bot.api.send_text_message(room.room_id, message)
@@ -71,51 +71,41 @@ async def make_choice(room, message):
         temp = False
     else:
         id = match.args()
-        try:
+        id = str(id[1])
-            id = int(id[1])
-        except ValueError:
-            youTriedMessage = ("Blunt tried :skull:")
-            await bot.api.send_text_message(room.room_id, youTriedMessage)
-
         quoteImage = fetch.fetchQuote(id)
         quoteData = fetch.fetchQuoteData(id)
 
     def formatData(data):
-        if data is not None:
-            timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(data['created']))
         dataToFormat = data
-            created = timestamp
+        created = str(data['created'])
         description = str(data['desc'])
         imageid = str(data['iid'])
         ocr = str(data['ocr'])
         score = str(data['score'])
         return created, description, imageid, ocr, score
-        else:
-            dataToFormat = data
-            created = "Error"
-            description = "Error"
-            imageid = "Error"
-            ocr = "Error"
-            score = "Error"
-            return created, description, imageid, ocr, score
 
     if debugMode == False:
         created, description, imageid, ocr, score = formatData(quoteData)
-        message1 = (f"""Created: {created}
+        message1 = (f"""
+                    Created: {created}
                     Description: {description}
                     Image ID: {imageid}
                     OCR (Tesseract): {ocr}
-Rating: {score}""")
+                    Rating: {score}
+                    """)
     else:
         created, description, imageid, ocr, score = formatData(quoteData)
-        message1 = (f"""Created: {created}
+        message1 = (f"""
+                    Created: {created}
                     Description: {description}
                     Image ID: {imageid}
-OCR (Tesseract):
+                    OCR (Tesseract): {ocr}
-> {ocr}
+                    Rating: {score}
-Rating: {score}""")
+                    """)
-        message2 = (f"""Command recived (DEBUG).
+        message2 = (f"""
-(We're supposed to fetch quote number {id} now.)""")
+        Command recived (DEBUG).
+        (We're supposed to fetch quote number {id} now.)
+        """)
 
     if debugMode == True:
         await bot.api.send_text_message(room.room_id, message2)
@@ -132,8 +122,10 @@ async def help_message(room, message):
             and match.command("source")):
         return
 
-    message = (f"""quotes-bot-python by Nyx Tutt (@n:everypizza.im)
+    message = (f"""
-https://git.everypizza.im/n/quotes-bot-python/""")
+    quotes-bot-python by Nyx Tutt (@n:everypizza.im)
+    https://git.everypizza.im/n/quotes-bot-python/
+    """)
 
     await bot.api.send_text_message(room.room_id, message)
 
@@ -144,18 +136,10 @@ async def help_message(room, message):
             and match.command("version")):
         return
 
-    message = (f"""quotes-bot-python version {version}""")
+    message = (f"""
+    quotes-bot-python version {version}
+    """)
 
     await bot.api.send_text_message(room.room_id, message)
 
-@bot.listener.on_message_event
-async def help_message(room, message):
-    match = botLibrary.MessageMatch(room, message, bot, PREFIX)
-    if match.is_not_from_this_bot() and match.prefix() and match.command("die"):
-        if match.is_from_userid(admin):
-            await bot.api.send_text_message(room.room_id, "Ok")
-            exit(0)
-        else:
-            await bot.api.send_text_message(room.room_id, "You don't have permissions for that.")
-
 bot.run()

config.sample.json

@@ -9,7 +9,6 @@
     "server": "https://quotes.example.com"
   },
   "bot": {
-    "debugMode": true,
+    "debugMode": true
-    "admin": "@alice:example.com"
   }
 }

fetch.py

@@ -30,12 +30,6 @@ def fetchQuoteData(quoteId):
         print(quoteData.json())
     else:
         print(f"An error occured while saving the file: {quoteData.status_code}")
-        return None
+        return "This file probably doesn't exist."
-
-def fetchTopQuotes(instance):
-    raise NotImplementedError
-
-def fetchBottomQuotes(instance):
-    raise NotImplementedError
 
 fetchQuoteData(178)