Merge branch 'master' of https://github.com/taciturasa/searchbot-discord

.gitignore

@@ -57,3 +57,4 @@ coverage.xml
 # Sphinx documentation
 docs/_build/
 
+extensions/__pycache__/core.cpython-38.pyc

.python-version

@@ -1 +1 @@
-pypy3.6-7.3.0
+3.8.1

extensions/utils/logging.py

@@ -22,28 +22,25 @@ class Logging():
 
         # Sets info hook first
         self.info_hook = self.online.get_webhook(
-            bot.config['HOOKS']['INFO_HOOK'] 
-            if bot.config['HOOKS']['INFO_HOOK']
+            bot.config['HOOKS']['INFO_HOOK']) \
+            if bot.config['HOOKS']['INFO_HOOK'] \
             else None
-        )
+        
 
         # Sets other hooks or defaults them
         if self.info_hook:
             self.warn_hook = self.online.get_webhook(
-                bot.config['HOOKS']['WARN_HOOK'] 
-                if bot.config['HOOKS']['WARN_HOOK']
+                bot.config['HOOKS']['WARN_HOOK']) \
+                if bot.config['HOOKS']['WARN_HOOK'] \
                 else self.info_hook
-            )
             self.error_hook = self.online.get_webhook(
-                bot.config['HOOKS']['ERROR_HOOK'] 
-                if bot.config['HOOKS']['ERROR_HOOK']
+                bot.config['HOOKS']['ERROR_HOOK']) \
+                if bot.config['HOOKS']['ERROR_HOOK'] \
                 else self.info_hook
-            )
             self.debug_hook = self.online.get_webhook(
-                bot.config['HOOKS']['DEBUG_HOOK'] 
-                if bot.config['HOOKS']['DEBUG_HOOK']
+                bot.config['HOOKS']['DEBUG_HOOK']) \
+                if bot.config['HOOKS']['DEBUG_HOOK'] \
                 else self.info_hook
-            )
 
         # If no hooks, nothing is there
         else:

requirements.txt

@@ -1,6 +1,32 @@
-discord.py
-aiohttp
-py-cpuinfo
-psutil
-rethinkdb
-dblpy
+aiohttp==3.6.2
+astroid==2.3.3
+async-timeout==3.0.1
+attrs==19.3.0
+autopep8==1.5
+chardet==3.0.4
+dblpy==0.3.4
+discord==1.0.1
+discord.py==1.3.1
+entrypoints==0.3
+flake8==3.7.9
+idna==2.9
+isort==4.3.21
+lazy-object-proxy==1.4.3
+mccabe==0.6.1
+multidict==4.7.4
+mypy==0.770
+mypy-extensions==0.4.3
+psutil==5.7.0
+py-cpuinfo==5.0.0
+pycodestyle==2.5.0
+pyflakes==2.1.1
+pylint==2.4.4
+ratelimiter==1.2.0.post0
+rethinkdb==2.4.5
+rope==0.16.0
+six==1.14.0
+typed-ast==1.4.1
+typing-extensions==3.7.4.1
+websockets==8.1
+wrapt==1.11.2
+yarl==1.4.2