♻️ refactor utils.get to utils.find across multiple files

Author: Paillat-dev

CHANGELOG-V3.md

@@ -22,6 +22,7 @@ release.
 - `utils.time_snowflake` use `utils.generate_snowflake` instead
 - `utils.warn_deprecated`
 - `utils.deprecated`
-- `utils.get` use `utils.find` instead
+- `utils.get` use `utils.find` with `lambda i: i.attr == val`instead
+- `AsyncIterator.get` use `AsyncIterator.find` with `lambda i: i.attr == val` instead
 - `utils.as_chunks` use `itertools.batched` on Python 3.12+ or your own implementation
   instead

discord/bot.py

@@ -63,7 +63,7 @@
 from .shard import AutoShardedClient
 from .types import interactions
 from .user import User
-from .utils import MISSING, find, get
+from .utils import MISSING, find
 from .utils.private import async_all
 
 if TYPE_CHECKING:
@@ -358,7 +358,7 @@ def _check_command(cmd: ApplicationCommand, match: Mapping[str, Any]) -> bool:
 
         # Now let's see if there are any commands on discord that we need to delete
         for cmd, value_ in registered_commands_dict.items():
-            match = get(pending, name=registered_commands_dict[cmd]["name"])
+            match = find(lambda c: c.name == registered_commands_dict[cmd]["name"], pending)
             if match is None:
                 # We have this command registered but not in our list
                 return_value.append(
@@ -516,8 +516,9 @@ def register(
                         }
                     )
                     continue
-                # We can assume the command item is a command, since it's only a string if action is delete
-                match = get(pending, name=cmd["command"].name, type=cmd["command"].type)
+                # We can assume the command item is a com
+                # mand, since it's only a string if action is delete
+                match = find(lambda c: c.name == cmd["command"].name and c.type == cmd["command"].type, pending)
                 if match is None:
                     continue
                 if cmd["action"] == "edit":
@@ -606,10 +607,9 @@ def register(
             registered = await register("bulk", data, guild_id=guild_id)
 
         for i in registered:
-            cmd = get(
+            cmd = find(
+                lambda c: c.name == i["name"] and c.type == i.get("type"),
                 self.pending_application_commands,
-                name=i["name"],
-                type=i.get("type"),
             )
             if not cmd:
                 raise ValueError(f"Registered command {i['name']}, type {i.get('type')} not found in pending commands")
@@ -713,11 +713,9 @@ async def on_connect():
                 registered_guild_commands[guild_id] = app_cmds
 
         for i in registered_commands:
-            cmd = get(
+            cmd = find(
+                lambda c: c.name == i["name"] and c.guild_ids is None and c.type == i.get("type"),
                 self.pending_application_commands,
-                name=i["name"],
-                guild_ids=None,
-                type=i.get("type"),
             )
             if cmd:
                 cmd.id = i["id"]

discord/channel.py

@@ -1025,7 +1025,7 @@ def get_tag(self, id: int, /) -> ForumTag | None:
 
         .. versionadded:: 2.3
         """
-        return utils.get(lambda t: t.id == id, self.available_tags)
+        return utils.find(lambda t: t.id == id, self.available_tags)
 
     @overload
     async def edit(
@@ -2491,7 +2491,7 @@ def instance(self) -> StageInstance | None:
 
         .. versionadded:: 2.0
         """
-        return utils.get(self.guild.stage_instances, channel_id=self.id)
+        return utils.find(lambda s: s.channel_id == self.id, self.guild.stage_instances)
 
     async def create_instance(
         self,

discord/ext/bridge/core.py

@@ -40,7 +40,7 @@
     SlashCommandOptionType,
 )
 
-from ...utils import MISSING, find, get
+from ...utils import MISSING, find
 from ...utils.private import warn_deprecated
 from ..commands import (
     BadArgument,
@@ -621,7 +621,7 @@ async def convert(self, ctx, argument: str) -> Any:
 
             if self.choices:
                 choices_names: list[str | int | float] = [choice.name for choice in self.choices]
-                if converted in choices_names and (choice := get(self.choices, name=converted)):
+                if converted in choices_names and (choice := find(lambda c: c.name == converted, self.choices)):
                     converted = choice.value
                 else:
                     choices = [choice.value for choice in self.choices]

discord/ext/commands/converter.py

@@ -89,7 +89,6 @@ def _get_from_guilds(bot, getter, argument):
     return result
 
 
-_utils_get = discord.utils.get
 T = TypeVar("T")
 T_co = TypeVar("T_co", covariant=True)
 CT = TypeVar("CT", bound=discord.abc.GuildChannel)
@@ -194,7 +193,7 @@ async def query_member_named(self, guild, argument):
         if len(argument) > 5 and argument[-5] == "#":
             username, _, discriminator = argument.rpartition("#")
             members = await guild.query_members(username, limit=100, cache=cache)
-            return discord.utils.get(members, name=username, discriminator=discriminator)
+            return discord.utils.find(lambda m: m.name == username and m.discriminator == discriminator, members)
         members = await guild.query_members(argument, limit=100, cache=cache)
         return discord.utils.find(
             lambda m: argument in (m.nick, m.name, m.global_name),
@@ -239,7 +238,7 @@ async def convert(self, ctx: Context, argument: str) -> discord.Member:
             if guild:
                 result = guild.get_member(user_id)
                 if ctx.message is not None and result is None:
-                    result = _utils_get(ctx.message.mentions, id=user_id)
+                    result = discord.utils.find(lambda e: e.id == user_id, ctx.message.mentions)
             else:
                 result = _get_from_guilds(bot, "get_member", user_id)
 
@@ -287,7 +286,7 @@ async def convert(self, ctx: Context, argument: str) -> discord.User:
             user_id = int(match.group(1))
             result = ctx.bot.get_user(user_id)
             if ctx.message is not None and result is None:
-                result = _utils_get(ctx.message.mentions, id=user_id)
+                result = discord.utils.find(lambda e: e.id == user_id, ctx.message.mentions)
             if result is None:
                 try:
                     result = await ctx.bot.fetch_user(user_id)
@@ -441,7 +440,7 @@ def _resolve_channel(ctx: Context, argument: str, attribute: str, type: type[CT]
             # not a mention
             if guild:
                 iterable: Iterable[CT] = getattr(guild, attribute)
-                result: CT | None = discord.utils.get(iterable, name=argument)
+                result: CT | None = discord.utils.find(lambda e: e.name == argument, iterable)
             else:
 
                 def check(c):
@@ -470,7 +469,7 @@ def _resolve_thread(ctx: Context, argument: str, attribute: str, type: type[TT])
             # not a mention
             if guild:
                 iterable: Iterable[TT] = getattr(guild, attribute)
-                result: TT | None = discord.utils.get(iterable, name=argument)
+                result: TT | None = discord.utils.find(lambda e: e.name == argument, iterable)
         else:
             thread_id = int(match.group(1))
             if guild:
@@ -709,7 +708,7 @@ async def convert(self, ctx: Context, argument: str) -> discord.Role:
         if match:
             result = guild.get_role(int(match.group(1)))
         else:
-            result = discord.utils.get(guild._roles.values(), name=argument)
+            result = discord.utils.find(lambda e: e.name == argument, guild._roles.values())
 
         if result is None:
             raise RoleNotFound(argument)
@@ -760,7 +759,7 @@ async def convert(self, ctx: Context, argument: str) -> discord.Guild:
             result = ctx.bot.get_guild(guild_id)
 
         if result is None:
-            result = discord.utils.get(ctx.bot.guilds, name=argument)
+            result = discord.utils.find(lambda e: e.name == argument, ctx.bot.guilds)
 
             if result is None:
                 raise GuildNotFound(argument)
@@ -792,10 +791,10 @@ async def convert(self, ctx: Context, argument: str) -> discord.GuildEmoji:
         if match is None:
             # Try to get the emoji by name. Try local guild first.
             if guild:
-                result = discord.utils.get(guild.emojis, name=argument)
+                result = discord.utils.find(lambda e: e.name == argument, guild.emojis)
 
             if result is None:
-                result = discord.utils.get(bot.emojis, name=argument)
+                result = discord.utils.find(lambda e: e.name == argument, bot.emojis)
         else:
             emoji_id = int(match.group(1))
 
@@ -858,10 +857,10 @@ async def convert(self, ctx: Context, argument: str) -> discord.GuildSticker:
         if match is None:
             # Try to get the sticker by name. Try local guild first.
             if guild:
-                result = discord.utils.get(guild.stickers, name=argument)
+                result = discord.utils.find(lambda s: s.name == argument, guild.stickers, name=argument)
 
             if result is None:
-                result = discord.utils.get(bot.stickers, name=argument)
+                result = discord.utils.find(lambda s: s.name == argument, bot.stickers)
         else:
             sticker_id = int(match.group(1))
 
@@ -913,17 +912,23 @@ async def convert(self, ctx: Context, argument: str) -> str:
         if ctx.guild:
 
             def resolve_member(id: int) -> str:
-                m = (None if msg is None else _utils_get(msg.mentions, id=id)) or ctx.guild.get_member(id)
+                m = (
+                    None if msg is None else discord.utils.find(lambda e: e.id == id, msg.mentions)
+                ) or ctx.guild.get_member(id)
                 return f"@{m.display_name if self.use_nicknames else m.name}" if m else "@deleted-user"
 
             def resolve_role(id: int) -> str:
-                r = (None if msg is None else _utils_get(msg.mentions, id=id)) or ctx.guild.get_role(id)
+                r = (
+                    None if msg is None else discord.utils.find(lambda e: e.id == id, msg.mentions)
+                ) or ctx.guild.get_role(id)
                 return f"@{r.name}" if r else "@deleted-role"
 
         else:
 
             def resolve_member(id: int) -> str:
-                m = (None if msg is None else _utils_get(msg.mentions, id=id)) or ctx.bot.get_user(id)
+                m = (
+                    None if msg is None else discord.utils.find(lambda e: e.id == id, msg.mentions)
+                ) or ctx.bot.get_user(id)
                 return f"@{m.name}" if m else "@deleted-user"
 
             def resolve_role(id: int) -> str:

discord/ext/commands/core.py

@@ -1866,9 +1866,9 @@ def predicate(ctx: Context) -> bool:
 
         # ctx.guild is None doesn't narrow ctx.author to Member
         if isinstance(item, int):
-            role = discord.utils.get(ctx.author.roles, id=item)  # type: ignore
+            role = discord.utils.find(lambda r: r.id == item, ctx.author.roles)  # type: ignore
         else:
-            role = discord.utils.get(ctx.author.roles, name=item)  # type: ignore
+            role = discord.utils.find(lambda r: r.name == item, ctx.author.roles)  # type: ignore
         if role is None:
             raise MissingRole(item)
         return True
@@ -1913,9 +1913,14 @@ def predicate(ctx):
             raise NoPrivateMessage()
 
         # ctx.guild is None doesn't narrow ctx.author to Member
-        getter = functools.partial(discord.utils.get, ctx.author.roles)  # type: ignore
+        getter = functools.partial(discord.utils.find, seq=ctx.author.roles)  # type: ignore
         if any(
-            (getter(id=item) is not None if isinstance(item, int) else getter(name=item) is not None) for item in items
+            (
+                getter(lambda e: e.id == item) is not None
+                if isinstance(item, int)
+                else getter(lambda e: e.name == item) is not None
+            )
+            for item in items
         ):
             return True
         raise MissingAnyRole(list(items))
@@ -1943,9 +1948,9 @@ def predicate(ctx):
 
         me = ctx.me
         if isinstance(item, int):
-            role = discord.utils.get(me.roles, id=item)
+            role = discord.utils.find(lambda r: r.id == item, me.roles)
         else:
-            role = discord.utils.get(me.roles, name=item)
+            role = discord.utils.find(lambda r: r.name == item, me.roles)
         if role is None:
             raise BotMissingRole(item)
         return True
@@ -1972,9 +1977,14 @@ def predicate(ctx):
             raise NoPrivateMessage()
 
         me = ctx.me
-        getter = functools.partial(discord.utils.get, me.roles)
+        getter = functools.partial(discord.utils.find, seq=me.roles)
         if any(
-            (getter(id=item) is not None if isinstance(item, int) else getter(name=item) is not None) for item in items
+            (
+                getter(lambda e: e.id == item) is not None
+                if isinstance(item, int)
+                else getter(lambda e: e.name == item) is not None
+            )
+            for item in items
         ):
             return True
         raise BotMissingAnyRole(list(items))

discord/guild.py

@@ -1020,7 +1020,7 @@ def get_member_named(self, name: str, /) -> Member | None:
 
             # do the actual lookup and return if found
             # if it isn't found then we'll do a full name lookup below.
-            result = utils.get(members, name=name[:-5], discriminator=potential_discriminator)
+            result = utils.find(lambda m: m.name == name[:-5] and discriminator == potential_discriminator, members)
             if result is not None:
                 return result
 

discord/iterators.py

@@ -85,20 +85,6 @@ class _AsyncIterator(AsyncIterator[T]):
     async def next(self) -> T:
         raise NotImplementedError
 
-    def get(self, **attrs: Any) -> Awaitable[T | None]:
-        def predicate(elem: T):
-            for attr, val in attrs.items():
-                nested = attr.split("__")
-                obj = elem
-                for attribute in nested:
-                    obj = getattr(obj, attribute)
-
-                if obj != val:
-                    return False
-            return True
-
-        return self.find(predicate)
-
     async def find(self, predicate: _Func[T, bool]) -> T | None:
         while True:
             try:

discord/poll.py

@@ -144,7 +144,7 @@ def count(self) -> int | None:
             return None
         if self._poll.results is None:
             return None  # Unknown vote count.
-        _count = self._poll.results and utils.get(self._poll.results.answer_counts, id=self.id)
+        _count = self._poll.results and utils.find(lambda p: p.id == id, self._poll.results.answer_counts)
         if _count:
             return _count.count
         return 0  # If an answer isn't in answer_counts, it has 0 votes.
@@ -426,7 +426,7 @@ def get_answer(self, id) -> PollAnswer | None:
         Optional[:class:`.PollAnswer`]
             The returned answer or ``None`` if not found.
         """
-        return utils.get(self.answers, id=id)
+        return utils.find(lambda a: a.id == id, self.answers)
 
     def add_answer(
         self,

discord/team.py

@@ -85,7 +85,7 @@ def icon(self) -> Asset | None:
     @property
     def owner(self) -> TeamMember | None:
         """The team's owner."""
-        return utils.get(self.members, id=self.owner_id)
+        return utils.find(lambda m: m.id == self.owner_id, self.members)
 
 
 class TeamMember(BaseUser):