fix(ranks): Tighten up rank refresh.

This commit is contained in:
2023-09-11 08:01:44 +03:00
parent f59f3093d8
commit 6cc253e428
4 changed files with 66 additions and 55 deletions

View File

@@ -31,6 +31,7 @@ class RankOverviewUI(MessageUI):
self.bot = bot
self.guild = guild
self.guildid = guild.id
self.cog = bot.get_cog('RankCog')
self.lguild = None
@@ -99,8 +100,8 @@ class RankOverviewUI(MessageUI):
Refresh the current ranks,
ensuring that all members have the correct rank.
"""
cog = self.bot.get_cog('RankCog')
await cog.interactive_rank_refresh(press, self.guild)
async with self.cog.ranklock(self.guild.id):
await self.cog.interactive_rank_refresh(press, self.guild)
async def refresh_button_refresh(self):
self.refresh_button.label = self.bot.translator.t(_p(
@@ -135,9 +136,10 @@ class RankOverviewUI(MessageUI):
except ResponseTimedOut:
result = False
if result:
await self.rank_model.table.delete_where(guildid=self.guildid)
self.bot.get_cog('RankCog').flush_guild_ranks(self.guild.id)
self.ranks = []
async with self.cog.ranklock(self.guild.id):
await self.rank_model.table.delete_where(guildid=self.guildid)
self.cog.flush_guild_ranks(self.guild.id)
self.ranks = []
await self.redraw()
async def clear_button_refresh(self):

View File

@@ -199,10 +199,11 @@ class RankRefreshUI(MessageUI):
))
value = t(_p(
'ui:refresh_ranks|embed|field:remove|value',
"0 {progress} {total}"
"{progress} {done}/{total} removed"
)).format(
progress=self.progress_bar(self.removed, 0, self.to_remove),
total=self.to_remove,
done=self.removed,
)
embed.add_field(name=name, value=value, inline=False)
else:
@@ -221,10 +222,11 @@ class RankRefreshUI(MessageUI):
))
value = t(_p(
'ui:refresh_ranks|embed|field:add|value',
"0 {progress} {total}"
"{progress} {done}/{total} given"
)).format(
progress=self.progress_bar(self.added, 0, self.to_add),
total=self.to_add,
done=self.added,
)
embed.add_field(name=name, value=value, inline=False)
else: