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

Merge branch 'master' of ZeroHD/MinecraftManagerDjango into master

reminder
Etzelia 2018-12-11 17:25:47 +01:00 committed by Gitea
parent 93b3c881e0 94350da9bd
commit 2f2981154c
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/bot.py
View File

@ -68,14 +68,26 @@ class Discord(discord.Client):
count = Player.objects.filter(username__iexact=search, application__accepted=True).count() count = Player.objects.filter(username__iexact=search, application__accepted=True).count()
if count > 0: if count > 0:
if count == 1: count = Player.objects.filter(username__iexact=search, application__accepted=True).count()
if count == 0:
msg = "{0}, please join the server once before joining the discord.".format(message.author.mention)
yield from self.discord_message(message.channel, msg)
return
player = Player.objects.filter(username__iexact=search, application__accepted=True).all()[0] player = Player.objects.filter(username__iexact=search, application__accepted=True).all()[0]
nickname = player.username nickname = player.username
if not player.is_banned: if not player.is_banned:
member = discord.utils.get(message.server.members, display_name=nickname) on_server = False
for member in message.server.members:
if member is message.author:
continue
if member is not None and member is not message.author: if member.display_name == nickname:
on_server = True
if on_server:
msg = "{0}, a member with that name is already exists, please contact the staff".format(message.author.mention) msg = "{0}, a member with that name is already exists, please contact the staff".format(message.author.mention)
yield from self.discord_message(message.channel, msg) yield from self.discord_message(message.channel, msg)
else: else: