mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-05 18:58:53 -05:00
* 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
187 lines
6.1 KiB
Python
187 lines
6.1 KiB
Python
import itertools
|
|
import re
|
|
from typing import NamedTuple, Union, Optional
|
|
|
|
import discord
|
|
|
|
from redbot.core import commands
|
|
from redbot.core.i18n import Translator
|
|
from redbot.core.utils import AsyncIter
|
|
|
|
_ = Translator("PermissionsConverters", __file__)
|
|
|
|
MENTION_RE = re.compile(r"^<?(?:(?:@[!&]?)?|#)(\d{15,20})>?$")
|
|
|
|
|
|
def _match_id(arg: str) -> Optional[int]:
|
|
m = MENTION_RE.match(arg)
|
|
if m:
|
|
return int(m.group(1))
|
|
|
|
|
|
class GlobalUniqueObjectFinder(commands.Converter):
|
|
async def convert(
|
|
self, ctx: commands.Context, arg: str
|
|
) -> Union[discord.Guild, discord.abc.GuildChannel, discord.abc.User, discord.Role]:
|
|
bot: commands.Bot = ctx.bot
|
|
_id = _match_id(arg)
|
|
|
|
if _id is not None:
|
|
guild: discord.Guild = bot.get_guild(_id)
|
|
if guild is not None:
|
|
return guild
|
|
channel: discord.abc.GuildChannel = bot.get_channel(_id)
|
|
if channel is not None and not isinstance(channel, discord.Thread):
|
|
return channel
|
|
|
|
user: discord.User = bot.get_user(_id)
|
|
if user is not None:
|
|
return user
|
|
|
|
async for guild in AsyncIter(bot.guilds, steps=100):
|
|
role: discord.Role = guild.get_role(_id)
|
|
if role is not None:
|
|
return role
|
|
|
|
all_roles = [
|
|
filter(lambda r: not r.is_default(), guild.roles)
|
|
async for guild in AsyncIter(bot.guilds, steps=100)
|
|
]
|
|
|
|
objects = itertools.chain(bot.get_all_channels(), bot.users, bot.guilds, *all_roles)
|
|
|
|
maybe_matches = []
|
|
async for obj in AsyncIter(objects, steps=100):
|
|
if obj.name == arg or str(obj) == arg:
|
|
maybe_matches.append(obj)
|
|
|
|
if ctx.guild is not None:
|
|
async for member in AsyncIter(ctx.guild.members, steps=100):
|
|
if member.nick == arg and not any(obj.id == member.id for obj in maybe_matches):
|
|
maybe_matches.append(member)
|
|
|
|
if not maybe_matches:
|
|
raise commands.BadArgument(
|
|
_(
|
|
'"{arg}" was not found. It must be the ID, mention, or name of a server, '
|
|
"channel, user or role which the bot can see."
|
|
).format(arg=arg)
|
|
)
|
|
elif len(maybe_matches) == 1:
|
|
return maybe_matches[0]
|
|
else:
|
|
raise commands.BadArgument(
|
|
_(
|
|
'"{arg}" does not refer to a unique server, channel, user or role. Please use '
|
|
"the ID for whatever/whoever you're trying to specify, or mention it/them."
|
|
).format(arg=arg)
|
|
)
|
|
|
|
|
|
class GuildUniqueObjectFinder(commands.Converter):
|
|
async def convert(
|
|
self, ctx: commands.Context, arg: str
|
|
) -> Union[discord.abc.GuildChannel, discord.Member, discord.Role]:
|
|
guild: discord.Guild = ctx.guild
|
|
_id = _match_id(arg)
|
|
|
|
if _id is not None:
|
|
channel: discord.abc.GuildChannel = guild.get_channel(_id)
|
|
if channel is not None:
|
|
return channel
|
|
|
|
member: discord.Member = guild.get_member(_id)
|
|
if member is not None:
|
|
return member
|
|
|
|
role: discord.Role = guild.get_role(_id)
|
|
if role is not None and not role.is_default():
|
|
return role
|
|
|
|
objects = itertools.chain(
|
|
guild.channels, guild.members, filter(lambda r: not r.is_default(), guild.roles)
|
|
)
|
|
|
|
maybe_matches = []
|
|
async for obj in AsyncIter(objects, steps=100):
|
|
if obj.name == arg or str(obj) == arg:
|
|
maybe_matches.append(obj)
|
|
try:
|
|
if obj.nick == arg:
|
|
maybe_matches.append(obj)
|
|
except AttributeError:
|
|
pass
|
|
|
|
if not maybe_matches:
|
|
raise commands.BadArgument(
|
|
_(
|
|
'"{arg}" was not found. It must be the ID, mention, or name of a channel, '
|
|
"user or role in this server."
|
|
).format(arg=arg)
|
|
)
|
|
elif len(maybe_matches) == 1:
|
|
return maybe_matches[0]
|
|
else:
|
|
raise commands.BadArgument(
|
|
_(
|
|
'"{arg}" does not refer to a unique channel, user or role. Please use the ID '
|
|
"for whatever/whoever you're trying to specify, or mention it/them."
|
|
).format(arg=arg)
|
|
)
|
|
|
|
|
|
class CogOrCommand(NamedTuple):
|
|
type: str
|
|
name: str
|
|
obj: Union[commands.Command, commands.Cog]
|
|
|
|
# noinspection PyArgumentList
|
|
@classmethod
|
|
async def convert(cls, ctx: commands.Context, arg: str) -> "CogOrCommand":
|
|
ret = None
|
|
if cog := ctx.bot.get_cog(arg):
|
|
ret = cls(type="COG", name=cog.qualified_name, obj=cog)
|
|
|
|
elif cmd := ctx.bot.get_command(arg):
|
|
ret = cls(type="COMMAND", name=cmd.qualified_name, obj=cmd)
|
|
|
|
if ret:
|
|
if isinstance(ret.obj, commands.commands._RuleDropper):
|
|
raise commands.BadArgument(
|
|
"You cannot apply permission rules to this cog or command."
|
|
)
|
|
return ret
|
|
|
|
raise commands.BadArgument(
|
|
_(
|
|
'Cog or command "{name}" not found. Please note that this is case sensitive.'
|
|
).format(name=arg)
|
|
)
|
|
|
|
|
|
def RuleType(arg: str) -> bool:
|
|
if arg.lower() in ("allow", "whitelist", "allowed"):
|
|
return True
|
|
if arg.lower() in ("deny", "blacklist", "denied"):
|
|
return False
|
|
|
|
raise commands.BadArgument(
|
|
_('"{arg}" is not a valid rule. Valid rules are "allow" or "deny"').format(arg=arg)
|
|
)
|
|
|
|
|
|
def ClearableRuleType(arg: str) -> Optional[bool]:
|
|
if arg.lower() in ("allow", "whitelist", "allowed"):
|
|
return True
|
|
if arg.lower() in ("deny", "blacklist", "denied"):
|
|
return False
|
|
if arg.lower() in ("clear", "reset"):
|
|
return None
|
|
|
|
raise commands.BadArgument(
|
|
_(
|
|
'"{arg}" is not a valid rule. Valid rules are "allow" or "deny", or "clear" to '
|
|
"remove the rule"
|
|
).format(arg=arg)
|
|
)
|