mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-06 03:08:55 -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
202 lines
8.0 KiB
Python
202 lines
8.0 KiB
Python
import asyncio
|
|
import logging
|
|
import re
|
|
from abc import ABC
|
|
from collections import defaultdict
|
|
from typing import List, Tuple, Literal
|
|
|
|
import discord
|
|
from redbot.core.utils import AsyncIter
|
|
|
|
from redbot.core import Config, modlog, commands
|
|
from redbot.core.bot import Red
|
|
from redbot.core.i18n import Translator, cog_i18n
|
|
from redbot.core.utils._internal_utils import send_to_owners_with_prefix_replaced
|
|
from redbot.core.utils.chat_formatting import inline
|
|
from .events import Events
|
|
from .kickban import KickBanMixin
|
|
from .names import ModInfo
|
|
from .slowmode import Slowmode
|
|
from .settings import ModSettings
|
|
|
|
_ = T_ = Translator("Mod", __file__)
|
|
|
|
__version__ = "1.2.0"
|
|
|
|
|
|
class CompositeMetaClass(type(commands.Cog), type(ABC)):
|
|
"""
|
|
This allows the metaclass used for proper type detection to
|
|
coexist with discord.py's metaclass
|
|
"""
|
|
|
|
pass
|
|
|
|
|
|
@cog_i18n(_)
|
|
class Mod(
|
|
ModSettings,
|
|
Events,
|
|
KickBanMixin,
|
|
ModInfo,
|
|
Slowmode,
|
|
commands.Cog,
|
|
metaclass=CompositeMetaClass,
|
|
):
|
|
"""Moderation tools."""
|
|
|
|
default_global_settings = {
|
|
"version": "",
|
|
"track_all_names": True,
|
|
}
|
|
|
|
default_guild_settings = {
|
|
"mention_spam": {"ban": None, "kick": None, "warn": None, "strict": False},
|
|
"delete_repeats": -1,
|
|
"ignored": False,
|
|
"respect_hierarchy": True,
|
|
"delete_delay": -1,
|
|
"reinvite_on_unban": False,
|
|
"current_tempbans": [],
|
|
"dm_on_kickban": False,
|
|
"default_days": 0,
|
|
"default_tempban_duration": 60 * 60 * 24,
|
|
"track_nicknames": True,
|
|
}
|
|
|
|
default_channel_settings = {"ignored": False}
|
|
|
|
default_member_settings = {"past_nicks": [], "perms_cache": {}, "banned_until": False}
|
|
|
|
default_user_settings = {"past_names": []}
|
|
|
|
def __init__(self, bot: Red):
|
|
super().__init__()
|
|
self.bot = bot
|
|
|
|
self.config = Config.get_conf(self, 4961522000, force_registration=True)
|
|
self.config.register_global(**self.default_global_settings)
|
|
self.config.register_guild(**self.default_guild_settings)
|
|
self.config.register_channel(**self.default_channel_settings)
|
|
self.config.register_member(**self.default_member_settings)
|
|
self.config.register_user(**self.default_user_settings)
|
|
self.cache: dict = {}
|
|
self.tban_expiry_task = asyncio.create_task(self.tempban_expirations_task())
|
|
self.last_case: dict = defaultdict(dict)
|
|
|
|
async def red_delete_data_for_user(
|
|
self,
|
|
*,
|
|
requester: Literal["discord_deleted_user", "owner", "user", "user_strict"],
|
|
user_id: int,
|
|
):
|
|
if requester != "discord_deleted_user":
|
|
return
|
|
|
|
all_members = await self.config.all_members()
|
|
|
|
async for guild_id, guild_data in AsyncIter(all_members.items(), steps=100):
|
|
if user_id in guild_data:
|
|
await self.config.member_from_ids(guild_id, user_id).clear()
|
|
|
|
await self.config.user_from_id(user_id).clear()
|
|
|
|
guild_data = await self.config.all_guilds()
|
|
|
|
async for guild_id, guild_data in AsyncIter(guild_data.items(), steps=100):
|
|
if user_id in guild_data["current_tempbans"]:
|
|
async with self.config.guild_from_id(guild_id).current_tempbans() as tbs:
|
|
try:
|
|
tbs.remove(user_id)
|
|
except ValueError:
|
|
pass
|
|
# possible with a context switch between here and getting all guilds
|
|
|
|
async def cog_load(self) -> None:
|
|
await self._maybe_update_config()
|
|
|
|
def cog_unload(self):
|
|
self.tban_expiry_task.cancel()
|
|
|
|
async def _maybe_update_config(self):
|
|
"""Maybe update `delete_delay` value set by Config prior to Mod 1.0.0."""
|
|
if not await self.config.version():
|
|
guild_dict = await self.config.all_guilds()
|
|
async for guild_id, info in AsyncIter(guild_dict.items(), steps=25):
|
|
delete_repeats = info.get("delete_repeats", False)
|
|
if delete_repeats:
|
|
val = 3
|
|
else:
|
|
val = -1
|
|
await self.config.guild_from_id(guild_id).delete_repeats.set(val)
|
|
await self.config.version.set("1.0.0") # set version of last update
|
|
if await self.config.version() < "1.1.0":
|
|
message_sent = False
|
|
async for e in AsyncIter((await self.config.all_channels()).values(), steps=25):
|
|
if e["ignored"] is not False:
|
|
msg = _(
|
|
"Ignored guilds and channels have been moved. "
|
|
"Please use {command} to migrate the old settings."
|
|
).format(command=inline("[p]moveignoredchannels"))
|
|
asyncio.create_task(send_to_owners_with_prefix_replaced(self.bot, msg))
|
|
message_sent = True
|
|
break
|
|
if message_sent is False:
|
|
async for e in AsyncIter((await self.config.all_guilds()).values(), steps=25):
|
|
if e["ignored"] is not False:
|
|
msg = _(
|
|
"Ignored guilds and channels have been moved. "
|
|
"Please use {command} to migrate the old settings."
|
|
).format(command=inline("[p]moveignoredchannels"))
|
|
asyncio.create_task(send_to_owners_with_prefix_replaced(self.bot, msg))
|
|
break
|
|
await self.config.version.set("1.1.0")
|
|
if await self.config.version() < "1.2.0":
|
|
async for e in AsyncIter((await self.config.all_guilds()).values(), steps=25):
|
|
if e["delete_delay"] != -1:
|
|
msg = _(
|
|
"Delete delay settings have been moved. "
|
|
"Please use {command} to migrate the old settings."
|
|
).format(command=inline("[p]movedeletedelay"))
|
|
asyncio.create_task(send_to_owners_with_prefix_replaced(self.bot, msg))
|
|
break
|
|
await self.config.version.set("1.2.0")
|
|
if await self.config.version() < "1.3.0":
|
|
guild_dict = await self.config.all_guilds()
|
|
async for guild_id in AsyncIter(guild_dict.keys(), steps=25):
|
|
async with self.config.guild_from_id(guild_id).all() as guild_data:
|
|
current_state = guild_data.pop("ban_mention_spam", False)
|
|
if current_state is not False:
|
|
if "mention_spam" not in guild_data:
|
|
guild_data["mention_spam"] = {}
|
|
guild_data["mention_spam"]["ban"] = current_state
|
|
await self.config.version.set("1.3.0")
|
|
|
|
@commands.command()
|
|
@commands.is_owner()
|
|
async def moveignoredchannels(self, ctx: commands.Context) -> None:
|
|
"""Move ignored channels and servers to core"""
|
|
all_guilds = await self.config.all_guilds()
|
|
all_channels = await self.config.all_channels()
|
|
for guild_id, settings in all_guilds.items():
|
|
await self.bot._config.guild_from_id(guild_id).ignored.set(settings["ignored"])
|
|
await self.config.guild_from_id(guild_id).ignored.clear()
|
|
for channel_id, settings in all_channels.items():
|
|
await self.bot._config.channel_from_id(channel_id).ignored.set(settings["ignored"])
|
|
await self.config.channel_from_id(channel_id).clear()
|
|
await ctx.send(_("Ignored channels and guilds restored."))
|
|
|
|
@commands.command()
|
|
@commands.is_owner()
|
|
async def movedeletedelay(self, ctx: commands.Context) -> None:
|
|
"""
|
|
Move deletedelay settings to core
|
|
"""
|
|
all_guilds = await self.config.all_guilds()
|
|
for guild_id, settings in all_guilds.items():
|
|
await self.bot._config.guild_from_id(guild_id).delete_delay.set(
|
|
settings["delete_delay"]
|
|
)
|
|
await self.config.guild_from_id(guild_id).delete_delay.clear()
|
|
await ctx.send(_("Delete delay settings restored."))
|