Mirror/app-MAIL-temp
1
0
Fork 0
mirror of https://github.com/simple-login/app.git synced 2024-09-28 20:51:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

linting

Browse Source
This commit is contained in:
Renaud Boyer 2020-12-06 18:04:29 +01:00
parent 7e1a474875
commit 7bac9e82b9
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/dashboard/views/alias_contact_manager.py
View File

@ -1,4 +1,3 @@
import re
from dataclasses import dataclass from dataclasses import dataclass
from operator import or_ from operator import or_
@ -9,13 +8,12 @@ from flask_wtf import FlaskForm
from sqlalchemy import and_, func, case from sqlalchemy import and_, func, case
from wtforms import StringField, validators, ValidationError from wtforms import StringField, validators, ValidationError
from app.config import EMAIL_DOMAIN, PAGE_LIMIT from app.config import PAGE_LIMIT
from app.dashboard.base import dashboard_bp from app.dashboard.base import dashboard_bp
from app.email_utils import parseaddr_unicode, is_valid_email, generate_reply_email from app.email_utils import parseaddr_unicode, is_valid_email, generate_reply_email
from app.extensions import db from app.extensions import db
from app.log import LOG from app.log import LOG
from app.models import Alias, Contact, EmailLog from app.models import Alias, Contact, EmailLog
from app.utils import random_string
def email_validator(): def email_validator():
@ -33,7 +31,7 @@ def email_validator():
if "<" in email and ">" in email: if "<" in email and ">" in email:
if email.find("<") + 1 < email.find(">"): if email.find("<") + 1 < email.find(">"):
email_part = email[email.find("<") + 1 : email.find(">")].strip() email_part = email[email.find("<") + 1:email.find(">")].strip()
if not is_valid_email(email_part): if not is_valid_email(email_part):
raise ValidationError(message) raise ValidationError(message)
@ -68,8 +66,8 @@ def get_contact_infos(alias: Alias, page=0, contact_id=None) -> [ContactInfo]:
[ [
( (
and_( and_(
EmailLog.is_reply == False, EmailLog.is_reply.is_(False),
EmailLog.blocked == False, EmailLog.blocked.is_(False),
), ),
1, 1,
) )
@ -107,7 +105,7 @@ def get_contact_infos(alias: Alias, page=0, contact_id=None) -> [ContactInfo]:
or_( or_(
EmailLog.created_at == sub.c.max_email_log_created_at, EmailLog.created_at == sub.c.max_email_log_created_at,
# no email log yet for this contact # no email log yet for this contact
sub.c.max_email_log_created_at == None, sub.c.max_email_log_created_at.is_(None),
) )
) )
) )