Migrated clash of code cog to new extension format #249

FirePlank · 2023-11-02T20:37:51Z

Migrated clash of code cog to new extension format. This PR fixes the issue addressed at #222

HETHAT

Would be nice to move all the api doing into utils.py and even nicer using codingame library

bot/extensions/clashofcode/commands.py

takos22

LGTM

bot/extensions/clashofcode/commands.py

bot/extensions/clashofcode/events.py

bot/extensions/clashofcode/commands.py

takos22 · 2023-11-03T00:48:34Z

even nicer using codingame library

Ping me if you need any help with it 👀

takos22

LGTM

bot/extensions/clashofcode/views.py

SylteA · 2023-11-09T08:53:58Z

bot/extensions/clashofcode/__init__.py

+
+
+async def setup(bot: DiscordBot) -> None:
+    await coc_client.login(remember_me_cookie=settings.coc.session_cookie)


Don't log in here init file is only for setup of the cog.

SylteA · 2023-11-09T08:55:16Z

bot/extensions/clashofcode/commands.py

+from bot.extensions.clashofcode.views import CreateCocView
+
+
+class ClashOfCode(commands.GroupCog, group_name="coc"):


Set default_permisisons to administrator=True for the group.
Don't need permissions per command in the group (That's impossible)

SylteA · 2023-11-09T08:57:42Z

pyproject.toml

@@ -18,6 +18,7 @@ jishaku = {extras = ["procinfo", "profiling"], version = "^2.5.1"}
 beautifulsoup4 = "^4.12.2"
 tabulate = "^0.9.0"
 pillow = "^10.1.0"
+codingame = {extras = ["async"], version = "^1.4.2"}


I think we should skip installing the async extra and just use our own version of aiohttp

SylteA · 2023-11-09T09:00:25Z

bot/extensions/clashofcode/views.py

