ryujinx-archive/ryuko-ng
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

macro: Allow users to target multiple members when invoking macros (#64)

Browse source 
* macro: Use Greedy type annotation to optionally match multiple members

* Apply black formatting
This commit is contained in:
TSRBerry 2023-06-26 07:47:57 +02:00 committed by GitHub
parent ed26c0f552
commit 2ca94dd377
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
robocop_ng/cogs/macro.py
View file

@ -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(