diff --git a/app/api/views/alias.py b/app/api/views/alias.py index 83e9a5d4..7c2291c9 100644 --- a/app/api/views/alias.py +++ b/app/api/views/alias.py @@ -146,7 +146,9 @@ def get_alias_activities(alias_id): activity["to"] = alias_log.alias activity["from"] = alias_log.website_from or alias_log.website_email - if alias_log.blocked: + if alias_log.bounced: + activity["action"] = "bounced" + elif alias_log.blocked: activity["action"] = "block" else: activity["action"] = "forward" diff --git a/app/dashboard/templates/dashboard/alias_log.html b/app/dashboard/templates/dashboard/alias_log.html index a9b5819f..3bccaedf 100644 --- a/app/dashboard/templates/dashboard/alias_log.html +++ b/app/dashboard/templates/dashboard/alias_log.html @@ -117,6 +117,8 @@ {% elif log.blocked %} + {% elif log.bounced %} + --- Refused (or bounced) ---> {% else %} {% endif %} diff --git a/app/dashboard/views/alias_log.py b/app/dashboard/views/alias_log.py index 060fd1e2..91465b53 100644 --- a/app/dashboard/views/alias_log.py +++ b/app/dashboard/views/alias_log.py @@ -15,6 +15,7 @@ class AliasLog: when: arrow.Arrow is_reply: bool blocked: bool + bounced: bool def __init__(self, **kwargs): for k, v in kwargs.items(): @@ -79,6 +80,7 @@ def get_alias_log(gen_email: GenEmail, page_id=0): when=fel.created_at, is_reply=fel.is_reply, blocked=fel.blocked, + bounced=fel.bounced, ) logs.append(al) logs = sorted(logs, key=lambda l: l.when, reverse=True)