+                    [
+                        test_session_handle,
+                        {
+                            "code": "",


I liked the "Ignore me I'm a bot" text :D

SylteA · 2023-11-09T10:31:58Z

bot/extensions/clashofcode/commands.py

+
+    @app_commands.command()
+    @app_commands.default_permissions()
+    async def start(self, interaction: core.InteractionType):


I was thinking differently about this

I was thinking that we start a session and the bot automatically creates a game for us with the provided settings.
Then when that game ends, the bot will automatically create a new game.

Then we can also have commands to force start / stop a clash?

SylteA · 2023-11-09T10:34:07Z

bot/extensions/clashofcode/events.py

+    @commands.Cog.listener()
+    async def on_raw_reaction_add(self, payload: discord.RawReactionActionEvent):
+        if payload.user_id == self.bot.user.id:
+            return
+
+        if payload.message_id != settings.coc.message_id:
+            return
+
+        if self.role in payload.member.roles:
+            return
+
+        await payload.member.add_roles(self.role)
+        try:
+            await payload.member.send(f"Gave you the **{self.role.name}** role!")
+        except discord.HTTPException:
+            pass
+
+    @commands.Cog.listener()
+    async def on_raw_reaction_remove(self, payload: discord.RawReactionActionEvent):
+        if payload.user_id == self.bot.user.id:
+            return
+
+        if payload.message_id != settings.coc.message_id:
+            return
+
+        member = self.bot.guild.get_member(payload.user_id)
+        if self.role not in member.roles:
+            return
+
+        await member.remove_roles(self.role)
+        try:
+            await member.send(f"Removed your **{self.role.name}** role!")
+        except discord.HTTPException:
+            pass


I thought we were going to set up the welcome screen where people can select roles?

yes we are, avib will do that when he has time

SylteA · 2023-11-09T10:34:45Z

bot/extensions/clashofcode/utils.py

+languages = [
+    "Bash",
+    "C",
+    "C#",
+    "C++",
+    "Clojure",
+    "D",
+    "Dart",
+    "Go",
+    "Groovy",
+    "Haskell",
+    "Java",
+    "Javascript",
+    "Kotlin",
+    "Lua",
+    "ObjectiveC",
+    "OCaml",
+    "Pascal",
+    "Perl",
+    "PHP",
+    "Python3",
+    "Ruby",
+    "Rust",
+    "Scala",
+    "Swift",
+    "TypeScript",
+]


Can't we get this list from codingame api

If not, at least format it better.

Example from what I did in another project:

# fmt: off CRC16_TABLE = ( 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440, 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, 0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841, 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40, 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41, 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641, 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040, 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240, 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441, 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41, 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40, 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640, 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041, 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240, 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441, 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, 0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840, 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640, 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041, 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241, 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440, 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40, 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841, 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41, 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 ) # fmt: on

# fmt: off disables black formatting in "this" file until you enable it again.

SylteA · 2023-11-09T10:52:20Z

bot/extensions/clashofcode/views.py

+        if len(selected_languages) == 25:
+            selected_languages = []
+        if not selected_modes:
+            selected_modes = modes


Just to confirm
If they don't select any modes, we use all of them?

SylteA · 2023-11-09T10:52:46Z

bot/extensions/clashofcode/views.py

+        if not selected_modes:
+            selected_modes = modes
+
+        await interaction.response.defer()


Here we can probably do a thinking=True, if that does anything on a button

SylteA · 2023-11-09T10:54:21Z

bot/extensions/clashofcode/views.py

+
+            try:
+                # Submit an empty solution to not hold up the clash once everyone has submitted
+                await coc_client.request(


Maybe (if there's any reason to) we should wait with submitting ours until the game is over?

SylteA · 2023-12-04T11:02:31Z

My thought here right now is that we get the automated chess PR finished and look at how well it works, then we can jump back and complete this

FirePlank added 2 commits November 2, 2023 22:36

Migrated clash of code cog to new extension format

3e4df48

switched to using cog_app_command_error

c01ba86

HETHAT requested changes Nov 2, 2023

View reviewed changes

bot/extensions/clashofcode/commands.py Outdated Show resolved Hide resolved

takos22 reviewed Nov 3, 2023

View reviewed changes

bot/extensions/clashofcode/commands.py Outdated Show resolved Hide resolved

bot/extensions/clashofcode/events.py Outdated Show resolved Hide resolved

bot/extensions/clashofcode/commands.py Outdated Show resolved Hide resolved

FirePlank added 3 commits November 3, 2023 14:36

switched to using interaction_check as per request

456c5de

Overhauled the entire cog

1221911

Added return True to interaction check

496153a

FirePlank requested a review from HETHAT November 5, 2023 19:07

takos22 approved these changes Nov 6, 2023

View reviewed changes

bot/extensions/clashofcode/views.py Show resolved Hide resolved

bot/extensions/clashofcode/views.py Show resolved Hide resolved

bot/extensions/clashofcode/views.py Outdated Show resolved Hide resolved

bot/extensions/clashofcode/views.py Outdated Show resolved Hide resolved

SylteA requested changes Nov 6, 2023

View reviewed changes

bot/extensions/clashofcode/views.py Outdated Show resolved Hide resolved

Bot now successfully submits solution when clash starts

ef8b0a1

FirePlank requested a review from SylteA November 7, 2023 15:31

SylteA requested changes Nov 9, 2023

View reviewed changes

SylteA linked an issue Nov 11, 2023 that may be closed by this pull request

Migrate clash of code cog to new extension format #222

Open

SylteA marked this pull request as draft December 4, 2023 11:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Migrated clash of code cog to new extension format #249

Migrated clash of code cog to new extension format #249

FirePlank commented Nov 2, 2023

HETHAT left a comment

takos22 left a comment

takos22 commented Nov 3, 2023

takos22 left a comment

SylteA Nov 9, 2023

SylteA Nov 9, 2023

SylteA Nov 9, 2023

SylteA Nov 9, 2023

SylteA Nov 9, 2023

SylteA Nov 9, 2023

sarzz2 Nov 9, 2023

SylteA Nov 9, 2023

SylteA Nov 9, 2023

SylteA Nov 9, 2023

SylteA Nov 9, 2023

SylteA Nov 9, 2023

SylteA commented Dec 4, 2023



		async def setup(bot: DiscordBot) -> None:
		await coc_client.login(remember_me_cookie=settings.coc.session_cookie)

		from bot.extensions.clashofcode.views import CreateCocView


		class ClashOfCode(commands.GroupCog, group_name="coc"):

Migrated clash of code cog to new extension format #249

Are you sure you want to change the base?

Migrated clash of code cog to new extension format #249

Conversation

FirePlank commented Nov 2, 2023

HETHAT left a comment

Choose a reason for hiding this comment

takos22 left a comment

Choose a reason for hiding this comment

takos22 commented Nov 3, 2023

takos22 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SylteA commented Dec 4, 2023