master updates #41

Manually merged
alex_orid merged 177 commits from master into github-master 2021-05-13 21:11:10 +00:00
Showing only changes of commit 373c398306 - Show all commits

View File

@ -73,13 +73,6 @@ class Twitch_Module():
def eval_command(self, message):
command, rest = utility.parse_line(message.text)
try:
is_actionable = self.is_command(command)
if is_actionable:
if self.cooldownModule.isCooldownActive("twitchChat") == False:
self.exec_command(message ,command, rest)
except:
praxis_logger_obj.log("something went wrong with a command")
try:
is_actionable = self.is_command(command)
@ -88,11 +81,18 @@ class Twitch_Module():
praxis_logger_obj.log("Sent a thing")
except:
praxis_logger_obj.log("something went wrong with Event LOG")
try:
is_actionable = self.is_command(command)
if is_actionable:
if self.cooldownModule.isCooldownActive("twitchChat") == False:
self.exec_command(message ,command, rest)
except:
praxis_logger_obj.log("something went wrong with a command")
def is_command(self, word: str) -> bool:
# todo need to url-escape word
clean_param = urlencode({'name': word})
url = "http://standalone_command:42010/api/v1/command?%s" % clean_param
url = "http://localhost:42010/api/v1/command?%s" % clean_param
resp = requests.get(url)
return resp.status_code == 200
@ -104,8 +104,8 @@ class Twitch_Module():
'command_name': command,
'rest': rest,
'bonus_data': realMessage})
url = "http://standalone_command:42010/api/v1/exec_command?%s" % params
#standalone_command
url = "http://localhost:42010/api/v1/exec_command?%s" % params
resp = requests.get(url)
if resp.status_code == 200:
print("Got the following message: %s" % resp.text)
@ -144,7 +144,7 @@ class Twitch_Module():
'event_time': eventTime,
'event_type': eventType,
'event_data': rest})
url = "http://127.0.0.1:42008/api/v1/event_log/add_event?%s" % params
url = "http://localhost:42008/api/v1/event_log/add_event?%s" % params
resp = requests.get(url)
if resp.status_code == 200:
@ -161,7 +161,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:42064/api/v1/tts/send_text?%s" % params
url = "http://localhost: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)