add sina email support
This commit is contained in:
@@ -16,11 +16,13 @@ from src.pojo.mail.mail_pojo import MailPojo, MailAddress
|
|||||||
|
|
||||||
AOL_IMAP_SERVER = "imap.aol.com"
|
AOL_IMAP_SERVER = "imap.aol.com"
|
||||||
IMAP_SERVER_163 = "imap.163.com"
|
IMAP_SERVER_163 = "imap.163.com"
|
||||||
|
IMAP_SERVER_SINA = "imap.sina.com"
|
||||||
YAHOO_IMAP_SERVER = "imap.mail.yahoo.com"
|
YAHOO_IMAP_SERVER = "imap.mail.yahoo.com"
|
||||||
CONFIRMATION_SUBJECT_FR = 'Votre rendez-vous est'
|
CONFIRMATION_SUBJECT_FR = 'Votre rendez-vous est'
|
||||||
CONFIRMATION_SUBJECT_EN = 'appointment is confirmed'
|
CONFIRMATION_SUBJECT_EN = 'appointment is confirmed'
|
||||||
HERMES_EMAIL = "no-reply@hermes.com"
|
HERMES_EMAIL = "no-reply@hermes.com"
|
||||||
DOMAIN_YAHOO = "yahoo.com"
|
DOMAIN_YAHOO = "yahoo.com"
|
||||||
|
DOMAIN_SINA = "sina.com"
|
||||||
|
|
||||||
DOMAIN_163 = "163.com"
|
DOMAIN_163 = "163.com"
|
||||||
date_format = "%d-%b-%Y" # DD-Mon-YYYY e.g., 3-Mar-2014
|
date_format = "%d-%b-%Y" # DD-Mon-YYYY e.g., 3-Mar-2014
|
||||||
@@ -43,6 +45,8 @@ class MailConfirmationReader():
|
|||||||
imap = imaplib.IMAP4_SSL(IMAP_SERVER_163)
|
imap = imaplib.IMAP4_SSL(IMAP_SERVER_163)
|
||||||
elif DOMAIN_YAHOO in self.login:
|
elif DOMAIN_YAHOO in self.login:
|
||||||
imap = imaplib.IMAP4_SSL(YAHOO_IMAP_SERVER)
|
imap = imaplib.IMAP4_SSL(YAHOO_IMAP_SERVER)
|
||||||
|
elif DOMAIN_SINA in self.login:
|
||||||
|
imap = imaplib.IMAP4_SSL(IMAP_SERVER_SINA)
|
||||||
else:
|
else:
|
||||||
imap = imaplib.IMAP4_SSL(AOL_IMAP_SERVER)
|
imap = imaplib.IMAP4_SSL(AOL_IMAP_SERVER)
|
||||||
# authenticate
|
# authenticate
|
||||||
@@ -116,7 +120,7 @@ def clean(text):
|
|||||||
def accept_appointment_found(accepted_result_list: list):
|
def accept_appointment_found(accepted_result_list: list):
|
||||||
mailer = Mailer()
|
mailer = Mailer()
|
||||||
for reserve in accepted_result_list:
|
for reserve in accepted_result_list:
|
||||||
mailer.send_email(get_accepted_result_from(reserve), to_all=True)
|
mailer.send_email(get_accepted_result_from(reserve), to_all=False)
|
||||||
MONGO_STORE_MANAGER.update_reserve_result(reserve.id, ResultEnum.ACCEPTED)
|
MONGO_STORE_MANAGER.update_reserve_result(reserve.id, ResultEnum.ACCEPTED)
|
||||||
|
|
||||||
if len(accepted_result_list) > 0:
|
if len(accepted_result_list) > 0:
|
||||||
@@ -138,7 +142,7 @@ def read_mails_and_find_confirmation_contacts():
|
|||||||
successful_items = MONGO_STORE_MANAGER.get_all_successful_items_for_day()
|
successful_items = MONGO_STORE_MANAGER.get_all_successful_items_for_day()
|
||||||
# check the hours
|
# check the hours
|
||||||
current_hour = datetime.datetime.now().hour
|
current_hour = datetime.datetime.now().hour
|
||||||
if current_hour < 19:
|
if current_hour < 15:
|
||||||
# add yesterday's appointment only for morning
|
# add yesterday's appointment only for morning
|
||||||
successful_items.extend(MONGO_STORE_MANAGER.get_all_successful_items_for_yesterday())
|
successful_items.extend(MONGO_STORE_MANAGER.get_all_successful_items_for_yesterday())
|
||||||
for mail in mails_messages:
|
for mail in mails_messages:
|
||||||
|
|||||||
@@ -19,12 +19,14 @@ from datetime import time
|
|||||||
AOL_IMAP_SERVER = "imap.aol.com"
|
AOL_IMAP_SERVER = "imap.aol.com"
|
||||||
YAHOO_IMAP_SERVER = "imap.mail.yahoo.com"
|
YAHOO_IMAP_SERVER = "imap.mail.yahoo.com"
|
||||||
IMAP_SERVER_163 = "imap.163.com"
|
IMAP_SERVER_163 = "imap.163.com"
|
||||||
|
IMAP_SERVER_SINA = "imap.sina.com"
|
||||||
VALIDATION_URL_SUBJECT_fr = 'Validation de votre demande de rendez-vous'
|
VALIDATION_URL_SUBJECT_fr = 'Validation de votre demande de rendez-vous'
|
||||||
VALIDATION_URL_SUBJECT_EN = 'Please confirm your appointment'
|
VALIDATION_URL_SUBJECT_EN = 'Please confirm your appointment'
|
||||||
VALIDATION_URL_REGEX = """https:\/\/rendezvousparis.hermes.com\/client\/register\/[A-Z0-9]+\/validate.code=[A-Z0-9]+"""
|
VALIDATION_URL_REGEX = """https:\/\/rendezvousparis.hermes.com\/client\/register\/[A-Z0-9]+\/validate.code=[A-Z0-9]+"""
|
||||||
HERMES_EMAIL = "no-reply@hermes.com"
|
HERMES_EMAIL = "no-reply@hermes.com"
|
||||||
|
|
||||||
DOMAIN_163 = "163.com"
|
DOMAIN_163 = "163.com"
|
||||||
|
DOMAIN_SINA = "sina.com"
|
||||||
DOMAIN_YAHOO = "yahoo.com"
|
DOMAIN_YAHOO = "yahoo.com"
|
||||||
date_format = "%d-%b-%Y" # DD-Mon-YYYY e.g., 3-Mar-2014
|
date_format = "%d-%b-%Y" # DD-Mon-YYYY e.g., 3-Mar-2014
|
||||||
REDIRECTION_MAILS = "appointment2022@aol.com, chenpeijun@aol.com,hongjiang176@aol,ciyuexie@aol.com"
|
REDIRECTION_MAILS = "appointment2022@aol.com, chenpeijun@aol.com,hongjiang176@aol,ciyuexie@aol.com"
|
||||||
@@ -47,6 +49,8 @@ class MailReader():
|
|||||||
imap = imaplib.IMAP4_SSL(IMAP_SERVER_163)
|
imap = imaplib.IMAP4_SSL(IMAP_SERVER_163)
|
||||||
elif DOMAIN_YAHOO in self.login:
|
elif DOMAIN_YAHOO in self.login:
|
||||||
imap = imaplib.IMAP4_SSL(YAHOO_IMAP_SERVER)
|
imap = imaplib.IMAP4_SSL(YAHOO_IMAP_SERVER)
|
||||||
|
elif DOMAIN_SINA in self.login:
|
||||||
|
imap = imaplib.IMAP4_SSL(IMAP_SERVER_SINA)
|
||||||
else:
|
else:
|
||||||
imap = imaplib.IMAP4_SSL(AOL_IMAP_SERVER)
|
imap = imaplib.IMAP4_SSL(AOL_IMAP_SERVER)
|
||||||
# authenticate
|
# authenticate
|
||||||
|
|||||||
Reference in New Issue
Block a user