From 4a0fc8380fdcf46f7a1bec3be2f46de0d1d9484b Mon Sep 17 00:00:00 2001
From: devStorm <59678453+developStorm@users.noreply.github.com>
Date: Fri, 14 May 2021 11:03:16 -0700
Subject: [PATCH] variable naming

---
 app/config.py                                  | 2 +-
 app/dashboard/templates/dashboard/setting.html | 2 +-
 app/dashboard/views/custom_alias.py            | 6 +++---
 app/dashboard/views/setting.py                 | 4 ++--
 app/models.py                                  | 6 +++---
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/config.py b/app/config.py
index aedffe76..d7eda033 100644
--- a/app/config.py
+++ b/app/config.py
@@ -375,4 +375,4 @@ ALIAS_LIMIT = os.environ.get("ALIAS_LIMIT") or "100/day;50/hour;5/minute"
 
 ENABLE_SPAM_ASSASSIN = "ENABLE_SPAM_ASSASSIN" in os.environ
 
-ALIAS_RAND_SUFFIX_LENGTH = int(os.environ.get("ALIAS_RAND_SUFFIX_LENGTH", 5))
+ALIAS_RANDOM_SUFFIX_LENGTH = int(os.environ.get("ALIAS_RAND_SUFFIX_LENGTH", 5))
diff --git a/app/dashboard/templates/dashboard/setting.html b/app/dashboard/templates/dashboard/setting.html
index 233915c6..410bf7ef 100644
--- a/app/dashboard/templates/dashboard/setting.html
+++ b/app/dashboard/templates/dashboard/setting.html
@@ -248,7 +248,7 @@
           <button class="btn btn-outline-primary">Update</button>
         </form>
 
-        <div class="mt-3 mb-1">Select the default suffix generator for aliases.</div>
+        <div id="random-alias-suffix" class="mt-3 mb-1">Select the default suffix generator for aliases.</div>
         <form method="post" action="#random-alias-suffix" class="form-inline">
           <input type="hidden" name="form-name" value="random-alias-suffix">
           <select class="form-control mr-sm-2" name="random-alias-suffix-generator">
diff --git a/app/dashboard/views/custom_alias.py b/app/dashboard/views/custom_alias.py
index 9f737aec..24deee07 100644
--- a/app/dashboard/views/custom_alias.py
+++ b/app/dashboard/views/custom_alias.py
@@ -10,7 +10,7 @@ from app.config import (
     DISABLE_ALIAS_SUFFIX,
     CUSTOM_ALIAS_SECRET,
     ALIAS_LIMIT,
-    ALIAS_RAND_SUFFIX_LENGTH,
+    ALIAS_RANDOM_SUFFIX_LENGTH,
 )
 from app.dashboard.base import dashboard_bp
 from app.extensions import db, limiter
@@ -261,8 +261,8 @@ def get_suffix(user: User) -> str:
     Returns:
         str: the random suffix generated
     """
-    if user.random_alias_suffix == AliasSuffixEnum.rnd_string.value:
-        return random_string(ALIAS_RAND_SUFFIX_LENGTH, include_digits=True)
+    if user.random_alias_suffix == AliasSuffixEnum.random_string.value:
+        return random_string(ALIAS_RANDOM_SUFFIX_LENGTH, include_digits=True)
     return random_word()
 
 
diff --git a/app/dashboard/views/setting.py b/app/dashboard/views/setting.py
index cfc96d6d..c8db8202 100644
--- a/app/dashboard/views/setting.py
+++ b/app/dashboard/views/setting.py
@@ -19,7 +19,7 @@ from app.config import (
     URL,
     FIRST_ALIAS_DOMAIN,
     JOB_DELETE_ACCOUNT,
-    ALIAS_RAND_SUFFIX_LENGTH,
+    ALIAS_RANDOM_SUFFIX_LENGTH,
 )
 from app.dashboard.base import dashboard_bp
 from app.email_utils import (
@@ -306,7 +306,7 @@ def setting():
         apple_sub=apple_sub,
         coinbase_sub=coinbase_sub,
         FIRST_ALIAS_DOMAIN=FIRST_ALIAS_DOMAIN,
-        ALIAS_RAND_SUFFIX_LENGTH=ALIAS_RAND_SUFFIX_LENGTH,
+        ALIAS_RAND_SUFFIX_LENGTH=ALIAS_RANDOM_SUFFIX_LENGTH,
     )
 
 
diff --git a/app/models.py b/app/models.py
index d15a523a..d5df3cbc 100644
--- a/app/models.py
+++ b/app/models.py
@@ -164,7 +164,7 @@ class AliasGeneratorEnum(EnumE):
 
 class AliasSuffixEnum(EnumE):
     word = 0  # Random word from dictionary file
-    rnd_string = 1  # Completely random string
+    random_string = 1  # Completely random string
 
 
 class Fido(db.Model, ModelMixin):
@@ -298,8 +298,8 @@ class User(db.Model, ModelMixin, UserMixin):
     random_alias_suffix = db.Column(
         db.Integer,
         nullable=False,
-        default=AliasSuffixEnum.rnd_string.value,
-        server_default=str(AliasSuffixEnum.rnd_string.value),
+        default=AliasSuffixEnum.random_string.value,
+        server_default=str(AliasSuffixEnum.random_string.value),
     )
 
     @classmethod