diff --git a/cogs/activity_counter.py b/cogs/activity_counter.py index 41f39e9..d8dd72c 100644 --- a/cogs/activity_counter.py +++ b/cogs/activity_counter.py @@ -43,27 +43,13 @@ class ActiveCount(commands.Cog): if message.guild is None: return hour = message.created_at.replace(tzinfo=timezone.utc).astimezone(tz=None).hour - db.history.update_one( + await db.history.update_one( {"type": "server", "id": message.guild.id}, {"$inc": {f"current.{hour}": 1}} ) @app_commands.command() async def activity(self, inter): - async def get_string(inter, string: str) -> str: - data = await self.bot.tree.translator.translate( - app_commands.locale_str(string), - inter.locale, - app_commands.TranslationContext( - app_commands.TranslationContextLocation.other, - "activity" - ) - ) - logger.debug(data) - - if data is None: return string - return data - day = datetime.now().weekday() fig, ax = plt.subplots(figsize=(8, 5)) diff --git a/cogs/economic.py b/cogs/economic.py index fb56c26..708a5e9 100644 --- a/cogs/economic.py +++ b/cogs/economic.py @@ -248,7 +248,7 @@ class Economic(commands.Cog, name="Экономика"): if user is None: user = inter.user if self.bot.get_user(user.id).bot: - await inter.response.send_message(await get_text(inter, "rank", "Bot hasn't experience")) + await inter.response.send_message(await get_text(inter, "Bot hasn't experience", "rank")) return user_data = await db.members.find_one({"id": user.id}) @@ -300,27 +300,27 @@ class Economic(commands.Cog, name="Экономика"): else: last_day = "???" - description = f"{await get_text(inter, 'rank', 'Money')}: {user_data['money']}{chocolate}\n\n" \ - f"__{await get_text(inter, 'rank', 'Global stats')}:__\n" \ - f"{await get_text(inter, 'rank', 'Level')}: {user_data['level']}\n" \ - f"{await get_text(inter, 'rank', 'Exp')}: {user_data['exp']} / {user_data['level'] ** 2 * 50 + 5}" \ + description = f"{await get_text(inter, 'Money', 'rank')}: {user_data['money']}{chocolate}\n\n" \ + f"__{await get_text(inter, 'Global stats', 'rank')}:__\n" \ + f"{await get_text(inter, 'Level', 'rank')}: {user_data['level']}\n" \ + f"{await get_text(inter, 'Exp', 'rank')}: {user_data['exp']} / {user_data['level'] ** 2 * 50 + 5}" \ f" ({(user_data['level'] ** 2 * 50 + 5) - user_data['exp']})\n" \ - f"{await get_text(inter, 'rank', 'Per hour')}: {per_hour}, {await get_text(inter, 'rank', 'per the past hour')}: {last_hour}\n" \ - f"{await get_text(inter, 'rank', 'Per day')}: {per_day}, {await get_text(inter, 'rank', 'per the past day')}: {last_day}\n" + f"{await get_text(inter, 'Per hour', 'rank')}: {per_hour}, {await get_text(inter, 'per the past hour', 'rank')}: {last_hour}\n" \ + f"{await get_text(inter, 'Per day', 'rank')}: {per_day}, {await get_text(inter, 'per the past day', 'rank')}: {last_day}\n" secs = user_data['guild_stat'][str(inter.guild.id)]['secs_in_voice'] if "guild_stat" in list(user_data.keys()): if inter.guild is not None and str(inter.guild.id) in list(user_data['guild_stat'].keys()): description += f"\n__{await get_text(inter, 'rank', 'On this guild')}:__\n" \ - f"{await get_text(inter, 'rank', 'Level')}: {user_data['guild_stat'][str(inter.guild.id)]['level']}\n" \ - f"{await get_text(inter, 'rank', 'Exp')}: {user_data['guild_stat'][str(inter.guild.id)]['exp']} / " \ + f"{await get_text(inter, 'Level', 'rank')}: {user_data['guild_stat'][str(inter.guild.id)]['level']}\n" \ + f"{await get_text(inter, 'Exp', 'rank')}: {user_data['guild_stat'][str(inter.guild.id)]['exp']} / " \ f"{user_data['guild_stat'][str(inter.guild.id)]['level'] ** 2 * 50 + 5}" \ f" ({(user_data['guild_stat'][str(inter.guild.id)]['level'] ** 2 * 50 + 5) - user_data['guild_stat'][str(inter.guild.id)]['exp']})\n" \ - f"{await get_text(inter, 'rank', 'Time in voice channels')}: {self.time_translation(secs)}" + f"{await get_text(inter, 'Time in voice channels', 'rank')}: {self.time_translation(secs)}" - e = discord.Embed(title=f"{await get_text(inter, 'rank', 'Info about')} {self.bot.get_user(user.id).name}", + e = discord.Embed(title=f"{await get_text(inter, 'Info about', 'rank')} {self.bot.get_user(user.id).name}", description=description, color=color) await inter.response.send_message(embed=e) @@ -356,7 +356,7 @@ class Economic(commands.Cog, name="Экономика"): data_ = await db.members.find({f"guild_stat.{inter.guild.id}": {"$exists": True}}).sort(categories[category], -1).to_list(10) if not data_: - await inter.response.send_message(await get_text(inter, "top", "Not enough data. Try later")) + await inter.response.send_message(await get_text(inter, "Not enough data. Try later", "rank")) return l = min(len(data_), 10) diff --git a/utils/translate.py b/utils/translate.py index 4d89526..724838d 100644 --- a/utils/translate.py +++ b/utils/translate.py @@ -30,7 +30,7 @@ def translate(string, region): else: return string -async def get_text(inter, location, string): +async def get_text(inter, string, location = None): data = await inter.translate( string=app_commands.locale_str(string), locale=inter.locale,