diff --git a/setup.cfg b/setup.cfg index 6910a71..223b283 100644 --- a/setup.cfg +++ b/setup.cfg @@ -13,7 +13,7 @@ platforms = linux [options] packages = find_namespace: -python_requires = >=3.7 +python_requires = >=3.8 install_requires = appdirs>=1.4.4 asyncpg>=0.21.0 diff --git a/setup.py b/setup.py index 61cdbfc..4b57aa4 100644 --- a/setup.py +++ b/setup.py @@ -1,5 +1,5 @@ from setuptools import setup setup( - python_requires=">=3.7", + python_requires=">=3.8", ) diff --git a/tuxbot/cogs/Admin/admin.py b/tuxbot/cogs/Admin/admin.py index 70ec062..feb4285 100644 --- a/tuxbot/cogs/Admin/admin.py +++ b/tuxbot/cogs/Admin/admin.py @@ -68,14 +68,12 @@ class Admin(commands.Cog, name="Admin"): # ========================================================================= @command_extra(name="quit", aliases=["shutdown"], deletable=False) - @commands.guild_only() @checks.is_owner() async def _quit(self, ctx: ContextPlus): await ctx.send("*quit...*") await self.bot.shutdown() @command_extra(name="restart", deletable=False) - @commands.guild_only() @checks.is_owner() async def _restart(self, ctx: ContextPlus): await ctx.send("*restart...*") diff --git a/tuxbot/cogs/Admin/locales/messages.pot b/tuxbot/cogs/Admin/locales/messages.pot index 388088c..e43ef9c 100644 --- a/tuxbot/cogs/Admin/locales/messages.pot +++ b/tuxbot/cogs/Admin/locales/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Tuxbot-bot\n" "Report-Msgid-Bugs-To: rick@gnous.eu\n" -"POT-Creation-Date: 2021-01-22 10:16+0100\n" +"POT-Creation-Date: 2021-01-25 14:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/tuxbot/cogs/Custom/locales/messages.pot b/tuxbot/cogs/Custom/locales/messages.pot index c037054..f83bcd3 100644 --- a/tuxbot/cogs/Custom/locales/messages.pot +++ b/tuxbot/cogs/Custom/locales/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Tuxbot-bot\n" "Report-Msgid-Bugs-To: rick@gnous.eu\n" -"POT-Creation-Date: 2021-01-22 10:16+0100\n" +"POT-Creation-Date: 2021-01-25 14:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/tuxbot/cogs/Polls/functions/listeners.py b/tuxbot/cogs/Polls/functions/listeners.py index 194f274..aafd8e6 100644 --- a/tuxbot/cogs/Polls/functions/listeners.py +++ b/tuxbot/cogs/Polls/functions/listeners.py @@ -67,7 +67,8 @@ async def _suggest_reaction_add( content["fields"].append( { - "name": f"__{emote} - {upper_first(suggest.proposition)}__", + "name": f"__{emote} " + f"- {upper_first(suggest.proposition)}__", "value": "**0** vote", } ) diff --git a/tuxbot/cogs/Polls/locales/messages.pot b/tuxbot/cogs/Polls/locales/messages.pot index 3d9bfe5..12e214d 100644 --- a/tuxbot/cogs/Polls/locales/messages.pot +++ b/tuxbot/cogs/Polls/locales/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Tuxbot-bot\n" "Report-Msgid-Bugs-To: rick@gnous.eu\n" -"POT-Creation-Date: 2021-01-22 10:16+0100\n" +"POT-Creation-Date: 2021-01-25 14:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/tuxbot/cogs/Utils/locales/en-US.po b/tuxbot/cogs/Utils/locales/en-US.po index 2d07260..972ab75 100644 --- a/tuxbot/cogs/Utils/locales/en-US.po +++ b/tuxbot/cogs/Utils/locales/en-US.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Tuxbot-bot\n" "Report-Msgid-Bugs-To: rick@gnous.eu\n" -"POT-Creation-Date: 2020-11-11 02:44+0100\n" +"POT-Creation-Date: 2021-01-25 14:36+0100\n" "PO-Revision-Date: 2020-06-10 00:38+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -17,104 +17,104 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: tuxbot/cogs/Utils/utils.py:38 +#: tuxbot/cogs/Utils/utils.py:40 msgid "Information about TuxBot" -msgstr "" +msgstr "Information sur TuxBot" -#: tuxbot/cogs/Utils/utils.py:44 +#: tuxbot/cogs/Utils/utils.py:46 msgid "__:busts_in_silhouette: Development__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:61 +#: tuxbot/cogs/Utils/utils.py:63 msgid "" "**{}** physical memory\n" "**{}** virtual memory" msgstr "" -#: tuxbot/cogs/Utils/utils.py:72 -msgid "__Servers count__" -msgstr "" - #: tuxbot/cogs/Utils/utils.py:77 +msgid "__Servers count__" +msgstr "__Nombre de serveurs__" + +#: tuxbot/cogs/Utils/utils.py:82 msgid "__Channels count__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:82 +#: tuxbot/cogs/Utils/utils.py:87 msgid "__Members count__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:88 +#: tuxbot/cogs/Utils/utils.py:93 msgid "__:file_folder: Files__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:95 +#: tuxbot/cogs/Utils/utils.py:100 msgid "__¶ Lines__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:98 +#: tuxbot/cogs/Utils/utils.py:103 msgid "class" msgstr "" -#: tuxbot/cogs/Utils/utils.py:100 +#: tuxbot/cogs/Utils/utils.py:106 msgid "functions" msgstr "" -#: tuxbot/cogs/Utils/utils.py:102 +#: tuxbot/cogs/Utils/utils.py:109 msgid "coroutines" msgstr "" -#: tuxbot/cogs/Utils/utils.py:104 +#: tuxbot/cogs/Utils/utils.py:112 msgid "comments" msgstr "" -#: tuxbot/cogs/Utils/utils.py:105 +#: tuxbot/cogs/Utils/utils.py:118 msgid "__Latest changes__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:111 +#: tuxbot/cogs/Utils/utils.py:124 msgid "__:link: Links__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:116 +#: tuxbot/cogs/Utils/utils.py:129 msgid "| [Invite]" msgstr "" -#: tuxbot/cogs/Utils/utils.py:131 +#: tuxbot/cogs/Utils/utils.py:144 msgid "Contributors" msgstr "" -#: tuxbot/cogs/Utils/utils.py:187 +#: tuxbot/cogs/Utils/utils.py:200 msgid "Invite" msgstr "" -#: tuxbot/cogs/Utils/utils.py:191 +#: tuxbot/cogs/Utils/utils.py:204 msgid "Minimal" msgstr "" -#: tuxbot/cogs/Utils/utils.py:193 +#: tuxbot/cogs/Utils/utils.py:206 msgid "" "The minimum permissions include the strict requirements for the proper " "functioning of all basics commands.\n" msgstr "" -#: tuxbot/cogs/Utils/utils.py:198 tuxbot/cogs/Utils/utils.py:210 +#: tuxbot/cogs/Utils/utils.py:211 tuxbot/cogs/Utils/utils.py:223 msgid "[Add!]" msgstr "" -#: tuxbot/cogs/Utils/utils.py:203 +#: tuxbot/cogs/Utils/utils.py:216 msgid "Admin" msgstr "" -#: tuxbot/cogs/Utils/utils.py:205 +#: tuxbot/cogs/Utils/utils.py:218 msgid "" "All minimal permissions + extra permissions for admin commands such as kick " "and ban\n" msgstr "" -#: tuxbot/cogs/Utils/utils.py:233 +#: tuxbot/cogs/Utils/utils.py:246 msgid "Unable to find `{}`" msgstr "" -#: tuxbot/cogs/Utils/utils.py:241 +#: tuxbot/cogs/Utils/utils.py:254 msgid "Unable to fetch lines for `{}`" msgstr "" diff --git a/tuxbot/cogs/Utils/locales/fr-FR.po b/tuxbot/cogs/Utils/locales/fr-FR.po index 44ba9b0..cecf786 100644 --- a/tuxbot/cogs/Utils/locales/fr-FR.po +++ b/tuxbot/cogs/Utils/locales/fr-FR.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Tuxbot-bot\n" "Report-Msgid-Bugs-To: rick@gnous.eu\n" -"POT-Creation-Date: 2020-11-11 02:44+0100\n" +"POT-Creation-Date: 2021-01-25 14:36+0100\n" "PO-Revision-Date: 2020-06-10 00:38+0200\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -18,83 +18,82 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: tuxbot/cogs/Utils/utils.py:38 +#: tuxbot/cogs/Utils/utils.py:40 msgid "Information about TuxBot" msgstr "Information sur TuxBot" -#: tuxbot/cogs/Utils/utils.py:44 +#: tuxbot/cogs/Utils/utils.py:46 msgid "__:busts_in_silhouette: Development__" msgstr "__:busts_in_silhouette: Développement__" -#: tuxbot/cogs/Utils/utils.py:61 +#: tuxbot/cogs/Utils/utils.py:63 msgid "" "**{}** physical memory\n" -"**{}** virtual memory" +"**{}** virtual memory\n" +"**{}**% CPU" msgstr "" -"**{}** mémoire physique\n" -"**{}** mémoire virtuelle" -#: tuxbot/cogs/Utils/utils.py:72 +#: tuxbot/cogs/Utils/utils.py:77 msgid "__Servers count__" msgstr "__Nombre de serveurs__" -#: tuxbot/cogs/Utils/utils.py:77 +#: tuxbot/cogs/Utils/utils.py:82 msgid "__Channels count__" msgstr "__Nombre de salons__" -#: tuxbot/cogs/Utils/utils.py:82 +#: tuxbot/cogs/Utils/utils.py:87 msgid "__Members count__" msgstr "__Nombre de membres__" -#: tuxbot/cogs/Utils/utils.py:88 +#: tuxbot/cogs/Utils/utils.py:93 msgid "__:file_folder: Files__" msgstr "__:file_folder: Fichiers__" -#: tuxbot/cogs/Utils/utils.py:95 +#: tuxbot/cogs/Utils/utils.py:100 msgid "__¶ Lines__" msgstr "__¶ Lines__" -#: tuxbot/cogs/Utils/utils.py:98 +#: tuxbot/cogs/Utils/utils.py:103 msgid "class" msgstr "classes" -#: tuxbot/cogs/Utils/utils.py:100 +#: tuxbot/cogs/Utils/utils.py:106 msgid "functions" msgstr "fonctions" -#: tuxbot/cogs/Utils/utils.py:102 +#: tuxbot/cogs/Utils/utils.py:109 msgid "coroutines" msgstr "" -#: tuxbot/cogs/Utils/utils.py:104 +#: tuxbot/cogs/Utils/utils.py:112 msgid "comments" msgstr "commentaires" -#: tuxbot/cogs/Utils/utils.py:105 +#: tuxbot/cogs/Utils/utils.py:118 msgid "__Latest changes__" msgstr "__Derniers changements__" -#: tuxbot/cogs/Utils/utils.py:111 +#: tuxbot/cogs/Utils/utils.py:124 msgid "__:link: Links__" msgstr "__:link: Liens__" -#: tuxbot/cogs/Utils/utils.py:116 +#: tuxbot/cogs/Utils/utils.py:129 msgid "| [Invite]" msgstr "| [Invitation]" -#: tuxbot/cogs/Utils/utils.py:131 +#: tuxbot/cogs/Utils/utils.py:144 msgid "Contributors" msgstr "Contributeurs" -#: tuxbot/cogs/Utils/utils.py:187 +#: tuxbot/cogs/Utils/utils.py:200 msgid "Invite" msgstr "Invitation" -#: tuxbot/cogs/Utils/utils.py:191 +#: tuxbot/cogs/Utils/utils.py:204 msgid "Minimal" msgstr "Minimale" -#: tuxbot/cogs/Utils/utils.py:193 +#: tuxbot/cogs/Utils/utils.py:206 msgid "" "The minimum permissions include the strict requirements for the proper " "functioning of all basics commands.\n" @@ -102,15 +101,15 @@ msgstr "" "Les permissions minimales avec le strict nécessaire pour le bon " "fonctionnement des commandes de base\n" -#: tuxbot/cogs/Utils/utils.py:198 tuxbot/cogs/Utils/utils.py:210 +#: tuxbot/cogs/Utils/utils.py:211 tuxbot/cogs/Utils/utils.py:223 msgid "[Add!]" msgstr "[Ajouter !]" -#: tuxbot/cogs/Utils/utils.py:203 +#: tuxbot/cogs/Utils/utils.py:216 msgid "Admin" msgstr "Admin" -#: tuxbot/cogs/Utils/utils.py:205 +#: tuxbot/cogs/Utils/utils.py:218 msgid "" "All minimal permissions + extra permissions for admin commands such as kick " "and ban\n" @@ -118,10 +117,10 @@ msgstr "" "Toutes les permissions minimales + les permissions extra pour les commandes " "d'administration telles que kick et ban\n" -#: tuxbot/cogs/Utils/utils.py:233 +#: tuxbot/cogs/Utils/utils.py:246 msgid "Unable to find `{}`" msgstr "Impossible de trouver `{}`" -#: tuxbot/cogs/Utils/utils.py:241 +#: tuxbot/cogs/Utils/utils.py:254 msgid "Unable to fetch lines for `{}`" msgstr "Impossible de récuperer les lignes pour `{}`" diff --git a/tuxbot/cogs/Utils/locales/messages.pot b/tuxbot/cogs/Utils/locales/messages.pot index 7d30a35..58f747e 100644 --- a/tuxbot/cogs/Utils/locales/messages.pot +++ b/tuxbot/cogs/Utils/locales/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Tuxbot-bot\n" "Report-Msgid-Bugs-To: rick@gnous.eu\n" -"POT-Creation-Date: 2021-01-22 10:16+0100\n" +"POT-Creation-Date: 2021-01-25 14:36+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,100 +17,101 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: tuxbot/cogs/Utils/utils.py:38 +#: tuxbot/cogs/Utils/utils.py:40 msgid "Information about TuxBot" msgstr "" -#: tuxbot/cogs/Utils/utils.py:44 +#: tuxbot/cogs/Utils/utils.py:46 msgid "__:busts_in_silhouette: Development__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:61 +#: tuxbot/cogs/Utils/utils.py:63 msgid "" "**{}** physical memory\n" -"**{}** virtual memory" -msgstr "" - -#: tuxbot/cogs/Utils/utils.py:72 -msgid "__Servers count__" +"**{}** virtual memory\n" +"**{}**% CPU" msgstr "" #: tuxbot/cogs/Utils/utils.py:77 -msgid "__Channels count__" +msgid "__Servers count__" msgstr "" #: tuxbot/cogs/Utils/utils.py:82 +msgid "__Channels count__" +msgstr "" + +#: tuxbot/cogs/Utils/utils.py:87 msgid "__Members count__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:88 +#: tuxbot/cogs/Utils/utils.py:93 msgid "__:file_folder: Files__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:95 +#: tuxbot/cogs/Utils/utils.py:100 msgid "__¶ Lines__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:98 +#: tuxbot/cogs/Utils/utils.py:103 msgid "class" msgstr "" -#: tuxbot/cogs/Utils/utils.py:101 +#: tuxbot/cogs/Utils/utils.py:106 msgid "functions" msgstr "" -#: tuxbot/cogs/Utils/utils.py:104 +#: tuxbot/cogs/Utils/utils.py:109 msgid "coroutines" msgstr "" -#: tuxbot/cogs/Utils/utils.py:107 +#: tuxbot/cogs/Utils/utils.py:112 msgid "comments" msgstr "" -#: tuxbot/cogs/Utils/utils.py:113 +#: tuxbot/cogs/Utils/utils.py:118 msgid "__Latest changes__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:119 +#: tuxbot/cogs/Utils/utils.py:124 msgid "__:link: Links__" msgstr "" -#: tuxbot/cogs/Utils/utils.py:124 +#: tuxbot/cogs/Utils/utils.py:129 msgid "| [Invite]" msgstr "" -#: tuxbot/cogs/Utils/utils.py:139 +#: tuxbot/cogs/Utils/utils.py:144 msgid "Contributors" msgstr "" -#: tuxbot/cogs/Utils/utils.py:195 +#: tuxbot/cogs/Utils/utils.py:200 msgid "Invite" msgstr "" -#: tuxbot/cogs/Utils/utils.py:199 +#: tuxbot/cogs/Utils/utils.py:204 msgid "Minimal" msgstr "" -#: tuxbot/cogs/Utils/utils.py:201 +#: tuxbot/cogs/Utils/utils.py:206 msgid "The minimum permissions include the strict requirements for the proper functioning of all basics commands.\n" msgstr "" -#: tuxbot/cogs/Utils/utils.py:206 tuxbot/cogs/Utils/utils.py:218 +#: tuxbot/cogs/Utils/utils.py:211 tuxbot/cogs/Utils/utils.py:223 msgid "[Add!]" msgstr "" -#: tuxbot/cogs/Utils/utils.py:211 +#: tuxbot/cogs/Utils/utils.py:216 msgid "Admin" msgstr "" -#: tuxbot/cogs/Utils/utils.py:213 +#: tuxbot/cogs/Utils/utils.py:218 msgid "All minimal permissions + extra permissions for admin commands such as kick and ban\n" msgstr "" -#: tuxbot/cogs/Utils/utils.py:241 +#: tuxbot/cogs/Utils/utils.py:246 msgid "Unable to find `{}`" msgstr "" -#: tuxbot/cogs/Utils/utils.py:249 +#: tuxbot/cogs/Utils/utils.py:254 msgid "Unable to fetch lines for `{}`" msgstr "" diff --git a/tuxbot/cogs/Utils/utils.py b/tuxbot/cogs/Utils/utils.py index 62a18b7..d5c068b 100644 --- a/tuxbot/cogs/Utils/utils.py +++ b/tuxbot/cogs/Utils/utils.py @@ -34,6 +34,8 @@ class Utils(commands.Cog, name="Utils"): with proc.oneshot(): mem = proc.memory_full_info() + cpu = proc.cpu_percent() / psutil.cpu_count() + e = discord.Embed( title=_("Information about TuxBot", ctx, self.bot.config), color=0x89C4F9, @@ -58,12 +60,15 @@ class Utils(commands.Cog, name="Utils"): e.add_field( name="__:gear: Usage__", value=_( - "**{}** physical memory\n**{}** virtual memory", + "**{}** physical memory\n" + "**{}** virtual memory\n" + "**{:.2f}**% CPU", ctx, self.bot.config, ).format( humanize.naturalsize(mem.rss), humanize.naturalsize(mem.vms), + cpu, ), inline=True, )