From 4b479ea00325555424d5e625a4dbec11f05a8d25 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Sat, 4 Jul 2020 23:27:02 +0200
Subject: [PATCH] take into account user.default_random_alias_public_domain_id
 in create_new_random()

---
 app/models.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/models.py b/app/models.py
index 1d1da048..7d7b15e4 100644
--- a/app/models.py
+++ b/app/models.py
@@ -877,12 +877,17 @@ class Alias(db.Model, ModelMixin):
         note: str = None,
     ):
         """create a new random alias"""
-        domain = None
+        custom_domain = None
 
         if user.default_random_alias_domain_id:
-            domain = CustomDomain.get(user.default_random_alias_domain_id)
+            custom_domain = CustomDomain.get(user.default_random_alias_domain_id)
             random_email = generate_email(
-                scheme=scheme, in_hex=in_hex, alias_domain=domain.domain
+                scheme=scheme, in_hex=in_hex, alias_domain=custom_domain.domain
+            )
+        elif user.default_random_alias_public_domain_id:
+            public_domain = PublicDomain.get(user.default_random_alias_public_domain_id)
+            random_email = generate_email(
+                scheme=scheme, in_hex=in_hex, alias_domain=public_domain.domain
             )
         else:
             random_email = generate_email(scheme=scheme, in_hex=in_hex)
@@ -894,8 +899,8 @@ class Alias(db.Model, ModelMixin):
             note=note,
         )
 
-        if domain:
-            alias.custom_domain_id = domain.id
+        if custom_domain:
+            alias.custom_domain_id = custom_domain.id
 
         return alias