2 files changed, 6 insertions, 53 deletions
diff --git a/ATRI/plugins/utils/__init__.py b/ATRI/plugins/utils/__init__.py
index 47c3b47..10b3317 100644
--- a/ATRI/plugins/utils/__init__.py
+++ b/ATRI/plugins/utils/__init__.py
@@ -1,26 +1,9 @@
-#!/usr/bin/env python3
-# -*- coding:utf-8 -*-
-'''
-File: __init__.py
-Created Date: 2021-02-04 21:14:48
-Author: Kyomotoi
-Email: [email protected]
-License: GPLv3
-Project: https://github.com/Kyomotoi/ATRI
---------
-Last Modified: Sunday, 7th March 2021 3:14:16 pm
-Modified By: Kyomotoi ([email protected])
---------
-Copyright (c) 2021 Kyomotoi
-'''
-
 import re
-
-from nonebot.plugin import on_command
 from nonebot.adapters.cqhttp import Bot, MessageEvent
 
+from ATRI.service import Service as sv
 from ATRI.rule import (
-    is_in_banlist,
+    is_block,
     is_in_dormant,
     is_in_service
 )
@@ -29,9 +12,10 @@ from .data_source import roll_dice
 
 __plugin_name__ = "roll"
 
-roll = on_command(
-    "/roll",
-    rule=is_in_banlist() & is_in_dormant()
+roll = sv.on_command(
+    name="roll一下",
+    cmd="/roll",
+    rule=is_block() & is_in_dormant()
     & is_in_service(__plugin_name__)
 )
 
@@ -50,18 +34,3 @@ async def _(bot: Bot, event: MessageEvent, state: dict) -> None:
         await roll.finish("请输入正确的参数！！\ndemo：1d10 或 2d10+2d10")
     
     await roll.finish(roll_dice(resu))
-
-
-# __plugin_name__ = "fakemsg"
-
-# fakemsg = on_command(
-#     "/fakemsg",
-#     rule=is_in_banlist() & is_in_dormant()
-#     & is_in_service(__plugin_name__)
-# )
-
-# @fakemsg.handle()
-# async def _fakemsg(bot: Bot, event: MessageEvent, state: dict) -> None:
-#     ...
-
-# @fakemsg.got()
-\ No newline at end of file
diff --git a/ATRI/plugins/utils/data_source.py b/ATRI/plugins/utils/data_source.py
index 6d018f1..f41a1d1 100644
--- a/ATRI/plugins/utils/data_source.py
+++ b/ATRI/plugins/utils/data_source.py
@@ -1,19 +1,3 @@
-#!/usr/bin/env python3
-# -*- coding:utf-8 -*-
-'''
-File: data_source.py
-Created Date: 2021-02-04 21:14:59
-Author: Kyomotoi
-Email: [email protected]
-License: GPLv3
-Project: https://github.com/Kyomotoi/ATRI
---------
-Last Modified: Sunday, 7th March 2021 3:14:22 pm
-Modified By: Kyomotoi ([email protected])
---------
-Copyright (c) 2021 Kyomotoi
-'''
-
 import re
 import random