jr/discord
1
0
Fork 0
mirror of https://github.com/runyanjake/discord.git synced 2025-10-04 15:27:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

Refactor commands a bit, add links

Browse Source
This commit is contained in:
whitney 2025-01-28 17:10:27 -08:00
parent d7b1a0288f
commit ab867b3b0c
4 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pwsBot/commands/echo.py
View File

@ -1,5 +1,3 @@
import discord
async def echo(message, echo):
await message.channel.send(echo)

2
pwsBot/commands/hello_world.py
View File

@ -1,5 +1,3 @@
import discord
async def hello_world(message):
await message.channel.send('Hello World!')

8
pwsBot/commands/links.py Normal file
View File

@ -0,0 +1,8 @@
linksMessage = """# **Links**
- PWS Homepage [Link](https://www.whitney.rip)
- pZ_aeriaL Youtube [Link](https://www.youtube.com/channel/UCZctf3QSXXk9a5KzrAJ2bmwt)
- My Source Code [Link](https://github.com/runyanjake/discord/tree/main/pwsBot)
"""
async def links(message):
await message.channel.send(linksMessage)

49
pwsBot/commands/message_handler.py
View File

@ -4,6 +4,7 @@ import sys
from commands.echo import echo
from commands.hello_world import hello_world
from commands.links import links
pws_command_prefix = '/pws '
pws_command_regex = r'/pws (\S+)'
@ -32,24 +33,42 @@ async def handle_message(client, message):
match command:
case 'helloworld':
if args:
logging.warn('Command ' + command + ' got unexpected arguments: ' + message.content + '.')
await message.author.send('Unexpected arguments for command: `' + message.content + '`. Check list of commands (`/pws help`) for valid usage.')
else:
await hello_world(message)
await handle_command(command, hello_world, args, message, False)
case 'echo':
if not args:
logging.warn('Command ' + command + ' did not specify argument(s): ' + message.content + '.')
await message.author.send('Did not specify argument(s) for command: `' + message.content + '`. Check list of commands (`/pws help`) for valid usage.')
else:
await echo(message, args)
await handle_command(command, echo, args, message, True)
case 'links':
await handle_command(command, links, args, message, False)
case 'help' | 'commands':
if args:
logging.warn('Command ' + command + ' got unexpected arguments: ' + message.content + '.')
await message.author.send('Unexpected arguments for command: `' + message.content + '`. Check list of commands (`/pws help`) for valid usage.')
else:
await message.author.send('**Commands**\n- /pws helloworld\n- /pws echo\n- /pws help\n- /pws commands')
await handle_command(command, commands, args, message, False)
case _:
logging.warn('Invalid command ' + command + ' received.')
await message.author.send('Invalid command `' + command + '`. Check list of commands for valid usage.')
commandsMessage = """# **Commands**
- /pws helloworld
- /pws echo
- /pws links
- /pws help
- /pws commands
"""
async def commands(message):
await message.author.send(commandsMessage)
async def handle_command(command, func, args, message, should_have_args=True):
await handle_command_with_args(command, func, args, message) if should_have_args else await handle_command_without_args(command, func, args, message)
async def handle_command_without_args(command, func, args, message):
if args:
logging.warn('Command ' + command + ' got unexpected arguments: ' + message.content + '.')
await message.author.send('Unexpected arguments for command: `' + message.content + '`. Check list of commands (`/pws help`) for valid usage.')
else:
await func(message)
async def handle_command_with_args(command, func, args, message):
if not args:
logging.warn('Command ' + command + ' did not specify argument(s): ' + message.content + '.')
await message.author.send('Did not specify argument(s) for command: `' + message.content + '`. Check list of commands (`/pws help`) for valid usage.')
else:
await func(message, args)