CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make [p]selfrole without subcommand "toggle" the selfrole (#4826)

Browse Source 
* Merge selfrole and remove into one command

replacement pr

* docs

add to the docs

* Update admin.py

remove register name

* Update admin.rst

* Fixes

* Fix the duplicated command decorators

* Minimize the diff

Co-authored-by: jack1142 <6032823+jack1142@users.noreply.github.com>
This commit is contained in:
Wyn 2021-02-16 09:16:16 -05:00 committed by GitHub
parent 1be7435fb5
commit bee022d1bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docs/cog_guides/admin.rst
View File

@ -46,13 +46,16 @@ selfrole
.. code-block:: none .. code-block:: none
[p]selfrole [p]selfrole <selfrole>
**Description** **Description**
Add or remove roles to yourself. Those roles must have been configured as user Add or remove a role from yourself. It must have been configured as user settable
settable by admins using the :ref:`selfroleset command by admins using the :ref:`selfroleset command <admin-command-selfroleset>`.
<admin-command-selfroleset>`.
**Arguments**
* ``<selfrole>``: The role you want to attribute or remove from yourself. |role-input|
.. _admin-command-selfrole-add: .. _admin-command-selfrole-add:

20
redbot/cogs/admin/admin.py
View File

@ -391,12 +391,20 @@ class Admin(commands.Cog):
return valid_roles return valid_roles
@commands.guild_only() @commands.guild_only()
@commands.group() @commands.group(invoke_without_command=True)
async def selfrole(self, ctx: commands.Context): async def selfrole(self, ctx: commands.Context, *, selfrole: SelfRole):
"""Apply selfroles.""" """
pass Add or remove a selfrole from yourself.
@selfrole.command(name="add") Server admins must have configured the role as user settable.
NOTE: The role is case sensitive!
"""
if selfrole in ctx.author.roles:
return await self._removerole(ctx, ctx.author, selfrole, check_user=False)
else:
return await self._addrole(ctx, ctx.author, selfrole, check_user=False)
@selfrole.command(name="add", hidden=True)
async def selfrole_add(self, ctx: commands.Context, *, selfrole: SelfRole): async def selfrole_add(self, ctx: commands.Context, *, selfrole: SelfRole):
""" """
Add a selfrole to yourself. Add a selfrole to yourself.
@ -407,7 +415,7 @@ class Admin(commands.Cog):
# noinspection PyTypeChecker # noinspection PyTypeChecker
await self._addrole(ctx, ctx.author, selfrole, check_user=False) await self._addrole(ctx, ctx.author, selfrole, check_user=False)
@selfrole.command(name="remove") @selfrole.command(name="remove", hidden=True)
async def selfrole_remove(self, ctx: commands.Context, *, selfrole: SelfRole): async def selfrole_remove(self, ctx: commands.Context, *, selfrole: SelfRole):
""" """
Remove a selfrole from yourself. Remove a selfrole from yourself.