Improve code, rename command to tree_command, add bot.command

discord.json

@@ -7,7 +7,7 @@
         },
         {
             "type": "startswith",
-            "content": "$hello",
+            "content": "hello",
             "response": "Hello!"
         },
         {
@@ -17,6 +17,22 @@
         }
     ],
     "command": [
+    	{
+    		"name": "ping",
+    		"response": "pong"
+    	},
+    	{
+    		"name": "hello",
+    		"function": "greet",
+    		"parameters": [
+    			{
+    				"name": "name",
+    				"type": "str"
+    			}
+    		]
+    	}
+    ],
+    "app_command": [
         {
             "name": "greet",
             "description": "Greets the specified user",

discord_bot.py

@@ -1,6 +1,7 @@
 # This code is based on the following example:
 # https://discordpy.readthedocs.io/en/stable/quickstart.html#a-minimal-bot
 
+import sys
 import os
 import discord
 from discord import app_commands
@@ -12,6 +13,10 @@ import inspect
 from async_eval import eval
 
 
+# 读取json
+with open("discord.json", "r") as f:
+    json_data = json.load(f)
+
 
 # 创建一个字典，将规则类型映射到相应的条件检查函数
 check_functions = {
@@ -25,61 +30,139 @@ check_functions = {
 # 定义bot和tree
 intents = discord.Intents.default()
 intents.message_content = True
-bot = commands.Bot(command_prefix='>', intents=intents)
+bot = commands.Bot(
+	command_prefix=json_data["command_prefix"] if "command_prefix" in json_data else '>',
+	intents=intents
+)
 tree = bot.tree
 
 
-# 读取json
-with open("discord.json", "r") as f:
-    json_data = json.load(f)
+COMMAND_NAME_PREFIX=json_data["command_name_prefix"] if "command_name_prefix" in json_data else "discord_bot_call_"
 
 
-COMMAND_NAME_PREFIX="discord_bot_call_"
+def load_module_by_function_name(name: str = ""):
+	"""
+	根据函数名称，导入对应的模块
+	Args:
+		name: 函数名称
+	"""
+	module_name=name.split(".")[0]
+	if name.find(".") > 0 and module_name not in sys.modules:
+		exec(f"import {module_name}")
 
 
-# 生成discord command的callback的调用参数
-def generate_discord_command_callback_param_str(parameters: list = []) -> str:
-	result=f'''
-	interaction: discord.Interaction{''.join([f", {param['name']}: {param['type']}"
+def generate_discord_command_callback_param_str(pre: str = '', parameters: list = []) -> str:
+	"""
+	生成discord command的callback的调用参数
+	Args:
+		pre: 前置固定参数
+		parameters: 参数列表
+	Returns:
+		string: 生成的调用参数的代码
+	"""
+	return f'''
+	{pre}{''.join([f", {param['name']}: {param['type']}"
 	for param in parameters])}
 '''
-	return result
 
 
-# 生成调用用户自定义的函数的参数
 def generate_user_function_param_str(parameters: list = []) -> str:
-	result=f'''{', '.join([f"{param['name']}={param['name']}"
+	"""
+	生成调用用户自定义的函数的参数
+	Args:
+		parameters: 参数列表
+	Returns:
+		str: 生成的调用参数的代码
+	
+	"""
+	return f'''{', '.join([f"{param['name']}={param['name']}"
 	for param in parameters])}'''
-	return result
 
 
-# 生成tree add_command
 def generate_tree_add_command(command: dict = {}) -> str:
-	result=f'''
+	"""
+	生成tree add_command
+	Args:
+		command: command
+	Returns:
+		str: 生成的调用代码
+	"""
+	return f'''
 tree.add_command(app_commands.Command(
 	name="{command['name']}",
 	description="{command['description']}",
 	callback={COMMAND_NAME_PREFIX}{command['name']}
 ))
 '''
-	return result
 
 
-# 生成discord command的callback的调用函数
 def generate_discord_command_callback_function_str(command: dict = {}) -> str:
-	result=f'''
-async def {COMMAND_NAME_PREFIX}{command['name']}({generate_discord_command_callback_param_str(command['parameters'])}):
+	"""
+	生成discord command的callback的调用函数
+	Args:
+		command: command
+	Returns:
+		str: 生成的调用代码
+	"""
+	return f'''
+async def {COMMAND_NAME_PREFIX}{command['name']}({generate_discord_command_callback_param_str('interaction: discord.Interaction', command['parameters'] if 'parameters' in command else [])}):
 	await interaction.response.defer()
-	result = await {command['function']}({generate_user_function_param_str(command['parameters'])})
+	result = await {command['function']}({generate_user_function_param_str(command['parameters'] if 'parameters' in command else [])})
 	if result is not None:
 		await interaction.followup.send(result)
 '''
-	return result
 
 
-for command in json_data["command"]:
-	exec(generate_discord_command_callback_function_str(command))
-	exec(generate_tree_add_command(command))
+def generate_bot_command_send(command: dict = {}) -> str:
+	"""
+	生成bot.command的send语句
+	Args:
+		command: command
+	Returns:
+		str: 生成的调用代码
+	"""
+	return f'''await ctx.send(\"{command['response']}\")'''
+
+
+def generate_bot_command_callback(command: dict = {}) -> str:
+	"""
+	生成bot.command的调用用户函数和send语句
+	Args:
+		command: command
+	Returns:
+		str: 生成的调用代码
+	"""
+	return f'''result = await {command['function']}({generate_user_function_param_str(command['parameters'] if 'parameters' in command else [])})
+	await ctx.send(result)'''
+
+
+def generate_bot_command_def(command: dict = {}) -> str:
+	"""
+	生成bot.command的定义函数
+	Args:
+		command: command
+	Returns:
+		str: 生成的调用代码
+	"""
+	return f'''
+@bot.command()
+async def {command['name']}({generate_discord_command_callback_param_str('ctx', command['parameters'] if 'parameters' in command else [])}):
+	{generate_bot_command_send(command) if "response" in command else generate_bot_command_callback(command)}
+'''
+
+
+if "app_command" in json_data:
+	for command in json_data["app_command"]:
+		load_module_by_function_name(command["function"])
+		exec(generate_discord_command_callback_function_str(command))
+		exec(generate_tree_add_command(command))
+
+
+if "command" in json_data:
+	for command in json_data["command"]:
+		if "function" in command:
+			load_module_by_function_name(command["function"])
+		exec(generate_bot_command_def(command))
 
 
 async def greet(name: str):
@@ -91,6 +174,7 @@ async def get_kudos():
             return f'Error: {details["code"]} {details["reason"]}'
         return f'The amount of Kudos this user has is {details["kudos"]}'
 
+
 async def generate_status(id: str):
     async with HordeAPI.generateCheck(id) as details:
         if "kudos" not in details:
@@ -115,11 +199,6 @@ async def generate_status(id: str):
         return f'Position in queue: {details["queue_position"]}, wait time: {details["wait_time"]}s'
 
 
-@bot.command()
-async def ping(ctx):
-    await ctx.send('pong')
-
-
 @bot.event
 async def on_ready():
     await tree.sync()
@@ -132,20 +211,21 @@ async def on_message(message):
     if message.author == bot.user:
         return
 
-    for rule in json_data["message"]:
-        rule_type = rule["type"]
-        content = rule["content"]
-        
-        # 根据规则类型动态调用对应的判断函数
-        if check_functions.get(rule_type, lambda c, m: False)(content, message):
-            # 如果规则指定了函数，则调用对应的函数
-            if "function" in rule:
-                function_name = rule["function"]
-                result = eval(f"await {function_name}()")
-                await message.channel.send(result)
-            # 否则发送预定义的响应消息
-            elif "response" in rule:
-                await message.channel.send(rule["response"])
+    if "message" in json_data:
+	    for rule in json_data["message"]:
+	        rule_type = rule["type"]
+	        content = rule["content"]
+	        
+	        # 根据规则类型动态调用对应的判断函数
+	        if check_functions.get(rule_type, lambda c, m: False)(content, message):
+	            # 如果规则指定了函数，则调用对应的函数
+	            if "function" in rule:
+	                function_name = rule["function"]
+	                result = eval(f"await {function_name}()")
+	                await message.channel.send(result)
+	            # 否则发送预定义的响应消息
+	            elif "response" in rule:
+	                await message.channel.send(rule["response"])
 
     # 确保命令系统正常工作
     await bot.process_commands(message)
@@ -184,7 +264,7 @@ def sendMessageToChannel(data):
 
 def run():
     try:
-      token = os.environ.get("TOKEN") or ""
+      token = json_data["token"] if "token" in json_data else (os.environ.get("TOKEN") or "")
       if token == "":
         raise Exception("Please add your token to the Secrets pane.")
       bot.run(token)
@@ -203,3 +283,6 @@ def run():
 def discord_bot():
     print("Running discord_bot")
     run()
+
+if __name__ == "__main__":
+	discord_bot()