Improve code

discord.json

@@ -13,16 +13,10 @@
         {
             "type": "equals",
             "content": "get kudos",
-            "function": "getKudos"
+            "function": "get_kudos"
         }
     ],
     "command": [
-        {
-            "name": "hello",
-            "description": "Sends a greeting!",
-            "function": "hello",
-            "parameters": []
-        },
         {
             "name": "greet",
             "description": "Greets the specified user",
@@ -38,13 +32,13 @@
         {
             "name": "get_kudos",
             "description": "The amount of Kudos this user has.",
-            "function": "getKudos",
+            "function": "get_kudos",
             "parameters": []
         },
         {
             "name": "generate_status",
             "description": "Retrieve the status of an Asynchronous generation request.",
-            "function": "generateStatus",
+            "function": "generate_status",
             "parameters": [
                 {
                     "name": "id",

discord_bot.py

@@ -11,12 +11,6 @@ from horde import HordeAPI
 import inspect
 
 
-TYPE_MAPPING = {
-    "str": str,
-    "int": int,
-    "float": float
-}
-
 
 # 创建一个字典，将规则类型映射到相应的条件检查函数
 check_functions = {
@@ -27,18 +21,23 @@ check_functions = {
 }
 
 
+# 定义bot和tree
 intents = discord.Intents.default()
 intents.message_content = True
 bot = commands.Bot(command_prefix='>', intents=intents)
 tree = bot.tree
 
 
+# 读取json
 with open("discord.json", "r") as f:
     json_data = json.load(f)
 
+
 # 自动生成调用函数
-commandNamePrefix="discord_bot_call_"
-file_content="\n\n".join([f"async def {commandNamePrefix}{command['name']}(interaction: discord.Interaction"
+COMMAND_NAME_PREFIX="discord_bot_call_"
+FILE_CONTENT="\n\n".join([
+f"async def {COMMAND_NAME_PREFIX}{command['name']}"
++"(interaction: discord.Interaction"
 +''.join([f", {param['name']}: {param['type']}" for param in command["parameters"]])
 +f"):\n\
     await interaction.response.defer()\n\
@@ -47,162 +46,48 @@ file_content="\n\n".join([f"async def {commandNamePrefix}{command['name']}(inter
 +f")\n\
     if result is not None:\n\
         await interaction.followup.send(result)\n\
-tree.add_command(app_commands.Command(name=\"{command['name']}\", description=\"{command['description']}\", callback={commandNamePrefix}{command['name']}))"
+tree.add_command(app_commands.Command(\
+name=\"{command['name']}\", \
+description=\"{command['description']}\", \
+callback={COMMAND_NAME_PREFIX}{command['name']}\
+))"
 for command in json_data["command"]])
-exec(file_content)
-
-
-
-
-"""
-@tree.command(name="hello", description="Sends a greeting!")
-async def hello(interaction: discord.Interaction):
-    await interaction.response.send_message(f"Hello, {interaction.user.mention}!")
-
-@tree.command(name="greet", description="Greets the specified user")
-async def greet(interaction: discord.Interaction, name: str):
-    await interaction.response.send_message(f"Hello, {name}!")
-
-@tree.command(name="get-kudos", description="The amount of Kudos this user has.")
-async def getKudos(interaction: discord.Interaction):
-    await interaction.response.defer()
-    async with HordeAPI.getUserDetails() as details:
-        if "kudos" not in details:
-            await interaction.followup.send(f'Error: {details["code"]} {details["reason"]}')
-            return
-        await interaction.followup.send(f'The amount of Kudos this user has is {details["kudos"]}')
-
-@tree.command(name="generate-status", description="Retrieve the status of an Asynchronous generation request.")
-async def generateStatus(interaction: discord.Interaction, id: str):
-    await interaction.response.defer()
-    async with HordeAPI.generateCheck(id) as details:
-        if "kudos" not in details:
-            await interaction.followup.send(f'Check Error: {details["code"]} {details["reason"]}')
-            return
-        if bool(details["is_possible"]) == False:
-            await interaction.followup.send("This generation is impossible.")
-            return
-        if bool(details["faulted"]) == True:
-            await interaction.followup.send("This generation is faulted.")
-            return
-        if bool(details["done"]) == True:
-            async with HordeAPI.generateStatus(id) as generationDetail:
-                if "generations" not in generationDetail:
-                    await interaction.followup.send(f'Status Error: {generationDetail["code"]} {generationDetail["reason"]}')
-                for i in range(len(generationDetail["generations"])):
-                    await interaction.followup.send(generationDetail["generations"][i]["img"])
-            return
-        if int(details["processing"]) > 0:
-            total = int(details["finished"]) + int(details["processing"]) + int(details["queue_position"]) + int(details["restarted"]) + int(details["waiting"])
-            await interaction.followup.send(f'Processing image: {details["processing"]}/{total}')
-            return
-        await interaction.followup.send(f'Position in queue: {details["queue_position"]}, wait time: {details["wait_time"]}s')
-"""
-
-print(discord.version_info)
-print(discord.__version__)
-print(inspect.signature(app_commands.Command))
+exec(FILE_CONTENT)
 
-async def hello():
-    return f"Hello, {interaction.user.mention}!"
 
 async def greet(name: str):
     return f"Hello, {name}!"
 
-async def getKudos():
+async def get_kudos():
     async with HordeAPI.getUserDetails() as details:
         if "kudos" not in details:
             return f'Error: {details["code"]} {details["reason"]}'
         return f'The amount of Kudos this user has is {details["kudos"]}'
 
-async def generateStatus(id: str):
+async def generate_status(id: str):
     async with HordeAPI.generateCheck(id) as details:
         if "kudos" not in details:
             return f'Check Error: {details["code"]} {details["reason"]}'
-        if bool(details["is_possible"]) == False:
+        if bool(details["is_possible"]) is False:
             return "This generation is impossible."
-        if bool(details["faulted"]) == True:
+        if bool(details["faulted"]) is True:
             return "This generation is faulted."
-        if bool(details["done"]) == True:
-            async with HordeAPI.generateStatus(id) as generationDetail:
-                if "generations" not in generationDetail:
-                    return f'Status Error: {generationDetail["code"]} {generationDetail["reason"]}'
-                for i in range(len(generationDetail["generations"])):
-                    return generationDetail["generations"][i]["img"]
+        if bool(details["done"]) is True:
+            async with HordeAPI.generateStatus(id) as generation_detail:
+                if "generations" not in generation_detail:
+                    return f'Status Error: {generation_detail["code"]} {generation_detail["reason"]}'
+                for i in range(len(generation_detail["generations"])):
+                    return generation_detail["generations"][i]["img"]
         if int(details["processing"]) > 0:
-            total = int(details["finished"]) + int(details["processing"]) + int(details["queue_position"]) + int(details["restarted"]) + int(details["waiting"])
+            total = int(details["finished"])
+            + int(details["processing"])
+            + int(details["queue_position"])
+            + int(details["restarted"])
+            + int(details["waiting"])
             return f'Processing image: {details["processing"]}/{total}'
         return f'Position in queue: {details["queue_position"]}, wait time: {details["wait_time"]}s'
 
 
-"""
-# 根据 json 数据动态创建命令
-for command in json_data["command"]:
-    @tree.command(name=command["name"], description=command["description"])
-    async def dynamic_command(interaction: discord.Interaction, **kwargs):
-        print(kwargs)
-        await interaction.response.defer()
-        # 动态调用命令对应的函数
-        function_name = command["function"]
-        function = globals()[function_name]
-        result = await function()
-        await interaction.followup.send(result)
-
-    # 动态创建参数
-    #params = [app_commands.Parameter(name=param["name"], display_name=param['name'], description=param["description"], type=TYPE_MAPPING[param["type"]], autocomplete=False, required=True)
-    #          for param in command["parameters"]]
-              
-    
-
-    # 动态创建命令并注册
-    tree_command = app_commands.Command(
-        name=command["name"],
-        description=command["description"],
-        callback=dynamic_command
-    )
-
-    # 将命令添加到 bot 的 command tree
-    bot.tree.add_command(tree_command)
-"""
-
-
-"""
-class MyClient(discord.Client):
-    def __init__(self, **kwargs):
-        # 从 kwargs 中获取 intents，或者使用默认 intents
-        intents = kwargs.pop('intents', discord.Intents.default())
-        
-        # 调用 discord.Client 的 __init__，并将 intents 作为关键字参数传递
-        super().__init__(intents=intents, **kwargs)
-
-        self.tree = app_commands.CommandTree(self)
-
-    async def setup_hook(self):
-        # 在这里你可以注册动态生成的命令
-        self.tree.add_command(app_commands.Command(name="test", callback=self.test, description="test"))
-        await self.tree.sync()  # 同步命令
-
-    async def test(self, interaction: discord.Interaction, x: str, y: int):
-        print(self)
-        print(interaction)
-        print(x)
-        print(y)
-        await interaction.response.send_message(f"x: {x}, y: {y}")
-MyClient(bot)
-"""
-
-
-"""
-@tree.command(name="test", description="test")
-async def test(interaction: discord.Interaction, *args):
-        print(interaction)
-        print(args)
-        await interaction.response.send_message(f"{args}")
-#tree.add_command(app_commands.Command(name="test", description="test", callback=test))
-"""
-
-
-
 @bot.command()
 async def ping(ctx):
     await ctx.send('pong')
@@ -220,13 +105,6 @@ async def on_message(message):
     if message.author == bot.user:
         return
 
-    """
-    if message.content == 'ping':
-        await message.channel.send('pong')
-
-    if message.content.startswith('$hello'):
-        await message.channel.send('Hello!')
-    """
     for rule in json_data["message"]:
         rule_type = rule["type"]
         content = rule["content"]
@@ -238,12 +116,11 @@ async def on_message(message):
             if "function" in rule:
                 function_name = rule["function"]
                 function = globals()[function_name]
-                await function(message)
-                break
+                result = await function(message)
+                await message.channel.send(result)
             # 否则发送预定义的响应消息
             elif "response" in rule:
-                await message.channel.send(rule["response"])
-                break
+                await message.channel.send(response)
 
     # 确保命令系统正常工作
     await bot.process_commands(message)