Fix Changing Admin info with api (#792)

* [Fix] Prevent admin hashed_password become null + discord massage * [Fix]
Gozargah · Feb 12, 2024 · f60a487 · f60a487
1 parent da3bdd5
commit f60a487
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/app/db/crud.py b/app/db/crud.py
@@ -429,7 +429,7 @@ def create_admin(db: Session, admin: AdminCreate):
 def update_admin(db: Session, dbadmin: Admin, modified_admin: AdminModify):
     if modified_admin.is_sudo:
         dbadmin.is_sudo = modified_admin.is_sudo
-    if dbadmin.hashed_password and dbadmin.hashed_password != modified_admin.hashed_password:
+    if modified_admin.password is not None and dbadmin.hashed_password != modified_admin.hashed_password:
         dbadmin.hashed_password = modified_admin.hashed_password
         dbadmin.password_reset_at = datetime.utcnow()
     if modified_admin.telegram_id:

diff --git a/app/discord/handlers/report.py b/app/discord/handlers/report.py
@@ -70,10 +70,10 @@ def report_new_user(username: str, by: str, expire_date: int, data_limit: int, p
                 "title": ":new: Created",
                 "description": f"""
                 **Username:** {username}
-                **Traffic Limit:** {data_limit}
-                **Expire Date:** {expire_date}
-                **Proxies:** {proxies}
-                **Data Limit Reset Strategy:**{data_limit_reset_strategy}""",
+**Traffic Limit:** {data_limit}
+**Expire Date:** {expire_date}
+**Proxies:** {proxies}
+**Data Limit Reset Strategy:**{data_limit_reset_strategy}""",
 
                 "footer": {
                     "text": f"Belongs To: {admin.username if admin else None}\nBy: {by}"
@@ -102,10 +102,10 @@ def report_user_modification(username: str, expire_date: int, data_limit: int, p
                 'title': ':pencil2: Modified',
                 'description': f"""
                 **Username:** {username}
-                **Traffic Limit:** {data_limit}
-                **Expire Date:** {expire_date}
-                **Proxies:** {proxies}
-                **Data Limit Reset Strategy:**{data_limit_reset_strategy}""",
+**Traffic Limit:** {data_limit}
+**Expire Date:** {expire_date}
+**Proxies:** {proxies}
+**Data Limit Reset Strategy:**{data_limit_reset_strategy}""",
 
                 "footer": {
                     "text": f"Belongs To: {admin.username if admin else None}\nBy: {by}"