From c527efa3844555edac6728c0203a0a1f29223e08 Mon Sep 17 00:00:00 2001
From: CramMK <39596050+CramMK@users.noreply.github.com>
Date: Thu, 13 Feb 2020 19:06:05 +0100
Subject: [PATCH] Leave behind Windows

---
 aquabot.py       | 19 ++++++++++---------
 config/config.py |  2 ++
 config/media.py  | 21 +++++++++++----------
 config/status.py |  7 ++++---
 loadconfig.py    |  6 ++++--
 requirements.txt |  1 +
 6 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 config/config.py

diff --git a/aquabot.py b/aquabot.py
index 6b95e66..a0eae7a 100644
--- a/aquabot.py
+++ b/aquabot.py
@@ -12,21 +12,22 @@ import logging
 from datetime import datetime
 import platform
 import random
+import asyncio
 
 # IMPORTS - internal
 import loadconfig
 
 # LOGGING
-logger = logging.getLogger("discord")
+#logger = logging.getLogger("discord")
 # https://docs.python.org/3/library/logging.html#levels
-logger.setLevel(logging.INFO)
-handler = logging.FileHandler(
-        filename="logs/discord-{%Y-%m-%d_%H-%M}.log".format(datetime.now()),
-        encoding="utf-8",
-        mode="w")
-handler.setFormatter(
-        logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s"))
-logger.addHandler(handler)
+#logger.setLevel(logging.INFO)
+#handler = logging.FileHandler(
+#        filename="logs/discord.log",
+#        encoding="utf-8",
+#        mode="w")
+#handler.setFormatter(
+#        logging.Formatter("%(asctime)s:%(levelname)s:%(name)s: %(message)s"))
+#logger.addHandler(handler)
 
 # INIT THE BOT
 bot = commands.Bot(
diff --git a/config/config.py b/config/config.py
new file mode 100644
index 0000000..d349a3f
--- /dev/null
+++ b/config/config.py
@@ -0,0 +1,2 @@
+__token__ = "NjIzMjA4NzgyOTY0NDU3NTAz.XYD_RQ.qQqLIeq_5XmjV0MOqv5H7Cb8LSo"
+__prefix__ = "."
\ No newline at end of file
diff --git a/config/media.py b/config/media.py
index 13b5ace..c2cc8c7 100644
--- a/config/media.py
+++ b/config/media.py
@@ -2,16 +2,6 @@
 Media, which can be accessed from the bot.
 """
 
-# Exports
-__media_anime__ = [gifs_anime, pics_anime]
-
-__media_waifu__ = {
-        "aqua": waifu_aqua,
-        "meugmin": waifu_megumin,
-        "akeno": waifu_akeno,
-        "rem": waifu_rem
-        }
-
 # Internal lists
 gifs_anime = []
 
@@ -26,3 +16,14 @@ waifu_megumin = []
 waifu_akeno = []
 
 waifu_rem = []
+
+
+# Exports
+__media_anime__ = [gifs_anime, pics_anime]
+
+__media_waifu__ = {
+        "aqua": waifu_aqua,
+        "meugmin": waifu_megumin,
+        "akeno": waifu_akeno,
+        "rem": waifu_rem
+        }
diff --git a/config/status.py b/config/status.py
index abbd578..e723158 100644
--- a/config/status.py
+++ b/config/status.py
@@ -2,13 +2,14 @@
 The bot's online status rotates through this list
 """
 
+import discord
+
 __activity__ = [
         (discord.ActivityType.watching, "Hentai"),
         (discord.ActivityType.watching, "Konosuba"),
-        (discord.ActivityType.watching, "beach episodes")
-        (discord.ActivityType.playing, "with water")
+        (discord.ActivityType.watching, "beach episodes"),
+        (discord.ActivityType.playing, "with water"),
         (discord.ActivityType.playing, "with Megumin"),
         (discord.ActivityType.playing, "with Sake"),
         (discord.ActivityType.streaming, "Hentai")
-        (discord.ActivityType.custom, "mizu")
         ]
diff --git a/loadconfig.py b/loadconfig.py
index f6dd9dc..9d3757f 100644
--- a/loadconfig.py
+++ b/loadconfig.py
@@ -15,11 +15,13 @@ try:
     with open("config/config.yml") as file:
         config = yaml.safe_load(file)
 
-    __token__ = config['token']
-    __prefix__ = config['prefix']
+        __token__ = config['token']
+        __prefix__ = config['prefix']
 
 except yaml.YAMLError as error:
     print(f"Error while parsing: {error}")
+except FileNotFoundError as error:
+    print(f"Error, please create a config file: {error}")
 
 try:
     from config.cogs import __cogs__
diff --git a/requirements.txt b/requirements.txt
index 44b454e..9335153 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 discord.py[voice]=1.2.5
 youtube-dl
+pyyaml
\ No newline at end of file