diff --git a/discord_script.py b/discord_script.py index 3f767e1..aa349d0 100644 --- a/discord_script.py +++ b/discord_script.py @@ -16,6 +16,7 @@ import discord.channel class Discord_Module(discord.Client): def __init__(self): + super().__init__() self.dbCredential: credentials.DB_Credential self.discordCredential: credentials.Discord_Credential @@ -23,7 +24,14 @@ class Discord_Module(discord.Client): def main(self): self.run(self.discordCredential.token) - + + def alt_main(self): + credentials_manager = credentials.Credentials_Module() + credentials_manager.load_credentials() + self.dbCredential = credentials_manager.find_DB_Credential("praxis_bot") + self.discordCredential = credentials_manager.find_Discord_Credential("praxis_bot") + + self.run(self.discordCredential.token) async def on_ready(self): print('Logged on as', self.user) @@ -47,10 +55,12 @@ class Discord_Module(discord.Client): if __name__ == "__main__": testModule = Discord_Module() - credentials_manager = credentials.Credentials_Module() - credentials_manager.load_credentials() - testModule.dbCredential = credentials_manager.find_DB_Credential("praxis_bot") - testModule.discordCredential = credentials_manager.find_Discord_Credential("praxis_bot") - testModule.main() + #credentials_manager = credentials.Credentials_Module() + #credentials_manager.load_credentials() + #testModule.dbCredential = credentials_manager.find_DB_Credential("praxis_bot") + #testModule.discordCredential = credentials_manager.find_Discord_Credential("praxis_bot") + #testModule.main() + + testModule.alt_main() \ No newline at end of file diff --git a/main.py b/main.py index 0dc3cd2..3a5d1f9 100644 --- a/main.py +++ b/main.py @@ -48,6 +48,8 @@ def new_main(inputArg): def twitch_module_init(dbCert, twitchCert): + credentials_manager = credentials.Credentials_Module() + credentials_manager.load_credentials() twitch_chat = twitch_script.Twitch_Module() twitch_chat.db_manager.setup_engine(dbCert) @@ -56,32 +58,30 @@ def twitch_module_init(dbCert, twitchCert): twitch_chat.join_channel(None, "thecuriousnerd") -def discord_module_init(dbCert, discordCert): +def discord_module_init(discord_connection): + #discord_connection = discord_script.Discord_Module() - discord_connection = discord_script.Discord_Module() - discord_connection.dbCredential = dbCert - discord_connection.discordCredential = discordCert - - discord_connection.main() + discord_connection.alt_main() def thread_main(): - global twitch_chat - global credentials_manager - credentials_manager = credentials.Credentials_Module() - credentials_manager.load_credentials() - dbCert: credentials.DB_Credential = credentials_manager.find_Credential(credentials.DB_Credential, "praxis_bot") - twitchCert: credentials.Twitch_Credential = credentials_manager.find_Twitch_Credential("praxis_bot") - discordCert: credentials.Discord_Credential = credentials_manager.find_Discord_Credential("praxis_bot") + #global twitch_chat + #global credentials_manager + #credentials_manager = credentials.Credentials_Module() + #credentials_manager.load_credentials() + #dbCert: credentials.DB_Credential = credentials_manager.find_Credential(credentials.DB_Credential, "praxis_bot") + #twitchCert: credentials.Twitch_Credential = credentials_manager.find_Twitch_Credential("praxis_bot") + #discordCert: credentials.Discord_Credential = credentials_manager.find_Discord_Credential("praxis_bot") threads = [] - twitch = threading.Thread(target=twitch_module_init, args=(dbCert, twitchCert)) - threads.append(twitch) - twitch.start() + #twitch = threading.Thread(target=twitch_module_init, args=(dbCert, twitchCert)) + #threads.append(twitch) + #twitch.start() - discord = threading.Thread(target=discord_module_init, args=(dbCert, discordCert)) + discord_connection = discord_script.Discord_Module() + discord = threading.Thread(target=discord_module_init, args=(discord_connection)) threads.append(discord) discord.start()