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
218 lines
6.6 KiB
Python
218 lines
6.6 KiB
Python
# Original source of reaction-based menu idea from
|
|
# https://github.com/Lunar-Dust/Dusty-Cogs/blob/master/menu/menu.py
|
|
#
|
|
# Ported to Red V3 by Palm\_\_ (https://github.com/palmtree5)
|
|
import asyncio
|
|
import contextlib
|
|
import functools
|
|
from typing import Iterable, List, Union
|
|
import discord
|
|
|
|
from .. import commands
|
|
from .predicates import ReactionPredicate
|
|
|
|
_ReactableEmoji = Union[str, discord.Emoji]
|
|
|
|
|
|
async def menu(
|
|
ctx: commands.Context,
|
|
pages: Union[List[str], List[discord.Embed]],
|
|
controls: dict,
|
|
message: discord.Message = None,
|
|
page: int = 0,
|
|
timeout: float = 30.0,
|
|
):
|
|
"""
|
|
An emoji-based menu
|
|
|
|
.. note:: All pages should be of the same type
|
|
|
|
.. note:: All functions for handling what a particular emoji does
|
|
should be coroutines (i.e. :code:`async def`). Additionally,
|
|
they must take all of the parameters of this function, in
|
|
addition to a string representing the emoji reacted with.
|
|
This parameter should be the last one, and none of the
|
|
parameters in the handling functions are optional
|
|
|
|
Parameters
|
|
----------
|
|
ctx: commands.Context
|
|
The command context
|
|
pages: `list` of `str` or `discord.Embed`
|
|
The pages of the menu.
|
|
controls: dict
|
|
A mapping of emoji to the function which handles the action for the
|
|
emoji.
|
|
message: discord.Message
|
|
The message representing the menu. Usually :code:`None` when first opening
|
|
the menu
|
|
page: int
|
|
The current page number of the menu
|
|
timeout: float
|
|
The time (in seconds) to wait for a reaction
|
|
|
|
Raises
|
|
------
|
|
RuntimeError
|
|
If either of the notes above are violated
|
|
"""
|
|
if not isinstance(pages[0], (discord.Embed, str)):
|
|
raise RuntimeError("Pages must be of type discord.Embed or str")
|
|
if not all(isinstance(x, discord.Embed) for x in pages) and not all(
|
|
isinstance(x, str) for x in pages
|
|
):
|
|
raise RuntimeError("All pages must be of the same type")
|
|
for key, value in controls.items():
|
|
maybe_coro = value
|
|
if isinstance(value, functools.partial):
|
|
maybe_coro = value.func
|
|
if not asyncio.iscoroutinefunction(maybe_coro):
|
|
raise RuntimeError("Function must be a coroutine")
|
|
current_page = pages[page]
|
|
|
|
if not message:
|
|
if isinstance(current_page, discord.Embed):
|
|
message = await ctx.send(embed=current_page)
|
|
else:
|
|
message = await ctx.send(current_page)
|
|
# Don't wait for reactions to be added (GH-1797)
|
|
# noinspection PyAsyncCall
|
|
start_adding_reactions(message, controls.keys())
|
|
else:
|
|
try:
|
|
if isinstance(current_page, discord.Embed):
|
|
await message.edit(embed=current_page)
|
|
else:
|
|
await message.edit(content=current_page)
|
|
except discord.NotFound:
|
|
return
|
|
|
|
try:
|
|
predicates = ReactionPredicate.with_emojis(tuple(controls.keys()), message, ctx.author)
|
|
tasks = [
|
|
asyncio.create_task(ctx.bot.wait_for("reaction_add", check=predicates)),
|
|
asyncio.create_task(ctx.bot.wait_for("reaction_remove", check=predicates)),
|
|
]
|
|
done, pending = await asyncio.wait(
|
|
tasks, timeout=timeout, return_when=asyncio.FIRST_COMPLETED
|
|
)
|
|
for task in pending:
|
|
task.cancel()
|
|
|
|
if len(done) == 0:
|
|
raise asyncio.TimeoutError()
|
|
react, user = done.pop().result()
|
|
except asyncio.TimeoutError:
|
|
if not ctx.me:
|
|
return
|
|
try:
|
|
if (
|
|
isinstance(message.channel, discord.PartialMessageable)
|
|
or message.channel.permissions_for(ctx.me).manage_messages
|
|
):
|
|
await message.clear_reactions()
|
|
else:
|
|
raise RuntimeError
|
|
except (discord.Forbidden, RuntimeError): # cannot remove all reactions
|
|
for key in controls.keys():
|
|
try:
|
|
await message.remove_reaction(key, ctx.bot.user)
|
|
except discord.Forbidden:
|
|
return
|
|
except discord.HTTPException:
|
|
pass
|
|
except discord.NotFound:
|
|
return
|
|
else:
|
|
return await controls[react.emoji](
|
|
ctx, pages, controls, message, page, timeout, react.emoji
|
|
)
|
|
|
|
|
|
async def next_page(
|
|
ctx: commands.Context,
|
|
pages: list,
|
|
controls: dict,
|
|
message: discord.Message,
|
|
page: int,
|
|
timeout: float,
|
|
emoji: str,
|
|
):
|
|
if page == len(pages) - 1:
|
|
page = 0 # Loop around to the first item
|
|
else:
|
|
page = page + 1
|
|
return await menu(ctx, pages, controls, message=message, page=page, timeout=timeout)
|
|
|
|
|
|
async def prev_page(
|
|
ctx: commands.Context,
|
|
pages: list,
|
|
controls: dict,
|
|
message: discord.Message,
|
|
page: int,
|
|
timeout: float,
|
|
emoji: str,
|
|
):
|
|
if page == 0:
|
|
page = len(pages) - 1 # Loop around to the last item
|
|
else:
|
|
page = page - 1
|
|
return await menu(ctx, pages, controls, message=message, page=page, timeout=timeout)
|
|
|
|
|
|
async def close_menu(
|
|
ctx: commands.Context,
|
|
pages: list,
|
|
controls: dict,
|
|
message: discord.Message,
|
|
page: int,
|
|
timeout: float,
|
|
emoji: str,
|
|
):
|
|
with contextlib.suppress(discord.NotFound):
|
|
await message.delete()
|
|
|
|
|
|
def start_adding_reactions(
|
|
message: discord.Message, emojis: Iterable[_ReactableEmoji]
|
|
) -> asyncio.Task:
|
|
"""Start adding reactions to a message.
|
|
|
|
This is a non-blocking operation - calling this will schedule the
|
|
reactions being added, but the calling code will continue to
|
|
execute asynchronously. There is no need to await this function.
|
|
|
|
This is particularly useful if you wish to start waiting for a
|
|
reaction whilst the reactions are still being added - in fact,
|
|
this is exactly what `menu` uses to do that.
|
|
|
|
Parameters
|
|
----------
|
|
message: discord.Message
|
|
The message to add reactions to.
|
|
emojis : Iterable[Union[str, discord.Emoji]]
|
|
The emojis to react to the message with.
|
|
|
|
Returns
|
|
-------
|
|
asyncio.Task
|
|
The task for the coroutine adding the reactions.
|
|
|
|
"""
|
|
|
|
async def task():
|
|
# The task should exit silently if the message is deleted
|
|
with contextlib.suppress(discord.NotFound):
|
|
for emoji in emojis:
|
|
await message.add_reaction(emoji)
|
|
|
|
return asyncio.create_task(task())
|
|
|
|
|
|
DEFAULT_CONTROLS = {
|
|
"\N{LEFTWARDS BLACK ARROW}\N{VARIATION SELECTOR-16}": prev_page,
|
|
"\N{CROSS MARK}": close_menu,
|
|
"\N{BLACK RIGHTWARDS ARROW}\N{VARIATION SELECTOR-16}": next_page,
|
|
}
|