Skip to content

Commit

Permalink
life: Handle per rank equivalent.
Browse files Browse the repository at this point in the history
  • Loading branch information
synrg committed Aug 13, 2024
1 parent 6d0dd9c commit b20ef78
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions inatcog/commands/obs.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
from typing import Optional, Union
import urllib.parse

from dronefly.core.constants import RANK_KEYWORDS, RANK_LEVELS
from dronefly.core.constants import RANK_KEYWORDS
from dronefly.core.formatters.constants import WWW_BASE_URL
from dronefly.core.formatters.generic import TaxonListFormatter
from dronefly.core.parsers.url import PAT_OBS_LINK, PAT_TAXON_LINK
from dronefly.core.query.query import Query
from dronefly.core.utils import obs_url_from_v1
from dronefly.discord.embeds import make_embed
from dronefly.discord.menus import TaxonListMenu
from pyinaturalist.models import Observation
from pyinaturalist import Observation, RANK_EQUIVALENTS, RANK_LEVELS
from redbot.core import checks, commands
from redbot.core.commands import BadArgument
from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
Expand Down Expand Up @@ -274,9 +274,14 @@ async def life(self, ctx, *, query: Optional[Union[TaxonReplyConverter, str]]):
f"See `{ctx.clean_prefix}help life` for details."
)
order = _query.order or None
# TODO: support this lower down?
_per_rank = per_rank
if per_rank in RANK_EQUIVALENTS:
_per_rank = RANK_EQUIVALENTS[per_rank]

taxon_list_formatter = TaxonListFormatter(
taxon_list,
per_rank,
_per_rank,
query_response,
with_taxa=True,
per_page=per_page,
Expand Down

0 comments on commit b20ef78

Please sign in to comment.