Update style according to Flake8

[tall.bot.git] / tallbot.py

diff --git a/tallbot.py b/tallbot.py
index f17e04e5348def307940d2bf257618a16daf7ad5..1b184f24b0444012d66398813e6c22afbff40309 100755 (executable)
--- a/tallbot.py
+++ b/tallbot.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # tall.bot - a simple Discord Wikipedia bot
-# Armaan Bhojwani 2020
+# Armaan Bhojwani 2021
+
 
 import logging
 import sqlite3
@@ -9,9 +10,11 @@ import time
 import wikipedia
 import discord
 
+
 def wiki_sum(search, sen, pid):
     try:
-        logging.info(str(pid) + " | " + str(int(time.time())) + " | " + str(search))
+        logging.info(str(pid) + " | " + str(int(time.time())) + " | " +
+                     str(search))
         log_query(search, pid)
         return "<Wikipedia> " + wikipedia.summary(search,
                                                   sentences=sen,
@@ -20,6 +23,7 @@ def wiki_sum(search, sen, pid):
         logging.debug(str(pid) + " | " + str(search) + " | " + str(e))
         return str(e)
 
+
 def create_query(inp):
     key1 = ["What", "what", "who", "Who", "what's", "What's", "whats", "Whats",
             "Whatsa", "whatsa"]
@@ -36,6 +40,7 @@ def create_query(inp):
 
     return " ".join(x)
 
+
 def tell_more(inp, pid):
     def find_query(inp):
         key1 = ["Tell me more", "tell me more"]
@@ -48,13 +53,16 @@ def tell_more(inp, pid):
         old = int(time.time()) - 150
         c.execute("SELECT query FROM queries WHERE pid = (?) AND time > (?)",
                   (str(pid), old))
-        return c.fetchone()
+
+        (query, *_) = c.fetchone()
+        return str(query)
 
     if find_query(inp):
         return query_lookup(pid)
     else:
         return False
 
+
 def prep_database():
     c.execute("""CREATE TABLE IF NOT EXISTS queries(
               time INTEGER,
@@ -62,6 +70,7 @@ def prep_database():
               query TEXT)""")
     conn.commit()
 
+
 def log_query(search, pid):
     c.execute("DELETE FROM queries WHERE pid = (?)", (str(pid),))
     c.execute("""INSERT INTO queries
@@ -69,6 +78,7 @@ def log_query(search, pid):
               (int(time.time()), str(pid), str(search)))
     conn.commit()
 
+
 class TallBot(discord.Client):
     async def on_ready(self):
         logging.info('Logged in as ', self.user)
@@ -80,14 +90,16 @@ class TallBot(discord.Client):
         query = create_query(message.content)
         more_info = tell_more(message.content, message.author)
         if query:
-            await message.channel.send(wiki_sum(query, 2, message.author))
+            await message.channel.send(wiki_sum(query, 1, message.author))
         elif more_info:
-            await message.channel.send(wiki_sum(more_info, 8, message.author))
+            await message.channel.send(wiki_sum(more_info, 6, message.author))
+
 
 def main():
     prep_database()
     TallBot().run(sys.argv[1])
 
+
 if __name__ == "__main__":
     conn = sqlite3.connect("queries.db")
     c = conn.cursor()