earthjasonlin/MailForwarder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: From for @yandex.com

Browse Source
This commit is contained in:
Zichao Lin 2024-07-24 14:02:54 +08:00
parent e2fcedf2c9
commit d7d2b86a9f
Signed by: earthjasonlin
GPG Key ID: 406D9913DE2E42FB
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.py
View File

@ -14,6 +14,12 @@ import re
from email.header import decode_header from email.header import decode_header
def provider_in(address, provider_list):
for provider in provider_list:
if address.endswith(provider):
return True
return False
def decode_mime_words(s): def decode_mime_words(s):
decoded_fragments = decode_header(s) decoded_fragments = decode_header(s)
return ''.join( return ''.join(
@ -66,7 +72,7 @@ def get_unforwarded_emails(account_config, logger):
imap.login(account_config['email'], account_config['password']) imap.login(account_config['email'], account_config['password'])
if "163.com" in account_config['email'] or "126.com" in account_config['email']: if provider_in(account_config['email'], ["163.com", "126.com"]):
imaplib.Commands['ID'] = ('AUTH') imaplib.Commands['ID'] = ('AUTH')
args = ("name","XXXX","contact","XXXX@163.com","version","1.0.0","vendor","myclient") args = ("name","XXXX","contact","XXXX@163.com","version","1.0.0","vendor","myclient")
typ, dat = imap._simple_command('ID', '("' + '" "'.join(args) + '")') typ, dat = imap._simple_command('ID', '("' + '" "'.join(args) + '")')
@ -109,7 +115,10 @@ def forward_emails(account_config, emails, logger):
to_name, to_address = parseaddr(original_msg['To']) to_name, to_address = parseaddr(original_msg['To'])
to_name = decode_mime_words(to_name) to_name = decode_mime_words(to_name)
msg = MIMEMultipart('mixed') msg = MIMEMultipart('mixed')
msg['From'] = f"{from_name} ({from_address}) via Forwarder <{account_config['email']}>" if provider_in(account_config['email'], ["yandex.com"]):
msg['From'] = f"{from_name} via Forwarder <{account_config['email']}>"
else:
msg['From'] = f"{from_name} ({from_address}) via Forwarder <{account_config['email']}>"
msg['To'] = f"{to_name} ({to_address}) via Forwarder <{recipient}>" msg['To'] = f"{to_name} ({to_address}) via Forwarder <{recipient}>"
original_subject = decode_mime_words(original_msg['Subject']) original_subject = decode_mime_words(original_msg['Subject'])
msg['Subject'] = original_subject msg['Subject'] = original_subject