diff options
| author | Kyomotoi <[email protected]> | 2022-10-13 22:00:03 +0800 |
|---|---|---|
| committer | Kyomotoi <[email protected]> | 2022-10-13 22:00:03 +0800 |
| commit | afbb48c7fb6536e24961fb1edfe0c57c818ceba1 (patch) | |
| tree | 6a9888a6daced960c78ba40c1b6693e641072b73 /ATRI/plugins | |
| parent | 6098b1b82942ef7ac89bbe8d393ba12bfea684df (diff) | |
| parent | 83a9fb95251c173b2394b668aab1b63908af5f29 (diff) | |
| download | ATRI-afbb48c7fb6536e24961fb1edfe0c57c818ceba1.tar.gz ATRI-afbb48c7fb6536e24961fb1edfe0c57c818ceba1.tar.bz2 ATRI-afbb48c7fb6536e24961fb1edfe0c57c818ceba1.zip | |
🔀 Merge branch 'main' of https://github.com/Kyomotoi/ATRI
Diffstat (limited to 'ATRI/plugins')
| -rw-r--r-- | ATRI/plugins/console/__init__.py | 2 | ||||
| -rw-r--r-- | ATRI/plugins/repo.py | 4 | ||||
| -rw-r--r-- | ATRI/plugins/twitter/data_source.py | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/ATRI/plugins/console/__init__.py b/ATRI/plugins/console/__init__.py index 522998d..ea109dc 100644 --- a/ATRI/plugins/console/__init__.py +++ b/ATRI/plugins/console/__init__.py @@ -41,7 +41,7 @@ async def _(event: PrivateMessageEvent, is_pub_n: str = ArgPlainText("is_pub_n") .text(f"Token: {token}") .text("该 token 有效时间为 15min") ) - + await gen_console_key.finish(msg) diff --git a/ATRI/plugins/repo.py b/ATRI/plugins/repo.py index 2b0962f..1c53d58 100644 --- a/ATRI/plugins/repo.py +++ b/ATRI/plugins/repo.py @@ -14,6 +14,7 @@ from ATRI.message import MessageBuilder _repo_flmt_notice = choice(["慢...慢一..点❤", "冷静1下", "歇会歇会~~"]) +<<<<<<< HEAD _REPO_FORMAT = ( MessageBuilder("来自用户{user}反馈:") .text("{msg}") @@ -21,6 +22,9 @@ _REPO_FORMAT = ( .text("- 无需担心, 关注其它内容即可") .done() ) +======= +_REPO_FORMAT = MessageBuilder("来自用户{user}反馈:").text("{msg}").done() +>>>>>>> 83a9fb95251c173b2394b668aab1b63908af5f29 repo = Service("反馈", "向维护者发送消息", rule=is_in_service("反馈")) diff --git a/ATRI/plugins/twitter/data_source.py b/ATRI/plugins/twitter/data_source.py index 18a8fb9..8f3e793 100644 --- a/ATRI/plugins/twitter/data_source.py +++ b/ATRI/plugins/twitter/data_source.py @@ -17,9 +17,7 @@ from .api import API _DYNAMIC_OUTPUT_FORMAT = ( - MessageBuilder("{t_nickname} 的推更新了！") - .text("{t_dy_content}") - .done() + MessageBuilder("{t_nickname} 的推更新了！").text("{t_dy_content}").done() ) |