From 2565686d11ca4d315af303a516582ffac6e7ba8c Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Thu, 23 Mar 2023 22:47:04 +0100 Subject: [PATCH] add rambler.ru mails --- src/mail/mail_confirmation.py | 4 +++- src/mail/mail_constants.py | 2 ++ src/mail/mail_reader.py | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/mail/mail_confirmation.py b/src/mail/mail_confirmation.py index bdb5fcf..b8f5096 100644 --- a/src/mail/mail_confirmation.py +++ b/src/mail/mail_confirmation.py @@ -10,7 +10,7 @@ from builtins import list from src.db.mirgration.migration_tools import migre_accepted_appointment from src.db.mongo_manager import MONGO_STORE_MANAGER from src.mail.mail_constants import DOMAIN_163, DOMAIN_YAHOO, DOMAIN_SINA, IMAP_SERVER_163, YAHOO_IMAP_SERVER, \ - IMAP_SERVER_SINA, AOL_IMAP_SERVER, DOMAIN_HOTMAIL, HOTMAIL_IMAP_SERVER + IMAP_SERVER_SINA, AOL_IMAP_SERVER, DOMAIN_HOTMAIL, HOTMAIL_IMAP_SERVER, DOMAIN_RAMBLER_RU, RAMBLER_IMAP_SERVER from src.notification.AcceptedResultPojo import get_accepted_result_from from src.notification.mailer import Mailer from src.pojo.ResultEnum import ResultEnum @@ -44,6 +44,8 @@ class MailConfirmationReader(): imap = imaplib.IMAP4_SSL(IMAP_SERVER_SINA) elif DOMAIN_HOTMAIL in self.login: imap = imaplib.IMAP4_SSL(HOTMAIL_IMAP_SERVER) + elif DOMAIN_RAMBLER_RU in self.login: + imap = imaplib.IMAP4_SSL(RAMBLER_IMAP_SERVER) else: imap = imaplib.IMAP4_SSL(AOL_IMAP_SERVER) return imap diff --git a/src/mail/mail_constants.py b/src/mail/mail_constants.py index 8a2726a..b16b282 100644 --- a/src/mail/mail_constants.py +++ b/src/mail/mail_constants.py @@ -3,9 +3,11 @@ DOMAIN_SINA = "sina.com" DOMAIN_HOTMAIL = "hotmail.com" DOMAIN_163 = "163.com" +DOMAIN_RAMBLER_RU = "rambler.ru" AOL_IMAP_SERVER = "imap.aol.com" IMAP_SERVER_163 = "imap.163.com" IMAP_SERVER_SINA = "imap.sina.com" YAHOO_IMAP_SERVER = "imap.mail.yahoo.com" HOTMAIL_IMAP_SERVER = "outlook.office365.com" +RAMBLER_IMAP_SERVER = "imap.rambler.ru" diff --git a/src/mail/mail_reader.py b/src/mail/mail_reader.py index 510b53c..fe06c0d 100644 --- a/src/mail/mail_reader.py +++ b/src/mail/mail_reader.py @@ -12,7 +12,7 @@ from src import params from src.db.mongo_manager import MONGO_STORE_MANAGER from src.logs.AppLogging import init_logger from src.mail.mail_constants import DOMAIN_163, DOMAIN_YAHOO, DOMAIN_SINA, IMAP_SERVER_163, YAHOO_IMAP_SERVER, \ - IMAP_SERVER_SINA, AOL_IMAP_SERVER, DOMAIN_HOTMAIL, HOTMAIL_IMAP_SERVER + IMAP_SERVER_SINA, AOL_IMAP_SERVER, DOMAIN_HOTMAIL, HOTMAIL_IMAP_SERVER, DOMAIN_RAMBLER_RU, RAMBLER_IMAP_SERVER from src.pojo.mail.mail_pojo import MailPojo, MailAddress from src.proxy.proxy_type import ProxyType from src.utils.timeutiles import is_time_between @@ -49,6 +49,8 @@ class MailReader(): imap = imaplib.IMAP4_SSL(IMAP_SERVER_SINA) elif DOMAIN_HOTMAIL in self.login: imap = imaplib.IMAP4_SSL(HOTMAIL_IMAP_SERVER) + elif DOMAIN_RAMBLER_RU in self.login: + imap = imaplib.IMAP4_SSL(RAMBLER_IMAP_SERVER) else: imap = imaplib.IMAP4_SSL(AOL_IMAP_SERVER) return imap