mirror of https://github.com/stijndcl/didier
Adding commands, calling works
parent
3cfc87b7e1
commit
4bcd00826e
|
@ -76,8 +76,9 @@ class Events(commands.Cog):
|
||||||
await message.channel.send(eER)
|
await message.channel.send(eER)
|
||||||
|
|
||||||
# Check for custom commands
|
# Check for custom commands
|
||||||
custom = custom_commands.is_custom_command(message.content)
|
custom = custom_commands.is_custom_command(message)
|
||||||
if custom:
|
|
||||||
|
if custom.id is not None:
|
||||||
await message.channel.send(custom.response)
|
await message.channel.send(custom.response)
|
||||||
|
|
||||||
# Earn XP & Message count
|
# Earn XP & Message count
|
||||||
|
|
|
@ -8,6 +8,8 @@ from functions.database import memes, githubs, twitch, dadjoke
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
|
||||||
|
from functions.database.custom_commands import is_name_free, add_command, add_alias
|
||||||
|
|
||||||
|
|
||||||
class ModCommands(commands.Cog):
|
class ModCommands(commands.Cog):
|
||||||
|
|
||||||
|
@ -106,13 +108,35 @@ class ModCommands(commands.Cog):
|
||||||
return await ctx.send("Ik kan geen bericht zien met dit Id.")
|
return await ctx.send("Ik kan geen bericht zien met dit Id.")
|
||||||
await message.add_reaction(emoji)
|
await message.add_reaction(emoji)
|
||||||
|
|
||||||
# Adds stuff into their databases
|
|
||||||
@commands.group(name="Add", usage="[Category] [Args]", case_insensitive=True, invoke_without_command=False)
|
@commands.group(name="Add", usage="[Category] [Args]", case_insensitive=True, invoke_without_command=False)
|
||||||
@commands.check(checks.isMe)
|
@commands.check(checks.isMe)
|
||||||
@help.Category(category=Category.Mod)
|
@help.Category(category=Category.Mod)
|
||||||
async def add(self, ctx):
|
async def add(self, ctx):
|
||||||
|
"""
|
||||||
|
Commands group that adds database entries
|
||||||
|
"""
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
@add.command(name="Custom", usage="[Name] [Response]")
|
||||||
|
async def custom(self, ctx, name, *, resp):
|
||||||
|
err_msg = add_command(name, resp)
|
||||||
|
|
||||||
|
# Something went wrong
|
||||||
|
if err_msg:
|
||||||
|
return await ctx.send(err_msg)
|
||||||
|
else:
|
||||||
|
await ctx.message.add_reaction("✅")
|
||||||
|
|
||||||
|
@add.command(name="Alias", usage="[Name] [Alias]")
|
||||||
|
async def add_alias(self, ctx, command, alias):
|
||||||
|
err_msg = add_alias(command, alias)
|
||||||
|
|
||||||
|
# Something went wrong
|
||||||
|
if err_msg:
|
||||||
|
return await ctx.send(err_msg)
|
||||||
|
else:
|
||||||
|
await ctx.message.add_reaction("✅")
|
||||||
|
|
||||||
@add.command(name="Dadjoke", aliases=["Dj", "Dad"], usage="[Joke]")
|
@add.command(name="Dadjoke", aliases=["Dj", "Dad"], usage="[Joke]")
|
||||||
async def dadjoke(self, ctx, *, joke):
|
async def dadjoke(self, ctx, *, joke):
|
||||||
dadjoke.addJoke(joke)
|
dadjoke.addJoke(joke)
|
||||||
|
|
|
@ -10,6 +10,3 @@ class CustomCommand:
|
||||||
name: str = None
|
name: str = None
|
||||||
response: str = None
|
response: str = None
|
||||||
alias_used: str = None
|
alias_used: str = None
|
||||||
|
|
||||||
def __nonzero__(self):
|
|
||||||
return self.id is not None
|
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
"8ball": "Magic 8-Ball Didier beantwoordt ja/nee vragen.",
|
"8ball": "Magic 8-Ball Didier beantwoordt ja/nee vragen.",
|
||||||
"add": "Voegt [Args] toe aan [Categorie].",
|
"add": "Voegt [Args] toe aan [Categorie].",
|
||||||
"add 8-ball": "Voegt een 8-Ball response toe aan de database.",
|
"add 8-ball": "Voegt een 8-Ball response toe aan de database.",
|
||||||
|
"add alias": "Voegt een alias voor custom commands toe aan de database.",
|
||||||
|
"add custom": "Voegt custom commands toe aan de database.",
|
||||||
"add dadjoke": "Voegt een Dadjoke toe aan de database.",
|
"add dadjoke": "Voegt een Dadjoke toe aan de database.",
|
||||||
"add github": "Voegt iemand's GitHub link toe aan de database.",
|
"add github": "Voegt iemand's GitHub link toe aan de database.",
|
||||||
"add meme": "Voegt een meme toe aan de database.",
|
"add meme": "Voegt een meme toe aan de database.",
|
||||||
|
|
|
@ -1,27 +1,33 @@
|
||||||
from data.database_classes.custom_commands import CustomCommand
|
from data.database_classes.custom_commands import CustomCommand
|
||||||
|
import discord
|
||||||
from functions.database import utils
|
from functions.database import utils
|
||||||
|
|
||||||
|
|
||||||
def is_custom_command(message: str) -> CustomCommand:
|
def is_custom_command(message: discord.Message) -> CustomCommand:
|
||||||
"""
|
"""
|
||||||
Check if a message triggers a custom command
|
Check if a message triggers a custom command
|
||||||
These use "?" as a prefix
|
These use "?" as a prefix
|
||||||
"""
|
"""
|
||||||
|
content = message.content
|
||||||
# Message didn't call a custom command
|
# Message didn't call a custom command
|
||||||
if not message.startswith("?"):
|
if not content.startswith("?"):
|
||||||
|
return CustomCommand()
|
||||||
|
|
||||||
|
# Can't be invoked by bots to prevent spam (@RPS)
|
||||||
|
if message.author.bot:
|
||||||
return CustomCommand()
|
return CustomCommand()
|
||||||
|
|
||||||
# Ignore capitals & spaces, strip off prefix
|
# Ignore capitals & spaces, strip off prefix
|
||||||
message = message.lower().replace(" ", "")[1:]
|
content = content.lower().replace(" ", "")[1:]
|
||||||
|
|
||||||
by_name = _find_by_name(message)
|
by_name = _find_by_name(content)
|
||||||
|
|
||||||
# Command was found by its name
|
# Command was found by its name
|
||||||
if by_name:
|
if by_name:
|
||||||
return CustomCommand(*by_name)
|
return CustomCommand(*by_name)
|
||||||
|
|
||||||
# Check if a command exists with this alias instead
|
# Check if a command exists with this alias instead
|
||||||
return CustomCommand(*_find_by_alias(message), alias_used=message)
|
return CustomCommand(*_find_by_alias(content), alias_used=content)
|
||||||
|
|
||||||
|
|
||||||
def _find_by_name(message):
|
def _find_by_name(message):
|
||||||
|
@ -31,7 +37,7 @@ def _find_by_name(message):
|
||||||
connection = utils.connect()
|
connection = utils.connect()
|
||||||
cursor = connection.cursor()
|
cursor = connection.cursor()
|
||||||
|
|
||||||
cursor.execute("SELECT response FROM custom_commands WHERE name = %s", message)
|
cursor.execute("SELECT * FROM custom_commands WHERE name = %s", (message,))
|
||||||
|
|
||||||
return cursor.fetchone()
|
return cursor.fetchone()
|
||||||
|
|
||||||
|
@ -43,7 +49,7 @@ def _find_by_alias(message):
|
||||||
connection = utils.connect()
|
connection = utils.connect()
|
||||||
cursor = connection.cursor()
|
cursor = connection.cursor()
|
||||||
|
|
||||||
cursor.execute("SELECT command FROM custom_command_aliases WHERE alias = %s", message)
|
cursor.execute("SELECT command FROM custom_command_aliases WHERE alias = %s", (message,))
|
||||||
|
|
||||||
res = cursor.fetchone()
|
res = cursor.fetchone()
|
||||||
|
|
||||||
|
@ -51,7 +57,7 @@ def _find_by_alias(message):
|
||||||
if not res:
|
if not res:
|
||||||
return ()
|
return ()
|
||||||
|
|
||||||
cursor.execute("SELECT response FROM custom_commands WHERE id = %s", res)
|
cursor.execute("SELECT * FROM custom_commands WHERE id = %s", (res,))
|
||||||
|
|
||||||
return cursor.fetchone()
|
return cursor.fetchone()
|
||||||
|
|
||||||
|
@ -64,11 +70,60 @@ def is_name_free(name) -> bool:
|
||||||
connection = utils.connect()
|
connection = utils.connect()
|
||||||
cursor = connection.cursor()
|
cursor = connection.cursor()
|
||||||
|
|
||||||
cursor.execute("SELECT id from custom_commands WHERE name = %s", name)
|
cursor.execute("SELECT id from custom_commands WHERE name = %s", (name,))
|
||||||
|
|
||||||
if cursor.fetchone():
|
if cursor.fetchone():
|
||||||
return False
|
return False
|
||||||
|
|
||||||
cursor.execute("SELECT command FROM custom_command_aliases WHERE alias = %s", name)
|
cursor.execute("SELECT id FROM custom_command_aliases WHERE alias = %s", (name,))
|
||||||
|
|
||||||
return len(cursor.fetchone()) != 0
|
return cursor.fetchone() is None
|
||||||
|
|
||||||
|
|
||||||
|
def _clean(inp: str):
|
||||||
|
"""
|
||||||
|
Strip markdown and other stuff out of a command name
|
||||||
|
"""
|
||||||
|
return "".join(filter(lambda x: x.isalnum(), inp))
|
||||||
|
|
||||||
|
|
||||||
|
def add_command(name: str, response: str):
|
||||||
|
"""
|
||||||
|
Add a new custom command
|
||||||
|
"""
|
||||||
|
name = _clean(name.lower())
|
||||||
|
|
||||||
|
if not is_name_free(name):
|
||||||
|
return "Er is al een commando met deze naam."
|
||||||
|
|
||||||
|
connection = utils.connect()
|
||||||
|
cursor = connection.cursor()
|
||||||
|
|
||||||
|
cursor.execute("INSERT INTO custom_commands(name, response) VALUES (%s, E%s)", (name, response,))
|
||||||
|
connection.commit()
|
||||||
|
|
||||||
|
|
||||||
|
def add_alias(command: str, alias: str):
|
||||||
|
"""
|
||||||
|
Add an alias for a command
|
||||||
|
Assumes the command exists
|
||||||
|
"""
|
||||||
|
command = _clean(command.lower())
|
||||||
|
alias = _clean(alias.lower())
|
||||||
|
|
||||||
|
# Base command doesn't exist
|
||||||
|
if is_name_free(command):
|
||||||
|
return "Er is geen commando met deze naam."
|
||||||
|
|
||||||
|
# Alias already exists
|
||||||
|
if not is_name_free(alias):
|
||||||
|
return "Er is al een commando met deze naam."
|
||||||
|
|
||||||
|
# Find the id of the base command
|
||||||
|
command_id = CustomCommand(*_find_by_name(command)).id
|
||||||
|
|
||||||
|
connection = utils.connect()
|
||||||
|
cursor = connection.cursor()
|
||||||
|
|
||||||
|
cursor.execute("INSERT INTO custom_command_aliases(command, alias) VALUES(%s, %s)", (command_id, alias,))
|
||||||
|
connection.commit()
|
||||||
|
|
Loading…
Reference in New Issue