|
|
@@ -2,7 +2,7 @@ import json
|
|
|
|
|
|
from mysql_db import DBManager
|
|
|
from email_client import EmailClient
|
|
|
-from notice import AiYuFeiFei, from_email, PushFactory
|
|
|
+from notice import PushFactory, PushMessage, MessageType, Email
|
|
|
|
|
|
EMAIL_CONFIG_SQL = '''
|
|
|
select email_address, -- 邮件地址
|
|
|
@@ -95,7 +95,7 @@ def check_new_email(email_config: dict):
|
|
|
try:
|
|
|
for email in new_emails:
|
|
|
current_email = email
|
|
|
- message = from_email(email)
|
|
|
+ message = to_message(email)
|
|
|
PushFactory.create_push(push_config).send_notification(message)
|
|
|
|
|
|
except Exception as e:
|
|
|
@@ -105,6 +105,23 @@ def check_new_email(email_config: dict):
|
|
|
if current_email and current_email['uid'] > email_config['last_check_uid']:
|
|
|
update_last_check_uid(db_manager, email_account, current_email['uid'])
|
|
|
|
|
|
+def to_message(email: dict):
|
|
|
+ sender_display = email["sender"].replace(' ', '\n').replace('"', '')
|
|
|
+ recipient_display = email["recipient"].replace(' ', '\n')
|
|
|
+
|
|
|
+ return PushMessage(
|
|
|
+ title="新邮件通知",
|
|
|
+ content=f'您有一封来自[{email["sender_name"] if email["sender_name"] else email["sender_email"]}]的邮件',
|
|
|
+ messageType=MessageType.EMAIL,
|
|
|
+ email=Email(
|
|
|
+ sender=sender_display,
|
|
|
+ recipient=recipient_display,
|
|
|
+ subject=email['subject'],
|
|
|
+ sendTime=email['date'],
|
|
|
+ content=email['content'],
|
|
|
+ )
|
|
|
+ )
|
|
|
+
|
|
|
|
|
|
if __name__ == '__main__':
|
|
|
db_manager = DBManager()
|