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
242 lines
9.4 KiB
Python
242 lines
9.4 KiB
Python
from typing import Optional, Tuple, Union
|
|
from datetime import timezone, timedelta, datetime
|
|
from .abc import MixinMeta
|
|
|
|
import discord
|
|
from redbot.core import commands, checks, i18n, modlog
|
|
from redbot.core.utils.chat_formatting import (
|
|
bold,
|
|
humanize_timedelta,
|
|
humanize_list,
|
|
pagify,
|
|
format_perms_list,
|
|
)
|
|
from redbot.core.utils.mod import get_audit_reason
|
|
|
|
from .converters import MuteTime
|
|
|
|
_ = i18n.Translator("Mutes", __file__)
|
|
|
|
|
|
class VoiceMutes(MixinMeta):
|
|
"""
|
|
This handles all voice channel related muting
|
|
"""
|
|
|
|
@staticmethod
|
|
async def _voice_perm_check(
|
|
ctx: commands.Context, user_voice_state: Optional[discord.VoiceState], **perms: bool
|
|
) -> Tuple[bool, Optional[str]]:
|
|
"""Check if the bot and user have sufficient permissions for voicebans.
|
|
|
|
This also verifies that the user's voice state and connected
|
|
channel are not ``None``.
|
|
|
|
Returns
|
|
-------
|
|
bool
|
|
``True`` if the permissions are sufficient and the user has
|
|
a valid voice state.
|
|
|
|
"""
|
|
if user_voice_state is None or user_voice_state.channel is None:
|
|
return False, _("That user is not in a voice channel.")
|
|
voice_channel: discord.VoiceChannel = user_voice_state.channel
|
|
required_perms = discord.Permissions()
|
|
required_perms.update(**perms)
|
|
if not voice_channel.permissions_for(ctx.me) >= required_perms:
|
|
return (
|
|
False,
|
|
_("I require the {perms} permission(s) in that user's channel to do that.").format(
|
|
perms=format_perms_list(required_perms)
|
|
),
|
|
)
|
|
if (
|
|
ctx.permission_state is commands.PermState.NORMAL
|
|
and not voice_channel.permissions_for(ctx.author) >= required_perms
|
|
):
|
|
return (
|
|
False,
|
|
_(
|
|
"You must have the {perms} permission(s) in that user's channel to use this "
|
|
"command."
|
|
).format(perms=format_perms_list(required_perms)),
|
|
)
|
|
return True, None
|
|
|
|
@commands.command(name="voicemute", usage="<users...> [reason]")
|
|
@commands.guild_only()
|
|
async def voice_mute(
|
|
self,
|
|
ctx: commands.Context,
|
|
users: commands.Greedy[discord.Member],
|
|
*,
|
|
time_and_reason: MuteTime = {},
|
|
):
|
|
"""Mute a user in their current voice channel.
|
|
|
|
`<users...>` is a space separated list of usernames, ID's, or mentions.
|
|
`[time_and_reason]` is the time to mute for and reason. Time is
|
|
any valid time length such as `30 minutes` or `2 days`. If nothing
|
|
is provided the mute will use the set default time or indefinite if not set.
|
|
|
|
Examples:
|
|
`[p]voicemute @member1 @member2 spam 5 hours`
|
|
`[p]voicemute @member1 3 days`"""
|
|
if not users:
|
|
return await ctx.send_help()
|
|
if ctx.me in users:
|
|
return await ctx.send(_("You cannot mute me."))
|
|
if ctx.author in users:
|
|
return await ctx.send(_("You cannot mute yourself."))
|
|
async with ctx.typing():
|
|
success_list = []
|
|
issue_list = []
|
|
for user in users:
|
|
user_voice_state = user.voice
|
|
can_move, perm_reason = await self._voice_perm_check(
|
|
ctx, user_voice_state, mute_members=True, manage_permissions=True
|
|
)
|
|
if not can_move:
|
|
issue_list.append((user, perm_reason))
|
|
continue
|
|
duration = time_and_reason.get("duration", None)
|
|
reason = time_and_reason.get("reason", None)
|
|
time = ""
|
|
until = None
|
|
if duration:
|
|
until = datetime.now(timezone.utc) + duration
|
|
time = _(" for {duration}").format(
|
|
duration=humanize_timedelta(timedelta=duration)
|
|
)
|
|
else:
|
|
default_duration = await self.config.guild(ctx.guild).default_time()
|
|
if default_duration:
|
|
until = datetime.now(timezone.utc) + timedelta(seconds=default_duration)
|
|
time = _(" for {duration}").format(
|
|
duration=humanize_timedelta(
|
|
timedelta=timedelta(seconds=default_duration)
|
|
)
|
|
)
|
|
guild = ctx.guild
|
|
author = ctx.author
|
|
channel = user_voice_state.channel
|
|
audit_reason = get_audit_reason(author, reason, shorten=True)
|
|
|
|
success = await self.channel_mute_user(
|
|
guild, channel, author, user, until, audit_reason
|
|
)
|
|
|
|
if success["success"]:
|
|
if "reason" in success and success["reason"]:
|
|
issue_list.append((user, success["reason"]))
|
|
else:
|
|
success_list.append(user)
|
|
await modlog.create_case(
|
|
self.bot,
|
|
guild,
|
|
ctx.message.created_at,
|
|
"vmute",
|
|
user,
|
|
author,
|
|
reason,
|
|
until=until,
|
|
channel=channel,
|
|
)
|
|
await self._send_dm_notification(
|
|
user, author, guild, _("Voice mute"), reason, duration
|
|
)
|
|
async with self.config.member(user).perms_cache() as cache:
|
|
cache[channel.id] = success["old_overs"]
|
|
else:
|
|
issue_list.append((user, success["reason"]))
|
|
|
|
if success_list:
|
|
msg = _("{users} has been muted in this channel{time}.")
|
|
if len(success_list) > 1:
|
|
msg = _("{users} have been muted in this channel{time}.")
|
|
await ctx.send(
|
|
msg.format(users=humanize_list([f"{u}" for u in success_list]), time=time)
|
|
)
|
|
if issue_list:
|
|
msg = _("The following users could not be muted\n")
|
|
for user, issue in issue_list:
|
|
msg += f"{user}: {issue}\n"
|
|
await ctx.send_interactive(pagify(msg))
|
|
|
|
@commands.command(name="voiceunmute", usage="<users...> [reason]")
|
|
@commands.guild_only()
|
|
async def unmute_voice(
|
|
self,
|
|
ctx: commands.Context,
|
|
users: commands.Greedy[discord.Member],
|
|
*,
|
|
reason: Optional[str] = None,
|
|
):
|
|
"""Unmute a user in their current voice channel.
|
|
|
|
`<users...>` is a space separated list of usernames, ID's, or mentions.
|
|
`[reason]` is the reason for the unmute."""
|
|
if not users:
|
|
return await ctx.send_help()
|
|
if ctx.me in users:
|
|
return await ctx.send(_("You cannot unmute me."))
|
|
if ctx.author in users:
|
|
return await ctx.send(_("You cannot unmute yourself."))
|
|
async with ctx.typing():
|
|
issue_list = []
|
|
success_list = []
|
|
for user in users:
|
|
user_voice_state = user.voice
|
|
can_move, perm_reason = await self._voice_perm_check(
|
|
ctx, user_voice_state, mute_members=True, manage_permissions=True
|
|
)
|
|
if not can_move:
|
|
issue_list.append((user, perm_reason))
|
|
continue
|
|
guild = ctx.guild
|
|
author = ctx.author
|
|
channel = user_voice_state.channel
|
|
audit_reason = get_audit_reason(author, reason, shorten=True)
|
|
|
|
success = await self.channel_unmute_user(
|
|
guild, channel, author, user, audit_reason
|
|
)
|
|
|
|
if success["success"]:
|
|
if "reason" in success and success["reason"]:
|
|
issue_list.append((user, success["reason"]))
|
|
else:
|
|
success_list.append(user)
|
|
await modlog.create_case(
|
|
self.bot,
|
|
guild,
|
|
ctx.message.created_at,
|
|
"vunmute",
|
|
user,
|
|
author,
|
|
reason,
|
|
until=None,
|
|
channel=channel,
|
|
)
|
|
await self._send_dm_notification(
|
|
user, author, guild, _("Voice unmute"), reason
|
|
)
|
|
else:
|
|
issue_list.append((user, success["reason"]))
|
|
if success_list:
|
|
if channel.id in self._channel_mutes and self._channel_mutes[channel.id]:
|
|
await self.config.channel(channel).muted_users.set(self._channel_mutes[channel.id])
|
|
else:
|
|
await self.config.channel(channel).muted_users.clear()
|
|
await ctx.send(
|
|
_("{users} unmuted in this channel.").format(
|
|
users=humanize_list([f"{u}" for u in success_list])
|
|
)
|
|
)
|
|
if issue_list:
|
|
msg = _("The following users could not be unmuted\n")
|
|
for user, issue in issue_list:
|
|
msg += f"{user}: {issue}\n"
|
|
await ctx.send_interactive(pagify(msg))
|