mirror of
https://github.com/Cog-Creators/Red-DiscordBot.git
synced 2025-11-07 03:38:53 -05:00
[Mutes] Add guild ID to mutes data (#4906)
* [Mutes] Add guild ID to mutes data. * Actually make the whole thing works. * config version as integer, and init task no longer in setup * oops * Fix cog_disabled_in_guild check. * Add Trusty's requested changes.
This commit is contained in:
PredaaA
GitHub
parent
fb701d8c72
commit
35dfb04066
@ -2,7 +2,6 @@ from redbot.core.bot import Red
|
||||
from .mutes import Mutes
|
||||
|
||||
|
||||
async def setup(bot: Red):
|
||||
def setup(bot: Red):
|
||||
cog = Mutes(bot)
|
||||
bot.add_cog(cog)
|
||||
await cog.initialize()
|
||||
|
||||
@ -12,7 +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 import AsyncIter, bounded_gather
|
||||
from redbot.core.utils.chat_formatting import bold, humanize_timedelta, humanize_list, pagify
|
||||
from redbot.core.utils.mod import get_audit_reason
|
||||
from redbot.core.utils.menus import start_adding_reactions
|
||||
@ -81,7 +81,7 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
|
||||
"dm": False,
|
||||
"show_mod": False,
|
||||
}
|
||||
self.config.register_global(force_role_mutes=True)
|
||||
self.config.register_global(force_role_mutes=True, schema_version=0)
|
||||
# Tbh I would rather force everyone to use role mutes.
|
||||
# I also honestly think everyone would agree they're the
|
||||
# way to go. If for whatever reason someone wants to
|
||||
@ -102,6 +102,8 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
|
||||
# to wait for a guild to finish channel unmutes before
|
||||
# checking for manual overwrites
|
||||
|
||||
self._init_task = self.bot.loop.create_task(self._initialize())
|
||||
|
||||
async def red_delete_data_for_user(
|
||||
self,
|
||||
*,
|
||||
@ -123,7 +125,10 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
|
||||
if m_id == user_id:
|
||||
await self.config.member_from_ids(g_id, m_id).clear()
|
||||
|
||||
async def initialize(self):
|
||||
async def _initialize(self):
|
||||
await self.bot.wait_until_red_ready()
|
||||
await self._maybe_update_config()
|
||||
|
||||
guild_data = await self.config.all_guilds()
|
||||
for g_id, mutes in guild_data.items():
|
||||
self._server_mutes[g_id] = {}
|
||||
@ -139,10 +144,35 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
|
||||
self._unmute_task = asyncio.create_task(self._handle_automatic_unmute())
|
||||
self._ready.set()
|
||||
|
||||
async def _maybe_update_config(self):
|
||||
schema_version = await self.config.schema_version()
|
||||
|
||||
if schema_version == 0:
|
||||
start = datetime.now()
|
||||
log.info("Config conversion to schema_version 1 started.")
|
||||
all_channels = await self.config.all_channels()
|
||||
async for channel_id in AsyncIter(all_channels.keys()):
|
||||
try:
|
||||
if (channel := self.bot.get_channel(channel_id)) is None:
|
||||
channel = await self.bot.fetch_channel(channel_id)
|
||||
async with self.config.channel_from_id(channel_id) as muted_users:
|
||||
for user_id, mute_data in muted_users.items():
|
||||
mute_data["guild"] = channel.guild.id
|
||||
except (discord.NotFound, discord.Forbidden):
|
||||
await self.config.channel_from_id(channel_id).clear()
|
||||
|
||||
schema_version += 1
|
||||
await self.config.schema_version.set(schema_version)
|
||||
log.info(
|
||||
"Config conversion to schema_version 1 done. It took %s to proceed.",
|
||||
datetime.now() - start,
|
||||
)
|
||||
|
||||
async def cog_before_invoke(self, ctx: commands.Context):
|
||||
await self._ready.wait()
|
||||
|
||||
def cog_unload(self):
|
||||
self._init_task.cancel()
|
||||
self._unmute_task.cancel()
|
||||
for task in self._unmute_tasks.values():
|
||||
task.cancel()
|
||||
@ -282,38 +312,33 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
|
||||
"""This is where the logic for handling channel unmutes is taken care of"""
|
||||
log.debug("Checking channel unmutes")
|
||||
multiple_mutes = {}
|
||||
for c_id in self._channel_mutes:
|
||||
channel = self.bot.get_channel(c_id)
|
||||
if channel is None or await self.bot.cog_disabled_in_guild(self, channel.guild):
|
||||
continue
|
||||
for u_id in self._channel_mutes[channel.id]:
|
||||
for c_id, c_data in self._channel_mutes.items():
|
||||
for u_id in self._channel_mutes[c_id]:
|
||||
if (
|
||||
not self._channel_mutes[channel.id][u_id]
|
||||
or not self._channel_mutes[channel.id][u_id]["until"]
|
||||
not self._channel_mutes[c_id][u_id]
|
||||
or not self._channel_mutes[c_id][u_id]["until"]
|
||||
):
|
||||
continue
|
||||
guild = self.bot.get_guild(self._channel_mutes[c_id][u_id]["guild"])
|
||||
if guild is None or await self.bot.cog_disabled_in_guild(self, guild):
|
||||
continue
|
||||
time_to_unmute = (
|
||||
self._channel_mutes[channel.id][u_id]["until"]
|
||||
self._channel_mutes[c_id][u_id]["until"]
|
||||
- datetime.now(timezone.utc).timestamp()
|
||||
)
|
||||
if time_to_unmute < 60.0:
|
||||
if channel.guild.id not in multiple_mutes:
|
||||
multiple_mutes[channel.guild.id] = {}
|
||||
if u_id not in multiple_mutes[channel.guild.id]:
|
||||
multiple_mutes[channel.guild.id][u_id] = {
|
||||
channel.id: self._channel_mutes[channel.id][u_id]
|
||||
}
|
||||
if guild not in multiple_mutes:
|
||||
multiple_mutes[guild] = {}
|
||||
if u_id not in multiple_mutes[guild]:
|
||||
multiple_mutes[guild][u_id] = {c_id: self._channel_mutes[c_id][u_id]}
|
||||
else:
|
||||
multiple_mutes[channel.guild.id][u_id][channel.id] = self._channel_mutes[
|
||||
channel.id
|
||||
][u_id]
|
||||
multiple_mutes[guild][u_id][c_id] = self._channel_mutes[c_id][u_id]
|
||||
|
||||
for guild_id, users in multiple_mutes.items():
|
||||
guild = self.bot.get_guild(guild_id)
|
||||
for guild, users in multiple_mutes.items():
|
||||
await i18n.set_contextual_locales_from_guild(self.bot, guild)
|
||||
for user, channels in users.items():
|
||||
if len(channels) > 1:
|
||||
task_name = f"server-unmute-channels-{guild_id}-{user}"
|
||||
task_name = f"server-unmute-channels-{guild.id}-{user}"
|
||||
if task_name in self._unmute_tasks:
|
||||
continue
|
||||
log.debug(f"Creating task: {task_name}")
|
||||
@ -332,6 +357,8 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
|
||||
self._auto_channel_unmute_user(guild.get_channel(channel), mute_data)
|
||||
)
|
||||
|
||||
del multiple_mutes
|
||||
|
||||
async def _auto_channel_unmute_user_multi(
|
||||
self, member: discord.Member, guild: discord.Guild, channels: Dict[int, dict]
|
||||
):
|
||||
@ -1641,6 +1668,7 @@ class Mutes(VoiceMutes, commands.Cog, metaclass=CompositeMetaClass):
|
||||
}
|
||||
self._channel_mutes[channel.id][user.id] = {
|
||||
"author": author.id,
|
||||
"guild": guild.id,
|
||||
"member": user.id,
|
||||
"until": until.timestamp() if until else None,
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user