summaryrefslogtreecommitdiff
path: root/ATRI
diff options
context:
space:
mode:
authorKyomotoi <[email protected]>2021-07-09 15:58:21 +0800
committerKyomotoi <[email protected]>2021-07-09 15:58:21 +0800
commit2e9dc0dc71ce8af4078f46b80abcf3b5a6930751 (patch)
tree00934da983375f6965d88849f64291f1e9881e0d /ATRI
parent33f456a2b600d81b7bfe5040e03e85caaa66a68c (diff)
downloadATRI-2e9dc0dc71ce8af4078f46b80abcf3b5a6930751.tar.gz
ATRI-2e9dc0dc71ce8af4078f46b80abcf3b5a6930751.tar.bz2
ATRI-2e9dc0dc71ce8af4078f46b80abcf3b5a6930751.zip
✏️ Fix: Typo
Diffstat (limited to 'ATRI')
-rw-r--r--ATRI/plugins/chat/__init__.py45
-rw-r--r--ATRI/plugins/repo.py19
2 files changed, 30 insertions, 34 deletions
diff --git a/ATRI/plugins/chat/__init__.py b/ATRI/plugins/chat/__init__.py
index 7b33a6b..077cde1 100644
--- a/ATRI/plugins/chat/__init__.py
+++ b/ATRI/plugins/chat/__init__.py
@@ -15,57 +15,50 @@ _chat_flmt_notice = choice(["慢...慢一..点❤", "冷静1下", "歇会歇会~
chat = Chat().on_message("闲聊(文爱")
-
@chat.handle()
async def _chat(bot: Bot, event: MessageEvent):
user_id = event.get_user_id()
if not _chat_flmt.check(user_id):
await chat.finish(_chat_flmt_notice)
-
+
msg = str(event.message)
repo = await Chat().deal(msg, user_id)
_chat_flmt.start_cd(user_id)
await chat.finish(repo)
-
my_name_is = Chat().on_command("叫我", "更改闲聊(划掉 文爱)时的称呼", aliases={"我是"}, priority=1)
-
@my_name_is.args_parser # type: ignore
async def _get_name(bot: Bot, event: MessageEvent, state: T_State):
msg = str(event.message).strip()
- quit_list = ["算了", "罢了"]
+ quit_list = ["算了", "罢了", "取消"]
if msg in quit_list:
await my_name_is.finish("好吧...")
if not msg:
- await my_name_is.reject("欧尼酱想让咱如何称呼你呢!0w0")
+ await my_name_is.reject("欧尼酱想让咱如何称呼呢!0w0")
else:
state["name"] = msg
-
@my_name_is.handle()
async def _name(bot: Bot, event: MessageEvent, state: T_State):
user_id = event.get_user_id()
if not _chat_flmt.check(user_id):
await my_name_is.finish(_chat_flmt_notice)
-
+
msg = str(event.message).strip()
if msg:
state["name"] = msg
-
-@my_name_is.got("name")
+@my_name_is.got("name", "欧尼酱想让咱如何称呼呢!0w0")
async def _deal_name(bot: Bot, event: MessageEvent, state: T_State):
user_id = event.get_user_id()
new_name = state["name"]
- repo = choice(
- [
- f"好~w 那咱以后就称呼你为{new_name}!",
- f"噢噢噢!原来你叫{new_name}阿~",
- f"好欸!{new_name}ちゃん~~~",
- "很不错的称呼呢w",
- ]
- )
+ repo = choice([
+ f"好~w 那咱以后就称呼你为{new_name}!",
+ f"噢噢噢!原来你叫{new_name}阿~",
+ f"好欸!{new_name}ちゃん~~~",
+ "很不错的称呼呢w"
+ ])
Chat().name_is(user_id, new_name)
_chat_flmt.start_cd(user_id)
await my_name_is.finish(repo)
@@ -73,7 +66,6 @@ async def _deal_name(bot: Bot, event: MessageEvent, state: T_State):
say = Chat().on_command("说", "别人让我说啥就说啥(", priority=1)
-
@say.args_parser # type: ignore
async def _get_say(bot: Bot, event: MessageEvent, state: T_State):
msg = str(event.message).strip()
@@ -81,30 +73,33 @@ async def _get_say(bot: Bot, event: MessageEvent, state: T_State):
if msg in quit_list:
await say.finish("好吧...")
if not msg:
- await say.reject("欧尼酱想让咱如何称呼你呢!0w0")
+ await say.reject("阿!要咱说啥呢...")
else:
state["say"] = msg
-
@say.handle()
async def _ready_say(bot: Bot, event: MessageEvent, state: T_State):
user_id = event.get_user_id()
if not _chat_flmt.check(user_id):
await say.finish(_chat_flmt_notice)
-
+
msg = str(event.message)
if msg:
state["say"] = msg
-
@say.got("say")
async def _deal_say(bot: Bot, event: MessageEvent, state: T_State):
msg = state["say"]
check = CoolqCodeChecker(msg).check
if not check:
- repo = choice(["不要...", "这个咱不想复读!", "不可以", "不好!"])
+ repo = choice([
+ "不要...",
+ "这个咱不想复读!",
+ "不可以",
+ "不好!"
+ ])
await say.finish(repo)
-
+
user_id = event.get_user_id()
_chat_flmt.start_cd(user_id)
await say.finish(msg)
diff --git a/ATRI/plugins/repo.py b/ATRI/plugins/repo.py
index b49b869..7939fc6 100644
--- a/ATRI/plugins/repo.py
+++ b/ATRI/plugins/repo.py
@@ -21,17 +21,17 @@ REPO_FORMAT = """
class Repo(Service):
+
def __init__(self):
Service.__init__(self, "反馈", "向维护者发送消息")
-
+
repo = Repo().on_command("来杯红茶", "向维护者发送消息", aliases={"反馈", "报告"})
-
@repo.args_parser # type: ignore
async def _get_repo(bot: Bot, event: MessageEvent, state: T_State):
msg = str(event.message).strip()
- quit_list = ["算了", "罢了", "不搜了", "取消"]
+ quit_list = ["算了", "罢了", "取消"]
if msg in quit_list:
await repo.finish("好吧...")
if not msg:
@@ -39,7 +39,6 @@ async def _get_repo(bot: Bot, event: MessageEvent, state: T_State):
else:
state["repo"] = msg
-
@repo.handle()
async def _ready_repo(bot: Bot, event: MessageEvent, state: T_State):
user_id = event.get_user_id()
@@ -47,24 +46,26 @@ async def _ready_repo(bot: Bot, event: MessageEvent, state: T_State):
await repo.finish(_repo_flmt_notice)
if not _repo_dlmt.check(user_id):
await repo.finish(_repo_dlmt_notice)
-
+
msg = str(event.message).strip()
if msg:
state["repo"] = msg
-
@repo.got("repo", "需要反馈的内容呢?~")
async def _deal_repo(bot: Bot, event: MessageEvent, state: T_State):
msg = state["repo"]
user_id = event.get_user_id()
- repo_0 = REPO_FORMAT.format(user=user_id, msg=msg)
-
+ repo_0 = REPO_FORMAT.format(
+ user=user_id,
+ msg=msg
+ )
+
for superuser in BotSelfConfig.superusers:
try:
await bot.send_private_msg(user_id=superuser, message=repo_0)
except BaseException:
await repo.finish("发送失败了呢...")
-
+
_repo_flmt.start_cd(user_id)
_repo_dlmt.increase(user_id)
await repo.finish("吾辈的心愿已由咱转告维护者!")