Prettify alias log
This commit is contained in:
parent
f468a21b14
commit
f80de382fe
|
@ -108,8 +108,18 @@
|
||||||
{% for log in logs %}
|
{% for log in logs %}
|
||||||
<div class="col-12">
|
<div class="col-12">
|
||||||
<div class="my-2 p-2 card border-light">
|
<div class="my-2 p-2 card border-light">
|
||||||
<div class="font-weight-bold">{{ log.when | dt }}</div>
|
<div class="font-weight-bold">{{ log.when | dt }}
|
||||||
|
{% if log.bounced %} ⚠️ {% endif %}
|
||||||
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
{% if log.bounced %}
|
||||||
|
<span class="mr-2">{{ log.website_from or log.website_email }}</span>
|
||||||
|
<img src="{{ url_for('static', filename='arrows/forward-arrow.svg') }}" class="arrow">
|
||||||
|
<span class="ml-2">{{ log.alias }}</span>
|
||||||
|
<img src="{{ url_for('static', filename='arrows/blocked-arrow.svg') }}" class="arrow">
|
||||||
|
<span class="ml-2">{{ log.mailbox }}</span>
|
||||||
|
{% else %}
|
||||||
<span class="mr-2">{{ log.website_from or log.website_email }}</span>
|
<span class="mr-2">{{ log.website_from or log.website_email }}</span>
|
||||||
|
|
||||||
<span>
|
<span>
|
||||||
|
@ -117,16 +127,13 @@
|
||||||
<img src="{{ url_for('static', filename='arrows/reply-arrow.svg') }}" class="arrow">
|
<img src="{{ url_for('static', filename='arrows/reply-arrow.svg') }}" class="arrow">
|
||||||
{% elif log.blocked %}
|
{% elif log.blocked %}
|
||||||
<img src="{{ url_for('static', filename='arrows/blocked-arrow.svg') }}" class="arrow">
|
<img src="{{ url_for('static', filename='arrows/blocked-arrow.svg') }}" class="arrow">
|
||||||
{% elif log.bounced %}
|
|
||||||
<span class="text-danger"> --- Refused (or bounced) ---> </span>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
<img src="{{ url_for('static', filename='arrows/forward-arrow.svg') }}" class="arrow">
|
<img src="{{ url_for('static', filename='arrows/forward-arrow.svg') }}" class="arrow">
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span class="ml-2">
|
<span class="ml-2">{{ log.alias }}</span>
|
||||||
{{ log.alias }}
|
{% endif %}
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -16,6 +16,7 @@ class AliasLog:
|
||||||
is_reply: bool
|
is_reply: bool
|
||||||
blocked: bool
|
blocked: bool
|
||||||
bounced: bool
|
bounced: bool
|
||||||
|
mailbox: str
|
||||||
|
|
||||||
def __init__(self, **kwargs):
|
def __init__(self, **kwargs):
|
||||||
for k, v in kwargs.items():
|
for k, v in kwargs.items():
|
||||||
|
@ -62,6 +63,7 @@ def alias_log(alias_id, page_id):
|
||||||
|
|
||||||
def get_alias_log(gen_email: GenEmail, page_id=0):
|
def get_alias_log(gen_email: GenEmail, page_id=0):
|
||||||
logs: [AliasLog] = []
|
logs: [AliasLog] = []
|
||||||
|
mailbox = gen_email.mailbox_email()
|
||||||
|
|
||||||
q = (
|
q = (
|
||||||
db.session.query(ForwardEmail, ForwardEmailLog)
|
db.session.query(ForwardEmail, ForwardEmailLog)
|
||||||
|
@ -81,6 +83,7 @@ def get_alias_log(gen_email: GenEmail, page_id=0):
|
||||||
is_reply=fel.is_reply,
|
is_reply=fel.is_reply,
|
||||||
blocked=fel.blocked,
|
blocked=fel.blocked,
|
||||||
bounced=fel.bounced,
|
bounced=fel.bounced,
|
||||||
|
mailbox=mailbox
|
||||||
)
|
)
|
||||||
logs.append(al)
|
logs.append(al)
|
||||||
logs = sorted(logs, key=lambda l: l.when, reverse=True)
|
logs = sorted(logs, key=lambda l: l.when, reverse=True)
|
||||||
|
|
|
@ -513,6 +513,12 @@ class GenEmail(db.Model, ModelMixin):
|
||||||
random_email = generate_email(scheme=scheme, in_hex=in_hex)
|
random_email = generate_email(scheme=scheme, in_hex=in_hex)
|
||||||
return GenEmail.create(user_id=user_id, email=random_email)
|
return GenEmail.create(user_id=user_id, email=random_email)
|
||||||
|
|
||||||
|
def mailbox_email(self):
|
||||||
|
if self.mailbox_id:
|
||||||
|
return self.mailbox.email
|
||||||
|
else:
|
||||||
|
return self.user.email
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
return f"<GenEmail {self.id} {self.email}>"
|
return f"<GenEmail {self.id} {self.email}>"
|
||||||
|
|
||||||
|
|
|
@ -250,11 +250,7 @@ def handle_forward(envelope, smtp: SMTP, msg: Message, rcpt_to: str) -> str:
|
||||||
LOG.d("alias %s cannot be created on-the-fly, return 510", alias)
|
LOG.d("alias %s cannot be created on-the-fly, return 510", alias)
|
||||||
return "510 Email not exist"
|
return "510 Email not exist"
|
||||||
|
|
||||||
if gen_email.mailbox_id:
|
mailbox_email = gen_email.mailbox_email()
|
||||||
mailbox_email = gen_email.mailbox.email
|
|
||||||
else:
|
|
||||||
mailbox_email = gen_email.user.email
|
|
||||||
|
|
||||||
forward_email = get_or_create_forward_email(msg["From"], gen_email)
|
forward_email = get_or_create_forward_email(msg["From"], gen_email)
|
||||||
forward_log = ForwardEmailLog.create(forward_id=forward_email.id)
|
forward_log = ForwardEmailLog.create(forward_id=forward_email.id)
|
||||||
|
|
||||||
|
@ -337,10 +333,7 @@ def handle_reply(envelope, smtp: SMTP, msg: Message, rcpt_to: str) -> str:
|
||||||
|
|
||||||
gen_email = forward_email.gen_email
|
gen_email = forward_email.gen_email
|
||||||
user = gen_email.user
|
user = gen_email.user
|
||||||
if gen_email.mailbox_id:
|
mailbox_email = gen_email.mailbox_email()
|
||||||
mailbox_email = gen_email.mailbox.email
|
|
||||||
else:
|
|
||||||
mailbox_email = gen_email.user.email
|
|
||||||
|
|
||||||
# bounce email initiated by Postfix
|
# bounce email initiated by Postfix
|
||||||
# can happen in case emails cannot be delivered to user-email
|
# can happen in case emails cannot be delivered to user-email
|
||||||
|
|
Loading…
Reference in New Issue