diff --git a/didier/data/apis/hydra.py b/didier/data/apis/hydra.py index 620e0df..63a45ac 100644 --- a/didier/data/apis/hydra.py +++ b/didier/data/apis/hydra.py @@ -12,4 +12,5 @@ async def fetch_menu(http_session: ClientSession, day_dt: date) -> Menu: """Fetch the menu for a given day""" endpoint = f"https://hydra.ugent.be/api/2.0/resto/menu/nl/{day_dt.year}/{day_dt.month}/{day_dt.day}.json" async with ensure_get(http_session, endpoint, log_exceptions=False) as response: + print(response) return Menu.parse_obj(response) diff --git a/didier/data/embeds/hydra/menu.py b/didier/data/embeds/hydra/menu.py index 8d1e8d4..9212d70 100644 --- a/didier/data/embeds/hydra/menu.py +++ b/didier/data/embeds/hydra/menu.py @@ -94,12 +94,17 @@ class Menu(EmbedPydantic): return embed def _regular_embed(self, embed: discord.Embed) -> discord.Embed: - embed.add_field(name="🥣 Soep", value=self._get_soups(), inline=False) - embed.add_field(name="🍴 Hoofdgerechten", value=self._get_main_courses(), inline=False) - embed.add_field(name="❄️Koud", value=self._get_cold_meals(), inline=False) + if soups := self._get_soups(): + embed.add_field(name="🥣 Soep", value=soups, inline=False) - vegetables = "\n".join(list(sorted(self.vegetables))) - embed.add_field(name="🥦 Groenten", value=vegetables, inline=False) + if mains := self._get_main_courses(): + embed.add_field(name="🍴 Hoofdgerechten", value=mains, inline=False) + + if cold := self._get_cold_meals(): + embed.add_field(name="❄️Koud", value=cold, inline=False) + + if vegetables := "\n".join(list(sorted(self.vegetables))): + embed.add_field(name="🥦 Groenten", value=vegetables, inline=False) return embed diff --git a/didier/utils/discord/converters/time.py b/didier/utils/discord/converters/time.py index 159e8d3..2a328f9 100644 --- a/didier/utils/discord/converters/time.py +++ b/didier/utils/discord/converters/time.py @@ -15,7 +15,7 @@ from didier.utils.types.datetime import ( str_to_weekday, ) -__all__ = ["date_converter"] +__all__ = ["date_converter", "DateTransformer"] def date_converter(argument: Optional[str]) -> date: @@ -56,6 +56,7 @@ def date_converter(argument: Optional[str]) -> date: class DateTransformer(app_commands.Transformer): """Application commands transformer for dates""" + @overrides async def autocomplete( self, interaction: discord.Interaction, value: Union[int, float, str] ) -> list[app_commands.Choice[Union[int, float, str]]]: diff --git a/requirements.txt b/requirements.txt index d72584a..b064107 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ aiohttp==3.8.1 alembic==1.8.0 asyncpg==0.25.0 beautifulsoup4==4.11.1 -discord.py==2.0.0 +discord.py==2.0.1 environs==9.5.0 feedparser==6.0.10 markdownify==0.11.2