diff --git a/src/mail/mail_confirmation.py b/src/mail/mail_confirmation.py index 5c65dc6..9f0e15a 100755 --- a/src/mail/mail_confirmation.py +++ b/src/mail/mail_confirmation.py @@ -78,7 +78,7 @@ class MailConfirmationReader(): body = body + str(part.get_payload(decode=True).decode("utf-8")) elif part.get_content_type() == "text/plain": body = body + part.get_payload() - if CONFIRMATION_SUBJECT_FR in subject or CONFIRMATION_SUBJECT_EN in subject: + if CONFIRMATION_SUBJECT_FR in subject or CONFIRMATION_SUBJECT_EN in subject or "Votre_rendez-vous_est_confirm" in subject: mail = MailPojo(subject=subject, body=body, from_address=from_address) mail.isImapClient = True print("subject is {}".format(subject)) diff --git a/src/mail/mail_constants.py b/src/mail/mail_constants.py index 139898d..3dad17b 100755 --- a/src/mail/mail_constants.py +++ b/src/mail/mail_constants.py @@ -20,6 +20,7 @@ DOMAIN_GMX_FR = "gmx.fr" DOMAIN_GMX_US = "gmx.us" DOMAIN_GMX_CH = "gmx.ch" DOMAIN_ONET = "onet.pl" +DOMAIN_GAZETA_PL = "gazeta.pl" DOMAIN_NAVER = "naver.com" DOMAIN_INBOX_LV = "inbox.lv" DOMAIN_GMX_DE = "gmx.de" @@ -33,6 +34,7 @@ DOMAIN_GENOCIDE_FUN = "genocide.fun" DOMAIN_DMC_CHAT = "dmc.chat" DOMAIN_WEB_DE = "web.de" DOMAIN_OUTLOOK_COM = "outlook.com" +DOMAIN_FIREMAIL_DE = "firemail.de" AOL_IMAP_SERVER = "imap.aol.com" IMAP_SERVER_163 = "imap.163.com" @@ -51,9 +53,11 @@ SERVER_IMAGE_ONET = "imap.poczta.onet.pl" SERVER_GMX = "imap.gmx.com" SERVER_GMX_NET = "imap.gmx.net" SERVER_GMX_AT = "imap.gmx.at" +SERVER_FIREMAIL_DE = "imap.firemail.de" SERVER_PISS_MAIL = "mail.pissmail.com" INBOX_LV = "mail.inbox.lv" SERVER_WEB_DE = "imap.web.de" +IMAP_SERVER_DOMAIN_GAZETA_PL = "imap.gazeta.pl" def show_folders(imap) -> list: @@ -81,6 +85,8 @@ def create_imap(login: str): imap = IMAPClient(IMAP_SERVER_163, use_uid=True) elif DOMAIN_YAHOO in login: imap = imaplib.IMAP4_SSL(YAHOO_IMAP_SERVER) + elif DOMAIN_FIREMAIL_DE in login: + imap = imaplib.IMAP4_SSL(SERVER_FIREMAIL_DE) elif DOMAIN_GMX in login or DOMAIN_GMX_FR in login or DOMAIN_GMX_US in login or DOMAIN_GMX_CH in login: imap = imaplib.IMAP4_SSL(SERVER_GMX) elif DOMAIN_SINA in login: @@ -110,6 +116,8 @@ def create_imap(login: str): imap = imaplib.IMAP4_SSL(SERVER_GMX_NET, port=993) elif DOMAIN_GMX_AT in login: imap = imaplib.IMAP4_SSL(SERVER_GMX_AT, port=993) + elif DOMAIN_GAZETA_PL in login: + imap = imaplib.IMAP4_SSL(IMAP_SERVER_DOMAIN_GAZETA_PL, port=993) elif DOMAIN_INBOX_LV in login: imap = imaplib.IMAP4_SSL(INBOX_LV, port=993) elif DOMAIN_WEB_DE in login: diff --git a/src/mail/mail_reader.py b/src/mail/mail_reader.py index 0f14dae..3bdc4da 100755 --- a/src/mail/mail_reader.py +++ b/src/mail/mail_reader.py @@ -167,12 +167,14 @@ class MailReader(): body = body + part.get_payload(decode=True).decode("utf-8") elif part.get_content_type() == "text/plain": body = body + part.get_payload() - if VALIDATION_URL_SUBJECT_fr in subject or VALIDATION_URL_SUBJECT_EN in subject: + if VALIDATION_URL_SUBJECT_fr in subject or VALIDATION_URL_SUBJECT_EN in subject or "Validation=20de=20votre=20demande=20de=20rendez-vous" in subject: mail = MailPojo(subject=subject, body=body, from_address=from_address) mail.isImapClient = True print("email is {}".format(self.login)) print("body is {}".format(body)) print("subject is {}".format(subject)) + if len(mail.to_address) == 0: + mail.to_address = self.login mail_messages.append(mail) except Exception as error: print(error) @@ -242,7 +244,7 @@ def read_mails(): mail_list = MONGO_STORE_MANAGER.get_destination_emails() # excel_reader = ExcelHelper() # mail_list = excel_reader.read_email_pojo(file_name="/Users/panlei/Downloads/hotmail_list.xlsx") - # mail_address1 = MailAddress(mail="quaveraidv@hotmail.com", password="2iB60x20") + # mail_address1 = MailAddress(mail="casandrakaamv@onet.pl", password="8F0o0APeAp0z") # mail_list = [mail_address1] successful_items = MONGO_STORE_MANAGER.get_all_successful_items_for_day() mails_messages = [] diff --git a/src/mail/mail_reader_all_contacts.py b/src/mail/mail_reader_all_contacts.py index 58e565f..1edee6f 100755 --- a/src/mail/mail_reader_all_contacts.py +++ b/src/mail/mail_reader_all_contacts.py @@ -186,12 +186,14 @@ class MailReader(): body = body + part.get_payload(decode=True).decode("utf-8") elif part.get_content_type() == "text/plain": body = body + part.get_payload() - if VALIDATION_URL_SUBJECT_fr in subject or VALIDATION_URL_SUBJECT_EN in subject: + if VALIDATION_URL_SUBJECT_fr in subject or VALIDATION_URL_SUBJECT_EN in subject or "Validation=20de=20votre=20demande=20de=20rendez-vous" in subject: mail = MailPojo(subject=subject, body=body, from_address=from_address) mail.isImapClient = True print("email is {}".format(self.login)) print("body is {}".format(body)) print("subject is {}".format(subject)) + if len(mail.to_address) == 0: + mail.to_address = self.login mail_messages.append(mail) except Exception as error: print(error)