mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-12-08 02:12:32 -05:00
Migration to discord.py 2.0 (#5600)
* Temporarily set d.py to use latest git revision
* Remove `bot` param to Client.start
* Switch to aware datetimes
A lot of this is removing `.replace(...)` which while not technically
needed, simplifies the code base. There's only a few changes that are
actually necessary here.
* Update to work with new Asset design
* [threads] Update core ModLog API to support threads
- Added proper support for passing `Thread` to `channel`
when creating/editing case
- Added `parent_channel_id` attribute to Modlog API's Case
- Added `parent_channel` property that tries to get parent channel
- Updated case's content to show both thread and parent information
* [threads] Disallow usage of threads in some of the commands
- announceset channel
- filter channel clear
- filter channel add
- filter channel remove
- GlobalUniqueObjectFinder converter
- permissions addglobalrule
- permissions removeglobalrule
- permissions removeserverrule
- Permissions cog does not perform any validation for IDs
when setting through YAML so that has not been touched
- streamalert twitch/youtube/picarto
- embedset channel
- set ownernotifications adddestination
* [threads] Handle threads in Red's permissions system (Requires)
- Made permissions system apply rules of (only) parent in threads
* [threads] Update embed_requested to support threads
- Threads don't have their own embed settings and inherit from parent
* [threads] Update Red.message_eligible_as_command to support threads
* [threads] Properly handle invocation of [p](un)mutechannel in threads
Usage of a (un)mutechannel will mute/unmute user in the parent channel
if it's invoked in a thread.
* [threads] Update Filter cog to properly handle threads
- `[p]filter channel list` in a threads sends list for parent channel
- Checking for filter hits for a message in a thread checks its parent
channel's word list. There's no separate word list for threads.
* [threads] Support threads in Audio cog
- Handle threads being notify channels
- Update type hint for `is_query_allowed()`
* [threads] Update type hints and documentation to reflect thread support
- Documented that `{channel}` in CCs might be a thread
- Allowed (documented) usage of threads with `Config.channel()`
- Separate thread scope is still in the picture though
if it were to be done, it's going to be in separate in PR
- GuildContext.channel might be Thread
* Use less costy channel check in customcom's on_message_without_command
This isn't needed for d.py 2.0 but whatever...
* Update for in-place edits
* Embed's bool changed behavior, I'm hoping it doesn't affect us
* Address User.permissions_in() removal
* Swap VerificationLevel.extreme with VerificationLevel.highest
* Change to keyword-only parameters
* Change of `Guild.vanity_invite()` return type
* avatar -> display_avatar
* Fix metaclass shenanigans with Converter
* Update Red.add_cog() to be inline with `dpy_commands.Bot.add_cog()`
This means adding `override` keyword-only parameter and causing
small breakage by swapping RuntimeError with discord.ClientException.
* Address all DEP-WARNs
* Remove Context.clean_prefix and use upstream implementation instead
* Remove commands.Literal and use upstream implementation instead
Honestly, this was a rather bad implementation anyway...
Breaking but actually not really - it was provisional.
* Update Command.callback's setter
Support for functools.partial is now built into d.py
* Add new perms in HUMANIZED_PERM mapping (some from d.py 1.7 it seems)
BTW, that should really be in core instead of what we have now...
* Remove the part of do_conversion that has not worked for a long while
* Stop wrapping BadArgument in ConversionFailure
This is breaking but it's best to resolve it like this.
The functionality of ConversionFailure can be replicated with
Context.current_parameter and Context.current_argument.
* Add custom errors for int and float converters
* Remove Command.__call__ as it's now implemented in d.py
* Get rid of _dpy_reimplements
These were reimplemented for the purpose of typing
so it is no longer needed now that d.py is type hinted.
* Add return to Red.remove_cog
* Ensure we don't delete messages that differ only by used sticker
* discord.InvalidArgument->ValueError
* Move from raw <t:...> syntax to discord.utils.format_dt()
* Address AsyncIter removal
* Swap to pos-only for params that are pos-only in upstream
* Update for changes to Command.params
* [threads] Support threads in ignore checks and allow ignoring them
- Updated `[p](un)ignore channel` to accept threads
- Updated `[p]ignore list` to list ignored threads
- Updated logic in `Red.ignored_channel_or_guild()`
Ignores for guild channels now work as follows (only changes for threads):
- if channel is not a thread:
- check if user has manage channels perm in channel
and allow command usage if so
- check if channel is ignored and disallow command usage if so
- allow command usage if none of the conditions above happened
- if channel is a thread:
- check if user has manage channels perm in parent channel
and allow command usage if so
- check if parent channel is ignored and disallow command usage
if so
- check if user has manage thread perm in parent channel
and allow command usage if so
- check if thread is ignored and disallow command usage if so
- allow command usage if none of the conditions above happened
* [partial] Raise TypeError when channel is of PartialMessageable type
- Red.embed_requested
- Red.ignored_channel_or_guild
* [partial] Discard command messages when channel is PartialMessageable
* [threads] Add utilities for checking appropriate perms in both channels & threads
* [threads] Update code to use can_react_in() and @bot_can_react()
* [threads] Update code to use can_send_messages_in
* [threads] Add send_messages_in_threads perm to mute role and overrides
* [threads] Update code to use (bot/user)_can_manage_channel
* [threads] Update [p]diagnoseissues to work with threads
* Type hint fix
* [threads] Patch vendored discord.ext.menus to check proper perms in threads
I guess we've reached time when we have to patch the lib we vendor...
* Make docs generation work with non-final d.py releases
* Update discord.utils.oauth_url() usage
* Swap usage of discord.Embed.Empty/discord.embeds.EmptyEmbed to None
* Update usage of Guild.member_count to work with `None`
* Switch from Guild.vanity_invite() to Guild.vanity_url
* Update startup process to work with d.py's new asynchronous startup
* Use setup_hook() for pre-connect actions
* Update core's add_cog, remove_cog, and load_extension methods
* Update all setup functions to async and add awaits to bot.add_cog calls
* Modernize cogs by using async cog_load and cog_unload
* Address StoreChannel removal
* [partial] Disallow passing PartialMessageable to Case.channel
* [partial] Update cogs and utils to work better with PartialMessageable
- Ignore messages with PartialMessageable channel in CustomCommands cog
- In Filter cog, don't pass channel to modlog.create_case()
if it's PartialMessageable
- In Trivia cog, only compare channel IDs
- Make `.utils.menus.menu()` work for messages
with PartialMessageable channel
- Make checks in `.utils.tunnel.Tunnel.communicate()` more rigid
* Add few missing DEP-WARNs
This commit is contained in:
jack1142
GitHub
@@ -7,6 +7,7 @@ from asyncio.futures import isfuture
|
||||
from itertools import chain
|
||||
from pathlib import Path
|
||||
from typing import (
|
||||
TYPE_CHECKING,
|
||||
Any,
|
||||
AsyncIterator,
|
||||
AsyncIterable,
|
||||
@@ -15,16 +16,27 @@ from typing import (
|
||||
Iterable,
|
||||
Iterator,
|
||||
List,
|
||||
Literal,
|
||||
NoReturn,
|
||||
Optional,
|
||||
Tuple,
|
||||
TypeVar,
|
||||
Union,
|
||||
Generator,
|
||||
Coroutine,
|
||||
overload,
|
||||
)
|
||||
|
||||
import discord
|
||||
from discord.ext import commands as dpy_commands
|
||||
from discord.utils import maybe_coroutine
|
||||
|
||||
from redbot.core import commands
|
||||
|
||||
if TYPE_CHECKING:
|
||||
GuildMessageable = Union[commands.GuildContext, discord.abc.GuildChannel, discord.Thread]
|
||||
DMMessageable = Union[commands.DMContext, discord.Member, discord.User, discord.DMChannel]
|
||||
|
||||
__all__ = (
|
||||
"bounded_gather",
|
||||
"bounded_gather_iter",
|
||||
@@ -32,6 +44,9 @@ __all__ = (
|
||||
"AsyncIter",
|
||||
"get_end_user_data_statement",
|
||||
"get_end_user_data_statement_or_raise",
|
||||
"can_user_send_messages_in",
|
||||
"can_user_manage_channel",
|
||||
"can_user_react_in",
|
||||
)
|
||||
|
||||
log = logging.getLogger("red.core.utils")
|
||||
@@ -532,7 +547,7 @@ def get_end_user_data_statement(file: Union[Path, str]) -> Optional[str]:
|
||||
>>> # In cog's `__init__.py`
|
||||
>>> from redbot.core.utils import get_end_user_data_statement
|
||||
>>> __red_end_user_data_statement__ = get_end_user_data_statement(__file__)
|
||||
>>> def setup(bot):
|
||||
>>> async def setup(bot):
|
||||
... ...
|
||||
"""
|
||||
try:
|
||||
@@ -590,3 +605,209 @@ def get_end_user_data_statement_or_raise(file: Union[Path, str]) -> str:
|
||||
info_json = file / "info.json"
|
||||
with info_json.open(encoding="utf-8") as fp:
|
||||
return json.load(fp)["end_user_data_statement"]
|
||||
|
||||
|
||||
@overload
|
||||
def can_user_send_messages_in(
|
||||
obj: discord.abc.User, messageable: discord.PartialMessageable, /
|
||||
) -> NoReturn:
|
||||
...
|
||||
|
||||
|
||||
@overload
|
||||
def can_user_send_messages_in(obj: discord.Member, messageable: GuildMessageable, /) -> bool:
|
||||
...
|
||||
|
||||
|
||||
@overload
|
||||
def can_user_send_messages_in(obj: discord.User, messageable: DMMessageable, /) -> Literal[True]:
|
||||
...
|
||||
|
||||
|
||||
def can_user_send_messages_in(
|
||||
obj: discord.abc.User, messageable: discord.abc.Messageable, /
|
||||
) -> bool:
|
||||
"""
|
||||
Checks if a user/member can send messages in the given messageable.
|
||||
|
||||
This function properly resolves the permissions for `discord.Thread` as well.
|
||||
|
||||
.. note::
|
||||
|
||||
Without making an API request, it is not possible to reliably detect
|
||||
whether a guild member (who is NOT current bot user) can send messages in a private thread.
|
||||
|
||||
If it's essential for you to reliably detect this, you will need to
|
||||
try fetching the thread member:
|
||||
|
||||
.. code::
|
||||
|
||||
can_send_messages = can_user_send_messages_in(member, thread)
|
||||
if thread.is_private() and not thread.permissions_for(member).manage_threads:
|
||||
try:
|
||||
await thread.fetch_member(member.id)
|
||||
except discord.NotFound:
|
||||
can_send_messages = False
|
||||
|
||||
Parameters
|
||||
----------
|
||||
obj: discord.abc.User
|
||||
The user or member to check permissions for.
|
||||
If passed ``messageable`` resolves to a guild channel/thread,
|
||||
this needs to be an instance of `discord.Member`.
|
||||
messageable: discord.abc.Messageable
|
||||
The messageable object to check permissions for.
|
||||
If this resolves to a DM/group channel, this function will return ``True``.
|
||||
|
||||
Returns
|
||||
-------
|
||||
bool
|
||||
Whether the user can send messages in the given messageable.
|
||||
|
||||
Raises
|
||||
------
|
||||
TypeError
|
||||
When the passed channel is of type `discord.PartialMessageable`.
|
||||
"""
|
||||
channel = messageable.channel if isinstance(messageable, dpy_commands.Context) else messageable
|
||||
if isinstance(channel, discord.PartialMessageable):
|
||||
# If we have a partial messageable, we sadly can't do much...
|
||||
raise TypeError("Can't check permissions for PartialMessageable.")
|
||||
|
||||
if isinstance(channel, discord.abc.User):
|
||||
# Unlike DMChannel, abc.User subclasses do not have `permissions_for()`.
|
||||
return True
|
||||
|
||||
perms = channel.permissions_for(obj)
|
||||
if isinstance(channel, discord.Thread):
|
||||
return (
|
||||
perms.send_messages_in_threads
|
||||
and (not channel.locked or perms.manage_threads)
|
||||
# For private threads, the only way to know if user can send messages would be to check
|
||||
# if they're a member of it which we cannot reliably do without an API request.
|
||||
#
|
||||
# and (not channel.is_private() or "obj is thread member" or perms.manage_threads)
|
||||
)
|
||||
|
||||
return perms.send_messages
|
||||
|
||||
|
||||
def can_user_manage_channel(
|
||||
obj: discord.Member,
|
||||
channel: Union[discord.abc.GuildChannel, discord.Thread],
|
||||
/,
|
||||
allow_thread_owner: bool = False,
|
||||
) -> bool:
|
||||
"""
|
||||
Checks if a guild member can manage the given channel.
|
||||
|
||||
This function properly resolves the permissions for `discord.Thread` as well.
|
||||
|
||||
Parameters
|
||||
----------
|
||||
obj: discord.Member
|
||||
The guild member to check permissions for.
|
||||
If passed ``messageable`` resolves to a guild channel/thread,
|
||||
this needs to be an instance of `discord.Member`.
|
||||
channel: Union[discord.abc.GuildChannel, discord.Thread]
|
||||
The messageable object to check permissions for.
|
||||
If this resolves to a DM/group channel, this function will return ``True``.
|
||||
allow_thread_owner: bool
|
||||
If ``True``, the function will also return ``True`` if the given member is a thread owner.
|
||||
This can, for example, be useful to check if the member can edit a channel/thread's name
|
||||
as that, in addition to members with manage channel/threads permission,
|
||||
can also be done by the thread owner.
|
||||
|
||||
Returns
|
||||
-------
|
||||
bool
|
||||
Whether the user can manage the given channel.
|
||||
"""
|
||||
perms = channel.permissions_for(obj)
|
||||
if isinstance(channel, discord.Thread):
|
||||
return perms.manage_threads or (allow_thread_owner and channel.owner_id == obj.id)
|
||||
|
||||
return perms.manage_channels
|
||||
|
||||
|
||||
@overload
|
||||
def can_user_react_in(
|
||||
obj: discord.abc.User, messageable: discord.PartialMessageable, /
|
||||
) -> NoReturn:
|
||||
...
|
||||
|
||||
|
||||
@overload
|
||||
def can_user_react_in(obj: discord.Member, messageable: GuildMessageable, /) -> bool:
|
||||
...
|
||||
|
||||
|
||||
@overload
|
||||
def can_user_react_in(obj: discord.User, messageable: DMMessageable, /) -> Literal[True]:
|
||||
...
|
||||
|
||||
|
||||
def can_user_react_in(obj: discord.abc.User, messageable: discord.abc.Messageable, /) -> bool:
|
||||
"""
|
||||
Checks if a user/guild member can react in the given messageable.
|
||||
|
||||
This function properly resolves the permissions for `discord.Thread` as well.
|
||||
|
||||
.. note::
|
||||
|
||||
Without making an API request, it is not possible to reliably detect
|
||||
whether a guild member (who is NOT current bot user) can react in a private thread.
|
||||
|
||||
If it's essential for you to reliably detect this, you will need to
|
||||
try fetching the thread member:
|
||||
|
||||
.. code::
|
||||
|
||||
can_react = can_user_react_in(member, thread)
|
||||
if thread.is_private() and not thread.permissions_for(member).manage_threads:
|
||||
try:
|
||||
await thread.fetch_member(member.id)
|
||||
except discord.NotFound:
|
||||
can_react = False
|
||||
|
||||
Parameters
|
||||
----------
|
||||
obj: discord.abc.User
|
||||
The user or member to check permissions for.
|
||||
If passed ``messageable`` resolves to a guild channel/thread,
|
||||
this needs to be an instance of `discord.Member`.
|
||||
messageable: discord.abc.Messageable
|
||||
The messageable object to check permissions for.
|
||||
If this resolves to a DM/group channel, this function will return ``True``.
|
||||
|
||||
Returns
|
||||
-------
|
||||
bool
|
||||
Whether the user can send messages in the given messageable.
|
||||
|
||||
Raises
|
||||
------
|
||||
TypeError
|
||||
When the passed channel is of type `discord.PartialMessageable`.
|
||||
"""
|
||||
channel = messageable.channel if isinstance(messageable, dpy_commands.Context) else messageable
|
||||
if isinstance(channel, discord.PartialMessageable):
|
||||
# If we have a partial messageable, we sadly can't do much...
|
||||
raise TypeError("Can't check permissions for PartialMessageable.")
|
||||
|
||||
if isinstance(channel, discord.abc.User):
|
||||
# Unlike DMChannel, abc.User subclasses do not have `permissions_for()`.
|
||||
return True
|
||||
|
||||
perms = channel.permissions_for(obj)
|
||||
if isinstance(channel, discord.Thread):
|
||||
return (
|
||||
(perms.read_message_history and perms.add_reactions)
|
||||
and not channel.archived
|
||||
# For private threads, the only way to know if user can send messages would be to check
|
||||
# if they're a member of it which we cannot reliably do without an API request.
|
||||
#
|
||||
# and (not channel.is_private() or perms.manage_threads or "obj is thread member")
|
||||
)
|
||||
|
||||
return perms.read_message_history and perms.add_reactions
|
||||
|
||||
@@ -32,6 +32,7 @@ from typing import (
|
||||
import aiohttp
|
||||
import discord
|
||||
import pkg_resources
|
||||
from discord.ext.commands.converter import get_converter # DEP-WARN
|
||||
from fuzzywuzzy import fuzz, process
|
||||
from rich.progress import ProgressColumn
|
||||
from rich.progress_bar import ProgressBar
|
||||
@@ -59,6 +60,7 @@ __all__ = (
|
||||
"deprecated_removed",
|
||||
"RichIndefiniteBarColumn",
|
||||
"cli_level_to_log_level",
|
||||
"get_converter",
|
||||
)
|
||||
|
||||
_T = TypeVar("_T")
|
||||
|
||||
@@ -106,7 +106,10 @@ async def menu(
|
||||
if not ctx.me:
|
||||
return
|
||||
try:
|
||||
if message.channel.permissions_for(ctx.me).manage_messages:
|
||||
if (
|
||||
isinstance(message.channel, discord.PartialMessageable)
|
||||
or message.channel.permissions_for(ctx.me).manage_messages
|
||||
):
|
||||
await message.clear_reactions()
|
||||
else:
|
||||
raise RuntimeError
|
||||
|
||||
@@ -9,7 +9,9 @@ if TYPE_CHECKING:
|
||||
from ..commands import Context
|
||||
|
||||
|
||||
async def mass_purge(messages: List[discord.Message], channel: discord.TextChannel):
|
||||
async def mass_purge(
|
||||
messages: List[discord.Message], channel: Union[discord.TextChannel, discord.Thread]
|
||||
):
|
||||
"""Bulk delete messages from a channel.
|
||||
|
||||
If more than 100 messages are supplied, the bot will delete 100 messages at
|
||||
@@ -24,7 +26,7 @@ async def mass_purge(messages: List[discord.Message], channel: discord.TextChann
|
||||
----------
|
||||
messages : `list` of `discord.Message`
|
||||
The messages to bulk delete.
|
||||
channel : discord.TextChannel
|
||||
channel : `discord.TextChannel` or `discord.Thread`
|
||||
The channel to delete messages from.
|
||||
|
||||
Raises
|
||||
|
||||
@@ -67,7 +67,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
def same_context(
|
||||
cls,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the message fits the described context.
|
||||
@@ -76,7 +76,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
----------
|
||||
ctx : Optional[Context]
|
||||
The current invocation context.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
The channel we expect a message in. If unspecified,
|
||||
defaults to ``ctx.channel``. If ``ctx`` is unspecified
|
||||
too, the message's channel will be ignored.
|
||||
@@ -104,7 +104,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
def cancelled(
|
||||
cls,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the message is ``[p]cancel``.
|
||||
@@ -113,7 +113,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
----------
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -133,7 +133,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
def yes_or_no(
|
||||
cls,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the message is "yes"/"y" or "no"/"n".
|
||||
@@ -145,7 +145,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
----------
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -176,7 +176,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
def valid_int(
|
||||
cls,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response is an integer.
|
||||
@@ -187,7 +187,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
----------
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -216,7 +216,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
def valid_float(
|
||||
cls,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response is a float.
|
||||
@@ -227,7 +227,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
----------
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -256,7 +256,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
def positive(
|
||||
cls,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response is a positive number.
|
||||
@@ -267,7 +267,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
----------
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -300,7 +300,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
def valid_role(
|
||||
cls,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[discord.TextChannel] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response refers to a role in the current guild.
|
||||
@@ -313,7 +313,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
----------
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -344,7 +344,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
def valid_member(
|
||||
cls,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[discord.TextChannel] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response refers to a member in the current guild.
|
||||
@@ -357,7 +357,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
----------
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -392,7 +392,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
def valid_text_channel(
|
||||
cls,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[discord.TextChannel] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response refers to a text channel in the current guild.
|
||||
@@ -405,7 +405,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
----------
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -440,7 +440,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
def has_role(
|
||||
cls,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[discord.TextChannel] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response refers to a role which the author has.
|
||||
@@ -454,7 +454,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
----------
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -492,7 +492,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
cls,
|
||||
value: str,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response is equal to the specified value.
|
||||
@@ -503,7 +503,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
The value to compare the response with.
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -522,7 +522,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
cls,
|
||||
value: str,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response *as lowercase* is equal to the specified value.
|
||||
@@ -533,7 +533,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
The value to compare the response with.
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -552,7 +552,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
cls,
|
||||
value: Union[int, float],
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response is less than the specified value.
|
||||
@@ -563,7 +563,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
The value to compare the response with.
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -583,7 +583,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
cls,
|
||||
value: Union[int, float],
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response is greater than the specified value.
|
||||
@@ -594,7 +594,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
The value to compare the response with.
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -614,7 +614,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
cls,
|
||||
length: int,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response's length is less than the specified length.
|
||||
@@ -625,7 +625,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
The value to compare the response's length with.
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -644,7 +644,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
cls,
|
||||
length: int,
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response's length is greater than the specified length.
|
||||
@@ -655,7 +655,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
The value to compare the response's length with.
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -674,7 +674,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
cls,
|
||||
collection: Sequence[str],
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response is contained in the specified collection.
|
||||
@@ -688,7 +688,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
The collection containing valid responses.
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -718,7 +718,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
cls,
|
||||
collection: Sequence[str],
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Same as :meth:`contained_in`, but the response is set to lowercase before matching.
|
||||
@@ -729,7 +729,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
The collection containing valid lowercase responses.
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -759,7 +759,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
cls,
|
||||
pattern: Union[Pattern[str], str],
|
||||
ctx: Optional[commands.Context] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.DMChannel]] = None,
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread, discord.DMChannel]] = None,
|
||||
user: Optional[discord.abc.User] = None,
|
||||
) -> "MessagePredicate":
|
||||
"""Match if the response matches the specified regex pattern.
|
||||
@@ -774,7 +774,7 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
The pattern to search for in the response.
|
||||
ctx : Optional[Context]
|
||||
Same as ``ctx`` in :meth:`same_context`.
|
||||
channel : Optional[discord.TextChannel]
|
||||
channel : Optional[Union[`discord.TextChannel`, `discord.Thread`, `discord.DMChannel`]]
|
||||
Same as ``channel`` in :meth:`same_context`.
|
||||
user : Optional[discord.abc.User]
|
||||
Same as ``user`` in :meth:`same_context`.
|
||||
@@ -815,7 +815,9 @@ class MessagePredicate(Callable[[discord.Message], bool]):
|
||||
|
||||
@staticmethod
|
||||
def _get_guild(
|
||||
ctx: commands.Context, channel: discord.TextChannel, user: discord.Member
|
||||
ctx: Optional[commands.Context],
|
||||
channel: Optional[Union[discord.TextChannel, discord.Thread]],
|
||||
user: Optional[discord.Member],
|
||||
) -> discord.Guild:
|
||||
if ctx is not None:
|
||||
return ctx.guild
|
||||
@@ -930,6 +932,7 @@ class ReactionPredicate(Callable[[discord.Reaction, discord.abc.User], bool]):
|
||||
|
||||
"""
|
||||
# noinspection PyProtectedMember
|
||||
# DEP-WARN
|
||||
me_id = message._state.self_id
|
||||
return cls(
|
||||
lambda self, r, u: u.id != me_id
|
||||
|
||||
@@ -4,7 +4,7 @@ from datetime import datetime
|
||||
from redbot.core.utils.chat_formatting import pagify
|
||||
import io
|
||||
import weakref
|
||||
from typing import List, Optional
|
||||
from typing import List, Optional, Union
|
||||
from .common_filters import filter_mass_mentions
|
||||
|
||||
_instances = weakref.WeakValueDictionary({})
|
||||
@@ -57,14 +57,18 @@ class Tunnel(metaclass=TunnelMeta):
|
||||
----------
|
||||
sender: `discord.Member`
|
||||
The person who opened the tunnel
|
||||
origin: `discord.TextChannel`
|
||||
origin: `discord.TextChannel` or `discord.Thread`
|
||||
The channel in which it was opened
|
||||
recipient: `discord.User`
|
||||
The user on the other end of the tunnel
|
||||
"""
|
||||
|
||||
def __init__(
|
||||
self, *, sender: discord.Member, origin: discord.TextChannel, recipient: discord.User
|
||||
self,
|
||||
*,
|
||||
sender: discord.Member,
|
||||
origin: Union[discord.TextChannel, discord.Thread],
|
||||
recipient: discord.User,
|
||||
):
|
||||
self.sender = sender
|
||||
self.origin = origin
|
||||
@@ -219,9 +223,9 @@ class Tunnel(metaclass=TunnelMeta):
|
||||
the bot can't upload at the origin channel
|
||||
or can't add reactions there.
|
||||
"""
|
||||
if message.channel == self.origin and message.author == self.sender:
|
||||
if message.channel.id == self.origin.id and message.author == self.sender:
|
||||
send_to = self.recipient
|
||||
elif message.author == self.recipient and isinstance(message.channel, discord.DMChannel):
|
||||
elif message.author == self.recipient and message.guild is None:
|
||||
send_to = self.origin
|
||||
else:
|
||||
return None
|
||||
|
||||
Reference in New Issue
Block a user