Ito mk8dx small bug fixes

.gitignore

@@ -3,3 +3,5 @@
 /.venv*
 /config.json
 /credentials.json
+.idea/*
+/example_configs/test/*

common.py

@@ -0,0 +1,34 @@
+import json
+from enum import Enum, auto
+from typing import TypeVar, Type, List
+
+_T = TypeVar('T')
+
+with open('./config.json', 'r') as cjson:
+    CONFIG = json.load(cjson)
+
+
+class Server(Enum):
+    MKW = auto()
+    MK8DX = auto()
+
+
+if CONFIG["lounge"] == "MKW":
+    SERVER = Server.MKW
+elif CONFIG["lounge"] == "MK8DX":
+    SERVER = Server.MK8DX
+else:
+    raise ValueError(f"{CONFIG['lounge']} is not a valid option for the 'lounge' attribute in the config.")
+
+
+def divide_chunks(list_: list, chunk_size: int):
+    # looping till length l
+    for i in range(0, len(list_), chunk_size):
+        yield list_[i:i + chunk_size]
+
+
+def flatten(matrix: List[List[_T]]) -> List[_T]:
+    flat_list = []
+    for row in matrix:
+        flat_list.extend(row)
+    return flat_list

example_configs/prod/mk8dx_prod_config.json

@@ -0,0 +1,47 @@
+{
+    "token": "",
+    "is_production": true,
+    "lounge": "MK8DX",
+    "lounge_description": "Valid options are MKW or MK8DX",
+    "guild_id": 445404006177570829,
+    "queue_join_channel": 1186158671525318719,
+    "queue_sub_channel": 1186158767029620766,
+	"queue_list_channel": 1221665101904478340,
+	"queue_history_channel": 1194440106266865684,
+    "queue_general_channel": 1186158671525318719,
+    "admin_roles": [
+        464610815299944448,
+        910528103225389107
+    ],
+    "helper_staff_roles": [
+        910528103225389107
+    ],
+    "members_for_channels": [
+        934740707934081035, 
+        743532508343304242, 
+        735910635082219570
+    ],
+    "roles_for_channels": [],
+    "PLACEMENT_PLAYER_MMR": 1500,
+    "placement_role_id": 730980761322389504,
+    "frequently_tagged_role_id": 682445864400453739,
+    "restricted_role_id": 600495108999086090,
+    "muted_role_id": 600495108999086090,
+    "queue_messages": true,
+    "sec_between_queue_msgs": 2,
+    "username": "username",
+    "password": "password",
+    "url": "https://www.mk8dx-lounge.com",
+    "track_type": "rt",
+    "FIRST_EVENT_TIME": 0,
+    "FIRST_EVENT_TIME_DESCRIPTION": "First event time is the number of minutes from 0:00 UTC that the bot would run the first event of the day. As an example, if this were set to 5, and the QUEUE_OPEN_TIME were set to 70, and the bot were to reboot at 2:00 UTC, the next event would immediately start and create rooms at 2:25 UTC.",
+    "QUEUE_OPEN_TIME": 60,
+    "JOINING_TIME": 55,
+    "DISPLAY_OFFSET_MINUTES": 5,
+    "EXTENSION_TIME": 3,
+    "ROOM_JOIN_PENALTY_TIME": 5,
+    "MOGI_LIFETIME": 180,
+    "SUB_RANGE_MMR_ALLOWANCE": 500, 
+    "SUB_MESSAGE_LIFETIME_SECONDS": 1200,
+    "ROOM_MMR_THRESHOLD": 9999999
+}

example_configs/prod/mkw_ct_prod_config.json

@@ -0,0 +1,58 @@
+{
+    "token": "",
+    "is_production": true,
+    "lounge": "MKW",
+    "lounge_description": "Valid options are MKW or MK8DX",
+    "guild_id": 387347467332485122,
+    "queue_join_channel": 1253109700107567155,
+    "queue_sub_channel": 1253109752418930779,
+    "queue_list_channel": 1253109466027655338,
+    "queue_history_channel": 1253109800196243618,
+    "queue_general_channel": 1253109398193045534,
+    "admin_roles": [
+        387347888935534593,
+        877629421811540016
+    ],
+    "helper_staff_roles": [
+        520808674411937792,
+        792891432301625364,
+        521149807994208295
+    ],
+    "members_for_channels": [
+        235148962103951360,
+        155149108183695360,
+        815483289515196416,
+        892420397570592768,
+        775415990238314518,
+        774812906830299136,
+        745443073202323586,
+        774866940950872095,
+        1019051989734273054
+    ],
+    "roles_for_channels":  [
+        520808645252874240,
+        520808674411937792
+    ],
+    "PLACEMENT_PLAYER_MMR": 750,
+    "placement_role_id": 723753340063842345,
+    "frequently_tagged_role_id": 1167985222533533817,
+    "restricted_role_id": 797208908153618452,
+    "muted_role_id": 434887701662007296,
+    "queue_messages": true,
+    "sec_between_queue_msgs": 2,
+    "username": "username",
+    "password": "password",
+    "url": "https://www.mkwlounge.gg",
+    "track_type": "ct",
+    "FIRST_EVENT_TIME": 0,
+    "FIRST_EVENT_TIME_DESCRIPTION": "First event time is the number of minutes from 0:00 UTC that the bot would run the first event of the day. As an example, if this were set to 5, and the QUEUE_OPEN_TIME were set to 70, and the bot were to reboot at 2:00 UTC, the next event would immediately start and create rooms at 2:25 UTC.",
+    "QUEUE_OPEN_TIME": 90,
+    "JOINING_TIME": 85,
+    "DISPLAY_OFFSET_MINUTES": 0,
+    "EXTENSION_TIME": 5,
+    "ROOM_JOIN_PENALTY_TIME": 8,
+    "MOGI_LIFETIME": 180,
+    "SUB_RANGE_MMR_ALLOWANCE": 700, 
+    "SUB_MESSAGE_LIFETIME_SECONDS": 1200,
+    "ROOM_MMR_THRESHOLD": 9000
+}

example_configs/prod/mkw_rt_prod_config.json

@@ -0,0 +1,58 @@
+{
+    "token": "",
+    "is_production": true,
+    "lounge": "MKW",
+    "lounge_description": "Valid options are MKW or MK8DX",
+    "guild_id": 387347467332485122,
+    "queue_join_channel": 1215174119767932979,
+    "queue_sub_channel": 1215174160234315806,
+    "queue_list_channel": 1215174057453162496,
+    "queue_history_channel": 1225709377747685477,
+    "queue_general_channel": 1241842559429513361,
+    "admin_roles": [
+        387347888935534593,
+        877629421811540016
+    ],
+    "helper_staff_roles": [
+        389252697284542465,
+        399384750923579392,
+        399382503825211393
+    ],
+    "members_for_channels": [
+        235148962103951360,
+        155149108183695360,
+        815483289515196416,
+        892420397570592768,
+        775415990238314518,
+        774812906830299136,
+        745443073202323586,
+        774866940950872095,
+        1019051989734273054
+    ],
+    "roles_for_channels": [
+        393600567781621761,
+        389252697284542465
+    ],
+    "PLACEMENT_PLAYER_MMR": 750,
+    "placement_role_id": 723753340063842345,
+    "frequently_tagged_role_id": 1167985222533533817,
+    "restricted_role_id": 797208908153618452,
+    "muted_role_id": 434887701662007296,
+    "queue_messages": true,
+    "sec_between_queue_msgs": 2,
+    "username": "username",
+    "password": "password",
+    "url": "https://www.mkwlounge.gg",
+    "track_type": "rt",
+    "FIRST_EVENT_TIME": 0,
+    "FIRST_EVENT_TIME_DESCRIPTION": "First event time is the number of minutes from 0:00 UTC that the bot would run the first event of the day. As an example, if this were set to 5, and the QUEUE_OPEN_TIME were set to 70, and the bot were to reboot at 2:00 UTC, the next event would immediately start and create rooms at 2:25 UTC.",
+    "QUEUE_OPEN_TIME": 72,
+    "JOINING_TIME": 67,
+    "DISPLAY_OFFSET_MINUTES": 0,
+    "EXTENSION_TIME": 5,
+    "ROOM_JOIN_PENALTY_TIME": 8,
+    "MOGI_LIFETIME": 180,
+    "SUB_RANGE_MMR_ALLOWANCE": 700, 
+    "SUB_MESSAGE_LIFETIME_SECONDS": 1200,
+    "ROOM_MMR_THRESHOLD": 8000
+}

host_fcs.py

@@ -0,0 +1,43 @@
+import common
+from typing import Dict
+from collections.abc import Iterable
+import aiohttp
+
+MKW_HOST_API_URL = f"https://mkwlounge.gg/api/hostfc.php?discord_guild_id={common.CONFIG['guild_id']}&discord_user_id="
+
+SESSION = None
+
+
+def create_new_session():
+    global SESSION
+    SESSION = aiohttp.ClientSession()
+
+
+async def _get_mk8dx_hosts(discord_ids: Iterable[str]) -> Dict[str, str]:
+    return {}
+
+
+async def _get_mkw_hosts(discord_ids: Iterable[str]) -> Dict[str, str]:
+    request_url = MKW_HOST_API_URL + ",".join(discord_ids)
+    async with aiohttp.ClientSession(timeout=aiohttp.ClientTimeout(total=5)) as session:
+        async with session.get(request_url) as r:
+            if r.status != 200:
+                print(f"hostfc endpoint returned status {r.status}")
+                return {}
+            results = await r.json()
+            if "status" not in results or results["status"] != "success":
+                print(f"hostfc endpoint returned unsuccessful results {results}")
+                return {}
+            host_mapping = {}
+            for item in results["results"]:
+                host_mapping[item["discord_user_id"]] = item["fc"]
+            return host_mapping
+
+
+async def get_hosts(discord_ids: Iterable[str]) -> Dict[str, str]:
+    if common.SERVER is common.Server.MKW:
+        return await _get_mkw_hosts(discord_ids)
+    elif common.SERVER is common.Server.MK8DX:
+        return await _get_mk8dx_hosts(discord_ids)
+    else:
+        raise ValueError("Bad config settings for server.")

lounge.py

@@ -1,3 +1,4 @@
+import common
 import discord
 from discord.ext import commands
 import json
@@ -10,9 +11,7 @@
                    case_insensitive=True, intents=intents, help_command=None)
 
 initial_extensions = ['cogs.SquadQueue']
-
-with open('./config.json', 'r') as cjson:
-    bot.config = json.load(cjson)
+bot.config = common.CONFIG
 
 
 @bot.event
@@ -50,6 +49,13 @@ async def on_command_error(ctx, error):
     raise error
 
 
+@bot.tree.error
+async def on_app_command_error(interaction: discord.Interaction, error: discord.app_commands.AppCommandError):
+    if isinstance(error, discord.app_commands.errors.CommandOnCooldown):
+        await interaction.response.send_message(f'You are on cooldown. Try again in {round(error.retry_after)}s', ephemeral=True)
+    else:
+        raise error
+
 @bot.event
 async def setup_hook():
     for extension in initial_extensions: