VG63 (#83)

Oscar Kevin · web-flow · commit 6b3a9171cd97 · 2022-08-30T15:13:48.000-04:00
* stuff

* vg63 assets
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-TBD# **FEH Gauntlet Bot** [![Build Status](https://www.travis-ci.com/Atemosta/FEH-Gauntlet-Bot.svg?branch=master)](https://www.travis-ci.com/Atemosta/FEH-Gauntlet-Bot)
+**FEH Gauntlet Bot** [![Build Status](https://www.travis-ci.com/Atemosta/FEH-Gauntlet-Bot.svg?branch=master)](https://www.travis-ci.com/Atemosta/FEH-Gauntlet-Bot)
 
 ![Gauntlet-Landing](assets/gauntlet_landing.PNG)
 
diff --git a/assets/Byleth/Byleth_Preview.png b/assets/Byleth/Byleth_Preview.png
diff --git a/assets/Byleth/Byleth_Quotes.txt b/assets/Byleth/Byleth_Quotes.txt
@@ -1,4 +1,4 @@
-For a new tomorrow!
-You cannot stop the flow of time!
-I will protect you!
-Here is something to believe in!
+With the goddess!
+You go no further!
+Have faith!
+Stay where you are!
diff --git a/assets/Chrom/Chrom_Preview.png b/assets/Chrom/Chrom_Preview.png
diff --git a/assets/Chrom/Chrom_Quotes.txt b/assets/Chrom/Chrom_Quotes.txt
@@ -1,4 +1,4 @@
-I'm being helpful!
-Charging on ahead!
-I can't stop this thing!
-Horse and man as one!
+This should do it!
+Believe in me.
+Coming through!
+How about this?
diff --git a/assets/Eirika/Eirika_Preview.png b/assets/Eirika/Eirika_Preview.png
diff --git a/assets/Eirika/Eirika_Quotes.txt b/assets/Eirika/Eirika_Quotes.txt
@@ -1,4 +1,4 @@
-Let's go for a swim.
-Summer is here!
-What fun!
-Look at all the fish!
+I cannot fall!
+My strength is my conviction!
+I will be your lance!
+Keep your eyes on me!
diff --git a/assets/Seliph/Seliph_Preview.png b/assets/Seliph/Seliph_Preview.png
diff --git a/assets/Seliph/Seliph_Quotes.txt b/assets/Seliph/Seliph_Quotes.txt
@@ -0,0 +1,4 @@
+Like my father...
+I shall protect all!
+Forward!
+We go together!
diff --git a/assets/Tiki/Tiki_Preview.png b/assets/Tiki/Tiki_Preview.png
diff --git a/assets/Tiki/Tiki_Quotes.txt b/assets/Tiki/Tiki_Quotes.txt
@@ -1,4 +1,4 @@
-Duo: Candy, please!
-Duo: Ninian! I'm here!
-Tiki: Tricky Tiki!
-Ninian: It's harvest season!
+Don't trouble me!
+Out of the way!
+Step by step!
+I'll protect you all!
diff --git a/convoy/config.py b/convoy/config.py
@@ -1,22 +1,22 @@
 # UTC is 7 Hours Ahead PDT
 vg_assets_root_path="assets"
-vg_hashtag='#SSS'
+vg_hashtag='#BC'
 vg_test=False
-vg_url='https://support.fire-emblem-heroes.com/voting_gauntlet/tournaments/62'
-round_1_start_raw = 'Jul 30 2022 7:00AM'
-round_1_end_raw = 'Aug 01 2022 4:00AM'
-round_2_start_raw = 'Aug 01 2022 7:00AM'
-round_2_end_raw = 'Aug 03 2022 4:00AM'
-round_3_start_raw = 'Aug 03 2022 7:00AM'
-round_3_end_raw = 'Aug 05 2022 4:00AM'
-vg_unit_1 = "Claude"
-vg_unit_2 = "Dimitri"
-vg_unit_3 = "Edelgard"
-vg_unit_4 = "Micaiah"
-vg_unit_5 = "Eirika"
-vg_unit_6 = "Seth"
-vg_unit_7 = "Thorr"
-vg_unit_8 = "Nifl"
+vg_url='https://support.fire-emblem-heroes.com/voting_gauntlet/tournaments/63'
+round_1_start_raw = 'Aug 31 2022 7:00AM'
+round_1_end_raw = 'Sep 02 2022 4:00AM'
+round_2_start_raw = 'Sep 02 2022 7:00AM'
+round_2_end_raw = 'Sep 04 2022 4:00AM'
+round_3_start_raw = 'Sep 04 2022 7:00AM'
+round_3_end_raw = 'Sep 06 2022 4:00AM'
+vg_unit_1 = "Chrom"
+vg_unit_2 = "Marth"
+vg_unit_3 = "Tiki"
+vg_unit_4 = "Marianne"
+vg_unit_5 = "Byleth"
+vg_unit_6 = "Gatekeeper"
+vg_unit_7 = "Seliph"
+vg_unit_8 = "Eirika"
 discord_channel_ids = {
     vg_unit_1 : 783177258713874443,
     vg_unit_2 : 783177296646897665,
diff --git a/discord/rebecca/discordclient.py b/discord/rebecca/discordclient.py
@@ -33,12 +33,19 @@ def message_parse(message):
 
 # Rest Endpoint
 def rest_get(path: str):
+    print("rest_get path: " + path)
     if (BOT_ENV == 'local'):
       REST_API_URL = "http://0.0.0.0:5057" # LOCAL URL
     elif (BOT_ENV == 'dev') or (BOT_ENV == 'prod') :
       REST_API_URL = "http://convoy:5057" # CONTAINER NETWORK URL
-    RESPONSE = json.loads(requests.get(f'{REST_API_URL}/{path}').json())
-    return RESPONSE
+    # RESPONSE = json.loads(requests.get(f'{REST_API_URL}/{path}').json())
+    RESPONSE_RAW = requests.get(f'{REST_API_URL}/{path}')
+    print(RESPONSE_RAW)
+    RESPONSE_JSON = RESPONSE_RAW.json()
+    print(RESPONSE_JSON)
+    RESPONSE_LOADS = json.loads()
+    print(RESPONSE_LOADS)
+    return RESPONSE_LOADS
 
 class MyDiscordClient(discord.Client):
     def __init__(self, *args, **kwargs):
diff --git a/discord/rebecca/rebecca.py b/discord/rebecca/rebecca.py
@@ -198,6 +198,41 @@ async def on_message(self, message):
                     ')
                 else:
                     await message.channel.send(f'You do not have the **{discord_role_id_admin}** role needed to perform this action!')
+           
+            # Announce Command
+            if message.content.startswith((f'{DISCORD_PREFIX}force-multiplier')):
+                await self.wait_until_ready()
+                # self.logger.debug(f'~~~~~starting rebecca_discord_client.send_vg_ugdate()~~~~~')
+                current_unit_scores = rest_get('feh-vg-bot/get-unit-scores')
+                if (len(current_unit_scores) <= 1):
+                    # logger.debug("In Beween Rounds, Do Nothing")
+                    print("In Beween Rounds, Do Nothing")
+                else:
+                    # self.logger.debug("During Voting Gauntlet")
+                    vg_scores  = rest_get('feh-vg-bot/check-vg')
+
+                    # Ping if multiplier is active for losing team (other team has 3% more flags)
+                    for score in vg_scores:
+                        message = score["Message"]
+                        # Send only text tweet
+                        if "Tie" in score["Losing"]:
+                            # self.logger.debug("Do nothing, Twitter Bot sends tie tweet.")
+                            print("Do nothing, Twitter Bot sends tie tweet.")
+                        # Send image and text
+                        else:
+                            losing_unit = score["Losing"]
+                            print(losing_unit)
+                            img_url = get_unit_image_url(losing_unit)
+                            role_team = discord.utils.get(client.guild.roles, name=f"Team {losing_unit}")
+                            role_webhook = f'<@&{role_team.id}>'
+                            updated_message =  role_webhook + score["Message"]
+                            channel_name = "team-" + losing_unit.lower()
+                            channel = discord.utils.get(self.guild.channels, name=channel_name)
+                            await channel.send(content=updated_message,file=discord.File(img_url))
+                            # self.logger.debug("Ping sent successfully for #Team" + losing_unit)
+                    # except:
+                        # Print out timestamp in the event of failure
+                        # self.logger.debug(f"Ping failed for #Team{losing_unit}") 
 
     #Check scores and send update to discord if required
     async def send_discord_update(self):
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,6 +5,7 @@ services:
     container_name: convoy
     # image: atemosta/feh-gauntlet-bot:convoy-latest
     command: uvicorn api:app --host 0.0.0.0 --port 5057 --reload
+    restart: always
     networks:
       - feh-compose-network
     ports:
@@ -16,6 +17,7 @@ services:
     container_name: genny
     # image: atemosta/feh-gauntlet-bot:genny-latest
     command: python genny.py
+    restart: always
     depends_on:
       - convoy
     networks:
@@ -29,6 +31,7 @@ services:
     container_name: rebecca
     # image: atemosta/feh-gauntlet-bot:rebecca-latest
     command: python rebecca.py
+    restart: always
     depends_on:
       - convoy
     networks:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-TBD# FEH Gauntlet Bot [![Build Status](https://www.travis-ci.com/Atemosta/FEH-Gauntlet-Bot.svg?branch=master)](https://www.travis-ci.com/Atemosta/FEH-Gauntlet-Bot)`
	`1`	`+FEH Gauntlet Bot [![Build Status](https://www.travis-ci.com/Atemosta/FEH-Gauntlet-Bot.svg?branch=master)](https://www.travis-ci.com/Atemosta/FEH-Gauntlet-Bot)`
`2`	`2`
`3`	`3`	`![Gauntlet-Landing](assets/gauntlet_landing.PNG)`
`4`	`4`