mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-21 18:27:59 -05:00
Move mutes to new cog, add role-based and temporary mutes (#3634)
* revert the revert the revert git is hard... * and remove old mutes * make voicemutes less yelly * fix error when no args present in mute commands * update docstrings * address review * black * oops * fix voicemutes * remove mutes.py file * Remove _voice_perm_check from mod since it's now in mutes cog * remove naive datetimes prevent muting the bot prevent muting yourself fix error message when lots of channels are present * change alias for channelunmute Be more verbose for creating default mute role * add `[p]activemutes` to show current mutes in the server and time remaining on the mutes * improve resolution of unmute time * black * Show indefinite mutes in activemutes and only show the current servers mutes in activemutes * replace message.created_at with timezone aware timezone * remove "server" from activemutes to clean up look since channelmutes will show channel * better cache management, add tracking for manual muted role removal in the cache and modlog cases * Fix keyerror in mutes command when unsuccessful mutes * add typing indicator and improve config settings * flake8 issue * add one time message when attempting to mute without a role set, consume rate limits across channels for overwrite mutes * Don't clear the whole guilds settings when a mute is finished. Optimize server mutes to better handle migration to API method later. Fix typehints. * Utilize usage to make converter make more sense * remove decorator permission checks and fix doc strings * handle role changes better * More sanely handle channel mutes return and improve failed mutes dialogue. Re-enable task cleaner. Reduce wait time to improve resolution of mute time. * Handle re-mute on leave properly * fix unbound error in overwrites mute * revert the revert the revert git is hard... * and remove old mutes * make voicemutes less yelly * fix error when no args present in mute commands * update docstrings * address review * black * oops * fix voicemutes * Remove _voice_perm_check from mod since it's now in mutes cog * remove naive datetimes prevent muting the bot prevent muting yourself fix error message when lots of channels are present * change alias for channelunmute Be more verbose for creating default mute role * add `[p]activemutes` to show current mutes in the server and time remaining on the mutes * improve resolution of unmute time * black * Show indefinite mutes in activemutes and only show the current servers mutes in activemutes * replace message.created_at with timezone aware timezone * remove "server" from activemutes to clean up look since channelmutes will show channel * better cache management, add tracking for manual muted role removal in the cache and modlog cases * Fix keyerror in mutes command when unsuccessful mutes * add typing indicator and improve config settings * flake8 issue * add one time message when attempting to mute without a role set, consume rate limits across channels for overwrite mutes * Don't clear the whole guilds settings when a mute is finished. Optimize server mutes to better handle migration to API method later. Fix typehints. * Utilize usage to make converter make more sense * remove decorator permission checks and fix doc strings * handle role changes better * More sanely handle channel mutes return and improve failed mutes dialogue. Re-enable task cleaner. Reduce wait time to improve resolution of mute time. * Handle re-mute on leave properly * fix unbound error in overwrites mute * remove mutes.pt * remove reliance on mods is_allowed_by_hierarchy since we don't have a setting to control that anyways inside this. * black * fix hierarchy check * wtf * Cache mute roles for large bots * fix lint * fix this error * Address review 1 * lint * fix string i18n issue * remove unused typing.Coroutine import and fix i18n again * missed this docstring * Put voiceban and voiceunban back in mod where it's more appropriate * Address review 2 electric boogaloo * Make voicemutes use same methods as channel mute * black * handle humanize_list doesn't accept generators * update voicemutes docstrings * make voiceperm check consistent with rest of error handling * bleh * fix modlog case spam when overrides are in place * <a:pandaexplode:639975629793787922> * bleck * use total_seconds() instead of a dict, sorry everyone already using this lmao * <:excited:474074780887285776> This should be everything * black * fix the things * bleh * more cleanup * lmao hang on * fix voice mutes thingy * Title Case Permissions * oh I see * I'm running out of funny one-liners for commit messages * oof * ugh * let's try this * voicemutes manage_permissions * Cleanup mutes if they expire when member is not present * black * linters go brr Co-authored-by: Drapersniper <27962761+drapersniper@users.noreply.github.com>
This commit is contained in:
TrustyJAID
GitHub
@@ -8,7 +8,13 @@ import discord
|
||||
from redbot.core import commands, i18n, checks, modlog
|
||||
from redbot.core.commands import UserInputOptional
|
||||
from redbot.core.utils import AsyncIter
|
||||
from redbot.core.utils.chat_formatting import pagify, humanize_number, bold, humanize_list
|
||||
from redbot.core.utils.chat_formatting import (
|
||||
pagify,
|
||||
humanize_number,
|
||||
bold,
|
||||
humanize_list,
|
||||
format_perms_list,
|
||||
)
|
||||
from redbot.core.utils.mod import get_audit_reason
|
||||
from .abc import MixinMeta
|
||||
from .converters import RawUserIds
|
||||
@@ -60,6 +66,48 @@ class KickBanMixin(MixinMeta):
|
||||
except discord.HTTPException:
|
||||
return
|
||||
|
||||
@staticmethod
|
||||
async def _voice_perm_check(
|
||||
ctx: commands.Context, user_voice_state: Optional[discord.VoiceState], **perms: bool
|
||||
) -> bool:
|
||||
"""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:
|
||||
await ctx.send(_("That user is not in a voice channel."))
|
||||
return False
|
||||
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:
|
||||
await ctx.send(
|
||||
_("I require the {perms} permission(s) in that user's channel to do that.").format(
|
||||
perms=format_perms_list(required_perms)
|
||||
)
|
||||
)
|
||||
return False
|
||||
if (
|
||||
ctx.permission_state is commands.PermState.NORMAL
|
||||
and not voice_channel.permissions_for(ctx.author) >= required_perms
|
||||
):
|
||||
await ctx.send(
|
||||
_(
|
||||
"You must have the {perms} permission(s) in that user's channel to use this "
|
||||
"command."
|
||||
).format(perms=format_perms_list(required_perms))
|
||||
)
|
||||
return False
|
||||
return True
|
||||
|
||||
async def ban_user(
|
||||
self,
|
||||
user: Union[discord.Member, discord.User, discord.Object],
|
||||
@@ -678,6 +726,88 @@ class KickBanMixin(MixinMeta):
|
||||
channel=case_channel,
|
||||
)
|
||||
|
||||
@commands.command()
|
||||
@commands.guild_only()
|
||||
@checks.admin_or_permissions(mute_members=True, deafen_members=True)
|
||||
async def voiceunban(self, ctx: commands.Context, user: discord.Member, *, reason: str = None):
|
||||
"""Unban a user from speaking and listening in the server's voice channels."""
|
||||
user_voice_state = user.voice
|
||||
if (
|
||||
await self._voice_perm_check(
|
||||
ctx, user_voice_state, deafen_members=True, mute_members=True
|
||||
)
|
||||
is False
|
||||
):
|
||||
return
|
||||
needs_unmute = True if user_voice_state.mute else False
|
||||
needs_undeafen = True if user_voice_state.deaf else False
|
||||
audit_reason = get_audit_reason(ctx.author, reason)
|
||||
if needs_unmute and needs_undeafen:
|
||||
await user.edit(mute=False, deafen=False, reason=audit_reason)
|
||||
elif needs_unmute:
|
||||
await user.edit(mute=False, reason=audit_reason)
|
||||
elif needs_undeafen:
|
||||
await user.edit(deafen=False, reason=audit_reason)
|
||||
else:
|
||||
await ctx.send(_("That user isn't muted or deafened by the server."))
|
||||
return
|
||||
|
||||
guild = ctx.guild
|
||||
author = ctx.author
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
"voiceunban",
|
||||
user,
|
||||
author,
|
||||
reason,
|
||||
until=None,
|
||||
channel=None,
|
||||
)
|
||||
await ctx.send(_("User is now allowed to speak and listen in voice channels."))
|
||||
|
||||
@commands.command()
|
||||
@commands.guild_only()
|
||||
@checks.admin_or_permissions(mute_members=True, deafen_members=True)
|
||||
async def voiceban(self, ctx: commands.Context, user: discord.Member, *, reason: str = None):
|
||||
"""Ban a user from speaking and listening in the server's voice channels."""
|
||||
user_voice_state: discord.VoiceState = user.voice
|
||||
if (
|
||||
await self._voice_perm_check(
|
||||
ctx, user_voice_state, deafen_members=True, mute_members=True
|
||||
)
|
||||
is False
|
||||
):
|
||||
return
|
||||
needs_mute = True if user_voice_state.mute is False else False
|
||||
needs_deafen = True if user_voice_state.deaf is False else False
|
||||
audit_reason = get_audit_reason(ctx.author, reason)
|
||||
author = ctx.author
|
||||
guild = ctx.guild
|
||||
if needs_mute and needs_deafen:
|
||||
await user.edit(mute=True, deafen=True, reason=audit_reason)
|
||||
elif needs_mute:
|
||||
await user.edit(mute=True, reason=audit_reason)
|
||||
elif needs_deafen:
|
||||
await user.edit(deafen=True, reason=audit_reason)
|
||||
else:
|
||||
await ctx.send(_("That user is already muted and deafened server-wide."))
|
||||
return
|
||||
|
||||
await modlog.create_case(
|
||||
self.bot,
|
||||
guild,
|
||||
ctx.message.created_at.replace(tzinfo=timezone.utc),
|
||||
"voiceban",
|
||||
user,
|
||||
author,
|
||||
reason,
|
||||
until=None,
|
||||
channel=None,
|
||||
)
|
||||
await ctx.send(_("User has been banned from speaking or listening in voice channels."))
|
||||
|
||||
@commands.command()
|
||||
@commands.guild_only()
|
||||
@commands.bot_has_permissions(ban_members=True)
|
||||
|
||||
Reference in New Issue
Block a user