This commit is contained in:
Romain J 2020-04-01 16:37:03 +02:00
parent caa98c44f4
commit 833884bcb2
18 changed files with 15 additions and 268 deletions

2
bot.py
View file

@ -37,7 +37,7 @@ l_extensions: List[str] = [
async def _prefix_callable(bot, message: discord.message) -> list: 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 message.guild is not None:
if str(message.guild.id) in bot.prefixes: if str(message.guild.id) in bot.prefixes:
extras.extend( extras.extend(

View file

@ -298,7 +298,6 @@ class Admin(commands.Cog):
@_warn.command(name='add', aliases=['new']) @_warn.command(name='add', aliases=['new'])
async def _warn_add(self, ctx: commands.Context, member: discord.Member, async def _warn_add(self, ctx: commands.Context, member: discord.Member,
*, reason="N/A"): *, reason="N/A"):
member = await ctx.guild.fetch_member(member.id)
if not member: if not member:
return await ctx.send( return await ctx.send(
Texts('utils', ctx).get("Unable to find the user...") Texts('utils', ctx).get("Unable to find the user...")
@ -310,9 +309,9 @@ class Admin(commands.Cog):
return False return False
return pld.emoji.name in ('1⃣', '2⃣', '3⃣') 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( e = discord.Embed(
title=Texts('admin', ctx).get('More than 2 warns'), title=Texts('admin', ctx).get('More than 2 warns'),
description=f"{member.mention} " description=f"{member.mention} "

View file

@ -94,7 +94,7 @@ class Useful(commands.Cog):
await ctx.trigger_typing() await ctx.trigger_typing()
try: try:
if ip_type in ('v6', 'ipv6'): if 'v6' in ip_type:
try: try:
ip = socket.getaddrinfo(addr, None, AF_INET6)[1][4][0] ip = socket.getaddrinfo(addr, None, AF_INET6)[1][4][0]
except socket.gaierror: except socket.gaierror:
@ -106,7 +106,6 @@ class Useful(commands.Cog):
async with self.bot.session.get(f"http://ip-api.com/json/{ip}") \ async with self.bot.session.get(f"http://ip-api.com/json/{ip}") \
as s: as s:
response: dict = await s.json() response: dict = await s.json()
if response.get('status') == 'success': if response.get('status') == 'success':
e = discord.Embed( e = discord.Embed(
title=f"{Texts('useful', ctx).get('Information for')}" title=f"{Texts('useful', ctx).get('Information for')}"
@ -116,20 +115,20 @@ class Useful(commands.Cog):
e.add_field( e.add_field(
name=Texts('useful', ctx).get('Belongs to :'), name=Texts('useful', ctx).get('Belongs to :'),
value=response.get('org', 'N/A'), value=response['org'] if response['org'] else 'N/A',
inline=False inline=False
) )
e.add_field( e.add_field(
name=Texts('useful', ctx).get('Is located at :'), 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 inline=True
) )
e.add_field( e.add_field(
name="Region :", name="Region :",
value=f"{response.get('regionName', 'N/A')} " value=f"{response['regionName'] if response['regionName'] else 'N/A'} "
f"({response.get('country', 'N/A')})", f"({response['country'] if response['country'] else 'N/A'})",
inline=True inline=True
) )
@ -141,9 +140,10 @@ class Useful(commands.Cog):
else: else:
await ctx.send( await ctx.send(
content=f"{Texts('useful', ctx).get('info not available')}" 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( await ctx.send(
f"{Texts('useful', ctx).get('Cannot connect to host')} {addr}" f"{Texts('useful', ctx).get('Cannot connect to host')} {addr}"
) )

View file

@ -1,8 +1,8 @@
[280805240977227776] [280805240977227776]
prefixes = b1. prefixes = b1.[301062143942590465]*
[303633056944881686] [303633056944881686]
prefixes = b1. prefixes = b1.[301062143942590465]*
[373881878471770112] [373881878471770112]
prefixes = b1. prefixes = b1.

2
todo Normal file
View file

@ -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

View file

@ -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

View file

@ -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 <davidedb@gmail.com>.
# Ported to Python 3.3 venv by Andrew Svetlov <andrew.svetlov@gmail.com>
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

View file

@ -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

View file

@ -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())

View file

@ -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())

View file

@ -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())

View file

@ -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())

View file

@ -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())

View file

@ -1 +0,0 @@
/usr/bin/python

View file

@ -1 +0,0 @@
python

View file

@ -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())

View file

@ -1 +0,0 @@
lib

View file

@ -1,3 +0,0 @@
home = /usr/bin
include-system-site-packages = false
version = 3.8.1