adoralaura/game-discord-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix and refactor a lot of stuff

Browse source
This commit is contained in:
Adora Laura Kalb 2024-01-01 18:01:33 +01:00
parent 488c8e1b32
commit aa8c5d5d8b
Signed by: adoralaura
GPG key ID: 7A4552166FC8C056
1 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
app.py
View file

@ -19,12 +19,9 @@ async def on_ready():
@client.event @client.event
async def on_message(message): async def on_message(message):
# Only allow chats in DM or whitelisted channels # Only allow chats in DM or whitelisted channels
# TODO: FIX
if not (isinstance(message.channel, discord.channel.DMChannel)) and not (message.channel.id in config['bot']['channels']): if not (isinstance(message.channel, discord.channel.DMChannel)) and not (message.channel.id in config['bot']['channels']):
print(isinstance(message.channel, discord.channel.DMChannel))
print(message.channel.id)
return return
# print(message.channel.name)
# Handle own messages # Handle own messages
if message.author == client.user: if message.author == client.user:
return return
@ -41,11 +38,6 @@ async def on_message(message):
await message.channel.send(f"{message.author.mention} 👋") await message.channel.send(f"{message.author.mention} 👋")
return return
# if message.content == f"{client.user.mention} version":
# logger.info(f"Version by {message.author.name}")
# await message.channel.send(f"{message.author.mention} ")
# return
# Handle @Bot mention # Handle @Bot mention
messagearray = message.content.split() messagearray = message.content.split()
if messagearray[0] == client.user.mention: if messagearray[0] == client.user.mention:
@ -53,39 +45,57 @@ async def on_message(message):
else: else:
return return
if messagearray[0] == "help": command = messagearray[0].lower()
# message starts with "help"
if command == "help":
logger.info(f"Help by {message.author.name}") logger.info(f"Help by {message.author.name}")
await message.channel.send(BuildHelpList()) await message.channel.send(BuildHelpList())
return return
if messagearray[0] in ["list", "info"]:
logger.info(f"{messagearray[0]} by {message.author.name}") # message starts with "list" or "info"
if command in ["list", "info"]:
logger.info(f"{command} by {message.author.name}")
await message.channel.send(BuildGameList()) await message.channel.send(BuildGameList())
return return
if messagearray[0] in ["start", "stop", "restart"] and len(messagearray) >= 2: if command in ["start", "stop", "restart"]:
if len(messagearray) != 2:
logger.error(
f"{command} with invalid numer of arguments by {message.author.name}. Command: \"{message.content}\"")
await message.add_reaction("❌")
await message.channel.send(f"Invalid number of arguments")
return
game = GetGameByGameSlug(messagearray[1]) game = GetGameByGameSlug(messagearray[1])
if not game: if not game:
logger.error( logger.error(
f"{messagearray[0]} for invalid Game \"{messagearray[1]}\" by {message.author.name}") f"{command} for invalid Game \"{messagearray[1]}\" by {message.author.name}")
await message.add_reaction("❌") await message.add_reaction("❌")
await message.channel.send(f"Invalid game: {messagearray[1]}") await message.channel.send(f"Invalid game: {messagearray[1]}")
return return
logger.info( logger.info(
f"{messagearray[0]} by {message.author.name}, Game: {messagearray[1]}") f"{command} by {message.author.name}, Game: {messagearray[1]}")
success = HandleSystemdService(game, messagearray[0]) success = HandleSystemdService(game, command)
# :white_check_mark: :x: # :white_check_mark: :x:
if success: if success:
logger.info( logger.info(
f"{messagearray[0]} by {message.author.name}, Game: {messagearray[1]} was SUCESSFUL") f"{command} by {message.author.name}, Game: {messagearray[1]} was SUCESSFUL")
await message.add_reaction("✅") await message.add_reaction("✅")
await message.channel.send(f"Successfully started {game['displayname']}! Happy gaming! 🎮")
else: else:
logger.error( logger.error(
f"{messagearray[0]} by {message.author.name}, Game: {messagearray[1]} FAILED!") f"{command} by {message.author.name}, Game: {messagearray[1]} FAILED!")
await message.add_reaction("❌") await message.add_reaction("❌")
await message.channel.send(f"Sorry {message.author.mention}, that didn't work. Ping @lauralani") await message.channel.send(f"Sorry {message.author.mention}, that didn't work. Ping @lauralani")
if messagearray[0] == "status": if command == "status":
if len(messagearray) != 2:
logger.error(
f"Status with invalid numer of arguments by {message.author.name}. Command: \"{message.content}\"")
await message.add_reaction("❌")
await message.channel.send(f"Invalid number of arguments")
return
status = BuildSingleGameStatus(messagearray[1]) status = BuildSingleGameStatus(messagearray[1])
if not status: if not status:
logger.error( logger.error(