Skip to content

Commit ad3114c

Browse files
CarrotManMattCarrotManMatt
authored
Improve stubs again & remove more ignore comments (#638)
1 parent 9dea8dd commit ad3114c

File tree

12 files changed

+80
-28
lines changed

12 files changed

+80
-28
lines changed

‎cogs/add_users_to_threads_and_channels.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ async def on_thread_create(self, thread: discord.Thread) -> None:
190190
name="user",
191191
description="The user to add to the channel.",
192192
input_type=str,
193-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members), # type: ignore[arg-type]
193+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members),
194194
required=True,
195195
parameter_name="user_id_str",
196196
)
@@ -245,7 +245,7 @@ async def add_user_to_channel(
245245
name="role",
246246
description="The role to add to the channel.",
247247
input_type=str,
248-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_roles), # type: ignore[arg-type]
248+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_roles),
249249
required=True,
250250
parameter_name="role_id_str",
251251
)

‎cogs/archive.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ async def autocomplete_get_non_archived_channels(
105105
description="The category to archive.",
106106
input_type=str,
107107
autocomplete=discord.utils.basic_autocomplete(
108-
autocomplete_get_non_archival_categories # type: ignore[arg-type]
108+
autocomplete_get_non_archival_categories
109109
),
110110
required=True,
111111
parameter_name="str_category_id",
@@ -197,15 +197,15 @@ async def archive_category(
197197
name="channel",
198198
description="The channel to archive.",
199199
input_type=str,
200-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_non_archived_channels), # type: ignore[arg-type]
200+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_non_archived_channels),
201201
required=True,
202202
parameter_name="str_channel_id",
203203
)
204204
@discord.option(
205205
name="category",
206206
description="The category to move the channel to.",
207207
input_type=str,
208-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_archival_categories), # type: ignore[arg-type]
208+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_archival_categories),
209209
required=True,
210210
parameter_name="str_category_id",
211211
)

‎cogs/committee_actions_tracking.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ async def autocomplete_get_action_status(
215215
name="user",
216216
description="The user to assign the action to.",
217217
input_type=str,
218-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_committee_members), # type: ignore[arg-type]
218+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_committee_members),
219219
required=False,
220220
default=None,
221221
parameter_name="action_member_id",
@@ -270,15 +270,15 @@ async def create(
270270
name="action",
271271
description="The action to mark as completed.",
272272
input_type=str,
273-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_user_action_ids), # type: ignore[arg-type]
273+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_user_action_ids),
274274
required=True,
275275
parameter_name="action_id",
276276
)
277277
@discord.option(
278278
name="status",
279279
description="The desired status of the action.",
280280
input_type=str,
281-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_action_status), # type: ignore[arg-type]
281+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_action_status),
282282
required=True,
283283
parameter_name="status",
284284
)
@@ -342,7 +342,7 @@ async def update_status( # NOTE: Committee role check is not present because no
342342
name="action",
343343
description="The action to mark as completed.",
344344
input_type=str,
345-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_user_action_ids), # type: ignore[arg-type]
345+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_user_action_ids),
346346
required=True,
347347
parameter_name="action_id",
348348
)
@@ -532,7 +532,7 @@ async def action_all_committee(
532532
name="user",
533533
description="The user to list actions for.",
534534
input_type=str,
535-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_committee_members), # type: ignore[arg-type]
535+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_committee_members),
536536
required=False,
537537
default=None,
538538
parameter_name="action_member_id",
@@ -548,7 +548,7 @@ async def action_all_committee(
548548
name="status",
549549
description="The desired status of the action.",
550550
input_type=str,
551-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_action_status), # type: ignore[arg-type]
551+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_action_status),
552552
required=False,
553553
default=None,
554554
parameter_name="status",
@@ -651,15 +651,15 @@ async def list_user_actions( # NOTE: Committee role check is not present becaus
651651
name="action",
652652
description="The action to reassign.",
653653
input_type=str,
654-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_user_action_ids), # type: ignore[arg-type]
654+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_user_action_ids),
655655
required=True,
656656
parameter_name="action_id",
657657
)
658658
@discord.option(
659659
name="user",
660660
description="The user to list actions for.",
661661
input_type=str,
662-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_committee_members), # type: ignore[arg-type]
662+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_committee_members),
663663
required=True,
664664
parameter_name="member_id",
665665
)
@@ -735,7 +735,7 @@ async def reassign_action(
735735
name="status-filter",
736736
description="The filter to apply to the status of actions.",
737737
input_type=str,
738-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_action_status), # type: ignore[arg-type]
738+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_action_status),
739739
required=False,
740740
default=None,
741741
parameter_name="status",
@@ -799,7 +799,7 @@ async def list_all_actions(
799799
name="action",
800800
description="The action to delete.",
801801
input_type=str,
802-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_user_action_ids), # type: ignore[arg-type]
802+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_user_action_ids),
803803
required=True,
804804
parameter_name="action_id",
805805
)

