puma.rc/tuxbot-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

feat(command|help): add usage and short desc

Browse source
This commit is contained in:
Romain J 2020-01-05 19:49:02 +01:00
parent d9221002d2
commit a781e09bde
11 changed files with 412 additions and 90 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -13,6 +13,7 @@ private.py
# other # other
*.logs *.logs
*.log
# Byte-compiled / optimized / DLL files # Byte-compiled / optimized / DLL files
__pycache__/ __pycache__/

64
cogs/Admin.py
View file

@ -67,7 +67,8 @@ class Admin(commands.Cog):
@groupExtra(name='say', invoke_without_command=True, category='text', @groupExtra(name='say', invoke_without_command=True, category='text',
description=Texts('admin_help').get('_say'), description=Texts('admin_help').get('_say'),
short_doc=Texts('admin_help').get('_say__short')) help=Texts('admin_help').get('_say__short'),
usage=Texts('admin_help').get('_say__usage'))
async def _say(self, ctx: commands.Context, *, content: str): async def _say(self, ctx: commands.Context, *, content: str):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
try: try:
@ -79,7 +80,8 @@ class Admin(commands.Cog):
@_say.command(name='edit', @_say.command(name='edit',
description=Texts('admin_help').get('_say_edit'), description=Texts('admin_help').get('_say_edit'),
short_doc=Texts('admin_help').get('_say_edit__short')) help=Texts('admin_help').get('_say_edit__short'),
usage=Texts('admin_help').get('_say_edit__usage'))
async def _say_edit(self, ctx: commands.Context, message_id: int, *, async def _say_edit(self, ctx: commands.Context, message_id: int, *,
content: str): content: str):
try: try:
@ -98,7 +100,8 @@ class Admin(commands.Cog):
@_say.command(name='to', @_say.command(name='to',
description=Texts('admin_help').get('_say_to'), description=Texts('admin_help').get('_say_to'),
short_doc=Texts('admin_help').get('_say_to__short')) help=Texts('admin_help').get('_say_to__short'),
usage=Texts('admin_help').get('_say_to__usage'))
async def _say_to(self, ctx: commands.Context, async def _say_to(self, ctx: commands.Context,
channel: Union[discord.TextChannel, discord.User], *, channel: Union[discord.TextChannel, discord.User], *,
content): content):
@ -113,7 +116,8 @@ class Admin(commands.Cog):
@commandExtra(name='ban', category='administration', @commandExtra(name='ban', category='administration',
description=Texts('admin_help').get('_ban'), description=Texts('admin_help').get('_ban'),
short_doc=Texts('admin_help').get('_ban__short')) help=Texts('admin_help').get('_ban__short'),
usage=Texts('admin_help').get('_ban__usage'))
async def _ban(self, ctx: commands.Context, user: discord.Member, *, async def _ban(self, ctx: commands.Context, user: discord.Member, *,
reason=""): reason=""):
try: try:
@ -142,7 +146,8 @@ class Admin(commands.Cog):
@commandExtra(name='kick', category='administration', @commandExtra(name='kick', category='administration',
description=Texts('admin_help').get('_kick'), description=Texts('admin_help').get('_kick'),
short_doc=Texts('admin_help').get('_kick__short')) help=Texts('admin_help').get('_kick__short'),
usage=Texts('admin_help').get('_kick__usage'))
async def _kick(self, ctx: commands.Context, user: discord.Member, *, async def _kick(self, ctx: commands.Context, user: discord.Member, *,
reason=""): reason=""):
try: try:
@ -171,7 +176,8 @@ class Admin(commands.Cog):
@commandExtra(name='clear', category='text', @commandExtra(name='clear', category='text',
description=Texts('admin_help').get('_clear'), description=Texts('admin_help').get('_clear'),
short_doc=Texts('admin_help').get('_clear__short')) help=Texts('admin_help').get('_clear__short'),
usage=Texts('admin_help').get('_clear__usage'))
async def _clear(self, ctx: commands.Context, count: int): async def _clear(self, ctx: commands.Context, count: int):
try: try:
await ctx.message.delete() await ctx.message.delete()
@ -183,14 +189,16 @@ class Admin(commands.Cog):
@groupExtra(name='react', category='text', @groupExtra(name='react', category='text',
description=Texts('admin_help').get('_react'), description=Texts('admin_help').get('_react'),
short_doc=Texts('admin_help').get('_react__short')) help=Texts('admin_help').get('_react__short'),
usage=Texts('admin_help').get('_react__usage'))
async def _react(self, ctx: commands.Context): async def _react(self, ctx: commands.Context):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send_help('react') await ctx.send_help('react')
@_react.command(name='add', @_react.command(name='add',
description=Texts('admin_help').get('_react_add'), description=Texts('admin_help').get('_react_add'),
short_doc=Texts('admin_help').get('_react_add__short')) help=Texts('admin_help').get('_react_add__short'),
usage=Texts('admin_help').get('_react_add__usage'))
async def _react_add(self, ctx: commands.Context, message_id: int, *, async def _react_add(self, ctx: commands.Context, message_id: int, *,
emojis: str): emojis: str):
emojis: list = emojis.split(' ') emojis: list = emojis.split(' ')
@ -208,7 +216,8 @@ class Admin(commands.Cog):
@_react.command(name='clear', @_react.command(name='clear',
description=Texts('admin_help').get('_react_remove'), description=Texts('admin_help').get('_react_remove'),
short_doc=Texts('admin_help').get('_react_remove__short')) help=Texts('admin_help').get('_react_remove__short'),
usage=Texts('admin_help').get('_react_remove__usage'))
async def _react_remove(self, ctx: commands.Context, message_id: int): async def _react_remove(self, ctx: commands.Context, message_id: int):
try: try:
message: discord.Message = await ctx.channel.fetch_message( message: discord.Message = await ctx.channel.fetch_message(
@ -224,7 +233,8 @@ class Admin(commands.Cog):
@groupExtra(name='delete', invoke_without_command=True, @groupExtra(name='delete', invoke_without_command=True,
category='text', category='text',
description=Texts('admin_help').get('_delete'), description=Texts('admin_help').get('_delete'),
short_doc=Texts('admin_help').get('_delete__short')) help=Texts('admin_help').get('_delete__short'),
usage=Texts('admin_help').get('_delete___usage'))
async def _delete(self, ctx: commands.Context, message_id: int): async def _delete(self, ctx: commands.Context, message_id: int):
try: try:
await ctx.message.delete() await ctx.message.delete()
@ -242,7 +252,8 @@ class Admin(commands.Cog):
@_delete.command(name='from', aliases=['to', 'in'], @_delete.command(name='from', aliases=['to', 'in'],
description=Texts('admin_help').get('_delete_from'), description=Texts('admin_help').get('_delete_from'),
short_doc=Texts('admin_help').get('_delete_from__short')) help=Texts('admin_help').get('_delete_from__short'),
usage=Texts('admin_help').get('_delete_from__usage'))
async def _delete_from(self, ctx: commands.Context, async def _delete_from(self, ctx: commands.Context,
channel: discord.TextChannel, message_id: int): channel: discord.TextChannel, message_id: int):
try: try:
@ -308,7 +319,8 @@ class Admin(commands.Cog):
@groupExtra(name='warn', aliases=['warns'], category='administration', @groupExtra(name='warn', aliases=['warns'], category='administration',
description=Texts('admin_help').get('_warn'), description=Texts('admin_help').get('_warn'),
short_doc=Texts('admin_help').get('_warn__short')) help=Texts('admin_help').get('_warn__short'),
usage=Texts('admin_help').get('_warn__usage'))
async def _warn(self, ctx: commands.Context): async def _warn(self, ctx: commands.Context):
await ctx.trigger_typing() await ctx.trigger_typing()
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
@ -322,7 +334,8 @@ class Admin(commands.Cog):
@_warn.command(name='add', aliases=['new'], @_warn.command(name='add', aliases=['new'],
description=Texts('admin_help').get('_warn_new'), description=Texts('admin_help').get('_warn_new'),
short_doc=Texts('admin_help').get('_warn_new__short')) help=Texts('admin_help').get('_warn_new__short'),
usage=Texts('admin_help').get('_warn_new__usage'))
async def _warn_new(self, ctx: commands.Context, member: discord.Member, async def _warn_new(self, ctx: commands.Context, member: discord.Member,
*, reason="N/A"): *, reason="N/A"):
member = await ctx.guild.fetch_member(member.id) member = await ctx.guild.fetch_member(member.id)
@ -403,7 +416,8 @@ class Admin(commands.Cog):
@_warn.command(name='remove', aliases=['revoke', 'del', 'delete'], @_warn.command(name='remove', aliases=['revoke', 'del', 'delete'],
description=Texts('admin_help').get('_warn_remove'), description=Texts('admin_help').get('_warn_remove'),
short_doc=Texts('admin_help').get('_warn_remove__short')) help=Texts('admin_help').get('_warn_remove__short'),
usage=Texts('admin_help').get('_warn_remove__usage'))
async def _warn_remove(self, ctx: commands.Context, warn_id: int): async def _warn_remove(self, ctx: commands.Context, warn_id: int):
warn = self.bot.database.session \ warn = self.bot.database.session \
.query(WarnModel) \ .query(WarnModel) \
@ -417,7 +431,8 @@ class Admin(commands.Cog):
@_warn.command(name='show', aliases=['list', 'all'], @_warn.command(name='show', aliases=['list', 'all'],
description=Texts('admin_help').get('_warn_show'), description=Texts('admin_help').get('_warn_show'),
short_doc=Texts('admin_help').get('_warn_show__short')) help=Texts('admin_help').get('_warn_show__short'),
usage=Texts('admin_help').get('_warn_show__usage'))
async def _warn_show(self, ctx: commands.Context, member: discord.Member): async def _warn_show(self, ctx: commands.Context, member: discord.Member):
warns_list, warns = await self.get_warn(ctx, member) warns_list, warns = await self.get_warn(ctx, member)
@ -430,7 +445,8 @@ class Admin(commands.Cog):
@_warn.command(name='edit', aliases=['change', 'modify'], @_warn.command(name='edit', aliases=['change', 'modify'],
description=Texts('admin_help').get('_warn_edit'), description=Texts('admin_help').get('_warn_edit'),
short_doc=Texts('admin_help').get('_warn_edit__short')) help=Texts('admin_help').get('_warn_edit__short'),
usage=Texts('admin_help').get('_warn_edit__usage'))
async def _warn_edit(self, ctx: commands.Context, warn_id: int, *, reason): async def _warn_edit(self, ctx: commands.Context, warn_id: int, *, reason):
warn = self.bot.database.session \ warn = self.bot.database.session \
.query(WarnModel) \ .query(WarnModel) \
@ -448,7 +464,8 @@ class Admin(commands.Cog):
@commandExtra(name='language', aliases=['lang', 'langue', 'langage'], @commandExtra(name='language', aliases=['lang', 'langue', 'langage'],
category='server', category='server',
description=Texts('admin_help').get('_language'), description=Texts('admin_help').get('_language'),
short_doc=Texts('admin_help').get('_language__short')) help=Texts('admin_help').get('_language__short'),
usage=Texts('admin_help').get('_language__usage'))
async def _language(self, ctx: commands.Context, locale: str): async def _language(self, ctx: commands.Context, locale: str):
available = self.bot.database.session \ available = self.bot.database.session \
.query(LangModel.value) \ .query(LangModel.value) \
@ -481,14 +498,16 @@ class Admin(commands.Cog):
@groupExtra(name='prefix', aliases=['prefixes'], category='server', @groupExtra(name='prefix', aliases=['prefixes'], category='server',
description=Texts('admin_help').get('_prefix'), description=Texts('admin_help').get('_prefix'),
short_doc=Texts('admin_help').get('_prefix_short')) help=Texts('admin_help').get('_prefix_short'),
usage=Texts('admin_help').get('_prefix__usage'))
async def _prefix(self, ctx: commands.Context): async def _prefix(self, ctx: commands.Context):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send_help('prefix') await ctx.send_help('prefix')
@_prefix.command(name='add', aliases=['set', 'new'], @_prefix.command(name='add', aliases=['set', 'new'],
description=Texts('admin_help').get('_prefix_add'), description=Texts('admin_help').get('_prefix_add'),
short_doc=Texts('admin_help').get('_prefix_add__short')) help=Texts('admin_help').get('_prefix_add__short'),
usage=Texts('admin_help').get('_prefix_add__usage'))
async def _prefix_add(self, ctx: commands.Context, prefix: str): async def _prefix_add(self, ctx: commands.Context, prefix: str):
if str(ctx.guild.id) in self.bot.prefixes: if str(ctx.guild.id) in self.bot.prefixes:
prefixes = self.bot.prefixes.get( prefixes = self.bot.prefixes.get(
@ -523,8 +542,8 @@ class Admin(commands.Cog):
@_prefix.command(name='remove', aliases=['drop', 'del', 'delete'], @_prefix.command(name='remove', aliases=['drop', 'del', 'delete'],
description=Texts('admin_help').get('_prefix_remove'), description=Texts('admin_help').get('_prefix_remove'),
short_doc=Texts('admin_help').get( help=Texts('admin_help').get('_prefix_remove__short'),
'_prefix_remove__short')) usage=Texts('admin_help').get('_prefix_remove__usage'))
async def _prefix_remove(self, ctx: commands.Context, prefix: str): async def _prefix_remove(self, ctx: commands.Context, prefix: str):
if str(ctx.guild.id) in self.bot.prefixes: if str(ctx.guild.id) in self.bot.prefixes:
prefixes = self.bot.prefixes.get( prefixes = self.bot.prefixes.get(
@ -554,7 +573,8 @@ class Admin(commands.Cog):
@_prefix.command(name='list', aliases=['show', 'all'], @_prefix.command(name='list', aliases=['show', 'all'],
description=Texts('admin_help').get('_prefix_list'), description=Texts('admin_help').get('_prefix_list'),
short_doc=Texts('admin_help').get('_prefix_list__short')) help=Texts('admin_help').get('_prefix_list__short'),
usage=Texts('admin_help').get('_prefix_list__usage'))
async def _prefix_list(self, ctx: commands.Context): async def _prefix_list(self, ctx: commands.Context):
extras = ['.'] extras = ['.']
if ctx.message.guild is not None: if ctx.message.guild is not None:

40
cogs/Help.py
View file

@ -16,28 +16,24 @@ log = logging.getLogger(__name__)
class HelpCommand(commands.HelpCommand): class HelpCommand(commands.HelpCommand):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.ignore_cogs = ["Monitoring", "Help", "Jishaku"] self.ignore_cogs = ["Monitoring", "Help"]
self.owner_cogs = ["Admin"] self.owner_cogs = ["Jishaku"]
self.admin_cogs = ["Admin"]
def common_command_formatting(self, emb, command): def common_command_formatting(self, e, command):
prefix = self.context.prefix if str(self.context.bot.user.id) not in self.context.prefix else f"@{self.context.bot.user.name}" prefix = self.context.prefix if str(self.context.bot.user.id) not in self.context.prefix else f"@{self.context.bot.user.name}"
emb.title = self.get_command_signature(command) e.title = self.get_command_signature(command)
e.description = command.description
emb.description = command.description e.add_field(
usage = command.description + "todo: usage" name="TODO: Text.params :",
value=command.usage
try: )
usg = command.description + "todo: usage" e.add_field(
emb.add_field( name="TODO: Text.usage :",
name=usage, value=f"{prefix}{command.qualified_name} " + command.usage
value=f"{prefix}{command.qualified_name} " + usg )
)
except KeyError:
emb.add_field(
name=usage,
value=f"{prefix}{command.qualified_name}"
)
aliases = "`" + '`, `'.join(command.aliases) + "`" aliases = "`" + '`, `'.join(command.aliases) + "`"
if aliases == "``": if aliases == "``":
@ -46,7 +42,7 @@ class HelpCommand(commands.HelpCommand):
).get( ).get(
'command_help.no_aliases' 'command_help.no_aliases'
) )
emb.add_field( e.add_field(
name=Texts( name=Texts(
'help', self.context 'help', self.context
).get( ).get(
@ -55,7 +51,7 @@ class HelpCommand(commands.HelpCommand):
value=aliases value=aliases
) )
return emb return e
async def send_bot_help(self, mapping): async def send_bot_help(self, mapping):
owners = self.context.bot.owners owners = self.context.bot.owners
@ -129,14 +125,14 @@ class HelpCommand(commands.HelpCommand):
pages[cmd.category] \ pages[cmd.category] \
+= f"{cmd.name}" \ += f"{cmd.name}" \
+ ' ' * int(17 - len(cmd.name)) \ + ' ' * int(17 - len(cmd.name)) \
+ f":: {cmd.short_doc}\n" + f":: {cmd.help}\n"
if isinstance(cmd, commands.Group): if isinstance(cmd, commands.Group):
for group_command in cmd.commands: for group_command in cmd.commands:
pages[cmd.category] \ pages[cmd.category] \
+= f"━ {group_command.name}" \ += f"━ {group_command.name}" \
+ ' ' * int(15 - len(group_command.name)) \ + ' ' * int(15 - len(group_command.name)) \
+ f":: {cmd.short_doc}\n" + f":: {cmd.help}\n"
for e in pages: for e in pages:
pages[e] += "```" pages[e] += "```"
formatted = [] formatted = []

6
cogs/Logs.py
View file

@ -245,7 +245,7 @@ class Logs(commands.Cog):
@commandExtra(name='commandstats', hidden=True, category='misc', @commandExtra(name='commandstats', hidden=True, category='misc',
description=Texts('logs_help').get('_commandstats'), description=Texts('logs_help').get('_commandstats'),
short_doc=Texts('logs_help').get('_commandstats__short')) help=Texts('logs_help').get('_commandstats__short'))
@commands.is_owner() @commands.is_owner()
async def _commandstats(self, ctx, limit=20): async def _commandstats(self, ctx, limit=20):
counter = self.bot.command_stats counter = self.bot.command_stats
@ -262,7 +262,7 @@ class Logs(commands.Cog):
@commandExtra(name='socketstats', hidden=True, category='misc', @commandExtra(name='socketstats', hidden=True, category='misc',
description=Texts('logs_help').get('_socketstats'), description=Texts('logs_help').get('_socketstats'),
short_doc=Texts('logs_help').get('_socketstats__short')) help=Texts('logs_help').get('_socketstats__short'))
@commands.is_owner() @commands.is_owner()
async def _socketstats(self, ctx): async def _socketstats(self, ctx):
delta = datetime.datetime.utcnow() - self.bot.uptime delta = datetime.datetime.utcnow() - self.bot.uptime
@ -274,7 +274,7 @@ class Logs(commands.Cog):
@commandExtra(name='uptime', category='misc', @commandExtra(name='uptime', category='misc',
description=Texts('logs_help').get('_uptime'), description=Texts('logs_help').get('_uptime'),
short_doc=Texts('logs_help').get('_uptime__short')) help=Texts('logs_help').get('_uptime__short'))
async def _uptime(self, ctx): async def _uptime(self, ctx):
uptime = humanize.naturaltime( uptime = humanize.naturaltime(
datetime.datetime.utcnow() - self.bot.uptime) datetime.datetime.utcnow() - self.bot.uptime)

4
cogs/Polls.py
View file

@ -207,14 +207,14 @@ class Polls(commands.Cog):
@groupExtra(name='poll', aliases=['sondage'], @groupExtra(name='poll', aliases=['sondage'],
category='poll', category='poll',
description=Texts('poll_help').get('_poll'), description=Texts('poll_help').get('_poll'),
short_doc=Texts('poll_help').get('_poll__short')) help=Texts('poll_help').get('_poll__short'))
async def _poll(self, ctx: commands.Context): async def _poll(self, ctx: commands.Context):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send_help('sondage') await ctx.send_help('sondage')
@_poll.group(name='create', aliases=['new', 'nouveau'], @_poll.group(name='create', aliases=['new', 'nouveau'],
description=Texts('poll_help').get('_poll_create'), description=Texts('poll_help').get('_poll_create'),
short_doc=Texts('poll_help').get('_poll_create__short')) help=Texts('poll_help').get('_poll_create__short'))
async def _poll_create(self, ctx: commands.Context, *, poll: str): async def _poll_create(self, ctx: commands.Context, *, poll: str):
is_anonymous = '--anonyme' in poll is_anonymous = '--anonyme' in poll
poll = poll.replace('--anonyme', '') poll = poll.replace('--anonyme', '')

14
cogs/Useful.py
View file

@ -70,7 +70,7 @@ class Useful(commands.Cog):
@commandExtra(name='iplocalise', category='network', @commandExtra(name='iplocalise', category='network',
description=Texts('useful_help').get('_iplocalise'), description=Texts('useful_help').get('_iplocalise'),
short_doc=Texts('useful_help').get('_iplocalise__short')) help=Texts('useful_help').get('_iplocalise__short'))
async def _iplocalise(self, ctx: commands.Context, addr, ip_type=''): async def _iplocalise(self, ctx: commands.Context, addr, ip_type=''):
addr = re.sub(r'http(s?)://', '', addr) addr = re.sub(r'http(s?)://', '', addr)
addr = addr[:-1] if addr.endswith('/') else addr addr = addr[:-1] if addr.endswith('/') else addr
@ -136,7 +136,7 @@ class Useful(commands.Cog):
@commandExtra(name='getheaders', category='network', @commandExtra(name='getheaders', category='network',
description=Texts('useful_help').get('_getheaders'), description=Texts('useful_help').get('_getheaders'),
short_doc=Texts('useful_help').get('_getheaders__short')) help=Texts('useful_help').get('_getheaders__short'))
async def _getheaders(self, ctx: commands.Context, addr: str): async def _getheaders(self, ctx: commands.Context, addr: str):
if (addr.startswith('http') or addr.startswith('ftp')) is not True: if (addr.startswith('http') or addr.startswith('ftp')) is not True:
addr = f"http://{addr}" addr = f"http://{addr}"
@ -169,7 +169,7 @@ class Useful(commands.Cog):
@commandExtra(name='git', aliases=['sources', 'source', 'github'], @commandExtra(name='git', aliases=['sources', 'source', 'github'],
category='misc', category='misc',
description=Texts('useful_help').get('_git'), description=Texts('useful_help').get('_git'),
short_doc=Texts('useful_help').get('_git__short')) help=Texts('useful_help').get('_git__short'))
async def _git(self, ctx): async def _git(self, ctx):
e = discord.Embed( e = discord.Embed(
title=Texts('useful', ctx).get('git repo'), title=Texts('useful', ctx).get('git repo'),
@ -186,7 +186,7 @@ class Useful(commands.Cog):
@commandExtra(name='quote', category='misc', @commandExtra(name='quote', category='misc',
description=Texts('useful_help').get('_quote'), description=Texts('useful_help').get('_quote'),
short_doc=Texts('useful_help').get('_quote__short')) help=Texts('useful_help').get('_quote__short'))
async def _quote(self, ctx, message_id: discord.Message): async def _quote(self, ctx, message_id: discord.Message):
e = discord.Embed( e = discord.Embed(
colour=message_id.author.colour, colour=message_id.author.colour,
@ -210,7 +210,7 @@ class Useful(commands.Cog):
@commandExtra(name='ping', category='network', @commandExtra(name='ping', category='network',
description=Texts('useful_help').get('_ping'), description=Texts('useful_help').get('_ping'),
short_doc=Texts('useful_help').get('_ping__short')) help=Texts('useful_help').get('_ping__short'))
async def _ping(self, ctx: commands.Context): async def _ping(self, ctx: commands.Context):
start = time.perf_counter() start = time.perf_counter()
await ctx.trigger_typing() await ctx.trigger_typing()
@ -230,7 +230,7 @@ class Useful(commands.Cog):
@commandExtra(name='info', aliases=['about'], category='misc', @commandExtra(name='info', aliases=['about'], category='misc',
description=Texts('useful_help').get('_info'), description=Texts('useful_help').get('_info'),
short_doc=Texts('useful_help').get('_info__short')) help=Texts('useful_help').get('_info__short'))
async def _info(self, ctx: commands.Context): async def _info(self, ctx: commands.Context):
proc = psutil.Process() proc = psutil.Process()
total, python = self.fetch_info() total, python = self.fetch_info()
@ -315,7 +315,7 @@ class Useful(commands.Cog):
@commandExtra(name='credits', aliases=['contributors', 'authors'], @commandExtra(name='credits', aliases=['contributors', 'authors'],
category='misc', category='misc',
description=Texts('useful_help').get('_credits'), description=Texts('useful_help').get('_credits'),
short_doc=Texts('useful_help').get('_credits__short')) help=Texts('useful_help').get('_credits__short'))
async def _credits(self, ctx: commands.Context): async def _credits(self, ctx: commands.Context):
e = discord.Embed( e = discord.Embed(
title=Texts('useful', ctx).get('Contributors'), title=Texts('useful', ctx).get('Contributors'),

8
cogs/User.py
View file

@ -21,14 +21,14 @@ class User(commands.Cog):
@groupExtra(name='alias', aliases=['aliases'], category='alias', @groupExtra(name='alias', aliases=['aliases'], category='alias',
description=Texts('user_help').get('_alias'), description=Texts('user_help').get('_alias'),
short_doc=Texts('user_help').get('_alias__short')) help=Texts('user_help').get('_alias__short'))
async def _alias(self, ctx: commands.Context): async def _alias(self, ctx: commands.Context):
if ctx.invoked_subcommand is None: if ctx.invoked_subcommand is None:
await ctx.send_help('alias') await ctx.send_help('alias')
@_alias.command(name='add', aliases=['set', 'new'], @_alias.command(name='add', aliases=['set', 'new'],
description=Texts('user_help').get('_alias_add'), description=Texts('user_help').get('_alias_add'),
short_doc=Texts('user_help').get('_alias_add__short')) help=Texts('user_help').get('_alias_add__short'))
async def _alias_add(self, ctx: commands.Context, *, user_alias: str): async def _alias_add(self, ctx: commands.Context, *, user_alias: str):
is_global = False is_global = False
if '--global' in user_alias: if '--global' in user_alias:
@ -57,13 +57,13 @@ class User(commands.Cog):
@_alias.command(name='remove', aliases=['drop', 'del', 'delete'], @_alias.command(name='remove', aliases=['drop', 'del', 'delete'],
description=Texts('user_help').get('_alias_remove'), description=Texts('user_help').get('_alias_remove'),
short_doc=Texts('user_help').get('_alias_remove__short')) help=Texts('user_help').get('_alias_remove__short'))
async def _alias_remove(self, ctx: commands.Context, prefix: str): async def _alias_remove(self, ctx: commands.Context, prefix: str):
... ...
@_alias.command(name='list', aliases=['show', 'all'], @_alias.command(name='list', aliases=['show', 'all'],
description=Texts('user_help').get('_alias_list'), description=Texts('user_help').get('_alias_list'),
short_doc=Texts('user_help').get('_alias_list__short')) help=Texts('user_help').get('_alias_list__short'))
async def _alias_list(self, ctx: commands.Context): async def _alias_list(self, ctx: commands.Context):
... ...

164
extras/locales/en/LC_MESSAGES/admin_help.po
View file

@ -14,79 +14,239 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n" "Generated-By: pygettext.py 1.5\n"
###########################################################################
########################## SAY ########################################
###########################################################################
msgid '_say' msgid '_say'
msgstr '' msgstr ''
msgid '_say_short'
msgstr '_say_short'
msgid '_say_usage'
msgstr '_say_usage'
###########################################################################
msgid '_say_edit' msgid '_say_edit'
msgstr '' msgstr ''
msgid '_say_to' msgid '_say_edit__help'
msgstr ''
msgid '_say_edit__usage'
msgstr '' msgstr ''
########################################################################### ###########################################################################
msgid '_say_to'
msgstr ''
msgid '_say_to__help'
msgstr ''
msgid '_say_to__usage'
msgstr ''
###########################################################################
########################## BAN ########################################
###########################################################################
msgid '_ban' msgid '_ban'
msgstr '' msgstr ''
msgid '_ban__help'
msgstr ''
msgid '_ban__usage'
msgstr ''
###########################################################################
########################## KICK #######################################
########################################################################### ###########################################################################
msgid '_kick' msgid '_kick'
msgstr '' msgstr ''
msgid '_kick__help'
msgstr ''
msgid '_kick__usage'
msgstr ''
###########################################################################
########################## CLEAR ######################################
########################################################################### ###########################################################################
msgid '_clear' msgid '_clear'
msgstr '' msgstr ''
msgid '_clear__help'
msgstr ''
msgid '_clear__usage'
msgstr ''
###########################################################################
########################## REACT ######################################
########################################################################### ###########################################################################
msgid '_react' msgid '_react'
msgstr '' msgstr ''
msgid '_react__help'
msgstr ''
msgid '_react__usage'
msgstr ''
###########################################################################
msgid '_react_remove' msgid '_react_remove'
msgstr '' msgstr ''
msgid '_react_remove__help'
msgstr ''
msgid '_react_remove__usage'
msgstr ''
###########################################################################
########################## DELETE #####################################
########################################################################### ###########################################################################
msgid '_delete' msgid '_delete'
msgstr '' msgstr ''
msgid '_delete__help'
msgstr ''
msgid '_delete__usage'
msgstr ''
###########################################################################
msgid '_delete_from' msgid '_delete_from'
msgstr '' msgstr ''
msgid '_delete_from__help'
msgstr ''
msgid '_delete_from__usage'
msgstr ''
###########################################################################
########################## WARN #######################################
########################################################################### ###########################################################################
msgid '_warn' msgid '_warn'
msgstr '' msgstr ''
msgid '_warn__help'
msgstr ''
msgid '_warn__usage'
msgstr ''
###########################################################################
msgid '_warn_new' msgid '_warn_new'
msgstr '' msgstr ''
msgid '_warn_new__help'
msgstr ''
msgid '_warn_new__usage'
msgstr ''
###########################################################################
msgid '_warn_remove' msgid '_warn_remove'
msgstr '' msgstr ''
msgid '_warn_remove__help'
msgstr ''
msgid '_warn_remove__usage'
msgstr ''
###########################################################################
msgid '_warn_show' msgid '_warn_show'
msgstr '' msgstr ''
msgid '_warn_show__help'
msgstr ''
msgid '_warn_show__usage'
msgstr ''
###########################################################################
msgid '_warn_edit' msgid '_warn_edit'
msgstr '' msgstr ''
msgid '_warn_edit__help'
msgstr ''
msgid '_warn_edit__usage'
msgstr ''
###########################################################################
########################## LANGUAGE ###################################
########################################################################### ###########################################################################
msgid '_language' msgid '_language'
msgstr '' msgstr ''
msgid '_language__help'
msgstr ''
msgid '_language__usage'
msgstr ''
###########################################################################
########################## PREFIX #####################################
########################################################################### ###########################################################################
msgid '_prefix' msgid '_prefix'
msgstr '' msgstr ''
msgid '_prefix__help'
msgstr ''
msgid '_prefix__usage'
msgstr ''
###########################################################################
msgid '_prefix_add' msgid '_prefix_add'
msgstr '' msgstr ''
msgid '_prefix_add__help'
msgstr ''
msgid '_prefix_add__usage'
msgstr ''
###########################################################################
msgid '_prefix_remove' msgid '_prefix_remove'
msgstr '' msgstr ''
msgid '_prefix_remove__help'
msgstr ''
msgid '_prefix_remove__usage'
msgstr ''
###########################################################################
msgid '_prefix_list' msgid '_prefix_list'
msgstr '' msgstr ''
msgid '_prefix_list__help'
msgstr ''
msgid '_prefix_list__usage'
msgstr ''

178
extras/locales/fr/LC_MESSAGES/admin_help.po
View file

@ -14,79 +14,239 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n" "Generated-By: pygettext.py 1.5\n"
###########################################################################
########################## SAY ########################################
###########################################################################
msgid '_say' msgid '_say'
msgstr '' msgstr 'Permet de faire en sorte que le TuxBot envoi votre message'
msgid '_say_edit' msgid '_say__short'
msgstr '' msgstr 'Fait parler TuxBot'
msgid '_say_to' msgid '_say_usage'
msgstr '' msgstr '[sous-commande] <message>'
########################################################################### ###########################################################################
msgid '_ban' msgid '_say_edit'
msgstr '' msgstr "Permet de modifier le contenu d'un message envoyé par TuxBot"
msgid '_say_edit__short'
msgstr 'Edite un message envoyé par le TuxBot'
msgid '_say_edit__usage'
msgstr '<ID/Lien du message> <message>'
###########################################################################
msgid '_say_to'
msgstr "Permet de faire en sorte que le TuxBot envoi votre message dans un autre salon ou en MP à quelqu'un"
msgid '_say_to__short'
msgstr 'Fait parler TuxBot dans un autre salon'
msgid '_say_to__usage'
msgstr "<ID/Mention du salon ou ID/Mention d'un membre> <message>"
###########################################################################
########################## BAN ########################################
###########################################################################
msgid '_ban'
msgstr 'Permet de bannir un membre'
msgid '_ban__short'
msgstr 'Bannir un membre'
msgid '_ban__usage'
msgstr '<ID/Mention du membre>'
###########################################################################
########################## KICK #######################################
########################################################################### ###########################################################################
msgid '_kick' msgid '_kick'
msgstr '' msgstr "Permet d'expulser un membre"
msgid '_kick__short'
msgstr 'Expulser un membre'
msgid '_kick__usage'
msgstr '<ID/Mention du membre>'
###########################################################################
########################## CLEAR ######################################
########################################################################### ###########################################################################
msgid '_clear' msgid '_clear'
msgstr '' msgstr ''
msgid '_clear__short'
msgstr ''
msgid '_clear__usage'
msgstr ''
###########################################################################
########################## REACT ######################################
########################################################################### ###########################################################################
msgid '_react' msgid '_react'
msgstr '' msgstr ''
msgid '_react__short'
msgstr ''
msgid '_react__usage'
msgstr ''
###########################################################################
msgid '_react_remove' msgid '_react_remove'
msgstr '' msgstr ''
msgid '_react_remove__short'
msgstr ''
msgid '_react_remove__usage'
msgstr ''
###########################################################################
########################## DELETE #####################################
########################################################################### ###########################################################################
msgid '_delete' msgid '_delete'
msgstr '' msgstr ''
msgid '_delete__short'
msgstr ''
msgid '_delete__usage'
msgstr ''
###########################################################################
msgid '_delete_from' msgid '_delete_from'
msgstr '' msgstr ''
msgid '_delete_from__short'
msgstr ''
msgid '_delete_from__usage'
msgstr ''
###########################################################################
########################## WARN #######################################
########################################################################### ###########################################################################
msgid '_warn' msgid '_warn'
msgstr '' msgstr ''
msgid '_warn__short'
msgstr ''
msgid '_warn__usage'
msgstr ''
###########################################################################
msgid '_warn_new' msgid '_warn_new'
msgstr '' msgstr ''
msgid '_warn_new__short'
msgstr ''
msgid '_warn_new__usage'
msgstr ''
###########################################################################
msgid '_warn_remove' msgid '_warn_remove'
msgstr '' msgstr ''
msgid '_warn_remove__short'
msgstr ''
msgid '_warn_remove__usage'
msgstr ''
###########################################################################
msgid '_warn_show' msgid '_warn_show'
msgstr '' msgstr ''
msgid '_warn_show__short'
msgstr ''
msgid '_warn_show__usage'
msgstr ''
###########################################################################
msgid '_warn_edit' msgid '_warn_edit'
msgstr '' msgstr ''
msgid '_warn_edit__short'
msgstr ''
msgid '_warn_edit__usage'
msgstr ''
###########################################################################
########################## LANGUAGE ###################################
########################################################################### ###########################################################################
msgid '_language' msgid '_language'
msgstr '' msgstr ''
msgid '_language__short'
msgstr ''
msgid '_language__usage'
msgstr ''
###########################################################################
########################## PREFIX #####################################
########################################################################### ###########################################################################
msgid '_prefix' msgid '_prefix'
msgstr '' msgstr ''
msgid '_prefix__short'
msgstr ''
msgid '_prefix__usage'
msgstr ''
###########################################################################
msgid '_prefix_add' msgid '_prefix_add'
msgstr '' msgstr ''
msgid '_prefix_add__short'
msgstr ''
msgid '_prefix_add__usage'
msgstr ''
###########################################################################
msgid '_prefix_remove' msgid '_prefix_remove'
msgstr '' msgstr ''
msgid '_prefix_remove__short'
msgstr ''
msgid '_prefix_remove__usage'
msgstr ''
###########################################################################
msgid '_prefix_list' msgid '_prefix_list'
msgstr '' msgstr ''
msgid '_prefix_list__short'
msgstr ''
msgid '_prefix_list__usage'
msgstr ''

19
logs/tuxbot.log
View file

@ -1,19 +0,0 @@
[INFO ] [2020-01-05 01:27:19] discord.client: logging in using static token
[INFO ] [2020-01-05 01:27:21] discord.gateway: Shard ID 0 has sent the IDENTIFY payload.
[INFO ] [2020-01-05 01:27:21] discord.gateway: Shard ID 0 has connected to Gateway: ["gateway-prd-main-9bmr",{"micros":437974,"calls":["discord-sessions-prd-1-19",{"micros":435593,"calls":["start_session",{"micros":38434,"calls":["api-prd-main-m577",{"micros":35095,"calls":["get_user",{"micros":1858},"add_authorized_ip",{"micros":1746},"get_guilds",{"micros":2400},"coros_wait",{"micros":2}]}]},"guilds_connect",{"micros":73,"calls":[]},"presence_connect",{"micros":1,"calls":[]}]}]}] (Session ID: 821ba51666f198bfd1e13b0e1b75fc84).
[INFO ] [2020-01-05 01:27:30] discord.state: Processed a chunk for 462 members in guild ID 280805240977227776.
[INFO ] [2020-01-05 01:27:30] discord.state: Processed a chunk for 794 members in guild ID 331981755177238530.
[INFO ] [2020-01-05 01:27:30] discord.state: Processed a chunk for 1000 members in guild ID 296698073177128962.
[INFO ] [2020-01-05 01:27:31] discord.state: Processed a chunk for 1000 members in guild ID 296698073177128962.
[INFO ] [2020-01-05 01:27:31] discord.state: Processed a chunk for 1000 members in guild ID 296698073177128962.
[INFO ] [2020-01-05 01:27:32] discord.state: Processed a chunk for 1000 members in guild ID 296698073177128962.
[INFO ] [2020-01-05 01:27:32] discord.state: Processed a chunk for 1000 members in guild ID 296698073177128962.
[INFO ] [2020-01-05 01:27:33] discord.state: Processed a chunk for 1000 members in guild ID 296698073177128962.
[INFO ] [2020-01-05 01:27:33] discord.state: Processed a chunk for 1000 members in guild ID 296698073177128962.
[INFO ] [2020-01-05 01:27:34] discord.state: Processed a chunk for 1000 members in guild ID 296698073177128962.
[INFO ] [2020-01-05 01:27:34] discord.state: Processed a chunk for 842 members in guild ID 296698073177128962.
[INFO ] [2020-01-05 01:27:36] cogs.Logs: 2020-01-05 00:27:55.614000: Romain#5117 in #tuxbot-test (Gnous): <@!301062143942590465> help Logs
[INFO ] [2020-01-05 01:30:14] discord.client: Cleaning up tasks.
[INFO ] [2020-01-05 01:30:14] discord.client: Cleaning up after 6 tasks.
[INFO ] [2020-01-05 01:30:15] discord.client: All tasks finished cancelling.
[INFO ] [2020-01-05 01:30:15] discord.client: Closing the event loop.

4
utils/extra.py
View file

@ -5,6 +5,8 @@ class commandsPlus(commands.Command):
def __init__(self, func, **kwargs): def __init__(self, func, **kwargs):
super().__init__(func, **kwargs) super().__init__(func, **kwargs)
self.category = kwargs.get("category", 'other') self.category = kwargs.get("category", 'other')
self.help = kwargs.get("help", 'No Help Provided')
self.usage = kwargs.get("usage", 'No Usage Provided')
def commandExtra(*args, **kwargs): def commandExtra(*args, **kwargs):
@ -15,6 +17,8 @@ class GroupPlus(commands.Group):
def __init__(self, func, **kwargs): def __init__(self, func, **kwargs):
super().__init__(func, **kwargs) super().__init__(func, **kwargs)
self.category = kwargs.get("category", 'other') self.category = kwargs.get("category", 'other')
self.help = kwargs.get("help", 'No Help Provided')
self.usage = kwargs.get("usage", 'No Usage Provided')
def groupExtra(*args, **kwargs): def groupExtra(*args, **kwargs):