benamaurer
/
minecraft_manager
forked from Minecraft/minecraft_manager
1
0
Fork 0
Code Pull Requests Activity

Removed appeal link and added register to the help command.

reminder
Joey Hines 2018-12-10 15:22:02 -06:00
parent 6000251a1a
commit a423de0cb8
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/bot.py
View File

@ -16,7 +16,6 @@ class Discord(discord.Client):
auth_roles = getattr(settings, 'DISCORD_BOT_ROLES', []) auth_roles = getattr(settings, 'DISCORD_BOT_ROLES', [])
error_users = getattr(settings, 'DISCORD_ERROR_USERS', []) error_users = getattr(settings, 'DISCORD_ERROR_USERS', [])
new_member_roles = getattr(settings, 'DISCORD_BOT_NEW_MEMBER_ROLES', []) new_member_roles = getattr(settings, 'DISCORD_BOT_NEW_MEMBER_ROLES', [])
appeal_self = getattr(settings, 'DISCORD_BOT_APPEAL_LINK', None)
token = None token = None
def __init__(self, token, **kwargs): def __init__(self, token, **kwargs):
@ -89,15 +88,12 @@ class Discord(discord.Client):
yield from self.change_nickname(message.author, nickname) yield from self.change_nickname(message.author, nickname)
yield from self.discord_message(message.channel, msg) yield from self.discord_message(message.channel, msg)
else: else:
if self.appeal_self is None: msg = "{0} You are currently banned.".format(message.author.mention)
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."
yield from self.discord_message(message.channel, msg) yield from self.discord_message(message.channel, msg)
return return
else: 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) yield from self.discord_message(message.channel, msg)
return return
@ -111,6 +107,7 @@ class Discord(discord.Client):
embed = discord.Embed(colour=discord.Colour(0x417505)) embed = discord.Embed(colour=discord.Colour(0x417505))
embed.set_thumbnail(url="https://cdn.discordapp.com/avatars/454457830918062081/b5792489bc43d9e17b8f657880a17dd4.png") embed.set_thumbnail(url="https://cdn.discordapp.com/avatars/454457830918062081/b5792489bc43d9e17b8f657880a17dd4.png")
embed.add_field(name="Minecraft Manager Help", value="-----------------------------") embed.add_field(name="Minecraft Manager Help", value="-----------------------------")
embed.add_field(name="{}register <username>".format(self.prefix), value="Allows new members to join the server if they have applied.")
embed.add_field(name="{}[app ]search <username>".format(self.prefix), value="Search for applications by partial or exact username.") embed.add_field(name="{}[app ]search <username>".format(self.prefix), value="Search for applications by partial or exact username.")
embed.add_field(name="{}[app ]info <app ID>".format(self.prefix), value="Get detailed information about a specific application.") embed.add_field(name="{}[app ]info <app ID>".format(self.prefix), value="Get detailed information about a specific application.")
embed.add_field(name="{}[app ]accept|deny <app ID>".format(self.prefix), value="Take action on an application.") embed.add_field(name="{}[app ]accept|deny <app ID>".format(self.prefix), value="Take action on an application.")

2
docs/source/django-settings.rst
View File

@ -59,8 +59,6 @@ Optional
``DISCORD_BOT_NEW_MEMBER_ROLES`` - A list of Discord Roles to give new players when they register. ``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 ``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 ``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