From 833884bcb28d5b5e06bb8b47a54a5ecf95fabd79 Mon Sep 17 00:00:00 2001 From: Romain J Date: Wed, 1 Apr 2020 16:37:03 +0200 Subject: [PATCH] :thinking: --- bot.py | 2 +- cogs/Admin.py | 5 +-- cogs/Useful.py | 16 ++++---- configs/prefixes.cfg | 4 +- todo | 2 + venv/bin/activate | 76 -------------------------------------- venv/bin/activate.csh | 37 ------------------- venv/bin/activate.fish | 75 ------------------------------------- venv/bin/chardetect | 10 ----- venv/bin/easy_install | 10 ----- venv/bin/import_expression | 10 ----- venv/bin/pip | 10 ----- venv/bin/pip3 | 10 ----- venv/bin/python | 1 - venv/bin/python3 | 1 - venv/bin/tcp-latency | 10 ----- venv/lib64 | 1 - venv/pyvenv.cfg | 3 -- 18 files changed, 15 insertions(+), 268 deletions(-) create mode 100644 todo delete mode 100644 venv/bin/activate delete mode 100644 venv/bin/activate.csh delete mode 100644 venv/bin/activate.fish delete mode 100755 venv/bin/chardetect delete mode 100755 venv/bin/easy_install delete mode 100755 venv/bin/import_expression delete mode 100755 venv/bin/pip delete mode 100755 venv/bin/pip3 delete mode 120000 venv/bin/python delete mode 120000 venv/bin/python3 delete mode 100755 venv/bin/tcp-latency delete mode 120000 venv/lib64 delete mode 100644 venv/pyvenv.cfg diff --git a/bot.py b/bot.py index f06583f..1267d12 100755 --- a/bot.py +++ b/bot.py @@ -37,7 +37,7 @@ l_extensions: List[str] = [ async def _prefix_callable(bot, message: discord.message) -> list: - extras = [bot.cluster.get('Name') + '.', '.'] + extras = [bot.cluster.get('Name') + '.'] if message.guild is not None: if str(message.guild.id) in bot.prefixes: extras.extend( diff --git a/cogs/Admin.py b/cogs/Admin.py index b9dd6a3..8109596 100644 --- a/cogs/Admin.py +++ b/cogs/Admin.py @@ -298,7 +298,6 @@ class Admin(commands.Cog): @_warn.command(name='add', aliases=['new']) async def _warn_add(self, ctx: commands.Context, member: discord.Member, *, reason="N/A"): - member = await ctx.guild.fetch_member(member.id) if not member: return await ctx.send( Texts('utils', ctx).get("Unable to find the user...") @@ -310,9 +309,9 @@ class Admin(commands.Cog): return False return pld.emoji.name in ('1⃣', '2⃣', '3⃣') - warns_list, warns = await self.get_warn(ctx) + warns_list, warns = await self.get_warn(ctx, member) - if warns.count() >= 3: + if warns.count() >= 2: e = discord.Embed( title=Texts('admin', ctx).get('More than 2 warns'), description=f"{member.mention} " diff --git a/cogs/Useful.py b/cogs/Useful.py index 6cdafd3..edcbcf3 100644 --- a/cogs/Useful.py +++ b/cogs/Useful.py @@ -94,7 +94,7 @@ class Useful(commands.Cog): await ctx.trigger_typing() try: - if ip_type in ('v6', 'ipv6'): + if 'v6' in ip_type: try: ip = socket.getaddrinfo(addr, None, AF_INET6)[1][4][0] except socket.gaierror: @@ -106,7 +106,6 @@ class Useful(commands.Cog): async with self.bot.session.get(f"http://ip-api.com/json/{ip}") \ as s: response: dict = await s.json() - if response.get('status') == 'success': e = discord.Embed( title=f"{Texts('useful', ctx).get('Information for')}" @@ -116,20 +115,20 @@ class Useful(commands.Cog): e.add_field( name=Texts('useful', ctx).get('Belongs to :'), - value=response.get('org', 'N/A'), + value=response['org'] if response['org'] else 'N/A', inline=False ) e.add_field( name=Texts('useful', ctx).get('Is located at :'), - value=response.get('city', 'N/A'), + value=response['city'] if response['city'] else 'N/A', inline=True ) e.add_field( name="Region :", - value=f"{response.get('regionName', 'N/A')} " - f"({response.get('country', 'N/A')})", + value=f"{response['regionName'] if response['regionName'] else 'N/A'} " + f"({response['country'] if response['country'] else 'N/A'})", inline=True ) @@ -141,9 +140,10 @@ class Useful(commands.Cog): else: await ctx.send( content=f"{Texts('useful', ctx).get('info not available')}" - f"``{response.get('query')}``") + f"``{response['query'] if response['query'] else 'N/A'}``") - except Exception: + except Exception as e: + await ctx.send(e) await ctx.send( f"{Texts('useful', ctx).get('Cannot connect to host')} {addr}" ) diff --git a/configs/prefixes.cfg b/configs/prefixes.cfg index 1924607..49d6637 100644 --- a/configs/prefixes.cfg +++ b/configs/prefixes.cfg @@ -1,8 +1,8 @@ [280805240977227776] -prefixes = b1. +prefixes = b1.[301062143942590465]* [303633056944881686] -prefixes = b1. +prefixes = b1.[301062143942590465]* [373881878471770112] prefixes = b1. diff --git a/todo b/todo new file mode 100644 index 0000000..5ac368b --- /dev/null +++ b/todo @@ -0,0 +1,2 @@ +reconnaissance d'image +commande d'archivage pour les salons vocaux avec output mp4 dans lequel on voit le pseudo de celui qui parle diff --git a/venv/bin/activate b/venv/bin/activate deleted file mode 100644 index 88bea70..0000000 --- a/venv/bin/activate +++ /dev/null @@ -1,76 +0,0 @@ -# This file must be used with "source bin/activate" *from bash* -# you cannot run it directly - -deactivate () { - # reset old environment variables - if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then - PATH="${_OLD_VIRTUAL_PATH:-}" - export PATH - unset _OLD_VIRTUAL_PATH - fi - if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then - PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}" - export PYTHONHOME - unset _OLD_VIRTUAL_PYTHONHOME - fi - - # This should detect bash and zsh, which have a hash command that must - # be called to get it to forget past commands. Without forgetting - # past commands the $PATH changes we made may not be respected - if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then - hash -r - fi - - if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then - PS1="${_OLD_VIRTUAL_PS1:-}" - export PS1 - unset _OLD_VIRTUAL_PS1 - fi - - unset VIRTUAL_ENV - if [ ! "${1:-}" = "nondestructive" ] ; then - # Self destruct! - unset -f deactivate - fi -} - -# unset irrelevant variables -deactivate nondestructive - -VIRTUAL_ENV="/home/romain/jetbrains/IDEs/PycharmProjects/gnousEU/discord/tuxbot-bot/venv" -export VIRTUAL_ENV - -_OLD_VIRTUAL_PATH="$PATH" -PATH="$VIRTUAL_ENV/bin:$PATH" -export PATH - -# unset PYTHONHOME if set -# this will fail if PYTHONHOME is set to the empty string (which is bad anyway) -# could use `if (set -u; : $PYTHONHOME) ;` in bash -if [ -n "${PYTHONHOME:-}" ] ; then - _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}" - unset PYTHONHOME -fi - -if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then - _OLD_VIRTUAL_PS1="${PS1:-}" - if [ "x(venv) " != x ] ; then - PS1="(venv) ${PS1:-}" - else - if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then - # special case for Aspen magic directories - # see http://www.zetadev.com/software/aspen/ - PS1="[`basename \`dirname \"$VIRTUAL_ENV\"\``] $PS1" - else - PS1="(`basename \"$VIRTUAL_ENV\"`)$PS1" - fi - fi - export PS1 -fi - -# This should detect bash and zsh, which have a hash command that must -# be called to get it to forget past commands. Without forgetting -# past commands the $PATH changes we made may not be respected -if [ -n "${BASH:-}" -o -n "${ZSH_VERSION:-}" ] ; then - hash -r -fi diff --git a/venv/bin/activate.csh b/venv/bin/activate.csh deleted file mode 100644 index d233f57..0000000 --- a/venv/bin/activate.csh +++ /dev/null @@ -1,37 +0,0 @@ -# This file must be used with "source bin/activate.csh" *from csh*. -# You cannot run it directly. -# Created by Davide Di Blasi . -# Ported to Python 3.3 venv by Andrew Svetlov - -alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; test "\!:*" != "nondestructive" && unalias deactivate' - -# Unset irrelevant variables. -deactivate nondestructive - -setenv VIRTUAL_ENV "/home/romain/jetbrains/IDEs/PycharmProjects/gnousEU/discord/tuxbot-bot/venv" - -set _OLD_VIRTUAL_PATH="$PATH" -setenv PATH "$VIRTUAL_ENV/bin:$PATH" - - -set _OLD_VIRTUAL_PROMPT="$prompt" - -if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then - if ("venv" != "") then - set env_name = "venv" - else - if (`basename "VIRTUAL_ENV"` == "__") then - # special case for Aspen magic directories - # see http://www.zetadev.com/software/aspen/ - set env_name = `basename \`dirname "$VIRTUAL_ENV"\`` - else - set env_name = `basename "$VIRTUAL_ENV"` - endif - endif - set prompt = "[$env_name] $prompt" - unset env_name -endif - -alias pydoc python -m pydoc - -rehash diff --git a/venv/bin/activate.fish b/venv/bin/activate.fish deleted file mode 100644 index 09228da..0000000 --- a/venv/bin/activate.fish +++ /dev/null @@ -1,75 +0,0 @@ -# This file must be used with ". bin/activate.fish" *from fish* (http://fishshell.org) -# you cannot run it directly - -function deactivate -d "Exit virtualenv and return to normal shell environment" - # reset old environment variables - if test -n "$_OLD_VIRTUAL_PATH" - set -gx PATH $_OLD_VIRTUAL_PATH - set -e _OLD_VIRTUAL_PATH - end - if test -n "$_OLD_VIRTUAL_PYTHONHOME" - set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME - set -e _OLD_VIRTUAL_PYTHONHOME - end - - if test -n "$_OLD_FISH_PROMPT_OVERRIDE" - functions -e fish_prompt - set -e _OLD_FISH_PROMPT_OVERRIDE - functions -c _old_fish_prompt fish_prompt - functions -e _old_fish_prompt - end - - set -e VIRTUAL_ENV - if test "$argv[1]" != "nondestructive" - # Self destruct! - functions -e deactivate - end -end - -# unset irrelevant variables -deactivate nondestructive - -set -gx VIRTUAL_ENV "/home/romain/jetbrains/IDEs/PycharmProjects/gnousEU/discord/tuxbot-bot/venv" - -set -gx _OLD_VIRTUAL_PATH $PATH -set -gx PATH "$VIRTUAL_ENV/bin" $PATH - -# unset PYTHONHOME if set -if set -q PYTHONHOME - set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME - set -e PYTHONHOME -end - -if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" - # fish uses a function instead of an env var to generate the prompt. - - # save the current fish_prompt function as the function _old_fish_prompt - functions -c fish_prompt _old_fish_prompt - - # with the original prompt function renamed, we can override with our own. - function fish_prompt - # Save the return status of the last command - set -l old_status $status - - # Prompt override? - if test -n "(venv) " - printf "%s%s" "(venv) " (set_color normal) - else - # ...Otherwise, prepend env - set -l _checkbase (basename "$VIRTUAL_ENV") - if test $_checkbase = "__" - # special case for Aspen magic directories - # see http://www.zetadev.com/software/aspen/ - printf "%s[%s]%s " (set_color -b blue white) (basename (dirname "$VIRTUAL_ENV")) (set_color normal) - else - printf "%s(%s)%s" (set_color -b blue white) (basename "$VIRTUAL_ENV") (set_color normal) - end - end - - # Restore the return status of the previous command. - echo "exit $old_status" | . - _old_fish_prompt - end - - set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" -end diff --git a/venv/bin/chardetect b/venv/bin/chardetect deleted file mode 100755 index 770ee2d..0000000 --- a/venv/bin/chardetect +++ /dev/null @@ -1,10 +0,0 @@ -#!/home/romain/jetbrains/IDEs/PycharmProjects/gnousEU/discord/tuxbot-bot/venv/bin/python -# -*- coding: utf-8 -*- -import re -import sys - -from chardet.cli.chardetect import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/venv/bin/easy_install b/venv/bin/easy_install deleted file mode 100755 index a6d276f..0000000 --- a/venv/bin/easy_install +++ /dev/null @@ -1,10 +0,0 @@ -#!/home/romain/jetbrains/IDEs/PycharmProjects/gnousEU/discord/tuxbot-bot/venv/bin/python -# -*- coding: utf-8 -*- -import re -import sys - -from setuptools.command.easy_install import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/venv/bin/import_expression b/venv/bin/import_expression deleted file mode 100755 index f271788..0000000 --- a/venv/bin/import_expression +++ /dev/null @@ -1,10 +0,0 @@ -#!/home/romain/jetbrains/IDEs/PycharmProjects/gnousEU/discord/tuxbot-bot/venv/bin/python -# -*- coding: utf-8 -*- -import re -import sys - -from import_expression.__main__ import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/venv/bin/pip b/venv/bin/pip deleted file mode 100755 index b322f3b..0000000 --- a/venv/bin/pip +++ /dev/null @@ -1,10 +0,0 @@ -#!/home/romain/jetbrains/IDEs/PycharmProjects/gnousEU/discord/tuxbot-bot/venv/bin/python -# -*- coding: utf-8 -*- -import re -import sys - -from pip._internal.main import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/venv/bin/pip3 b/venv/bin/pip3 deleted file mode 100755 index b322f3b..0000000 --- a/venv/bin/pip3 +++ /dev/null @@ -1,10 +0,0 @@ -#!/home/romain/jetbrains/IDEs/PycharmProjects/gnousEU/discord/tuxbot-bot/venv/bin/python -# -*- coding: utf-8 -*- -import re -import sys - -from pip._internal.main import main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(main()) diff --git a/venv/bin/python b/venv/bin/python deleted file mode 120000 index acd4152..0000000 --- a/venv/bin/python +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/python \ No newline at end of file diff --git a/venv/bin/python3 b/venv/bin/python3 deleted file mode 120000 index d8654aa..0000000 --- a/venv/bin/python3 +++ /dev/null @@ -1 +0,0 @@ -python \ No newline at end of file diff --git a/venv/bin/tcp-latency b/venv/bin/tcp-latency deleted file mode 100755 index e843526..0000000 --- a/venv/bin/tcp-latency +++ /dev/null @@ -1,10 +0,0 @@ -#!/home/romain/jetbrains/IDEs/PycharmProjects/gnousEU/discord/tuxbot-bot/venv/bin/python -# -*- coding: utf-8 -*- -import re -import sys - -from tcp_latency.tcp_latency import _main - -if __name__ == '__main__': - sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(_main()) diff --git a/venv/lib64 b/venv/lib64 deleted file mode 120000 index 7951405..0000000 --- a/venv/lib64 +++ /dev/null @@ -1 +0,0 @@ -lib \ No newline at end of file diff --git a/venv/pyvenv.cfg b/venv/pyvenv.cfg deleted file mode 100644 index 517a829..0000000 --- a/venv/pyvenv.cfg +++ /dev/null @@ -1,3 +0,0 @@ -home = /usr/bin -include-system-site-packages = false -version = 3.8.1