Merge pull request '更改邮件默认发送规则' (#251) from yystopf/forgeplus:hh_email_fix into develop

app/models/message_template/issue_assigned.rb

@@ -36,7 +36,6 @@ class MessageTemplate::IssueAssigned < MessageTemplate
   def self.get_email_message_content(receiver, operator, issue)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::IssueAssigned"]
-    end
       project = issue&.project
       owner = project&.owner 
       title = email_title
@@ -56,6 +55,9 @@ class MessageTemplate::IssueAssigned < MessageTemplate
       content.gsub!('{id}', issue&.id.to_s)
   
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
   rescue => e
     Rails.logger.info("MessageTemplate::IssueAssigned.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/issue_changed.rb

@@ -191,7 +191,6 @@ class MessageTemplate::IssueChanged < MessageTemplate
     return '', '', '' if change_params.blank?
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::IssueChanged"]
-    end
       project = issue&.project
       owner = project&.owner 
       title = email_title
@@ -362,6 +361,10 @@ class MessageTemplate::IssueChanged < MessageTemplate
       end
 
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+    
   rescue => e
     Rails.logger.info("MessageTemplate::IssueChanged.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/issue_deleted.rb

@@ -33,7 +33,6 @@ class MessageTemplate::IssueDeleted < MessageTemplate
   def self.get_email_message_content(receiver, operator, issue_title)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::IssueChanged"]
-    end
       title = email_title
       title.gsub!('{title}', issue_title)
       content = email
@@ -44,6 +43,9 @@ class MessageTemplate::IssueDeleted < MessageTemplate
       content.gsub!('{title}', issue_title)
 
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
   rescue => e
     Rails.logger.info("MessageTemplate::IssueDeleted.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/organization_joined.rb

@@ -34,7 +34,6 @@ class MessageTemplate::OrganizationJoined < MessageTemplate
   def self.get_email_message_content(receiver, organization) 
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Organization"]
-    end
       title = email_title
       title.gsub!('{organization}', organization&.real_name)
       content = email 
@@ -44,6 +43,10 @@ class MessageTemplate::OrganizationJoined < MessageTemplate
       content.gsub!('{organization}', organization&.real_name)
     
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+
   rescue => e
     Rails.logger.info("MessageTemplate::OrganizationJoined.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/organization_left.rb

@@ -34,7 +34,6 @@ class MessageTemplate::OrganizationLeft < MessageTemplate
   def self.get_email_message_content(receiver, organization)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Organization"]
-    end
       title = email_title
       title.gsub!('{organization}', organization&.real_name)
       content = email 
@@ -44,6 +43,10 @@ class MessageTemplate::OrganizationLeft < MessageTemplate
       content.gsub!('{organization}', organization&.real_name)
   
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+
   rescue => e
     Rails.logger.info("MessageTemplate::OrganizationLeft.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/organization_role.rb

@@ -34,7 +34,6 @@ class MessageTemplate::OrganizationRole < MessageTemplate
   def self.get_email_message_content(receiver, organization, role) 
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Permission"]
-    end
       title = email_title
       title.gsub!('{organization}', organization&.real_name)
       title.gsub!('{role}', role)
@@ -46,6 +45,10 @@ class MessageTemplate::OrganizationRole < MessageTemplate
       content.gsub!('{role}', role)
   
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+
   rescue => e
     Rails.logger.info("MessageTemplate::OrganizationRole.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_issue.rb

@@ -38,7 +38,6 @@ class MessageTemplate::ProjectIssue < MessageTemplate
   def self.get_email_message_content(receiver, is_manager, operator, issue)
     if receiver.user_template_message_setting.present? && is_manager
       return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::Issue"]
-    end
       project = issue&.project 
       owner = project&.owner 
       title = email_title
@@ -59,6 +58,10 @@ class MessageTemplate::ProjectIssue < MessageTemplate
       content.gsub!('{title}', issue&.subject)
       
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+   
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectIssue.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_joined.rb

@@ -34,7 +34,6 @@ class MessageTemplate::ProjectJoined < MessageTemplate
   def self.get_email_message_content(receiver, project) 
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Project"]
-    end
       title = email_title
       title.gsub!('{repository}', project&.name)
       
@@ -47,6 +46,10 @@ class MessageTemplate::ProjectJoined < MessageTemplate
       content.gsub!('{repository}', project&.name)
 
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+    
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectJoined.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_left.rb

@@ -33,7 +33,6 @@ class MessageTemplate::ProjectLeft < MessageTemplate
   def self.get_email_message_content(receiver, project)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Project"]
-    end
       title = email_title
       title.gsub!('{repository}', project&.name)
       
@@ -46,6 +45,10 @@ class MessageTemplate::ProjectLeft < MessageTemplate
       content.gsub!('{repository}', project&.name)
 
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+    
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectLeft.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_member_joined.rb

@@ -34,7 +34,6 @@ class MessageTemplate::ProjectMemberJoined < MessageTemplate
   def self.get_email_message_content(receiver, user, project)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::Member"]
-    end
       title = email_title
       title.gsub!('{nickname1}', user&.real_name)
       title.gsub!('{nickname2}', project&.owner&.real_name)
@@ -51,6 +50,9 @@ class MessageTemplate::ProjectMemberJoined < MessageTemplate
       content.gsub!('{repository}', project&.name)
 
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectMemberJoined.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_member_left.rb

@@ -34,7 +34,6 @@ class MessageTemplate::ProjectMemberLeft < MessageTemplate
   def self.get_email_message_content(receiver, user, project)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::Member"]
-    end
       title = email_title
       title.gsub!('{nickname1}', user&.real_name)
       title.gsub!('{nickname2}', project&.owner&.real_name)
@@ -51,6 +50,10 @@ class MessageTemplate::ProjectMemberLeft < MessageTemplate
       content.gsub!('{repository}', project&.name)
   
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectMemberLeft.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_pull_request.rb

@@ -38,7 +38,6 @@ class MessageTemplate::ProjectPullRequest < MessageTemplate
   def self.get_email_message_content(receiver, is_manager, operator, pull_request)
     if receiver.user_template_message_setting.present? && is_manager
       return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::PullRequest"]
-    end
       project = pull_request&.project 
       owner = project&.owner 
       title = email_title
@@ -59,6 +58,9 @@ class MessageTemplate::ProjectPullRequest < MessageTemplate
       content.gsub!('{title}', pull_request&.title)
       
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectPullRequest.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_role.rb

@@ -34,7 +34,6 @@ class MessageTemplate::ProjectRole < MessageTemplate
   def self.get_email_message_content(receiver, project, role)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::Permission"]
-    end
       title = email_title
       title.gsub!('{repository}', project&.name)
       title.gsub!('{role}', role)
@@ -49,6 +48,10 @@ class MessageTemplate::ProjectRole < MessageTemplate
       content.gsub!('{role}', role)
   
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectRole.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/project_setting_changed.rb

@@ -159,10 +159,9 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
   end
 
   def self.get_email_message_content(receiver, operator, project, change_params)
+    return '', '', '' if change_params.blank?
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["ManageProject::SettingChanged"]
-    end
-    return '', '', '' if change_params.blank?
       owner = project&.owner
       title = email_title
       title.gsub!('{nickname2}', owner&.real_name)
@@ -303,6 +302,9 @@ class MessageTemplate::ProjectSettingChanged < MessageTemplate
       end
       
       return receiver&.mail, title, content
+    else
+      return '', '', '' 
+    end
   rescue => e
     Rails.logger.info("MessageTemplate::ProjectSettingChanged.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/pull_request_assigned.rb

@@ -36,7 +36,6 @@ class MessageTemplate::PullRequestAssigned < MessageTemplate
   def self.get_email_message_content(receiver, operator, pull_request)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["Normal::PullRequestAssigned"]
-    end
       project = pull_request&.project
       owner = project&.owner 
       title = email_title
@@ -56,6 +55,9 @@ class MessageTemplate::PullRequestAssigned < MessageTemplate
       content.gsub!('{id}', pull_request&.id.to_s)
 
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
   rescue => e
     Rails.logger.info("MessageTemplate::PullRequestAssigned.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/pull_request_changed.rb

@@ -103,7 +103,6 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
     return '', '', '' if change_params.blank?
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::PullRequestChanged"]
-    end
       project = pull_request&.project
       owner = project&.owner 
       title = email_title
@@ -186,6 +185,10 @@ class MessageTemplate::PullRequestChanged < MessageTemplate
       end
   
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
+
   rescue => e
     Rails.logger.info("MessageTemplate::PullRequestChanged.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/pull_request_closed.rb

@@ -36,7 +36,6 @@ class MessageTemplate::PullRequestClosed < MessageTemplate
   def self.get_email_message_content(receiver, operator, pull_request)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::PullRequestChanged"]
-    end
       project = pull_request&.project
       owner = project&.owner 
       title = email_title
@@ -54,6 +53,10 @@ class MessageTemplate::PullRequestClosed < MessageTemplate
       content.gsub!('{id}', pull_request&.id.to_s)
   
       return receiver&.mail, title, content
+    else
+      return '', '', '' 
+    end
+
   rescue => e
     Rails.logger.info("MessageTemplate::PullRequestClosed.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/message_template/pull_request_merged.rb

@@ -36,7 +36,6 @@ class MessageTemplate::PullRequestMerged < MessageTemplate
   def self.get_email_message_content(receiver, operator, pull_request)
     if receiver.user_template_message_setting.present? 
       return '', '', '' unless receiver.user_template_message_setting.email_body["CreateOrAssign::PullRequestChanged"]
-    end
       project = pull_request&.project
       owner = project&.owner 
       title = email_title
@@ -54,6 +53,9 @@ class MessageTemplate::PullRequestMerged < MessageTemplate
       content.gsub!('{id}', pull_request&.id.to_s)
   
       return receiver&.mail, title, content
+    else
+      return '', '', ''
+    end
   rescue => e
     Rails.logger.info("MessageTemplate::PullRequestMerged.get_email_message_content [ERROR] #{e}")
     return '', '', ''

app/models/user_template_message_setting.rb

@@ -44,17 +44,17 @@ class UserTemplateMessageSetting < ApplicationRecord
 
   def self.init_email_body 
     {
-      "Normal::Permission": true,
+      "Normal::Permission": false,
-      "Normal::Project": true,
+      "Normal::Project": false,
-      "Normal::Organization": true,
+      "Normal::Organization": false,
-      "Normal::IssueAssigned": true,
+      "Normal::IssueAssigned": false,
-      "Normal::PullRequestAssigned": true,
+      "Normal::PullRequestAssigned": false,
-      "CreateOrAssign::IssueChanged": true,
+      "CreateOrAssign::IssueChanged": false,
-      "CreateOrAssign::PullRequestChanged": true,
+      "CreateOrAssign::PullRequestChanged": false,
-      "ManageProject::Issue": true,
+      "ManageProject::Issue": false,
-      "ManageProject::PullRequest": true,
+      "ManageProject::PullRequest": false,
-      "ManageProject::Member": true,
+      "ManageProject::Member": false,
-      "ManageProject::SettingChanged": true,
+      "ManageProject::SettingChanged": false,
     }.stringify_keys!
   end
 

app/services/cache/v2/project_common_service.rb

@@ -196,6 +196,7 @@ class Cache::V2::ProjectCommonService < ApplicationService
 
   def reset_project_common
     load_project
+    return unless @project.present?
     return unless @project.is_full_public
     $redis_cache.del(project_common_key)
     reset_project_owner_id