From 1e8a7e4bcaa51f9b76fcf879a0195cf1b3661bd4 Mon Sep 17 00:00:00 2001
From: Son NK <nguyenkims@hotmail.com>
Date: Thu, 30 Jan 2020 14:43:31 +0700
Subject: [PATCH] use can_create_new_alias() check when creating alias
 on-the-fly instead of is_premium() check

---
 email_handler.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/email_handler.py b/email_handler.py
index 397f2b94..2d247f0c 100644
--- a/email_handler.py
+++ b/email_handler.py
@@ -54,7 +54,14 @@ from app.email_utils import (
 )
 from app.extensions import db
 from app.log import LOG
-from app.models import GenEmail, ForwardEmail, ForwardEmailLog, CustomDomain, Directory
+from app.models import (
+    GenEmail,
+    ForwardEmail,
+    ForwardEmailLog,
+    CustomDomain,
+    Directory,
+    User,
+)
 from app.utils import random_string
 from server import create_app
 
@@ -138,8 +145,8 @@ class MailHandler:
 
                     # Only premium user can use the directory feature
                     if directory:
-                        dir_user = directory.user
-                        if dir_user.is_premium():
+                        dir_user: User = directory.user
+                        if dir_user.can_create_new_alias():
                             LOG.d("create alias %s for directory %s", alias, directory)
                             on_the_fly = True
 
@@ -166,8 +173,8 @@ class MailHandler:
 
                 # Only premium user can continue using the catch-all feature
                 if custom_domain and custom_domain.catch_all:
-                    domain_user = custom_domain.user
-                    if domain_user.is_premium():
+                    domain_user: User = custom_domain.user
+                    if domain_user.can_create_new_alias():
                         LOG.d("create alias %s for domain %s", alias, custom_domain)
                         on_the_fly = True