From c30decd0effa19925ca813de98234c49dc58be9e Mon Sep 17 00:00:00 2001 From: Alex Orid Date: Thu, 6 May 2021 00:07:53 -0400 Subject: [PATCH] Port Changes --- channel_rewards/implemented/ChannelReward_Hydration.py | 4 ++-- .../implemented/ChannelReward_RubiksCube.py | 4 ++-- .../implemented/ChannelReward_SuggestPoll.py | 4 ++-- channel_rewards/implemented/ChannelReward_TTS.py | 4 ++-- .../implemented/ChannelReward_Workout_Pushups.py | 4 ++-- .../implemented/ChannelReward_Workout_Situps.py | 4 ++-- .../implemented/ChannelReward_Workout_Squats.py | 4 ++-- .../implemented/ChannelReward_twitchBits.py | 4 ++-- .../implemented/ChannelReward_twitchSubs.py | 4 ++-- commands/implemented/Command_chyron_v2.py | 2 +- commands/implemented/Command_lights_v2.py | 2 +- commands/implemented/Command_text_v2.py | 2 +- commands/implemented/Command_tts_v2.py | 4 ++-- docker-compose.yaml | 10 +++++----- standalone_channelrewards.py | 2 +- standalone_command.py | 2 +- standalone_discord_script.py | 6 +++--- standalone_lights.py | 2 +- standalone_obsWebSocket.py | 2 +- standalone_tts_core.py | 2 +- standalone_twitch_pubsub.py | 4 ++-- standalone_twitch_script.py | 6 +++--- standalone_webSource.py | 2 +- 23 files changed, 42 insertions(+), 42 deletions(-) diff --git a/channel_rewards/implemented/ChannelReward_Hydration.py b/channel_rewards/implemented/ChannelReward_Hydration.py index 3253b09..15b2990 100644 --- a/channel_rewards/implemented/ChannelReward_Hydration.py +++ b/channel_rewards/implemented/ChannelReward_Hydration.py @@ -56,7 +56,7 @@ class ChannelReward_Hydration(AbstractChannelRewards, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -72,7 +72,7 @@ class ChannelReward_Hydration(AbstractChannelRewards, metaclass=ABCMeta): def send_TTS(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/channel_rewards/implemented/ChannelReward_RubiksCube.py b/channel_rewards/implemented/ChannelReward_RubiksCube.py index 920b775..ca16d79 100644 --- a/channel_rewards/implemented/ChannelReward_RubiksCube.py +++ b/channel_rewards/implemented/ChannelReward_RubiksCube.py @@ -47,7 +47,7 @@ class ChannelReward_RubiksCube(AbstractChannelRewards, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -63,7 +63,7 @@ class ChannelReward_RubiksCube(AbstractChannelRewards, metaclass=ABCMeta): def send_TTS(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/channel_rewards/implemented/ChannelReward_SuggestPoll.py b/channel_rewards/implemented/ChannelReward_SuggestPoll.py index 932f737..74646b0 100644 --- a/channel_rewards/implemented/ChannelReward_SuggestPoll.py +++ b/channel_rewards/implemented/ChannelReward_SuggestPoll.py @@ -46,7 +46,7 @@ class ChannelReward_Suggest_Poll(AbstractChannelRewards, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -62,7 +62,7 @@ class ChannelReward_Suggest_Poll(AbstractChannelRewards, metaclass=ABCMeta): def send_TTS(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/channel_rewards/implemented/ChannelReward_TTS.py b/channel_rewards/implemented/ChannelReward_TTS.py index 0255e85..da96ba9 100644 --- a/channel_rewards/implemented/ChannelReward_TTS.py +++ b/channel_rewards/implemented/ChannelReward_TTS.py @@ -46,7 +46,7 @@ class ChannelReward_TTS_Message(AbstractChannelRewards, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -62,7 +62,7 @@ class ChannelReward_TTS_Message(AbstractChannelRewards, metaclass=ABCMeta): def send_TTS(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/channel_rewards/implemented/ChannelReward_Workout_Pushups.py b/channel_rewards/implemented/ChannelReward_Workout_Pushups.py index 1a8d9be..1d14afb 100644 --- a/channel_rewards/implemented/ChannelReward_Workout_Pushups.py +++ b/channel_rewards/implemented/ChannelReward_Workout_Pushups.py @@ -46,7 +46,7 @@ class ChannelReward_Workout_Pushups(AbstractChannelRewards, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -62,7 +62,7 @@ class ChannelReward_Workout_Pushups(AbstractChannelRewards, metaclass=ABCMeta): def send_TTS(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/channel_rewards/implemented/ChannelReward_Workout_Situps.py b/channel_rewards/implemented/ChannelReward_Workout_Situps.py index 9cc08a2..557b9dc 100644 --- a/channel_rewards/implemented/ChannelReward_Workout_Situps.py +++ b/channel_rewards/implemented/ChannelReward_Workout_Situps.py @@ -46,7 +46,7 @@ class ChannelReward_Workout_Situps(AbstractChannelRewards, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -62,7 +62,7 @@ class ChannelReward_Workout_Situps(AbstractChannelRewards, metaclass=ABCMeta): def send_TTS(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/channel_rewards/implemented/ChannelReward_Workout_Squats.py b/channel_rewards/implemented/ChannelReward_Workout_Squats.py index a814870..1173bc3 100644 --- a/channel_rewards/implemented/ChannelReward_Workout_Squats.py +++ b/channel_rewards/implemented/ChannelReward_Workout_Squats.py @@ -46,7 +46,7 @@ class ChannelReward_Workout_Squats(AbstractChannelRewards, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -62,7 +62,7 @@ class ChannelReward_Workout_Squats(AbstractChannelRewards, metaclass=ABCMeta): def send_TTS(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/channel_rewards/implemented/ChannelReward_twitchBits.py b/channel_rewards/implemented/ChannelReward_twitchBits.py index f73e069..cbb455a 100644 --- a/channel_rewards/implemented/ChannelReward_twitchBits.py +++ b/channel_rewards/implemented/ChannelReward_twitchBits.py @@ -45,7 +45,7 @@ class ChannelReward_TwitchBits(AbstractChannelRewards, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -61,7 +61,7 @@ class ChannelReward_TwitchBits(AbstractChannelRewards, metaclass=ABCMeta): def send_TTS(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/channel_rewards/implemented/ChannelReward_twitchSubs.py b/channel_rewards/implemented/ChannelReward_twitchSubs.py index 461d910..eabf2f9 100644 --- a/channel_rewards/implemented/ChannelReward_twitchSubs.py +++ b/channel_rewards/implemented/ChannelReward_twitchSubs.py @@ -46,7 +46,7 @@ class ChannelReward_TwitchSubs(AbstractChannelRewards, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -62,7 +62,7 @@ class ChannelReward_TwitchSubs(AbstractChannelRewards, metaclass=ABCMeta): def send_TTS(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/commands/implemented/Command_chyron_v2.py b/commands/implemented/Command_chyron_v2.py index a9f779c..6b47d4c 100644 --- a/commands/implemented/Command_chyron_v2.py +++ b/commands/implemented/Command_chyron_v2.py @@ -57,7 +57,7 @@ class Command_chyron_v2(AbstractCommand, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/commands/implemented/Command_lights_v2.py b/commands/implemented/Command_lights_v2.py index 7243a6e..1b28a6c 100644 --- a/commands/implemented/Command_lights_v2.py +++ b/commands/implemented/Command_lights_v2.py @@ -47,7 +47,7 @@ class Command_lights_v2(AbstractCommand, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/commands/implemented/Command_text_v2.py b/commands/implemented/Command_text_v2.py index fd0683e..e3109a6 100644 --- a/commands/implemented/Command_text_v2.py +++ b/commands/implemented/Command_text_v2.py @@ -107,7 +107,7 @@ class Command_Text_v2(AbstractCommand, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/commands/implemented/Command_tts_v2.py b/commands/implemented/Command_tts_v2.py index f2f69b5..93e667b 100644 --- a/commands/implemented/Command_tts_v2.py +++ b/commands/implemented/Command_tts_v2.py @@ -67,7 +67,7 @@ class Command_tts_v2(AbstractCommand, metaclass=ABCMeta): # todo need to url-escape command and rest params = urlencode({'user_name': username, 'light_group': light_group, 'command': command, 'rest':rest}) #standalone_lights - url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params + url = "http://standalone_lights:42042/api/v1/exec_lights?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -83,7 +83,7 @@ class Command_tts_v2(AbstractCommand, metaclass=ABCMeta): def send_TTS(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/docker-compose.yaml b/docker-compose.yaml index c2f18d4..93dfe70 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -5,7 +5,7 @@ services: volumes: - "./:/Praxis/" ports: - - 6009:6009 + - 42010:42010 environment: - ISDOCKER=cat standalone_channelrewards: @@ -13,7 +13,7 @@ services: volumes: - "./:/Praxis/" ports: - - 6969:6969 + - 42069:42069 environment: - ISDOCKER=cat standalone_lights: @@ -21,7 +21,7 @@ services: volumes: - "./:/Praxis/" ports: - - 42069:42069 + - 42042:42042 environment: - ISDOCKER=cat standalone_tts_core: @@ -29,7 +29,7 @@ services: volumes: - "./:/Praxis/" ports: - - 60809:60809 + - 42064:42064 environment: - ISDOCKER=cat standalone_websource: @@ -37,7 +37,7 @@ services: volumes: - "./:/Praxis/" ports: - - 5500:5500 + - 42088:42088 environment: - ISDOCKER=cat standalone_twitchscript: diff --git a/standalone_channelrewards.py b/standalone_channelrewards.py index 64b9219..7b58718 100644 --- a/standalone_channelrewards.py +++ b/standalone_channelrewards.py @@ -110,4 +110,4 @@ def exec_reward(): if __name__ == '__main__': init() - api.run(host='0.0.0.0', port=6969) + api.run(host='0.0.0.0', port=42069) diff --git a/standalone_command.py b/standalone_command.py index 5333510..934f1f2 100644 --- a/standalone_command.py +++ b/standalone_command.py @@ -83,4 +83,4 @@ def exec_command(): if __name__ == '__main__': init() - api.run(host='0.0.0.0', port=6009) + api.run(host='0.0.0.0', port=42010) diff --git a/standalone_discord_script.py b/standalone_discord_script.py index 52378bb..861ed19 100644 --- a/standalone_discord_script.py +++ b/standalone_discord_script.py @@ -105,7 +105,7 @@ class Discord_Module(discord.Client): async def is_command(self, word: str) -> bool: # todo need to url-escape word clean_param = urlencode({'name': word}) - url = "http://standalone_command:6009/api/v1/command?%s" % clean_param + url = "http://standalone_command:42010/api/v1/command?%s" % clean_param resp = requests.get(url) return resp.status_code == 200 @@ -118,7 +118,7 @@ class Discord_Module(discord.Client): 'rest': rest, 'bonus_data': realMessage}) - url = "http://standalone_command:6009/api/v1/exec_command?%s" % params + url = "http://standalone_command:42010/api/v1/exec_command?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -180,7 +180,7 @@ class Discord_Module(discord.Client): async def exec_tts_sender(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/standalone_lights.py b/standalone_lights.py index 2e26541..294be50 100644 --- a/standalone_lights.py +++ b/standalone_lights.py @@ -302,5 +302,5 @@ def exec_lights(): if __name__ == "__main__": init() - api.run(host='0.0.0.0', port=42069) + api.run(host='0.0.0.0', port=42042) #testModule.raveMode() \ No newline at end of file diff --git a/standalone_obsWebSocket.py b/standalone_obsWebSocket.py index 553b216..68f6e16 100644 --- a/standalone_obsWebSocket.py +++ b/standalone_obsWebSocket.py @@ -42,4 +42,4 @@ def makeRequest(): if __name__ == "__main__": init() - api.run(host='0.0.0.0', port=6009) \ No newline at end of file + api.run(host='0.0.0.0', port=42010) \ No newline at end of file diff --git a/standalone_tts_core.py b/standalone_tts_core.py index aa45804..5b51020 100644 --- a/standalone_tts_core.py +++ b/standalone_tts_core.py @@ -51,4 +51,4 @@ def tts_send_text(): if __name__ == '__main__': #send_text("","Blah Blah Blah") #init() - api.run(host='0.0.0.0', port=60809) \ No newline at end of file + api.run(host='0.0.0.0', port=42064) \ No newline at end of file diff --git a/standalone_twitch_pubsub.py b/standalone_twitch_pubsub.py index ba1a1b2..00753dc 100644 --- a/standalone_twitch_pubsub.py +++ b/standalone_twitch_pubsub.py @@ -171,7 +171,7 @@ class Twitch_Pubsub(): clean_param = urlencode({'reward_name': rewardName, 'reward_type':rewardType}) print(rewardName, rewardType) #standalone_channelrewards - url = "http://standalone_channelrewards:6969/api/v1/reward?%s" % clean_param + url = "http://standalone_channelrewards:42069/api/v1/reward?%s" % clean_param resp = requests.get(url) return resp.status_code == 200 @@ -186,7 +186,7 @@ class Twitch_Pubsub(): 'bonus_data': realMessage}) #standalone_channelrewards - url = "http://standalone_channelrewards:6969/api/v1/exec_reward?%s" % params + url = "http://standalone_channelrewards:42069/api/v1/exec_reward?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/standalone_twitch_script.py b/standalone_twitch_script.py index 78c3215..d83551c 100644 --- a/standalone_twitch_script.py +++ b/standalone_twitch_script.py @@ -83,7 +83,7 @@ class Twitch_Module(): def is_command(self, word: str) -> bool: # todo need to url-escape word clean_param = urlencode({'name': word}) - url = "http://standalone_command:6009/api/v1/command?%s" % clean_param + url = "http://standalone_command:42010/api/v1/command?%s" % clean_param resp = requests.get(url) return resp.status_code == 200 @@ -96,7 +96,7 @@ class Twitch_Module(): 'rest': rest, 'bonus_data': realMessage}) - url = "http://standalone_command:6009/api/v1/exec_command?%s" % params + url = "http://standalone_command:42010/api/v1/exec_command?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) @@ -134,7 +134,7 @@ class Twitch_Module(): def exec_tts_sender(self, username, message): params = urlencode({'tts_sender': username, 'tts_text': message}) #standalone_tts_core - url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params + url = "http://standalone_tts_core:42064/api/v1/tts/send_text?%s" % params resp = requests.get(url) if resp.status_code == 200: print("Got the following message: %s" % resp.text) diff --git a/standalone_webSource.py b/standalone_webSource.py index 31fcf2d..040c38e 100644 --- a/standalone_webSource.py +++ b/standalone_webSource.py @@ -63,4 +63,4 @@ def textSource_timerTime(timer_name): if __name__ == "__main__": init() - api.run(host="0.0.0.0", port = 5500) \ No newline at end of file + api.run(host="0.0.0.0", port = 42088) \ No newline at end of file