Diuse/zhenxun_bot
1
0
Fork 0
mirror of https://github.com/zhenxun-org/zhenxun_bot.git synced 2025-12-15 14:22:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修复词条单图片/表情/at无法添加

Browse Source
This commit is contained in:
HibiKier 2023-03-02 22:45:37 +08:00
parent 422ed2ff51
commit 3cdabb7d81
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@ -338,6 +338,7 @@ PS: **ARM平台** 请使用全量版 同时 **如果你的机器 RAM < 1G 可能
* 修复词云 * 修复词云
* 修复我的签到签到图片 * 修复我的签到签到图片
* 更正BuffSkin添加语句 * 更正BuffSkin添加语句
* 修复词条单
### 2022/3/1 ### 2022/3/1

27
plugins/word_bank/_model.py
View File

@ -1,6 +1,7 @@
import random import random
import re import re
import time import time
import uuid
from datetime import datetime from datetime import datetime
from typing import Any, List, Optional, Tuple, Union from typing import Any, List, Optional, Tuple, Union
@ -129,7 +130,7 @@ class WordBank(Model):
image_path = f"problem/{group_id}/{user_id}_{int(time.time())}.jpg" image_path = f"problem/{group_id}/{user_id}_{int(time.time())}.jpg"
answer, _list = await cls._answer2format(answer, user_id, group_id) answer, _list = await cls._answer2format(answer, user_id, group_id)
if not await cls.exists( if not await cls.exists(
user_id, group_id, problem, answer, word_scope, word_type user_id, group_id, str(problem), answer, word_scope, word_type
): ):
await cls.create( await cls.create(
user_qq=user_id, user_qq=user_id,
@ -148,7 +149,7 @@ class WordBank(Model):
@classmethod @classmethod
async def _answer2format( async def _answer2format(
cls, answer: Union[str, Message], user_id: int, group_id: int cls, answer: Union[str, Message], user_id: int, group_id: Optional[int]
) -> Tuple[str, List[Any]]: ) -> Tuple[str, List[Any]]:
""" """
说明: 说明:
@ -164,24 +165,31 @@ class WordBank(Model):
text = "" text = ""
index = 0 index = 0
for seg in answer: for seg in answer:
placeholder = uuid.uuid1()
if isinstance(seg, str): if isinstance(seg, str):
text += seg text += seg
elif seg.type == "text": elif seg.type == "text":
text += seg.data["text"] text += seg.data["text"]
elif seg.type == "face": elif seg.type == "face":
text += f"[face:placeholder_{index}]" text += f"[face:placeholder_{placeholder}]"
_list.append(seg.data["id"]) _list.append(seg.data["id"])
elif seg.type == "at": elif seg.type == "at":
text += f"[at:placeholder_{index}]" text += f"[at:placeholder_{placeholder}]"
_list.append(seg.data["qq"]) _list.append(seg.data["qq"])
else: else:
text += f"[image:placeholder_{index}]" text += f"[image:placeholder_{placeholder}]"
index += 1 index += 1
t = int(time.time()) _file = (
_file = path / "answer" / f"{group_id}" / f"{user_id}_{t}.jpg" path
/ "answer"
/ f"{group_id or user_id}"
/ f"{user_id}_{placeholder}.jpg"
)
_file.parent.mkdir(exist_ok=True, parents=True) _file.parent.mkdir(exist_ok=True, parents=True)
await AsyncHttpx.download_file(seg.data["url"], _file) await AsyncHttpx.download_file(seg.data["url"], _file)
_list.append(f"answer/{group_id}/{user_id}_{t}.jpg") _list.append(
f"answer/{group_id or user_id}/{user_id}_{placeholder}.jpg"
)
return text, _list return text, _list
@classmethod @classmethod
@ -499,5 +507,4 @@ class WordBank(Model):
@classmethod @classmethod
async def _run_script(cls): async def _run_script(cls):
await cls.raw("ALTER TABLE word_bank2 ADD to_me varchar(255);") return ["ALTER TABLE word_bank2 ADD to_me varchar(255);"] # 添加 to_me 字段
"""添加 to_me 字段"""