codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix message

Browse Source
This commit is contained in:
jxxghp
2023-06-08 20:21:59 +08:00
parent 3fc21af41e
commit 0caac7ac00
9 changed files with 99 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/modules/wechat/__init__.py
View File

@ -1,8 +1,7 @@
from typing import Optional, Union, List, Tuple
from fastapi import Request
import xml.dom.minidom
from app.core import MediaInfo, TorrentInfo, settings
from typing import Optional, Union, List, Tuple, Any
from app.core import MediaInfo, settings, Context
from app.log import logger
from app.modules import _ModuleBase
from app.modules.wechat.WXBizMsgCrypt3 import WXBizMsgCrypt
@ -20,26 +19,31 @@ class WechatModule(_ModuleBase):
def init_setting(self) -> Tuple[str, Union[str, bool]]:
return "MESSAGER", "wechat"
def message_parser(self, request: Request) -> Optional[dict]:
def message_parser(self, body: Any, form: Any, args: Any) -> Optional[dict]:
"""
解析消息内容，返回字典，注意以下约定值：
userid: 用户ID
username: 用户名
text: 内容
:param request: 请求体
:param body: 请求体
:param form: 表单
:param args: 参数
:return: 消息内容、用户ID
"""
try:
# URL参数
sVerifyMsgSig = request.query_params.get("msg_signature")
sVerifyTimeStamp = request.query_params.get("timestamp")
sVerifyNonce = request.query_params.get("nonce")
sVerifyMsgSig = args.get("msg_signature")
sVerifyTimeStamp = args.get("timestamp")
sVerifyNonce = args.get("nonce")
if not sVerifyMsgSig or not sVerifyTimeStamp or not sVerifyNonce:
logger.error(f"微信请求参数错误：{args}")
return None
# 解密模块
wxcpt = WXBizMsgCrypt(sToken=settings.WECHAT_TOKEN,
sEncodingAESKey=settings.WECHAT_ENCODING_AESKEY,
sReceiveId=settings.WECHAT_CORPID)
# 报文数据
sReqData = request.form()
sReqData = form
if not sReqData:
return None
logger.debug(f"收到微信请求：{sReqData}")
@ -132,7 +136,7 @@ class WechatModule(_ModuleBase):
# 再发送内容
return self.wechat.send_medias_msg(medias=items, userid=userid)
def post_torrents_message(self, title: str, items: List[TorrentInfo],
def post_torrents_message(self, title: str, items: List[Context],
userid: Union[str, int] = None) -> Optional[bool]:
"""
发送种子信息选择列表

13
app/modules/wechat/wechat.py
View File

@ -3,7 +3,7 @@ import threading
from datetime import datetime
from typing import Optional, List
from app.core import settings, MediaInfo, TorrentInfo
from app.core import settings, MediaInfo, Context
from app.log import logger
from app.utils.http import RequestUtils
from app.utils.singleton import Singleton
@ -165,10 +165,10 @@ class WeChat(metaclass=Singleton):
articles = []
index = 1
for media in medias:
if media.get_vote_string():
title = f"{index}. {media.get_title_string()}\n{media.get_type_string()}，{media.get_vote_string()}"
if media.vote_average:
title = f"{index}. {media.get_title_string()}\n类型：{media.type.value}，评分：{media.vote_average}"
else:
title = f"{index}. {media.get_title_string()}\n{media.get_type_string()}"
title = f"{index}. {media.get_title_string()}\n类型：{media.type.value}"
articles.append({
"title": title,
"description": "",
@ -187,7 +187,7 @@ class WeChat(metaclass=Singleton):
}
return self.__post_request(message_url, req_json)
def send_torrents_msg(self, torrents: List[TorrentInfo], userid: str = "", title: str = "") -> Optional[bool]:
def send_torrents_msg(self, torrents: List[Context], userid: str = "", title: str = "") -> Optional[bool]:
"""
发送列表消息
"""
@ -197,7 +197,8 @@ class WeChat(metaclass=Singleton):
try:
index, caption = 1, "*%s*" % title
for torrent in torrents:
for context in torrents:
torrent = context.torrent_info
link = torrent.page_url
title = torrent.title
free = torrent.get_volume_factor_string()