channel_rewards/implemented/ChannelReward_Hydration.py

@@ -6,8 +6,6 @@ from json import loads
 from urllib.parse import urlencode
 import requests
 
-import docker_utility
-
 import threading
 
 import random
@@ -48,7 +46,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://%s:42069/api/v1/exec_lights?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_lights"), params
+        url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)
@@ -64,7 +62,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://%s:60809/api/v1/tts/send_text?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_tts_core"), params
+        url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)

channel_rewards/implemented/ChannelReward_RubiksCube.py

@@ -6,8 +6,6 @@ from json import loads
 from urllib.parse import urlencode
 import requests
 
-import docker_utility
-
 import threading
 
 import random
@@ -49,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://%s:42069/api/v1/exec_lights?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_lights"), params
+        url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)
@@ -65,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://%s:60809/api/v1/tts/send_text?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_tts_core"), params
+        url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)

channel_rewards/implemented/ChannelReward_twitchBits.py

@@ -6,8 +6,6 @@ from json import loads
 from urllib.parse import urlencode
 import requests
 
-import docker_utility
-
 import threading
 
 import random
@@ -47,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://%s:42069/api/v1/exec_lights?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_lights"), params
+        url = "http://standalone_lights:42069/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 +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://%s:60809/api/v1/tts/send_text?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_tts_core"), params
+        url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)

channel_rewards/implemented/ChannelReward_twitchSubs.py

@@ -6,8 +6,6 @@ from json import loads
 from urllib.parse import urlencode
 import requests
 
-import docker_utility
-
 import threading
 
 import random
@@ -48,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://%s:42069/api/v1/exec_lights?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_lights"), params
+        url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)
@@ -64,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://%s:60809/api/v1/tts/send_text?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_tts_core"), params
+        url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)

commands/implemented/Command_lights_v2.py

@@ -6,8 +6,6 @@ from json import loads
 from urllib.parse import urlencode
 import requests
 
-import docker_utility
-
 import config
 
 import os
@@ -49,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://%s:42069/api/v1/exec_lights?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_lights"), params
+        url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)

commands/implemented/Command_tts_v2.py

@@ -6,8 +6,6 @@ from json import loads
 from urllib.parse import urlencode
 import requests
 
-import docker_utility
-
 import config
 
 import os
@@ -44,7 +42,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://%s:42069/api/v1/exec_lights?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_lights"), params
+        url = "http://standalone_lights:42069/api/v1/exec_lights?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)
@@ -60,7 +58,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://%s:60809/api/v1/tts/send_text?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_tts_core"), params
+        url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)

docker_utility.py

@@ -1,14 +0,0 @@
-import os
-
-def isRunningInDocker():
-    isD = os.getenv('ISDOCKER')
-    if isD is None:
-        return False
-    return isD == "cat"
-
-def ifNotDockerUseLocalhost(address):
-    amIDocker = isRunningInDocker()
-    if amIDocker:
-        return address
-    else:
-        return "localhost"

standalone_discord_script.py

@@ -25,8 +25,6 @@ import discord.abc
 
 from cooldowns import Cooldown_Module
 
-import docker_utility
-
 import os
 import praxis_logging
 praxis_logger_obj = praxis_logging.praxis_logger()
@@ -107,14 +105,14 @@ 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://%s:6009/api/v1/command?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_command"), clean_param
+        url = "http://standalone_command:6009/api/v1/command?%s" % clean_param
         resp = requests.get(url)
         return resp.status_code == 200
 
     async def exec_command(self, realMessage: discord.Message, command: str, rest: str):
         # todo need to url-escape command and rest
-        clean_param = urlencode({'command_source': commands.command_base.AbstractCommand.CommandSource.Discord, 'user_name': realMessage.author.mention, 'command_name': command, 'rest': rest, 'bonus_data': realMessage})
-        url = "http://%s:6009/api/v1/exec_command?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_command"), clean_param
+        params = urlencode({'command_source': commands.command_base.AbstractCommand.CommandSource.Discord, 'user_name': realMessage.author.mention, 'command_name': command, 'rest': rest, 'bonus_data': realMessage})
+        url = "http://standalone_command:6009/api/v1/exec_command?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)
@@ -176,7 +174,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://%s:60809/api/v1/tts/send_text?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_tts_core"), params
+        url = "http://standalone_tts_core:60809/api/v1/tts/send_text?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)

standalone_twitch_pubsub.py

@@ -20,8 +20,6 @@ from uuid import UUID
 
 from cooldowns import Cooldown_Module
 
-import docker_utility
-
 import os
 import praxis_logging
 praxis_logger_obj = praxis_logging.praxis_logger()
@@ -173,7 +171,7 @@ class Twitch_Pubsub():
         clean_param = urlencode({'reward_name': rewardName, 'reward_type':rewardType})
         print(rewardName, rewardType)
         #standalone_channelrewards
-        url = "http://%s:6969/api/v1/reward?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_channelrewards"), clean_param
+        url = "http://standalone_channelrewards:6969/api/v1/reward?%s" % clean_param
         resp = requests.get(url)
         return resp.status_code == 200
 
@@ -188,7 +186,7 @@ class Twitch_Pubsub():
             'bonus_data': realMessage})
 
         #standalone_channelrewards
-        url = "http://%s:6969/api/v1/exec_reward?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_channelrewards"), params
+        url = "http://standalone_channelrewards:6969/api/v1/exec_reward?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)

standalone_twitch_script.py

@@ -12,8 +12,6 @@ from cooldowns import Cooldown_Module
 import commands.command_base
 import utilities_script as utility
 
-import docker_utility
-
 import os
 import praxis_logging
 praxis_logger_obj = praxis_logging.praxis_logger()
@@ -77,20 +75,20 @@ class Twitch_Module():
     def is_command(self, word: str) -> bool:
         # todo need to url-escape word
         clean_param = urlencode({'name': word})
-        url = "http://%s:6009/api/v1/command?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_command"), clean_param
+        url = "http://standalone_command:6009/api/v1/command?%s" % clean_param
         resp = requests.get(url)
         return resp.status_code == 200
 
     def exec_command(self, realMessage: twitch.chat.Message, command: str, rest: str):
         # todo need to url-escape command and rest
-        clean_param = urlencode(
+        params = urlencode(
             {'command_source': commands.command_base.AbstractCommand.CommandSource.Twitch,
             'user_name': realMessage.sender,
             'command_name': command,
             'rest': rest,
             'bonus_data': realMessage})
 
-        url = "http://%s:6009/api/v1/exec_command?%s" % docker_utility.ifNotDockerUseLocalhost("standalone_command"), clean_param
+        url = "http://standalone_command:6009/api/v1/exec_command?%s" % params
         resp = requests.get(url)
         if resp.status_code == 200:
             print("Got the following message: %s" % resp.text)