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-07-14 07:18:28 +08:00
parent df30b71077
commit ae3d2fb7ae
7 changed files with 71 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/modules/slack/__init__.py
View File

@ -7,6 +7,7 @@ from app.core.config import settings
from app.log import logger
from app.modules import _ModuleBase
from app.modules.slack.slack import Slack
from app.schemas import MessageChannel, CommingMessage
class SlackModule(_ModuleBase):
@ -22,7 +23,8 @@ class SlackModule(_ModuleBase):
return "MESSAGER", "slack"
@staticmethod
def message_parser(body: Any, form: Any, args: Any) -> Optional[dict]:
def message_parser(body: Any, form: Any,
args: Any) -> Optional[CommingMessage]:
"""
解析消息内容，返回字典，注意以下约定值：
userid: 用户ID
@ -31,7 +33,7 @@ class SlackModule(_ModuleBase):
:param body: 请求体
:param form: 表单
:param args: 参数
:return: 消息内容、用户ID
:return: 渠道、消息体
"""
"""
# 消息
@ -149,7 +151,7 @@ class SlackModule(_ModuleBase):
try:
msg_json: dict = json.loads(body)
except Exception as err:
logger.error(f"解析Slack消息失败：{err}")
logger.debug(f"解析Slack消息失败：{err}")
return None
if msg_json:
if msg_json.get("type") == "message":
@ -175,11 +177,8 @@ class SlackModule(_ModuleBase):
else:
return None
logger.info(f"收到Slack消息：userid={userid}, username={username}, text={text}")
return {
"userid": userid,
"username": username,
"text": text
}
return CommingMessage(channel=MessageChannel.Slack,
userid=userid, username=username, text=text)
return None
def post_message(self, title: str,

21
app/modules/telegram/__init__.py
View File

@ -6,6 +6,7 @@ from app.core.config import settings
from app.log import logger
from app.modules import _ModuleBase
from app.modules.telegram.telegram import Telegram
from app.schemas import MessageChannel, CommingMessage
class TelegramModule(_ModuleBase):
@ -20,7 +21,8 @@ class TelegramModule(_ModuleBase):
def init_setting(self) -> Tuple[str, Union[str, bool]]:
return "MESSAGER", "telegram"
def message_parser(self, body: Any, form: Any, args: Any) -> Optional[dict]:
def message_parser(self, body: Any, form: Any,
args: Any) -> Optional[CommingMessage]:
"""
解析消息内容，返回字典，注意以下约定值：
userid: 用户ID
@ -29,7 +31,7 @@ class TelegramModule(_ModuleBase):
:param body: 请求体
:param form: 表单
:param args: 参数
:return: 消息内容、用户ID
:return: 渠道、消息体
"""
"""
{
@ -61,7 +63,7 @@ class TelegramModule(_ModuleBase):
try:
message: dict = json.loads(body)
except Exception as err:
logger.error(f"解析Telegram消息失败：{err}")
logger.debug(f"解析Telegram消息失败：{err}")
return None
if message:
text = message.get("text")
@ -76,18 +78,17 @@ class TelegramModule(_ModuleBase):
and str(user_id) not in settings.TELEGRAM_ADMINS.split(',') \
and str(user_id) != settings.TELEGRAM_CHAT_ID:
self.telegram.send_msg(title="只有管理员才有权限执行此命令", userid=user_id)
return {}
return CommingMessage(channel=MessageChannel.Wechat,
userid=user_id, username=user_id, text="")
else:
if settings.TELEGRAM_USERS \
and not str(user_id) in settings.TELEGRAM_USERS.split(','):
logger.info(f"用户{user_id}不在用户白名单中，无法使用此机器人")
self.telegram.send_msg(title="你不在用户白名单中，无法使用此机器人", userid=user_id)
return {}
return {
"userid": user_id,
"username": user_name,
"text": text
}
return CommingMessage(channel=MessageChannel.Wechat,
userid=user_id, username=user_id, text="")
return CommingMessage(channel=MessageChannel.Wechat,
userid=user_id, username=user_id, text=text)
return None
def post_message(self, title: str,

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

@ -7,11 +7,11 @@ from app.log import logger
from app.modules import _ModuleBase
from app.modules.wechat.WXBizMsgCrypt3 import WXBizMsgCrypt
from app.modules.wechat.wechat import WeChat
from app.schemas import MessageChannel, CommingMessage
from app.utils.dom import DomUtils
class WechatModule(_ModuleBase):
wechat: WeChat = None
def init_module(self) -> None:
@ -23,7 +23,8 @@ class WechatModule(_ModuleBase):
def init_setting(self) -> Tuple[str, Union[str, bool]]:
return "MESSAGER", "wechat"
def message_parser(self, body: Any, form: Any, args: Any) -> Optional[dict]:
def message_parser(self, body: Any, form: Any,
args: Any) -> Optional[CommingMessage]:
"""
解析消息内容，返回字典，注意以下约定值：
userid: 用户ID
@ -32,7 +33,7 @@ class WechatModule(_ModuleBase):
:param body: 请求体
:param form: 表单
:param args: 参数
:return: 消息内容、用户ID
:return: 渠道、消息体
"""
try:
# URL参数
@ -40,7 +41,7 @@ class WechatModule(_ModuleBase):
sVerifyTimeStamp = args.get("timestamp")
sVerifyNonce = args.get("nonce")
if not sVerifyMsgSig or not sVerifyTimeStamp or not sVerifyNonce:
logger.error(f"微信请求参数错误：{args}")
logger.debug(f"微信请求参数错误：{args}")
return None
# 解密模块
wxcpt = WXBizMsgCrypt(sToken=settings.WECHAT_TOKEN,
@ -48,7 +49,7 @@ class WechatModule(_ModuleBase):
sReceiveId=settings.WECHAT_CORPID)
# 报文数据
if not body:
logger.error(f"微信请求数据为空")
logger.debug(f"微信请求数据为空")
return None
logger.debug(f"收到微信请求：{body}")
ret, sMsg = wxcpt.DecryptMsg(sPostData=body,
@ -99,18 +100,16 @@ class WechatModule(_ModuleBase):
if wechat_admins and not any(
user_id == admin_user for admin_user in wechat_admins):
self.wechat.send_msg(title="用户无权限执行菜单命令", userid=user_id)
return {}
return CommingMessage(channel=MessageChannel.Wechat,
userid=user_id, username=user_id, text="")
elif msg_type == "text":
# 文本消息
content = DomUtils.tag_value(root_node, "Content", default="")
if content:
logger.info(f"收到微信消息：userid={user_id}, text={content}")
# 处理消息内容
return {
"userid": user_id,
"username": user_id,
"text": content
}
return CommingMessage(channel=MessageChannel.Wechat,
userid=user_id, username=user_id, text=content)
except Exception as err:
logger.error(f"微信消息处理发生错误：{err}")
return None