master updates #41

Manually merged
alex_orid merged 177 commits from master into github-master 2021-05-13 21:11:10 +00:00
4 changed files with 6 additions and 6 deletions
Showing only changes of commit ca48b67a01 - Show all commits

View File

@ -8,4 +8,4 @@ RUN pip3 install -r requirements_sa_command.txt
COPY . .
CMD [ "python3", "standalone_channelPoints.py"]
CMD [ "python3", "standalone_channelpoints.py"]

View File

@ -6,8 +6,8 @@ services:
- 6009:6009
environment:
- ISDOCKER=cat
standalone_channelPoints:
image: standalone_channelPoints
standalone_channelpoints:
image: standalone_channelpoints
ports:
- 6969:6969
environment:

View File

@ -1,5 +1,5 @@
docker build --file Dockerfile_standalone_command --tag standalone_command .
docker build --file Dockerfile_standalone_channelPoints --tag standalone_channelPoints .
docker build --file Dockerfile_standalone_channelpoints --tag standalone_channelpoints .
docker build --file Dockerfile_standalone_DiscordScript --tag standalone_discordscript .
docker build --file Dockerfile_standalone_TwitchScript --tag standalone_twitchscript .
docker build --file Dockerfile_standalone_Twitch_Pubsub --tag standalone_twitch_pubsub .

View File

@ -87,14 +87,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://standalone_command:5000/api/v1/command?%s" % 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
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:5000/api/v1/exec?%s" % params
url = "http://standalone_command:6009/api/v1/exec?%s" % params
resp = requests.get(url)
if resp.status_code == 200:
print("Got the following message: %s" % resp.text)