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

fix

Browse Source
This commit is contained in:
jxxghp
2023-06-09 19:25:12 +08:00
parent 77b755da5f
commit 6925dde254
76 changed files with 137 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,8 @@
import json
from typing import Optional, Union, List, Tuple, Any
from app.core import MediaInfo, settings, Context
from app.core.context import MediaInfo, Context
from app.core.config import settings
from app.log import logger
from app.modules import _ModuleBase
from app.modules.telegram.telegram import Telegram

19
app/modules/telegram/telegram.py
View File

@ -4,11 +4,11 @@ from typing import Optional, List
import telebot
from app.core import settings, MediaInfo, Context
from app.core.config import settings
from app.core.context import MediaInfo, Context
from app.log import logger
from app.utils.http import RequestUtils
from app.utils.singleton import Singleton
from app.utils.string import StringUtils
class Telegram(metaclass=Singleton):
@ -20,6 +20,9 @@ class Telegram(metaclass=Singleton):
"""
初始化参数
"""
if settings.MESSAGER != "telegram":
return
# Token
self._telegram_token = settings.TELEGRAM_TOKEN
# Chat Id
@ -72,7 +75,7 @@ class Telegram(metaclass=Singleton):
else:
chat_id = self._telegram_chat_id
return self.__send_request(image=image, caption=caption)
return self.__send_request(userid=chat_id, image=image, caption=caption)
except Exception as msg_e:
logger.error(f"发送消息失败：{msg_e}")
@ -110,7 +113,7 @@ class Telegram(metaclass=Singleton):
else:
chat_id = self._telegram_chat_id
return self.__send_request(image=image, caption=caption)
return self.__send_request(userid=chat_id, image=image, caption=caption)
except Exception as msg_e:
logger.error(f"发送消息失败：{msg_e}")
@ -140,24 +143,24 @@ class Telegram(metaclass=Singleton):
else:
chat_id = self._telegram_chat_id
return self.__send_request(caption=caption)
return self.__send_request(userid=chat_id, caption=caption)
except Exception as msg_e:
logger.error(f"发送消息失败：{msg_e}")
return False
def __send_request(self, image="", caption="") -> bool:
def __send_request(self, userid: str = None, image="", caption="") -> bool:
"""
向Telegram发送报文
"""
if image:
ret = self._bot.send_photo(chat_id=self._telegram_chat_id,
ret = self._bot.send_photo(chat_id=userid or self._telegram_chat_id,
photo=image,
caption=caption,
parse_mode="Markdown")
else:
ret = self._bot.send_message(chat_id=self._telegram_chat_id,
ret = self._bot.send_message(chat_id=userid or self._telegram_chat_id,
text=caption,
parse_mode="Markdown")