cleaned up file structure. Moving error logging to a different file. And moving everything for the config and settings into load_config.

config/cogs.py

@@ -1,15 +0,0 @@
-# IF YOU ARE TESTING OR NOT IN THE GSS DISCORD, REMOVE "cogs.gss" FROM THE LIST
-
-cogs = [
-	"cogs.admin",
-	"cogs.fun",
-	"cogs.customcommands",
-	"cogs.joinleave",
-	"cogs.nsfw",
-	"cogs.reddit",
-	"cogs.selfassign",
-	"cogs.settings",
-	"cogs.twitch",
-	"cogs.util",
-	"cogs.gss"
-]

config/meta.py

@@ -1,7 +0,0 @@
-__description__ = """RoxBot, A Discord Bot made by a filthy Mercy Main. Built with love (and discord.py) by Roxxers#7443.
-
-[Github link](https://github.com/RainbowDinoaur/roxbot)
-[Changelog](https://github.com/RainbowDinoaur/roxbot#v100)"""
-__author__ = "Roxanne Gibson"
-__version__= "1.3.2"
-embedcolour = 0xDEADBF

config/servers.json

@@ -1 +0,0 @@
-{"304048071963312130": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "hellow", "default-message": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "self_assign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}, "mute": {"role": "", "admin-role": []}, "nsfw": {"enabled": 1, "channels": ["374688008869511168"]}, "admin_role": {"role": ""}, "custom_commands": {"0": {"test": "\"testedit\"", "hello": "<:tingles:346838411639914506>", "benis": "\ud83c\udd71enis", "sophie": "<@136619052994002944>", "myra": "<@342213251372941312>", "roxieee": "<@!142735312626515979>", "customs": "\"\ud83d\udec3\"", "zzz": "\ud83d\udca4", "lewd!": "\ud83d\udea8 lewd! \ud83d\udea8"}, "1": {}}, "perm_roles": {"admin": ["334078005347483648"], "mod": []}, "gss": {"logging_channel": "339201847678074880", "required_days": "5", "required_score": "3000000", "log_channel": ""}, "admin": {"warnings": {}}, "is_anal": {"y/n": 1}, "warnings": {"259869304369971200": [{"warned-by": "142735312626515979", "date": 1518514436.672631, "warning": "Hello"}, {"warned-by": "142735312626515979", "date": 1518514441.1129122, "warning": "Hello"}, {"warned-by": "142735312626515979", "date": 1518514442.534168, "warning": "Hello"}], "104291668810821632": [{"warned-by": "142735312626515979", "date": 1518519612.6708424, "warning": "For being a bad girl"}]}}, "395632940328943616": {"greets": {"enabled": 0, "welcome-channel": "", "member-role": "", "custom-message": "", "default-message": "Be sure to read the rules."}, "goodbyes": {"enabled": 0, "goodbye-channel": ""}, "self_assign": {"enabled": 0, "roles": []}, "twitch": {"enabled": 0, "twitch-channel": "", "whitelist": {"enabled": 0, "list": []}}, "nsfw": {"enabled": 0, "channels": []}, "perm_roles": {"admin": [], "mod": []}, "custom_commands": {"0": {}, "1": {}}, "gss": {"log_channel": "", "required_days": "", "required_score": ""}, "warnings": {}, "is_anal": {"y/n": 0}}}

config/settings.py

@@ -1,9 +0,0 @@
-import configparser
-
-settings = configparser.ConfigParser()
-settings.read("settings/preferences.ini")
-
-command_prefix = settings["Roxbot"]["Command_Prefix"]
-token = settings["Roxbot"]["Token"]
-owner = settings["Roxbot"]["OwnerID"]
-tattoken = settings["Roxbot"]["Tatsumaki_Token"]

load_config.py

@@ -1,12 +1,35 @@
-from config import settings, cogs, meta
-
-command_prefix = settings.command_prefix
-token = settings.token
-owner = settings.owner
-tat_token = settings.tattoken
-cogslist = cogs.cogs
-description = meta.__description__
-version = meta.__version__
-author = meta.__author__
-embedcolour = meta.embedcolour
+import configparser
 
+settings = configparser.ConfigParser()
+settings.read("settings/preferences.ini")
+
+command_prefix = settings["Roxbot"]["Command_Prefix"]
+token = settings["Roxbot"]["Token"]
+owner = settings["Roxbot"]["OwnerID"]
+tat_token = settings["Roxbot"]["Tatsumaki_Token"]
+
+
+__description__ = """RoxBot, A Discord Bot made by a filthy Mercy Main. Built with love (and discord.py) by Roxxers#7443.
+
+[Github link](https://github.com/RainbowDinoaur/roxbot)
+[Changelog](https://github.com/RainbowDinoaur/roxbot#v100)"""
+__author__ = "Roxanne Gibson"
+__version__= "1.3.2"
+embedcolour = 0xDEADBF
+
+
+# IF YOU ARE TESTING OR NOT IN THE GSS DISCORD, REMOVE "cogs.gss" FROM THE LIST
+
+cogs = [
+	"cogs.admin",
+	"cogs.fun",
+	"cogs.customcommands",
+	"cogs.joinleave",
+	"cogs.nsfw",
+	"cogs.reddit",
+	"cogs.selfassign",
+	"cogs.settings",
+	"cogs.twitch",
+	"cogs.util",
+	"cogs.gss"
+]

main.py

@@ -23,7 +23,7 @@ logger.addHandler(handler)
 
 
 server_config = ServerConfig()
-bot = commands.Bot(command_prefix=load_config.command_prefix, description=load_config.description)
+bot = commands.Bot(command_prefix=load_config.command_prefix, description=load_config.__description__)
 bot.dev = True # For debugging
 bot.owner = load_config.owner
 
@@ -37,23 +37,23 @@ def blacklisted(user):
 
 @bot.event
 async def on_ready():
-	server_config.error_check(bot.servers)
+	server_config.error_check(bot.guilds)
 	print("Discord.py version: " + discord.__version__)
 	print("Client logged in\n")
 	bot.owner = load_config.owner
 
-	print("Cogs Loaded:")
-	for cog in load_config.cogslist:
-		bot.load_extension(cog)
-		print(cog)
-	print("")
+	#print("Cogs Loaded:")
+	#for cog in load_config.cogs:
+	#	bot.load_extension(cog)
+	#	print(cog)
+	#print("")
 
 	print("Servers I am currently in:")
-	for server in bot.servers:
+	for server in bot.guilds:
 		print(server)
 	print("")
 
-	game = discord.Game(name="v{}".format(load_config.version), type=0)
+	game = discord.Game(name="v{}".format(load_config.__version__), type=0)
 	await bot.change_presence(game=game)
 
 
@@ -144,8 +144,13 @@ async def about():
 	return await bot.say(embed=em)
 
 
+if __name__ == "__main__":
+	if not os.path.isfile("settings/preferences.ini"):
+		print("PREFERENCE FILE MISSING. Something has gone wrong. Please make sure there is a file called 'preferences.ini' in the settings folder")
+		exit(0)
+
+	if not os.path.isfile("config/servers.json"):
+		with open("config/servers.json", "w") as fp:
+			fp.write("{}")
 
-if not os.path.isfile("settings/preferences.ini"):
-	print("PREFERENCE FILE MISSING. Something has gone wrong. Please make sure there is a file called 'preferences.ini' in the settings folder")
-else:
 	bot.run(load_config.token)