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

Replace use of asyncio.gather with bounded_gather (#4537)

Browse Source 
* Remove use of asyncio.gather

* black

* typo

* lol 1 character difference

* Let's try this instead

* another typo, it's too early to read

* Add max concurrency on makerole command and prevent multiple roles being added created
This commit is contained in:
TrustyJAID 2020-10-26 18:20:43 -06:00 committed by GitHub
parent fd77e97712
commit b13dec10c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
redbot/cogs/mutes/mutes.py
View File

@ -12,6 +12,7 @@ from .voicemutes import VoiceMutes
from redbot.core.bot import Red
from redbot.core import commands, checks, i18n, modlog, Config
from redbot.core.utils import bounded_gather
from redbot.core.utils.chat_formatting import humanize_timedelta, humanize_list, pagify
from redbot.core.utils.mod import get_audit_reason
from redbot.core.utils.menus import start_adding_reactions
@ -336,7 +337,7 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
tasks.append(
self._auto_channel_unmute_user(guild.get_channel(channel), mute_data, False)
)
results = await asyncio.gather(*tasks)
results = await bounded_gather(*tasks)
unmuted_channels = [guild.get_channel(c) for c in channels.keys()]
for result in results:
if not result:
@ -693,6 +694,7 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
@muteset.command(name="makerole")
@checks.admin_or_permissions(manage_roles=True)
@commands.bot_has_guild_permissions(manage_roles=True)
@commands.max_concurrency(1, commands.BucketType.guild)
async def make_mute_role(self, ctx: commands.Context, *, name: str):
"""Create a Muted role.
@ -702,6 +704,15 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
If you already have a muted role created on the server use
`[p]muteset role ROLE_NAME_HERE`
"""
if await self.config.guild(ctx.guild).mute_role():
command = f"`{ctx.clean_prefix}muteset role`"
return await ctx.send(
_(
"There is already a mute role setup in this server. "
"Please remove it with {command} before trying to "
"create a new one."
).format(command=command)
)
async with ctx.typing():
perms = discord.Permissions()
perms.update(send_messages=False, speak=False, add_reactions=False)
@ -709,20 +720,22 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
role = await ctx.guild.create_role(
name=name, permissions=perms, reason=_("Mute role setup")
)
await self.config.guild(ctx.guild).mute_role.set(role.id)
# save the role early incase of issue later
except discord.errors.Forbidden:
return await ctx.send(_("I could not create a muted role in this server."))
errors = []
tasks = []
for channel in ctx.guild.channels:
tasks.append(self._set_mute_role_overwrites(role, channel))
errors = await asyncio.gather(*tasks)
errors = await bounded_gather(*tasks)
if any(errors):
msg = _(
"I could not set overwrites for the following channels: {channels}"
).format(channels=humanize_list([i for i in errors if i]))
for page in pagify(msg, delims=[" "]):
await ctx.send(page)
await self.config.guild(ctx.guild).mute_role.set(role.id)
await ctx.send(_("Mute role set to {role}").format(role=role.name))
if not await self.config.guild(ctx.guild).notification_channel():
command_1 = f"`{ctx.clean_prefix}muteset notification`"
@ -1341,7 +1354,7 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
tasks = []
for channel in guild.channels:
tasks.append(self.channel_mute_user(guild, channel, author, user, until, reason))
task_result = await asyncio.gather(*tasks)
task_result = await bounded_gather(*tasks)
for task in task_result:
if not task["success"]:
ret["channels"].append((task["channel"], task["reason"]))
@ -1402,7 +1415,7 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
tasks = []
for channel in guild.channels:
tasks.append(self.channel_unmute_user(guild, channel, author, user, reason))
results = await asyncio.gather(*tasks)
results = await bounded_gather(*tasks)
for task in results:
if not task["success"]:
ret["channels"].append((task["channel"], task["reason"]))