From d38f2cb3809caa837fb03410b2eebd3fe0e876ea Mon Sep 17 00:00:00 2001
From: GareArc <chen4851@purdue.edu>
Date: Mon, 17 Mar 2025 15:34:28 -0400
Subject: [PATCH] fix: change subject title

---
 api/services/feature_service.py       | 6 +++---
 api/tasks/mail_invite_member_task.py  | 6 ++++--
 api/tasks/mail_reset_password_task.py | 6 ++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/api/services/feature_service.py b/api/services/feature_service.py
index 8335159999..1deed47d75 100644
--- a/api/services/feature_service.py
+++ b/api/services/feature_service.py
@@ -198,8 +198,8 @@ class FeatureService:
 
     @classmethod
     def get_enterprise_application_title(cls):
-        branding = cls.get_system_features().get("branding", None)
+        branding = cls.get_system_features().branding
         application_title = "Dify"
-        if branding and branding.get("enabled", False):
-            application_title = branding.get("application_title", "Dify")
+        if branding.enabled:
+            application_title = branding.application_title
         return application_title
diff --git a/api/tasks/mail_invite_member_task.py b/api/tasks/mail_invite_member_task.py
index 836fc3f991..0bb3b0dd68 100644
--- a/api/tasks/mail_invite_member_task.py
+++ b/api/tasks/mail_invite_member_task.py
@@ -46,11 +46,12 @@ def send_invite_member_mail_task(language: str, to: str, token: str, inviter_nam
                     url=url,
                     application_title=application_title,
                 )
+                mail.send(to=to, subject=f"立即加入 {application_title} 工作空间", html=html_content)
             else:
                 html_content = render_template(
                     template, to=to, inviter_name=inviter_name, workspace_name=workspace_name, url=url
                 )
-            mail.send(to=to, subject="立即加入 Dify 工作空间", html=html_content)
+                mail.send(to=to, subject="立即加入 Dify 工作空间", html=html_content)
         else:
             template = "invite_member_mail_template_en-US.html"
             if dify_config.ENTERPRISE_ENABLED:
@@ -64,11 +65,12 @@ def send_invite_member_mail_task(language: str, to: str, token: str, inviter_nam
                     url=url,
                     application_title=application_title,
                 )
+                mail.send(to=to, subject=f"Join {application_title} Workspace Now", html=html_content)
             else:
                 html_content = render_template(
                     template, to=to, inviter_name=inviter_name, workspace_name=workspace_name, url=url
                 )
-            mail.send(to=to, subject="Join Dify Workspace Now", html=html_content)
+                mail.send(to=to, subject="Join Dify Workspace Now", html=html_content)
 
         end_at = time.perf_counter()
         logging.info(
diff --git a/api/tasks/mail_reset_password_task.py b/api/tasks/mail_reset_password_task.py
index 37c6fa99e5..b47813bc1c 100644
--- a/api/tasks/mail_reset_password_task.py
+++ b/api/tasks/mail_reset_password_task.py
@@ -32,18 +32,20 @@ def send_reset_password_mail_task(language: str, to: str, code: str):
                 application_title = FeatureService.get_enterprise_application_title()
                 template = "without-brand/reset_password_mail_template_zh-CN.html"
                 html_content = render_template(template, to=to, code=code, application_title=application_title)
+                mail.send(to=to, subject=f"设置您的 {application_title} 密码", html=html_content)
             else:
                 html_content = render_template(template, to=to, code=code)
-            mail.send(to=to, subject="设置您的 Dify 密码", html=html_content)
+                mail.send(to=to, subject="设置您的 Dify 密码", html=html_content)
         else:
             template = "reset_password_mail_template_en-US.html"
             if dify_config.ENTERPRISE_ENABLED:
                 application_title = FeatureService.get_enterprise_application_title()
                 template = "without-brand/reset_password_mail_template_en-US.html"
                 html_content = render_template(template, to=to, code=code, application_title=application_title)
+                mail.send(to=to, subject=f"Set Your {application_title} Password", html=html_content)
             else:
                 html_content = render_template(template, to=to, code=code)
-            mail.send(to=to, subject="Set Your Dify Password", html=html_content)
+                mail.send(to=to, subject="Set Your Dify Password", html=html_content)
 
         end_at = time.perf_counter()
         logging.info(