From 4be0adf7378e6d3821e0847ad51f241b70c604ec Mon Sep 17 00:00:00 2001 From: Alex Orid Date: Mon, 18 Jan 2021 09:44:39 -0500 Subject: [PATCH] Moved things to Config --- config.py | 9 +++++++++ main.py | 29 +++++++++++++++++------------ 2 files changed, 26 insertions(+), 12 deletions(-) diff --git a/config.py b/config.py index 4316725..ec02abd 100644 --- a/config.py +++ b/config.py @@ -1,5 +1,14 @@ from enum import Enum +credentialsNickname = "praxis_bot" + +twitch_module: bool = True +discord_module: bool = True + +autojoinTwitchChannels = ("thecuriousnerd") + +selected_discordTTSChannels = (431129571308339210) + class Speaker(Enum): GOOGLE_TEXT_TO_SPEECH = 1 diff --git a/main.py b/main.py index c0ea930..31d6cbe 100644 --- a/main.py +++ b/main.py @@ -8,6 +8,7 @@ import twitch_script import discord_script import utilities_script as utility +import config as config import credentials @@ -25,14 +26,17 @@ def twitch_module_init(dbCert, twitchCert): twitch_chat.db_manager.setup_engine(dbCert) twitch_chat.twitchCredential = twitchCert - twitch_chat.join_channel(None, "thecuriousnerd") + for twitchChannel in config.autojoinTwitchChannels: + twitch_chat.join_channel(None, twitchChannel) def discord_module_init(dbCert, discordCert): discord_connection.dbCredential = dbCert discord_connection.discordCredential = discordCert - discord_connection.selected_ttsChannels.append(431129571308339210) + for ttsChannel in config.selected_discordTTSChannels: + discord_connection.selected_ttsChannels.append(ttsChannel) + discord_connection.main() @@ -48,19 +52,20 @@ def thread_main(): 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") + dbCert: credentials.DB_Credential = credentials_manager.find_Credential(credentials.DB_Credential, config.credentialsNickname) threads = [] + if config.twitch_module == True: + twitchCert: credentials.Twitch_Credential = credentials_manager.find_Twitch_Credential(config.credentialsNickname) + 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)) - threads.append(discord) - discord.start() + if config.discord_module == True: + discordCert: credentials.Discord_Credential = credentials_manager.find_Discord_Credential(config.credentialsNickname) + discord = threading.Thread(target=discord_module_init, args=(dbCert, discordCert)) + threads.append(discord) + discord.start() print("---Post Thread Creation Test---") for t in threads: