mirror of
https://github.com/Ryujinx/ryuko-ng.git
synced 2024-12-22 20:35:36 +00:00
macro: Allow users to target multiple members when invoking macros (#64)
* macro: Use Greedy type annotation to optionally match multiple members * Apply black formatting
This commit is contained in:
parent
ed26c0f552
commit
2ca94dd377
|
@ -2,7 +2,7 @@ from typing import Optional
|
||||||
|
|
||||||
import discord
|
import discord
|
||||||
from discord.ext import commands
|
from discord.ext import commands
|
||||||
from discord.ext.commands import Cog, Context, BucketType
|
from discord.ext.commands import Cog, Context, BucketType, Greedy
|
||||||
|
|
||||||
from robocop_ng.helpers.checks import check_if_staff, check_if_staff_or_dm
|
from robocop_ng.helpers.checks import check_if_staff, check_if_staff_or_dm
|
||||||
from robocop_ng.helpers.macros import (
|
from robocop_ng.helpers.macros import (
|
||||||
|
@ -24,14 +24,16 @@ class Macro(Cog):
|
||||||
@commands.cooldown(3, 30, BucketType.member)
|
@commands.cooldown(3, 30, BucketType.member)
|
||||||
@commands.command(aliases=["m"])
|
@commands.command(aliases=["m"])
|
||||||
async def macro(
|
async def macro(
|
||||||
self, ctx: Context, key: str, target: Optional[discord.Member] = None
|
self, ctx: Context, key: str, targets: Greedy[discord.Member] = None
|
||||||
):
|
):
|
||||||
await ctx.message.delete()
|
await ctx.message.delete()
|
||||||
if len(key) > 0:
|
if len(key) > 0:
|
||||||
text = get_macro(self.bot, key)
|
text = get_macro(self.bot, key)
|
||||||
if text is not None:
|
if text is not None:
|
||||||
if target is not None:
|
if targets is not None:
|
||||||
await ctx.send(f"{target.mention}:\n{text}")
|
await ctx.send(
|
||||||
|
f"{', '.join(target.mention for target in targets)}:\n{text}"
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
if ctx.message.reference is not None:
|
if ctx.message.reference is not None:
|
||||||
await ctx.send(
|
await ctx.send(
|
||||||
|
|
Loading…
Reference in a new issue