From a423de0cb87e2a37370bae4a005381d62270c9dc Mon Sep 17 00:00:00 2001 From: Joey Hines Date: Mon, 10 Dec 2018 15:22:02 -0600 Subject: [PATCH] Removed appeal link and added register to the help command. --- api/bot.py | 9 +++------ docs/source/django-settings.rst | 2 -- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/api/bot.py b/api/bot.py index 714b6a4..5b3897c 100644 --- a/api/bot.py +++ b/api/bot.py @@ -16,7 +16,6 @@ class Discord(discord.Client): auth_roles = getattr(settings, 'DISCORD_BOT_ROLES', []) error_users = getattr(settings, 'DISCORD_ERROR_USERS', []) new_member_roles = getattr(settings, 'DISCORD_BOT_NEW_MEMBER_ROLES', []) - appeal_self = getattr(settings, 'DISCORD_BOT_APPEAL_LINK', None) token = None def __init__(self, token, **kwargs): @@ -89,15 +88,12 @@ class Discord(discord.Client): yield from self.change_nickname(message.author, nickname) yield from self.discord_message(message.channel, msg) else: - if self.appeal_self is None: - msg = "{0} You are currently banned, please appeal here: <{1}>".format(message.author.mention, self.appeal_link) - else: - msg = "{0} You are currently banned, please appeal." + msg = "{0} You are currently banned.".format(message.author.mention) yield from self.discord_message(message.channel, msg) return else: - msg = "An application for {0} could not be found, please apply first.".format(search) + msg = "{0}, an application for {1} could not be found, please check your username and make sure you have applied.".format(message.author.mention, search) yield from self.discord_message(message.channel, msg) return @@ -111,6 +107,7 @@ class Discord(discord.Client): embed = discord.Embed(colour=discord.Colour(0x417505)) embed.set_thumbnail(url="https://cdn.discordapp.com/avatars/454457830918062081/b5792489bc43d9e17b8f657880a17dd4.png") embed.add_field(name="Minecraft Manager Help", value="-----------------------------") + embed.add_field(name="{}register ".format(self.prefix), value="Allows new members to join the server if they have applied.") embed.add_field(name="{}[app ]search ".format(self.prefix), value="Search for applications by partial or exact username.") embed.add_field(name="{}[app ]info ".format(self.prefix), value="Get detailed information about a specific application.") embed.add_field(name="{}[app ]accept|deny ".format(self.prefix), value="Take action on an application.") diff --git a/docs/source/django-settings.rst b/docs/source/django-settings.rst index b7e0f70..a7ef2fb 100644 --- a/docs/source/django-settings.rst +++ b/docs/source/django-settings.rst @@ -59,8 +59,6 @@ Optional ``DISCORD_BOT_NEW_MEMBER_ROLES`` - A list of Discord Roles to give new players when they register. -``DISCORD_BOT_APPEAL_LINK`` - Link of where to appeal bans on the server. - ``CAPTCHA_SECRET`` - Your secret key used for reCAPTCHA ``STATS_FILTER`` - A python list of partial strings used to filter out stats. e.g. ``['broken', 'dropped', 'picked_up']`` to filter out broken, dropped and picked up stats \ No newline at end of file