‎cogs/edit_message.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ async def autocomplete_get_text_channels(
5151
name="channel",
5252
description="The channel that the message, you wish to edit, is in.",
5353
input_type=str,
54-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_text_channels), # type: ignore[arg-type]
54+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_text_channels),
5555
required=True,
5656
parameter_name="str_channel_id",
5757
)

‎cogs/induct.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ async def autocomplete_get_members(
314314
name="user",
315315
description="The user to induct.",
316316
input_type=str,
317-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members), # type: ignore[arg-type]
317+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members),
318318
required=True,
319319
parameter_name="str_induct_member_id",
320320
)

‎cogs/make_applicant.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
from logging import Logger
1414
from typing import Final
1515

16-
from utils import TeXBotApplicationContext
16+
from utils import TeXBotApplicationContext, TeXBotAutocompleteContext
1717

1818
__all__: "Sequence[str]" = (
1919
"BaseMakeApplicantCog",
@@ -133,7 +133,7 @@ class MakeApplicantSlashCommandCog(BaseMakeApplicantCog):
133133

134134
@staticmethod
135135
async def autocomplete_get_members(
136-
ctx: "TeXBotApplicationContext",
136+
ctx: "TeXBotAutocompleteContext",
137137
) -> set[discord.OptionChoice]:
138138
"""
139139
Autocomplete callable that generates the set of available selectable members.
@@ -171,7 +171,7 @@ async def autocomplete_get_members(
171171
name="user",
172172
description="The user to make an Applicant.",
173173
input_type=str,
174-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members), # type: ignore[arg-type]
174+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members),
175175
required=True,
176176
parameter_name="str_applicant_member_id",
177177
)

‎cogs/remind_me.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ async def autocomplete_get_delays( # noqa: PLR0912, PLR0915
194194
input_type=str,
195195
description="The amount of time to wait before reminding you.",
196196
required=True,
197-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_delays), # type: ignore[arg-type]
197+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_delays),
198198
)
199199
@discord.option(
200200
name="message",

‎cogs/stats/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class StatsCommandsCog(TeXBotBaseCog):
6969
description="The channel to display the stats for.",
7070
input_type=str,
7171
autocomplete=discord.utils.basic_autocomplete(
72-
TeXBotBaseCog.autocomplete_get_text_channels, # type: ignore[arg-type]
72+
TeXBotBaseCog.autocomplete_get_text_channels
7373
),
7474
required=False,
7575
parameter_name="str_channel_id",

‎cogs/strike.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ async def autocomplete_get_members(
840840
name="user",
841841
description="The user to give a strike to.",
842842
input_type=str,
843-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members), # type: ignore[arg-type]
843+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members),
844844
required=True,
845845
parameter_name="str_strike_member_id",
846846
)
@@ -871,7 +871,7 @@ async def strike(self, ctx: "TeXBotApplicationContext", str_strike_member_id: st
871871
name="user",
872872
description="The user to check the number of strikes for.",
873873
input_type=str,
874-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members), # type: ignore[arg-type]
874+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members),
875875
required=True,
876876
parameter_name="str_strike_member_id",
877877
)
@@ -915,7 +915,7 @@ async def get_strikes(
915915
name="user",
916916
description="The user to remove a strike from.",
917917
input_type=str,
918-
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members), # type: ignore[arg-type]
918+
autocomplete=discord.utils.basic_autocomplete(autocomplete_get_members),
919919
required=True,
920920
parameter_name="str_strike_member_id",
921921
)

‎stubs/discord/commands/options.pyi‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ def option[**P, **Q, T, T_context: AutocompleteContext](
2323
parameter_name: str = ...,
2424
autocomplete: Callable[
2525
[T_context],
26-
Awaitable[Iterable[OptionChoice] | Iterable[str] | Iterable[int] | Iterable[float]],
26+
Awaitable[Iterable[OptionChoice] | Iterable[str]],
27+
]
28+
| Callable[
29+
[T_context],
30+
Awaitable[Iterable[OptionChoice] | Iterable[str] | Iterable[int]],
2731
] = ...,
2832
) -> Callable[[Callable[P, Awaitable[None]]], Callable[Q, Awaitable[None]]]: ...
2933
@overload
@@ -37,7 +41,11 @@ def option[**P, **Q, T_context: AutocompleteContext](
3741
choices: Iterable[OptionChoice] | Iterable[str] | Iterable[int] | Iterable[float] = ...,
3842
autocomplete: Callable[
3943
[T_context],
40-
Awaitable[Iterable[OptionChoice] | Iterable[str] | Iterable[int] | Iterable[float]],
44+
Awaitable[Iterable[OptionChoice] | Iterable[str]],
45+
]
46+
| Callable[
47+
[T_context],
48+
Awaitable[Iterable[OptionChoice] | Iterable[str] | Iterable[int]],
4149
] = ...,
4250
required: bool = ...,
4351
min_length: int = ...,

0 commit comments

Comments
 (0)