aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHsiangNianian <admin@jyunko.cn>2023-04-22 19:51:01 +0800
committerHsiangNianian <admin@jyunko.cn>2023-04-22 19:51:01 +0800
commitdb74ade0234a40c2120ad5f2a41bee50ce13de02 (patch)
tree6f66ffb0fd2b8f27df54569161586c2d8a436b96
parent30cde518ee38f63c743c8fe0e90dbad1a93f2cf9 (diff)
downloadHydroRoll-db74ade0234a40c2120ad5f2a41bee50ce13de02.tar.gz
HydroRoll-db74ade0234a40c2120ad5f2a41bee50ce13de02.zip
🤐
-rw-r--r--HydroRoll/Hydro/__init__.py2
-rw-r--r--HydroRoll/Hydro/iamai_plugin_dice/__init__.py51
-rw-r--r--HydroRoll/Hydro/roll.py12
-rw-r--r--HydroRoll/__init__.py5
-rw-r--r--HydroRoll/bot.py34
-rw-r--r--HydroRoll/config.py29
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_base/__init__.py (renamed from HydroRoll/plugins/iamai_plugin_base/__init__.py)0
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_base/config.py (renamed from HydroRoll/plugins/iamai_plugin_base/config.py)0
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_bot/__init__.py30
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_bot/config.py (renamed from HydroRoll/plugins/iamai_plugin_bot_info/config.py)0
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_dice/__init__.py (renamed from HydroRoll/plugins/iamai_plugin_dice/__init__.py)2
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_dice/config.py (renamed from HydroRoll/Hydro/iamai_plugin_dice/config.py)0
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_echo/__init__.py (renamed from HydroRoll/plugins/iamai_plugin_echo/__init__.py)2
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_echo/config.py (renamed from HydroRoll/plugins/iamai_plugin_echo/config.py)0
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_luck/__init__.py (renamed from HydroRoll/plugins/iamai_plugin_luck/__init__.py)2
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_luck/config.py (renamed from HydroRoll/plugins/iamai_plugin_luck/config.py)0
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_send/__init__.py (renamed from HydroRoll/plugins/iamai_plugin_send/__init__.py)2
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_send/config.py (renamed from HydroRoll/plugins/iamai_plugin_send/config.py)0
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_system/__init__.py73
-rw-r--r--HydroRoll/plugins/HydroRoll_plugin_system/config.py (renamed from HydroRoll/plugins/iamai_plugin_system_info/config.py)0
-rw-r--r--HydroRoll/plugins/__init__.py1
-rw-r--r--HydroRoll/plugins/iamai_plugin_bot_info/__init__.py20
-rw-r--r--HydroRoll/plugins/iamai_plugin_dice/config.py13
-rw-r--r--HydroRoll/plugins/iamai_plugin_system_info/__init__.py41
-rw-r--r--HydroRoll/plugins/plugin.py1
-rw-r--r--data.csv4
-rw-r--r--test.py18
-rw-r--r--test/config.toml (renamed from HydroRoll/config.toml)6
-rw-r--r--test/data/bot_info.json (renamed from HydroRoll/data/bot_info.json)4
-rw-r--r--test/data/reply_data.json (renamed from HydroRoll/data/reply_data.json)0
-rw-r--r--test/main.py (renamed from HydroRoll/main.py)3
-rw-r--r--test/plugins/iamai_plugin_base/__init__.py85
-rw-r--r--test/plugins/iamai_plugin_base/config.py30
-rw-r--r--test/plugins/iamai_plugin_reply/__init__.py (renamed from HydroRoll/plugins/iamai_plugin_reply/__init__.py)0
-rw-r--r--test/plugins/iamai_plugin_reply/config.py (renamed from HydroRoll/plugins/iamai_plugin_reply/config.py)0
35 files changed, 317 insertions, 153 deletions
diff --git a/HydroRoll/Hydro/__init__.py b/HydroRoll/Hydro/__init__.py
deleted file mode 100644
index 4171cac..0000000
--- a/HydroRoll/Hydro/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from .iamai_plugin_dice import Dice
-from .roll import Roll \ No newline at end of file
diff --git a/HydroRoll/Hydro/iamai_plugin_dice/__init__.py b/HydroRoll/Hydro/iamai_plugin_dice/__init__.py
deleted file mode 100644
index 396278a..0000000
--- a/HydroRoll/Hydro/iamai_plugin_dice/__init__.py
+++ /dev/null
@@ -1,51 +0,0 @@
-import re
-import random
-
-from iamai.log import logger
-
-from plugins.iamai_plugin_base import CommandPluginBase
-
-from .config import Config
-
-__all__ = ["Dice"]
-
-class Dice(CommandPluginBase[None, Config]):
- Config = Config
-
- def __post_init__(self):
- self.re_pattern = re.compile(
- r"\s*(?P<dice_times>\d+)d(?P<dice_faces>\d+)([*x](?P<dice_multiply>\d+))?",
- flags=re.I,
- )
-
- async def handle(self) -> None:
- dice_times = int(self.msg_match.group("dice_times"))
- dice_faces = int(self.msg_match.group("dice_faces"))
- if self.msg_match.group("dice_multiply") is None:
- dice_multiply = None
- else:
- dice_multiply = int(self.msg_match.group("dice_multiply"))
-
- if dice_times > self.config.max_dice_times:
- await self.event.reply(
- self.format_str(self.config.exceed_max_dice_times_str)
- )
- return
-
- dice = [random.randint(1, dice_faces) for _ in range(dice_times)]
- dice_sum = sum(dice)
- if dice_multiply is None:
- result_str = f"{dice_times}D{dice_faces}="
- if dice_times != 1:
- result_str += f"{'+'.join(map(lambda x: str(x), dice))}="
- result_str += str(dice_sum)
- else:
- result_str = f"{dice_times}D{dice_faces}x{dice_multiply}="
- if dice_times != 1:
- result_str += (
- f"({'+'.join(map(lambda x: str(x), dice))})x{dice_multiply}="
- )
- result_str += f"{dice_sum}x{dice_multiply}={dice_sum * dice_multiply}"
-
- logger.info(f"Dice Plugin: {result_str}")
- await self.event.reply(self.format_str(self.config.message_str, result_str))
diff --git a/HydroRoll/Hydro/roll.py b/HydroRoll/Hydro/roll.py
deleted file mode 100644
index c08bce9..0000000
--- a/HydroRoll/Hydro/roll.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from iamai import Plugin
-
-class Roll(Plugin):
- async def handle(self) -> None:
- await self.event.reply("1")
-
- async def rule(self) -> bool:
- return(
- self.event.adapter.name == "cqhttp" and
- self.event.type == "message" and
- self.event.get_plain_text() == "1"
- ) \ No newline at end of file
diff --git a/HydroRoll/__init__.py b/HydroRoll/__init__.py
index d73cd0c..c511260 100644
--- a/HydroRoll/__init__.py
+++ b/HydroRoll/__init__.py
@@ -1 +1,4 @@
-name = "HydroRoll" \ No newline at end of file
+name = "HydroR"
+
+from HydroR.bot import Bot
+from HydroR.config import GlobalConfig \ No newline at end of file
diff --git a/HydroRoll/bot.py b/HydroRoll/bot.py
new file mode 100644
index 0000000..9dcc623
--- /dev/null
+++ b/HydroRoll/bot.py
@@ -0,0 +1,34 @@
+from iamai import Bot as _Bot
+from typing import Optional, Dict, List, Type, Any, Union
+from pathlib import Path
+
+# 获取当前目录路径
+current_dir = Path.cwd()
+
+# 获取当前脚本文件路径
+script_file = current_dir.resolve() / __file__
+
+# 获取当前脚本文件所在目录路径
+script_dir = script_file.parent
+
+__all__ = ["Bot"]
+
+class Bot:
+ def __init__(
+ self,
+ *,
+ config_file: Optional[str] = "config.toml",
+ config_dict: Optional[Dict] = None,
+ hot_reload: bool = False,
+ ) -> None:
+ self.bot = _Bot(hot_reload=hot_reload,
+ config_file=config_file,
+ config_dict=config_dict
+ )
+ self.bot.load_plugins_from_dirs(Path(f"{script_dir}/plugins"))
+
+ def run(self) -> None:
+ self.bot.run()
+
+ def restart(self) -> None:
+ self.bot.restart() \ No newline at end of file
diff --git a/HydroRoll/config.py b/HydroRoll/config.py
new file mode 100644
index 0000000..1e132e4
--- /dev/null
+++ b/HydroRoll/config.py
@@ -0,0 +1,29 @@
+import argparse
+import sys
+import platform
+from importlib.metadata import version
+from iamai import Plugin
+# 创建全局 ArgumentParser 对象
+global_parser = argparse.ArgumentParser(description='HydroRoll[水系] 全局命令参数')
+
+# 定义全局配置类
+class GlobalConfig:
+ _name = "HydroRoll"
+ _version = "0.1.0"
+ _svn = "2"
+ _author = "简律纯"
+ _iamai_version = version('iamai')
+ _python_ver = sys.version
+ _python_ver_raw= '.'.join(map(str, platform.python_version_tuple()[:3]))
+ # 定义系统组件
+ class HydroSystem:
+ def __init__(self):
+ self.parser = argparse.ArgumentParser(description='HydroRoll[水系].system 系统命令参数')
+ self.subparsers = self.parser.add_subparsers()
+ self.status_parser = self.subparsers.add_parser('status', aliases=['s'], help='系统状态')
+ self.reload_parser = self.subparsers.add_parser('reload', aliases=['rld'], help='重新加载系统')
+ self.restart_parser = self.subparsers.add_parser('restart', aliases=['rst'], help='重启系统')
+ self.help = '\n'.join(self.parser.format_help().replace('\r\n', '\n').replace('\r', '').split('\n')[2:-3])
+ class HydroBot:
+ def __init__(self) -> None:
+ self.parser = argparse.ArgumentParser(description="Bot命令") \ No newline at end of file
diff --git a/HydroRoll/plugins/iamai_plugin_base/__init__.py b/HydroRoll/plugins/HydroRoll_plugin_base/__init__.py
index 8fe559b..8fe559b 100644
--- a/HydroRoll/plugins/iamai_plugin_base/__init__.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_base/__init__.py
diff --git a/HydroRoll/plugins/iamai_plugin_base/config.py b/HydroRoll/plugins/HydroRoll_plugin_base/config.py
index 04924e0..04924e0 100644
--- a/HydroRoll/plugins/iamai_plugin_base/config.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_base/config.py
diff --git a/HydroRoll/plugins/HydroRoll_plugin_bot/__init__.py b/HydroRoll/plugins/HydroRoll_plugin_bot/__init__.py
new file mode 100644
index 0000000..92cfb3c
--- /dev/null
+++ b/HydroRoll/plugins/HydroRoll_plugin_bot/__init__.py
@@ -0,0 +1,30 @@
+import re
+from importlib.metadata import version
+from plugins.HydroRoll_plugin_base import CommandPluginBase
+from HydroR.config import GlobalConfig
+
+from .config import Config
+
+
+class HydroBot(CommandPluginBase[None, Config]):
+ Config = Config
+ CurrentConfig = GlobalConfig
+ priority = 0
+
+ def __post_init__(self):
+ self.re_pattern = re.compile(r"(?P<bot_info_str>.*)", flags=re.I)
+
+ def bot_info(self):
+ info_str = f'{self.CurrentConfig._name} '
+ info_str += f'{self.CurrentConfig._version}({self.CurrentConfig._svn}) '
+ info_str += f'by {self.CurrentConfig._author} '
+ info_str += f'on Python {self.CurrentConfig._python_ver_raw}\n'
+ info_str += f'with {" & ".join([adapter + "("+version("iamai-adapter-"+adapter) +")" for adapter in dict(self.bot.config.adapter)])}\n'
+ info_str += f'for iamai({self.CurrentConfig._iamai_version})'
+
+ return info_str
+
+ async def handle(self) -> None:
+ await self.event.reply(
+ self.format_str(self.config.message_str, self.bot_info())
+ )
diff --git a/HydroRoll/plugins/iamai_plugin_bot_info/config.py b/HydroRoll/plugins/HydroRoll_plugin_bot/config.py
index cf92e81..cf92e81 100644
--- a/HydroRoll/plugins/iamai_plugin_bot_info/config.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_bot/config.py
diff --git a/HydroRoll/plugins/iamai_plugin_dice/__init__.py b/HydroRoll/plugins/HydroRoll_plugin_dice/__init__.py
index 396278a..3e76c6b 100644
--- a/HydroRoll/plugins/iamai_plugin_dice/__init__.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_dice/__init__.py
@@ -3,7 +3,7 @@ import random
from iamai.log import logger
-from plugins.iamai_plugin_base import CommandPluginBase
+from plugins.HydroRoll_plugin_base import CommandPluginBase
from .config import Config
diff --git a/HydroRoll/Hydro/iamai_plugin_dice/config.py b/HydroRoll/plugins/HydroRoll_plugin_dice/config.py
index a8c6700..a8c6700 100644
--- a/HydroRoll/Hydro/iamai_plugin_dice/config.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_dice/config.py
diff --git a/HydroRoll/plugins/iamai_plugin_echo/__init__.py b/HydroRoll/plugins/HydroRoll_plugin_echo/__init__.py
index 98cfa39..fe138f0 100644
--- a/HydroRoll/plugins/iamai_plugin_echo/__init__.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_echo/__init__.py
@@ -1,6 +1,6 @@
import re
-from plugins.iamai_plugin_base import CommandPluginBase
+from plugins.HydroRoll_plugin_base import CommandPluginBase
from .config import Config
diff --git a/HydroRoll/plugins/iamai_plugin_echo/config.py b/HydroRoll/plugins/HydroRoll_plugin_echo/config.py
index b1fe445..b1fe445 100644
--- a/HydroRoll/plugins/iamai_plugin_echo/config.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_echo/config.py
diff --git a/HydroRoll/plugins/iamai_plugin_luck/__init__.py b/HydroRoll/plugins/HydroRoll_plugin_luck/__init__.py
index f56019b..8ef097a 100644
--- a/HydroRoll/plugins/iamai_plugin_luck/__init__.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_luck/__init__.py
@@ -2,7 +2,7 @@ import re
import time
import random
-from plugins.iamai_plugin_base import CommandPluginBase
+from plugins.HydroRoll_plugin_base import CommandPluginBase
from .config import Config
diff --git a/HydroRoll/plugins/iamai_plugin_luck/config.py b/HydroRoll/plugins/HydroRoll_plugin_luck/config.py
index 3983266..3983266 100644
--- a/HydroRoll/plugins/iamai_plugin_luck/config.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_luck/config.py
diff --git a/HydroRoll/plugins/iamai_plugin_send/__init__.py b/HydroRoll/plugins/HydroRoll_plugin_send/__init__.py
index 4e4a516..881faa2 100644
--- a/HydroRoll/plugins/iamai_plugin_send/__init__.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_send/__init__.py
@@ -1,6 +1,6 @@
import re
-from plugins.iamai_plugin_base import CommandPluginBase
+from plugins.HydroRoll_plugin_base import CommandPluginBase
from .config import Config
diff --git a/HydroRoll/plugins/iamai_plugin_send/config.py b/HydroRoll/plugins/HydroRoll_plugin_send/config.py
index 959822c..959822c 100644
--- a/HydroRoll/plugins/iamai_plugin_send/config.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_send/config.py
diff --git a/HydroRoll/plugins/HydroRoll_plugin_system/__init__.py b/HydroRoll/plugins/HydroRoll_plugin_system/__init__.py
new file mode 100644
index 0000000..3d6d69c
--- /dev/null
+++ b/HydroRoll/plugins/HydroRoll_plugin_system/__init__.py
@@ -0,0 +1,73 @@
+import re
+from plugins.HydroRoll_plugin_base import CommandPluginBase
+from .config import Config
+import psutil
+import time
+from HydroR.config import GlobalConfig
+
+
+class System(CommandPluginBase[None, Config]):
+ priority: int = 0
+ Config = Config
+ CurrentConfig = GlobalConfig
+
+ def __post_init__(self):
+ self.re_pattern = re.compile(r"(?P<system_info_str>.*)", flags=re.I)
+
+ def eventReply(self, message: str):
+ return self.event.reply(
+ self.format_str(self.config.message_str, message)
+ )
+
+ def get_system_status(self) -> str:
+ cpu_usage = psutil.cpu_percent()
+ memory_usage = psutil.virtual_memory().percent
+ disk_usage = psutil.disk_usage('/').percent
+
+ current_time = time.time()
+ start_time = psutil.Process().create_time()
+
+ uptime_seconds = int(current_time - start_time)
+ uptime_str = time.strftime("%H:%M:%S", time.gmtime(uptime_seconds))
+
+ info_str = f"{self.CurrentConfig._name} Ver.{self.CurrentConfig._version}"
+ info_str += f"({self.CurrentConfig._svn}) built in Python {self.CurrentConfig._python_ver}\n"
+ info_str += f"本地时间: {time.strftime('%Y-%m-%d %H:%M:%S', time.localtime())}\n"
+ info_str += f"已启动时间:{uptime_str}\n"
+ info_str += f"CPU使用率:{cpu_usage}%\n"
+ info_str += f"内存占用率:{memory_usage}%\n"
+ info_str += f"磁盘使用率:{disk_usage}%"
+
+ return info_str
+
+ async def handle(self) -> None:
+ system = self.CurrentConfig.HydroSystem()
+ try:
+ sub_command = self.event.get_plain_text().split()[1]
+ except IndexError:
+ sub_command = ""
+
+ if sub_command in ["status", "s"]:
+ await self.event.reply(
+ self.format_str(self.config.message_str,
+ self.get_system_status())
+ )
+ elif sub_command in ["restart", "rst"]:
+ await self.event.reply(
+ self.format_str(self.config.message_str, "正在重启系统...")
+ )
+ self.bot.restart()
+
+ elif sub_command in ["reload", "rld"]:
+ await self.event.reply(
+ self.format_str(self.config.message_str, "正在重载...")
+ )
+ self.bot.reload_plugins()
+ await self.event.reply(
+ self.format_str(self.config.message_str,
+ f"已加载{len(self.bot.plugins)}枚插件")
+ )
+ else:
+ await self.event.reply(
+ self.format_str(self.config.message_str, system.help)
+ )
diff --git a/HydroRoll/plugins/iamai_plugin_system_info/config.py b/HydroRoll/plugins/HydroRoll_plugin_system/config.py
index 8571c38..8571c38 100644
--- a/HydroRoll/plugins/iamai_plugin_system_info/config.py
+++ b/HydroRoll/plugins/HydroRoll_plugin_system/config.py
diff --git a/HydroRoll/plugins/__init__.py b/HydroRoll/plugins/__init__.py
deleted file mode 100644
index 6cccc74..0000000
--- a/HydroRoll/plugins/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from Hydro import Dice \ No newline at end of file
diff --git a/HydroRoll/plugins/iamai_plugin_bot_info/__init__.py b/HydroRoll/plugins/iamai_plugin_bot_info/__init__.py
deleted file mode 100644
index 3cc869e..0000000
--- a/HydroRoll/plugins/iamai_plugin_bot_info/__init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import re
-import sys
-import platform
-from importlib.metadata import version
-from plugins.iamai_plugin_base import CommandPluginBase
-
-from .config import Config
-
-
-class BotInfo(CommandPluginBase[None, Config]):
- Config = Config
-
- def __post_init__(self):
- self.re_pattern = re.compile(r"(?P<bot_info_str>.*)", flags=re.I)
-
- async def handle(self) -> None:
- await self.event.reply(
- self.format_str(self.config.message_str,
- f"{self.bot.config.Chien['self']['header']} HydroRoll!{self.bot.config.Chien['version']}({self.bot.config.Chien['svn']}) by {self.bot.config.Chien['author']} on Python {'.'.join(map(str, platform.python_version_tuple()[:3]))} with {' & '.join([adapter + '('+version('iamai-adapter-'+adapter)+')' for adapter in dict(self.bot.config.adapter)])} for iamai({version('iamai')})\n{self.bot.config.Chien['self']['info']}")
- )
diff --git a/HydroRoll/plugins/iamai_plugin_dice/config.py b/HydroRoll/plugins/iamai_plugin_dice/config.py
deleted file mode 100644
index a8c6700..0000000
--- a/HydroRoll/plugins/iamai_plugin_dice/config.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from typing import Set
-
-from plugins.iamai_plugin_base import CommandPluginConfig
-
-
-class Config(CommandPluginConfig):
- __config_name__ = "plugin_dice"
- command: Set[str] = {"r", "roll", "dice"}
- """命令文本。"""
- max_dice_times: int = 1000
- """最大单次投掷次数。"""
- exceed_max_dice_times_str: str = "错误:超过最大投掷次数。"
- """超过最大单次投掷次数时的提示语。"""
diff --git a/HydroRoll/plugins/iamai_plugin_system_info/__init__.py b/HydroRoll/plugins/iamai_plugin_system_info/__init__.py
deleted file mode 100644
index 31fdf63..0000000
--- a/HydroRoll/plugins/iamai_plugin_system_info/__init__.py
+++ /dev/null
@@ -1,41 +0,0 @@
-import re
-import sys
-from plugins.iamai_plugin_base import CommandPluginBase
-from .config import Config
-import psutil
-import time
-
-
-class SystemInfo(CommandPluginBase[None, Config]):
- priority: int = 0
- Config = Config
-
- def __post_init__(self):
- self.re_pattern = re.compile(r"(?P<bot_info_str>.*)", flags=re.I)
-
- def get_system_info(self) -> str:
- cpu_usage = psutil.cpu_percent()
- memory_usage = psutil.virtual_memory().percent
- disk_usage = psutil.disk_usage('/').percent
-
- current_time = time.time()
- start_time = psutil.Process().create_time()
-
- uptime_seconds = int(current_time - start_time)
- uptime_str = time.strftime("%H:%M:%S", time.gmtime(uptime_seconds))
-
- info_str = f"HydroRoll!{self.bot.config.Chien['version']}({self.bot.config.Chien['svn']}) built in Python {sys.version}\n"
- info_str += f"本地时间: {time.strftime('%Y-%m-%d %H:%M:%S', time.localtime())}\n"
- info_str += f"已启动时间:{uptime_str}\n"
- info_str += f"CPU使用率:{cpu_usage}%\n"
- info_str += f"内存占用率:{memory_usage}%\n"
- info_str += f"磁盘使用率:{disk_usage}%"
-
- return info_str
-
- async def handle(self) -> None:
- system_info = self.get_system_info()
- message_str = f"{system_info}"
- await self.event.reply(
- self.format_str(self.config.message_str,message_str)
- ) \ No newline at end of file
diff --git a/HydroRoll/plugins/plugin.py b/HydroRoll/plugins/plugin.py
deleted file mode 100644
index 6cccc74..0000000
--- a/HydroRoll/plugins/plugin.py
+++ /dev/null
@@ -1 +0,0 @@
-from Hydro import Dice \ No newline at end of file
diff --git a/data.csv b/data.csv
new file mode 100644
index 0000000..d06fcc3
--- /dev/null
+++ b/data.csv
@@ -0,0 +1,4 @@
+name,age,email
+Alice,18,alice@example.com
+Bob,20,bob@example.com
+Charlie,22,charlie@example.com
diff --git a/test.py b/test.py
new file mode 100644
index 0000000..882ed9a
--- /dev/null
+++ b/test.py
@@ -0,0 +1,18 @@
+import random
+
+# 生成一个随机整数
+num = random.randint(1, 10)
+print(num)
+
+# 从序列中随机选择一个元素
+fruits = ['apple', 'banana', 'orange']
+fruit = random.choice(fruits)
+print(fruit)
+
+# 打乱序列中元素的顺序
+random.shuffle(fruits)
+print(fruits)
+
+# 生成一个 0 到 1 之间的随机小数
+r = random.uniform(1,2)
+print('%.2f' % r)
diff --git a/HydroRoll/config.toml b/test/config.toml
index 25ce660..55d49a5 100644
--- a/HydroRoll/config.toml
+++ b/test/config.toml
@@ -1,11 +1,11 @@
-[Chien]
+[HydroRoll]
version = "v0.1.0"
svn = "1"
author = "简律纯"
-[Chien.self]
+[HydroRoll.self]
header = "Hydro系[1]号"
-info = "一只水系骰子..."
+# info = "一只水系骰子..."
[bot]
diff --git a/HydroRoll/data/bot_info.json b/test/data/bot_info.json
index 5ff30dc..7890022 100644
--- a/HydroRoll/data/bot_info.json
+++ b/test/data/bot_info.json
@@ -1,3 +1,3 @@
-{
- nick : "本大魔王"
+{
+ nick : "本大魔王"
} \ No newline at end of file
diff --git a/HydroRoll/data/reply_data.json b/test/data/reply_data.json
index e4977ee..e4977ee 100644
--- a/HydroRoll/data/reply_data.json
+++ b/test/data/reply_data.json
diff --git a/HydroRoll/main.py b/test/main.py
index 793bbb7..1e9b864 100644
--- a/HydroRoll/main.py
+++ b/test/main.py
@@ -1,5 +1,4 @@
-from iamai import Bot
-
+from HydroR import Bot
bot = Bot(hot_reload=True)
diff --git a/test/plugins/iamai_plugin_base/__init__.py b/test/plugins/iamai_plugin_base/__init__.py
new file mode 100644
index 0000000..8fe559b
--- /dev/null
+++ b/test/plugins/iamai_plugin_base/__init__.py
@@ -0,0 +1,85 @@
+import re
+from abc import ABC, abstractmethod
+from typing import Type, Union, Generic, TypeVar
+
+from iamai import Plugin
+from iamai.typing import T_State
+from iamai.adapter.cqhttp.event import GroupMessageEvent, PrivateMessageEvent
+
+from .config import BasePluginConfig, RegexPluginConfig, CommandPluginConfig
+
+T_Config = TypeVar("T_Config", bound=BasePluginConfig)
+T_RegexPluginConfig = TypeVar("T_RegexPluginConfig", bound=RegexPluginConfig)
+T_CommandPluginConfig = TypeVar("T_CommandPluginConfig", bound=CommandPluginConfig)
+
+
+class BasePlugin(
+ Plugin[Union[PrivateMessageEvent, GroupMessageEvent], T_State, T_Config],
+ ABC,
+ Generic[T_State, T_Config],
+):
+ Config: Type[T_Config] = BasePluginConfig
+
+ def format_str(self, format_str: str, message_str: str = "") -> str:
+ return format_str.format(
+ message=message_str,
+ user_name=self.event.sender.nickname,
+ user_id=self.event.sender.user_id,
+ )
+
+ async def rule(self) -> bool:
+ if self.event.adapter.name != "cqhttp":
+ return False
+ if self.event.type != "message_sent":
+ return False
+ if self.config.handle_all_message:
+ return self.str_match(self.event.message.get_plain_text())
+ elif self.config.handle_friend_message:
+ if self.event.message_type == "private":
+ return self.str_match(self.event.message.get_plain_text())
+ elif self.config.handle_group_message:
+ if self.event.message_type == "group":
+ if (
+ self.config.accept_group is None
+ or self.event.group_id in self.config.accept_group
+ ):
+ return self.str_match(self.event.message.get_plain_text())
+ return False
+
+ @abstractmethod
+ def str_match(self, msg_str: str) -> bool:
+ raise NotImplemented
+
+
+class RegexPluginBase(BasePlugin[T_State, T_RegexPluginConfig], ABC):
+ msg_match: re.Match
+ re_pattern: re.Pattern
+ Config: Type[T_RegexPluginConfig] = RegexPluginConfig
+
+ def str_match(self, msg_str: str) -> bool:
+ msg_str = msg_str.strip()
+ self.msg_match = self.re_pattern.fullmatch(msg_str)
+ return bool(self.msg_match)
+
+
+class CommandPluginBase(RegexPluginBase[T_State, T_CommandPluginConfig], ABC):
+ command_match: re.Match
+ command_re_pattern: re.Pattern
+ Config: Type[T_CommandPluginConfig] = CommandPluginConfig
+
+ def str_match(self, msg_str: str) -> bool:
+ if not hasattr(self, "command_re_pattern"):
+ self.command_re_pattern = re.compile(
+ f'[{"".join(self.config.command_prefix)}]'
+ f'({"|".join(self.config.command)})'
+ r"\s*(?P<command_args>.*)",
+ flags=re.I if self.config.ignore_case else 0,
+ )
+ msg_str = msg_str.strip()
+ self.command_match = self.command_re_pattern.fullmatch(msg_str)
+ if not self.command_match:
+ return False
+ self.msg_match = self.re_pattern.fullmatch(
+ self.command_match.group("command_args")
+ )
+ return bool(self.msg_match)
diff --git a/test/plugins/iamai_plugin_base/config.py b/test/plugins/iamai_plugin_base/config.py
new file mode 100644
index 0000000..04924e0
--- /dev/null
+++ b/test/plugins/iamai_plugin_base/config.py
@@ -0,0 +1,30 @@
+from typing import Set, Optional
+
+from iamai import ConfigModel
+
+
+class BasePluginConfig(ConfigModel):
+ __config_name__ = ""
+ handle_all_message: bool = True
+ """是否处理所有类型的消息,此配置为 True 时会覆盖 handle_friend_message 和 handle_group_message。"""
+ handle_friend_message: bool = True
+ """是否处理好友消息。"""
+ handle_group_message: bool = True
+ """是否处理群消息。"""
+ accept_group: Optional[Set[int]] = None
+ """处理消息的群号,仅当 handle_group_message 为 True 时生效,留空表示处理所有群。"""
+ message_str: str = "{user_name}: {message}"
+ """最终发送消息的格式。"""
+
+
+class RegexPluginConfig(BasePluginConfig):
+ pass
+
+
+class CommandPluginConfig(RegexPluginConfig):
+ command_prefix: Set[str] = {".", "。","!",":"}
+ """命令前缀。"""
+ command: Set[str] = {}
+ """命令文本。"""
+ ignore_case: bool = True
+ """忽略大小写。"""
diff --git a/HydroRoll/plugins/iamai_plugin_reply/__init__.py b/test/plugins/iamai_plugin_reply/__init__.py
index 6835ca8..6835ca8 100644
--- a/HydroRoll/plugins/iamai_plugin_reply/__init__.py
+++ b/test/plugins/iamai_plugin_reply/__init__.py
diff --git a/HydroRoll/plugins/iamai_plugin_reply/config.py b/test/plugins/iamai_plugin_reply/config.py
index e024fb6..e024fb6 100644
--- a/HydroRoll/plugins/iamai_plugin_reply/config.py
+++ b/test/plugins/iamai_plugin_reply/config.py