Switch to application commands

Author: tesence

.editorconfig

@@ -7,7 +7,3 @@ indent_style = space
 indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
-
-[*.md]
-max_line_length = off
-trim_trailing_whitespace = false

gumo/api/__init__.py

@@ -1 +1 @@
-from .base import APIError
+from .core import BFRandomizerApiClient, SEEDGEN_API_URL

gumo/api/base.py

@@ -0,0 +1,67 @@
+import logging
+from urllib import parse
+
+import aiohttp
+
+from gumo.api import models
+
+logger = logging.getLogger(__name__)
+
+SEEDGEN_API_URL = "https://orirando.com"
+
+PATHS_INHERITENCE = {}
+PATHS_INHERITENCE['Casual'] = [v for k, v in models.LOGIC_PATHS.items() if k.startswith('Casual')]
+PATHS_INHERITENCE['Standard'] = PATHS_INHERITENCE['Casual'] + \
+                                [v for k, v in models.LOGIC_PATHS.items() if k.startswith('Standard')]
+PATHS_INHERITENCE['Expert'] = PATHS_INHERITENCE['Standard'] + \
+                              [v for k, v in models.LOGIC_PATHS.items() if k.startswith('Expert')] + \
+                              [models.LOGIC_PATHS['Dbash']]
+PATHS_INHERITENCE['Master'] = PATHS_INHERITENCE['Expert'] + \
+                              [v for k, v in models.LOGIC_PATHS.items() if k.startswith('Master')]
+PATHS_INHERITENCE['Glitched'] = PATHS_INHERITENCE['Expert'] + \
+                                [models.LOGIC_PATHS['Glitched'], models.LOGIC_PATHS['Timed-Level']]
+
+
+class BFRandomizerApiClient:
+
+
+    def __init__(self, *args, **kwargs):
+        self._session = aiohttp.ClientSession(*args, **kwargs, raise_for_status=True)
+
+
+    async def get_data(self, seed_name, logic_mode=None, key_mode=None, goal_mode=None, spawn=None,  variations=(),
+                       item_pool=None):
+
+        params = {('seed', seed_name)}
+
+        for path in PATHS_INHERITENCE[logic_mode]:
+            params.add(('path', path))
+
+        params.add(('key_mode', models.KEY_MODES[key_mode]))
+        params.add(('var', models.GOAL_MODES[goal_mode]))
+        params.add(('pool_preset', models.ITEM_POOLS[item_pool]))
+        params.add(('spawn', spawn))
+
+        # Variations
+        for variation in variations:
+            params.add(('var', models.VARIATIONS[variation]))
+
+        # Handle all the preset specificities
+        if logic_mode == "Casual":
+            params.add(('cell_freq', "20"))
+        elif logic_mode == "Standard":
+            params.add(('cell_freq', "40"))
+        elif logic_mode == "Expert":
+            params.add(('cell_freq', "256"))
+        elif logic_mode == "Master":
+            params.add(('cell_freq', "256"))
+            params.add(("path_diff", models.PATH_DIFFICULTIES['Hard']))
+            params.add(('var', models.VARIATIONS['Starved']))
+        elif logic_mode == "Glitched":
+            params.add(('cell_freq', "256"))
+            params.add(("path_diff", models.PATH_DIFFICULTIES['Hard']))
+
+        url = f"{SEEDGEN_API_URL}/generator/json?{parse.urlencode(list(params))}"
+        logger.debug(f"Outgoing request: {url}")
+        resp = await self._session.request('GET', url)
+        return await resp.json()

gumo/api/bf_randomizer.py

@@ -0,0 +1,87 @@
+LOGIC_MODES = {
+    'Casual': "Casual",
+    'Standard': "Standard",
+    'Expert': "Expert",
+    'Master': "Master",
+    'Glitched': "Glitched"
+}
+
+KEY_MODES = {
+    'None': "Default",
+    'Shards': "Shards",
+    'Limitkeys': "Limitkeys",
+    'Clues': "Clues",
+    'Free': "Free"
+}
+
+GOAL_MODES = {
+    'None': "",
+    'Force Trees': "ForceTrees",
+    'World Tour': "WorldTour",
+    'Force Maps': "ForceMaps",
+    'Warmth Frags': "WarmthFrags",
+    'Bingo': "Bingo"
+}
+
+SPAWNS = {
+    'Random': "Random",
+    'Glades': "Glades",
+    'Grove': "Grove",
+    'Swamp': "Swamp",
+    'Grotto': "Grotto",
+    'Forlorn': "Forlorn",
+    'Valley': "Valley",
+    'Horu': "Horu",
+    'Ginso': "Ginso",
+    'Sorrow': "Sorrow",
+    'Blackroot': "Blackroot"
+}
+
+VARIATIONS = {
+    'Starved': "Starved",
+    'OHKO': "OHKO",
+    '0XP': "0XP",
+    'Closed Dungeons': "ClosedDungeons",
+    'Extra Copies': "DoubleSkills",
+    'Strict Mapstones': "StrictMapstones",
+    'TP Starved': "TPStarved",
+    'Skip Final Escape': "GoalModeFinish",
+    'Wall Starved': "WallStarved",
+    'Grenade Starved': "GrenadeStarved",
+    'In-Logic Warps': "InLogicWarps"
+}
+
+LOGIC_PATHS = {
+    'Casual-core': "casual-core",
+    'Casual-dboost': "casual-dboost",
+    'Standard-core': "standard-core",
+    'Standard-dboost': "standard-dboost",
+    'Standard-lure': "standard-lure",
+    'Standard-abilities': "standard-abilities",
+    'Expert-core': "expert-core",
+    'Expert-dboost': "expert-dboost",
+    'Expert-lure': "expert-lure",
+    'Expert-abilities': "expert-abilities",
+    'Master-core': "master-core",
+    'Master-dboost': "master-dboost",
+    'Master-lure': "master-lure",
+    'Dbash': "dbash",
+    'Gjump': "gjump",
+    'Glitched': "glitched",
+    'Timed-Level': "timed-level",
+    'Insane': "insane"
+}
+
+ITEM_POOLS = {
+    'Standard': "Standard",
+    'Competitive': "Competitive",
+    'Bonus Lite': "Bonus Lite",
+    'Extra Bonus': "Extra Bonus",
+    'Hard': "Hard"
+}
+
+PATH_DIFFICULTIES = {
+    'Easy': "Easy",
+    'Normal': "Normal",
+    'Hard': "Hard"
+}

gumo/api/core.py

@@ -6,7 +6,6 @@
 
 MODULES = [
     "gumo.modules.emoji_chain",
-    "gumo.modules.help",
     "gumo.modules.seed"
 ]
 
@@ -25,3 +24,7 @@ def __init__(self, *args, **kwargs):
     async def setup_hook(self):
         for module in MODULES:
             await self.load_extension(module)
+
+    async def on_ready(self):
+        synced = await self.tree.sync()
+        logger.debug(f"Synced commands: {len(synced)}")