mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-12-05 17:02: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
@@ -29,23 +29,13 @@ class KickBanMixin(MixinMeta):
|
||||
"""
|
||||
|
||||
@staticmethod
|
||||
async def get_invite_for_reinvite(ctx: commands.Context, max_age: int = 86400):
|
||||
"""Handles the reinvite logic for getting an invite
|
||||
to send the newly unbanned user
|
||||
:returns: :class:`Invite`"""
|
||||
async def get_invite_for_reinvite(ctx: commands.Context, max_age: int = 86400) -> str:
|
||||
"""Handles the reinvite logic for getting an invite to send the newly unbanned user"""
|
||||
guild = ctx.guild
|
||||
my_perms: discord.Permissions = guild.me.guild_permissions
|
||||
if my_perms.manage_guild or my_perms.administrator:
|
||||
if "VANITY_URL" in guild.features:
|
||||
# guild has a vanity url so use it as the one to send
|
||||
try:
|
||||
return await guild.vanity_invite()
|
||||
except discord.NotFound:
|
||||
# If a guild has the vanity url feature,
|
||||
# but does not have it set up,
|
||||
# this prevents the command from failing
|
||||
# and defaults back to another regular invite.
|
||||
pass
|
||||
if guild.vanity_url is not None:
|
||||
return guild.vanity_url
|
||||
invites = await guild.invites()
|
||||
else:
|
||||
invites = []
|
||||
@@ -55,22 +45,22 @@ class KickBanMixin(MixinMeta):
|
||||
# has unlimited uses, doesn't expire, and
|
||||
# doesn't grant temporary membership
|
||||
# (i.e. they won't be kicked on disconnect)
|
||||
return inv
|
||||
return inv.url
|
||||
else: # No existing invite found that is valid
|
||||
channels_and_perms = zip(
|
||||
guild.text_channels, map(guild.me.permissions_in, guild.text_channels)
|
||||
channels_and_perms = (
|
||||
(channel, channel.permissions_for(guild.me)) for channel in guild.text_channels
|
||||
)
|
||||
channel = next(
|
||||
(channel for channel, perms in channels_and_perms if perms.create_instant_invite),
|
||||
None,
|
||||
)
|
||||
if channel is None:
|
||||
return
|
||||
return ""
|
||||
try:
|
||||
# Create invite that expires after max_age
|
||||
return await channel.create_invite(max_age=max_age)
|
||||
return (await channel.create_invite(max_age=max_age)).url
|
||||
except discord.HTTPException:
|
||||
return
|
||||
return ""
|
||||
|
||||
@staticmethod
|
||||
async def _voice_perm_check(
|
||||
@@ -220,7 +210,7 @@ class KickBanMixin(MixinMeta):
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
ctx.message.created_at,
|
||||
ban_type,
|
||||
user,
|
||||
author,
|
||||
@@ -356,7 +346,7 @@ class KickBanMixin(MixinMeta):
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
ctx.message.created_at,
|
||||
"kick",
|
||||
member,
|
||||
author,
|
||||
@@ -566,7 +556,7 @@ class KickBanMixin(MixinMeta):
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
ctx.message.created_at,
|
||||
"hackban",
|
||||
user_id,
|
||||
author,
|
||||
@@ -636,8 +626,6 @@ class KickBanMixin(MixinMeta):
|
||||
await ctx.send(_("Invalid days. Must be between 0 and 7."))
|
||||
return
|
||||
invite = await self.get_invite_for_reinvite(ctx, int(duration.total_seconds() + 86400))
|
||||
if invite is None:
|
||||
invite = ""
|
||||
|
||||
await self.config.member(member).banned_until.set(unban_time.timestamp())
|
||||
async with self.config.guild(guild).current_tempbans() as current_tempbans:
|
||||
@@ -646,7 +634,7 @@ class KickBanMixin(MixinMeta):
|
||||
with contextlib.suppress(discord.HTTPException):
|
||||
# We don't want blocked DMs preventing us from banning
|
||||
msg = _("You have been temporarily banned from {server_name} until {date}.").format(
|
||||
server_name=guild.name, date=f"<t:{int(unban_time.timestamp())}>"
|
||||
server_name=guild.name, date=discord.utils.format_dt(unban_time)
|
||||
)
|
||||
if guild_data["dm_on_kickban"] and reason:
|
||||
msg += _("\n\n**Reason:** {reason}").format(reason=reason)
|
||||
@@ -668,7 +656,7 @@ class KickBanMixin(MixinMeta):
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
ctx.message.created_at,
|
||||
"tempban",
|
||||
member,
|
||||
author,
|
||||
@@ -706,8 +694,6 @@ class KickBanMixin(MixinMeta):
|
||||
audit_reason = get_audit_reason(author, reason, shorten=True)
|
||||
|
||||
invite = await self.get_invite_for_reinvite(ctx)
|
||||
if invite is None:
|
||||
invite = ""
|
||||
|
||||
try: # We don't want blocked DMs preventing us from banning
|
||||
msg = await member.send(
|
||||
@@ -750,7 +736,7 @@ class KickBanMixin(MixinMeta):
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
ctx.message.created_at,
|
||||
"softban",
|
||||
member,
|
||||
author,
|
||||
@@ -797,7 +783,7 @@ class KickBanMixin(MixinMeta):
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
ctx.message.created_at,
|
||||
"vkick",
|
||||
member,
|
||||
author,
|
||||
@@ -840,7 +826,7 @@ class KickBanMixin(MixinMeta):
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
ctx.message.created_at,
|
||||
"voiceunban",
|
||||
member,
|
||||
author,
|
||||
@@ -881,7 +867,7 @@ class KickBanMixin(MixinMeta):
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
ctx.message.created_at,
|
||||
"voiceban",
|
||||
member,
|
||||
author,
|
||||
@@ -921,7 +907,7 @@ class KickBanMixin(MixinMeta):
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
ctx.message.created_at,
|
||||
"unban",
|
||||
ban_entry.user,
|
||||
author,
|
||||
@@ -946,7 +932,7 @@ class KickBanMixin(MixinMeta):
|
||||
_(
|
||||
"You've been unbanned from {server}.\n"
|
||||
"Here is an invite for that server: {invite_link}"
|
||||
).format(server=guild.name, invite_link=invite.url)
|
||||
).format(server=guild.name, invite_link=invite)
|
||||
)
|
||||
except discord.Forbidden:
|
||||
await ctx.send(
|
||||
@@ -954,12 +940,12 @@ class KickBanMixin(MixinMeta):
|
||||
"I failed to send an invite to that user. "
|
||||
"Perhaps you may be able to send it for me?\n"
|
||||
"Here's the invite link: {invite_link}"
|
||||
).format(invite_link=invite.url)
|
||||
).format(invite_link=invite)
|
||||
)
|
||||
except discord.HTTPException:
|
||||
await ctx.send(
|
||||
_(
|
||||
"Something went wrong when attempting to send that user "
|
||||
"an invite. Here's the link so you can try: {invite_link}"
|
||||
).format(invite_link=invite.url)
|
||||
).format(invite_link=invite)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user