Skip to content

The Unified and Autonomous Development Platform

Fix issue #1209 - Include comment user in FROM header of issue email notification

Robin Shend39c33266555
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
index 92fbefa482..40c97c64e0 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
@@ -224,7 +224,7 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
serverUrl, emailAddress.getId(), emailAddress.getVerificationCode());
String htmlBody = String.format("Hello,"
+ "<p style='margin: 16px 0;'>"
- + "The account \"%s\" at \"%s\" tries to use email address \"%s\", please visit below link to verify if this is you:<br><br>"
+ + "The account %s at %s tries to use email address %s, please visit below link to verify if this is you:<br><br>"
+ "<a href='%s'>%s</a>",
user.getName(), serverUrl, emailAddress.getValue(), verificationUrl, verificationUrl);
@@ -238,7 +238,7 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
Arrays.asList(emailAddress.getValue()),
Lists.newArrayList(), Lists.newArrayList(),
"[Verification] Please Verify Your Email Address",
- htmlBody, textBody, null, null);
+ htmlBody, textBody, null, null, null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java
index cc9a121053..8c164cc291 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java
@@ -1,104 +1,104 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.Arrays;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
-
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserInvitationManager;
-import io.onedev.server.mail.MailManager;
-import io.onedev.server.model.UserInvitation;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
-
-@Singleton
-public class DefaultUserInvitationManager extends BaseEntityManager<UserInvitation> implements UserInvitationManager {
-
- private final SettingManager settingManager;
-
- private final MailManager mailManager;
-
- @Inject
- public DefaultUserInvitationManager(Dao dao, SettingManager settingManager, MailManager mailManager) {
- super(dao);
- this.settingManager = settingManager;
- this.mailManager = mailManager;
- }
-
- @Override
- public UserInvitation findByEmailAddress(String emailAddress) {
- EntityCriteria<UserInvitation> criteria = EntityCriteria.of(UserInvitation.class);
- criteria.add(Restrictions.eq(UserInvitation.PROP_EMAIL_ADDRESS, emailAddress));
- return find(criteria);
- }
-
- @Override
- public UserInvitation findByInvitationCode(String invitationCode) {
- EntityCriteria<UserInvitation> criteria = EntityCriteria.of(UserInvitation.class);
- criteria.add(Restrictions.eq(UserInvitation.PROP_INVITATION_CODE, invitationCode));
- return find(criteria);
- }
-
- @Override
- public void sendInvitationEmail(UserInvitation invitation) {
- Preconditions.checkState(settingManager.getMailSetting() != null);
-
- String serverUrl = settingManager.getSystemSetting().getServerUrl();
-
- String setupAccountUrl = String.format("%s/~create-user-from-invitation/%d/%s",
- serverUrl, invitation.getId(), invitation.getInvitationCode());
- String htmlBody = String.format("Hello,"
- + "<p style='margin: 16px 0;'>"
- + "You are invited to use OneDev, please visit below link to set up account:<br><br>"
- + "<a href='%s'>%s</a>",
- setupAccountUrl, setupAccountUrl);
-
- String textBody = String.format("Hello,\n\n"
- + "You are invited to use OneDev, please visit below link to set up account:\n\n"
- + "%s",
- setupAccountUrl);
-
- mailManager.sendMail(
- settingManager.getMailSetting().getSendSetting(),
- Arrays.asList(invitation.getEmailAddress()),
- Lists.newArrayList(), Lists.newArrayList(),
- "[Invitation] You are Invited to Use OneDev",
- htmlBody, textBody, null, null);
- }
-
- private EntityCriteria<UserInvitation> getCriteria(@Nullable String term) {
- EntityCriteria<UserInvitation> criteria = EntityCriteria.of(UserInvitation.class);
- if (term != null)
- criteria.add(Restrictions.ilike(UserInvitation.PROP_EMAIL_ADDRESS, term, MatchMode.ANYWHERE));
- else
- criteria.setCacheable(true);
- return criteria;
- }
-
- @Sessional
- @Override
- public List<UserInvitation> query(String term, int firstResult, int maxResults) {
- EntityCriteria<UserInvitation> criteria = getCriteria(term);
- criteria.addOrder(Order.asc(UserInvitation.PROP_EMAIL_ADDRESS));
- return query(criteria, firstResult, maxResults);
- }
-
- @Sessional
- @Override
- public int count(String term) {
- return count(getCriteria(term));
- }
-
+package io.onedev.server.entitymanager.impl;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Lists;
+
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserInvitationManager;
+import io.onedev.server.mail.MailManager;
+import io.onedev.server.model.UserInvitation;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultUserInvitationManager extends BaseEntityManager<UserInvitation> implements UserInvitationManager {
+
+ private final SettingManager settingManager;
+
+ private final MailManager mailManager;
+
+ @Inject
+ public DefaultUserInvitationManager(Dao dao, SettingManager settingManager, MailManager mailManager) {
+ super(dao);
+ this.settingManager = settingManager;
+ this.mailManager = mailManager;
+ }
+
+ @Override
+ public UserInvitation findByEmailAddress(String emailAddress) {
+ EntityCriteria<UserInvitation> criteria = EntityCriteria.of(UserInvitation.class);
+ criteria.add(Restrictions.eq(UserInvitation.PROP_EMAIL_ADDRESS, emailAddress));
+ return find(criteria);
+ }
+
+ @Override
+ public UserInvitation findByInvitationCode(String invitationCode) {
+ EntityCriteria<UserInvitation> criteria = EntityCriteria.of(UserInvitation.class);
+ criteria.add(Restrictions.eq(UserInvitation.PROP_INVITATION_CODE, invitationCode));
+ return find(criteria);
+ }
+
+ @Override
+ public void sendInvitationEmail(UserInvitation invitation) {
+ Preconditions.checkState(settingManager.getMailSetting() != null);
+
+ String serverUrl = settingManager.getSystemSetting().getServerUrl();
+
+ String setupAccountUrl = String.format("%s/~create-user-from-invitation/%d/%s",
+ serverUrl, invitation.getId(), invitation.getInvitationCode());
+ String htmlBody = String.format("Hello,"
+ + "<p style='margin: 16px 0;'>"
+ + "You are invited to use OneDev, please visit below link to set up account:<br><br>"
+ + "<a href='%s'>%s</a>",
+ setupAccountUrl, setupAccountUrl);
+
+ String textBody = String.format("Hello,\n\n"
+ + "You are invited to use OneDev, please visit below link to set up account:\n\n"
+ + "%s",
+ setupAccountUrl);
+
+ mailManager.sendMail(
+ settingManager.getMailSetting().getSendSetting(),
+ Arrays.asList(invitation.getEmailAddress()),
+ Lists.newArrayList(), Lists.newArrayList(),
+ "[Invitation] You are Invited to Use OneDev",
+ htmlBody, textBody, null, null, null);
+ }
+
+ private EntityCriteria<UserInvitation> getCriteria(@Nullable String term) {
+ EntityCriteria<UserInvitation> criteria = EntityCriteria.of(UserInvitation.class);
+ if (term != null)
+ criteria.add(Restrictions.ilike(UserInvitation.PROP_EMAIL_ADDRESS, term, MatchMode.ANYWHERE));
+ else
+ criteria.setCacheable(true);
+ return criteria;
+ }
+
+ @Sessional
+ @Override
+ public List<UserInvitation> query(String term, int firstResult, int maxResults) {
+ EntityCriteria<UserInvitation> criteria = getCriteria(term);
+ criteria.addOrder(Order.asc(UserInvitation.PROP_EMAIL_ADDRESS));
+ return query(criteria, firstResult, maxResults);
+ }
+
+ @Sessional
+ @Override
+ public int count(String term) {
+ return count(getCriteria(term));
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
index ff199c7c31..b590c85e19 100644
--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
@@ -84,7 +84,7 @@ public class DefaultMailManager implements MailManager, Serializable {
private static final int MAX_INBOX_LIFE = 3600;
- private static final String SENDER_NAME = "~OneDev Notifier";
+ private static final String QUOTE_MARK = "[OneDev]";
private static final String SIGNATURE_PREFIX = "-- ";
@@ -160,7 +160,8 @@ public class DefaultMailManager implements MailManager, Serializable {
@Sessional
@Override
public void sendMailAsync(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
- String subject, String htmlBody, String textBody, String replyAddress, String references) {
+ String subject, String htmlBody, String textBody, @Nullable String replyAddress,
+ @Nullable String senderName, @Nullable String references) {
transactionManager.runAfterCommit(new Runnable() {
@Override
@@ -170,7 +171,8 @@ public class DefaultMailManager implements MailManager, Serializable {
@Override
public void run() {
try {
- sendMail(toList, ccList, bccList, subject, htmlBody, textBody, replyAddress, references);
+ sendMail(toList, ccList, bccList, subject, htmlBody, textBody, replyAddress,
+ senderName, references);
} catch (Exception e) {
logger.error("Error sending email (to: " + toList + ", subject: " + subject + ")", e);
}
@@ -219,8 +221,9 @@ public class DefaultMailManager implements MailManager, Serializable {
@Override
public void sendMail(MailSendSetting sendSetting, Collection<String> toList, Collection<String> ccList,
- Collection<String> bccList, String subject, String htmlBody, String textBody,
- String replyAddress, String references) {
+ Collection<String> bccList, String subject, String htmlBody, String textBody,
+ @Nullable String replyAddress, @Nullable String senderName,
+ @Nullable String references) {
if (toList.isEmpty() && ccList.isEmpty() && bccList.isEmpty())
return;
@@ -284,7 +287,11 @@ public class DefaultMailManager implements MailManager, Serializable {
message.addHeader(entry.getKey(), createFoldedHeaderValue(entry.getKey(), entry.getValue()));
}
- message.setFrom(createInetAddress(sendSetting.getSenderAddress(), SENDER_NAME));
+ if (senderName == null)
+ senderName = QUOTE_MARK;
+ else
+ senderName += " " + QUOTE_MARK;
+ message.setFrom(createInetAddress(sendSetting.getSenderAddress(), senderName));
if (toList.isEmpty() && ccList.isEmpty() && bccList.isEmpty())
throw new ExplicitException("At least one receiver address should be specified");
@@ -314,8 +321,10 @@ public class DefaultMailManager implements MailManager, Serializable {
@Override
public void sendMail(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
- String subject, String htmlBody, String textBody, String replyAddress, String references) {
- sendMail(null, toList, ccList, bccList, subject, htmlBody, textBody, replyAddress, references);
+ String subject, String htmlBody, String textBody, @Nullable String replyAddress,
+ @Nullable String senderName, @Nullable String references) {
+ sendMail(null, toList, ccList, bccList, subject, htmlBody, textBody, replyAddress,
+ senderName, references);
}
@Transactional
@@ -456,7 +465,7 @@ public class DefaultMailManager implements MailManager, Serializable {
+ "created issues matching those queries. In this case, you will need to login to your account "
+ "and unsubscribe those queries.";
sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), Lists.newArrayList(),
- subject, body, body, null, getMessageId(message));
+ subject, body, body, null, null, getMessageId(message));
}
}
} else {
@@ -482,7 +491,7 @@ public class DefaultMailManager implements MailManager, Serializable {
+ "get notifications of newly submitted pull request matching those queries. In this case, you "
+ "will need to login to your account and unsubscribe those queries.";
sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), Lists.newArrayList(),
- subject, body, body, null, getMessageId(message));
+ subject, body, body, null, null, getMessageId(message));
}
}
} else {
@@ -580,8 +589,8 @@ public class DefaultMailManager implements MailManager, Serializable {
@Nullable
private String stripQuotationAndSignature(MailSendSetting sendSetting, String content) {
String quotationMark = null;
- if (content.contains(SENDER_NAME)) {
- quotationMark = SENDER_NAME;
+ if (content.contains(QUOTE_MARK)) {
+ quotationMark = QUOTE_MARK;
} else if (content.contains(sendSetting.getSenderAddress())) {
quotationMark = sendSetting.getSenderAddress();
} else if (sendSetting.getSmtpUser() != null
@@ -758,7 +767,7 @@ public class DefaultMailManager implements MailManager, Serializable {
sendMailAsync(Lists.newArrayList(submitter.getAddress()), Lists.newArrayList(), Lists.newArrayList(),
"Re: " + issue.getTitle(), htmlBody, textBody, getReplyAddress(issue),
- issue.getEffectiveThreadingReference());
+ submitter.getPersonal(), issue.getEffectiveThreadingReference());
}
return issue;
}
diff --git a/server-core/src/main/java/io/onedev/server/mail/MailManager.java b/server-core/src/main/java/io/onedev/server/mail/MailManager.java
index 5f30ab9e00..87c68e74dd 100644
--- a/server-core/src/main/java/io/onedev/server/mail/MailManager.java
+++ b/server-core/src/main/java/io/onedev/server/mail/MailManager.java
@@ -14,17 +14,17 @@ public interface MailManager {
public static final String COMMENT_MARKER = "no-color";
- void sendMail(Collection<String> toList, Collection<String> ccList,
- Collection<String> bccList, String subject, String htmlBody,
- String textBody, @Nullable String replyAddress, @Nullable String references);
+ void sendMail(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
+ String subject, String htmlBody, String textBody, @Nullable String replyAddress,
+ @Nullable String senderName, @Nullable String references);
void sendMail(MailSendSetting sendSetting, Collection<String> toList, Collection<String> ccList,
- Collection<String> bccList, String subject, String htmlBody, String textBody,
- @Nullable String replyAddress, @Nullable String references);
+ Collection<String> bccList, String subject, String htmlBody, String textBody,
+ @Nullable String replyAddress, @Nullable String senderName, @Nullable String references);
void sendMailAsync(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
- String subject, String htmlBody, String textBody, @Nullable String replyAddress,
- @Nullable String references);
+ String subject, String htmlBody, String textBody, @Nullable String replyAddress,
+ @Nullable String senderName, @Nullable String references);
@Nullable
String getReplyAddress(Issue issue);
diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
index d69a0fb9d4..4155c1eacc 100644
--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
@@ -81,7 +81,7 @@ public class BuildNotificationManager extends AbstractNotificationManager {
String htmlBody = getHtmlBody(event, summary, null, url, false, null);
String textBody = getTextBody(event, summary, null, url, false, null);
mailManager.sendMailAsync(Lists.newArrayList(), Lists.newArrayList(), emails, subject, htmlBody,
- textBody, null, threadingReferences);
+ textBody, null, null, threadingReferences);
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
index 1ef229c9be..b65f9ea393 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
@@ -32,78 +32,66 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
private final UserManager userManager;
- private final TransactionManager transactionManager;
-
private final CodeCommentMentionManager mentionManager;
@Inject
public CodeCommentNotificationManager(MailManager mailManager, MarkdownManager markdownManager,
UserManager userManager, SettingManager settingManager,
- TransactionManager transactionManager,
CodeCommentMentionManager mentionManager) {
super(markdownManager, settingManager);
this.mailManager = mailManager;
this.userManager = userManager;
- this.transactionManager = transactionManager;
this.mentionManager = mentionManager;
}
@Transactional
@Listen
public void on(CodeCommentEvent event) {
- transactionManager.runAsyncAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- CodeComment comment = event.getComment();
- if (comment.getCompareContext().getPullRequest() == null) {
- MarkdownText markdown = (MarkdownText) event.getCommentText();
-
- Collection<User> notifyUsers = new HashSet<>();
-
- notifyUsers.add(comment.getUser());
- notifyUsers.addAll(comment.getReplies().stream().map(it -> it.getUser()).collect(Collectors.toSet()));
- notifyUsers.addAll(comment.getChanges().stream().map(it -> it.getUser()).collect(Collectors.toSet()));
-
- if (markdown != null) {
- for (String userName : new MentionParser().parseMentions(markdown.getRendered())) {
- User user = userManager.findByName(userName);
- if (user != null) {
- mentionManager.mention(comment, user);
- notifyUsers.add(user);
- }
- }
- }
-
- Set<String> emailAddresses = notifyUsers.stream()
- .filter(it -> it.isOrdinary()
- && !it.equals(event.getUser())
- && it.getPrimaryEmailAddress() != null
- && it.getPrimaryEmailAddress().isVerified())
- .map(it -> it.getPrimaryEmailAddress().getValue())
- .collect(Collectors.toSet());
-
- if (!emailAddresses.isEmpty() && !(event instanceof CodeCommentUpdated)) {
- String url = event.getUrl();
- String subject = String.format("[Code Comment] %s:%s",
- event.getProject().getPath(), comment.getMark().getPath());
-
- String summary = String.format("%s %s code comment",
- event.getUser().getDisplayName(), event.getActivity());
-
- String threadingReferences = "<" + comment.getProject().getPath()
- + "-codecomment-" + comment.getId() + "@onedev>";
-
- mailManager.sendMailAsync(emailAddresses, Lists.newArrayList(),
- Lists.newArrayList(), subject,
- getHtmlBody(event, summary, markdown != null ? markdown.getProcessed() : null, url, false, null),
- getTextBody(event, summary, markdown != null ? markdown.getContent() : null, url, false, null),
- null, threadingReferences);
+ CodeComment comment = event.getComment();
+ if (comment.getCompareContext().getPullRequest() == null) {
+ MarkdownText markdown = (MarkdownText) event.getCommentText();
+
+ Collection<User> notifyUsers = new HashSet<>();
+
+ notifyUsers.add(comment.getUser());
+ notifyUsers.addAll(comment.getReplies().stream().map(it -> it.getUser()).collect(Collectors.toSet()));
+ notifyUsers.addAll(comment.getChanges().stream().map(it -> it.getUser()).collect(Collectors.toSet()));
+
+ if (markdown != null) {
+ for (String userName : new MentionParser().parseMentions(markdown.getRendered())) {
+ User user = userManager.findByName(userName);
+ if (user != null) {
+ mentionManager.mention(comment, user);
+ notifyUsers.add(user);
}
}
}
- });
+ Set<String> emailAddresses = notifyUsers.stream()
+ .filter(it -> it.isOrdinary()
+ && !it.equals(event.getUser())
+ && it.getPrimaryEmailAddress() != null
+ && it.getPrimaryEmailAddress().isVerified())
+ .map(it -> it.getPrimaryEmailAddress().getValue())
+ .collect(Collectors.toSet());
+
+ if (!emailAddresses.isEmpty() && !(event instanceof CodeCommentUpdated)) {
+ String url = event.getUrl();
+ String subject = String.format("[Code Comment] %s:%s",
+ event.getProject().getPath(), comment.getMark().getPath());
+
+ String summary = String.format("%s %s code comment",
+ event.getUser().getDisplayName(), event.getActivity());
+
+ String threadingReferences = "<" + comment.getProject().getPath()
+ + "-codecomment-" + comment.getId() + "@onedev>";
+
+ mailManager.sendMailAsync(emailAddresses, Lists.newArrayList(),
+ Lists.newArrayList(), subject,
+ getHtmlBody(event, summary, markdown != null ? markdown.getProcessed() : null, url, false, null),
+ getTextBody(event, summary, markdown != null ? markdown.getContent() : null, url, false, null),
+ null, event.getUser().getDisplayName(), threadingReferences);
+ }
+ }
}
-
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
index dc5669ba9e..d9c04440a8 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
@@ -128,7 +128,7 @@ public class CommitNotificationManager extends AbstractNotificationManager {
mailManager.sendMailAsync(Lists.newArrayList(), Lists.newArrayList(), notifyEmails, subject,
getHtmlBody(event, summary, event.getHtmlBody(), url, false, null),
getTextBody(event, summary, event.getTextBody(), url, false, null),
- null, threadingReferences);
+ null, commit.getAuthorIdent().getName(), threadingReferences);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index 3bb39c316b..61bae3b2a3 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -79,11 +79,15 @@ public class IssueNotificationManager extends AbstractNotificationManager {
String url = event.getUrl();
+ String senderName;
String summary;
- if (user != null)
+ if (user != null) {
+ senderName = user.getDisplayName();
summary = user.getDisplayName() + " " + event.getActivity();
- else
+ } else {
+ senderName = null;
summary = StringUtils.capitalize(event.getActivity());
+ }
for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
@@ -164,7 +168,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
Lists.newArrayList(), Lists.newArrayList(), subject,
getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
getTextBody(event, summary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
+ replyAddress, senderName, threadingReferences);
}
}
}
@@ -188,7 +192,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
Lists.newArrayList(), Lists.newArrayList(), subject,
getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
getTextBody(event, summary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
+ replyAddress, senderName, threadingReferences);
}
}
}
@@ -224,7 +228,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
Sets.newHashSet(), Sets.newHashSet(), subject,
getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
getTextBody(event, summary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
+ replyAddress, senderName, threadingReferences);
}
notifiedUsers.add(mentionedUser);
}
@@ -258,7 +262,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
String threadingReferences = issue.getEffectiveThreadingReference();
mailManager.sendMailAsync(Sets.newHashSet(), Sets.newHashSet(),
bccEmailAddresses, subject, htmlBody, textBody,
- replyAddress, threadingReferences);
+ replyAddress, senderName, threadingReferences);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index 2858a119af..88773f5d52 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -144,13 +144,18 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
}
+ String senderName;
String summary;
- if (user != null)
+ if (user != null) {
+ senderName = user.getDisplayName();
summary = user.getDisplayName() + " " + event.getActivity();
- else if (committer != null)
+ } else if (committer != null) {
+ senderName = null;
summary = committer.getDisplayName() + " " + event.getActivity();
- else
+ } else {
+ senderName = null;
summary = StringUtils.capitalize(event.getActivity());
+ }
String replyAddress = mailManager.getReplyAddress(request);
boolean replyable = replyAddress != null;
@@ -181,7 +186,7 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
Lists.newArrayList(), Lists.newArrayList(), subject,
getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
getTextBody(event, summary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
+ replyAddress, senderName, threadingReferences);
}
notifiedUsers.add(request.getSubmitter());
}
@@ -208,7 +213,7 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
Lists.newArrayList(), Lists.newArrayList(), subject,
getHtmlBody(event, assignmentSummary, event.getHtmlBody(), url, replyable, null),
getTextBody(event, assignmentSummary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
+ replyAddress, senderName, threadingReferences);
}
notifiedUsers.add(assignee);
}
@@ -232,7 +237,7 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
Lists.newArrayList(), Lists.newArrayList(), subject,
getHtmlBody(event, reviewInvitationSummary, event.getHtmlBody(), url, replyable, null),
getTextBody(event, reviewInvitationSummary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
+ replyAddress, senderName, threadingReferences);
}
notifiedUsers.add(reviewer);
}
@@ -261,7 +266,7 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
Sets.newHashSet(), Sets.newHashSet(), subject,
getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
getTextBody(event, summary, event.getTextBody(), url, replyable, null),
- replyAddress, threadingReferences);
+ replyAddress, senderName, threadingReferences);
}
notifiedUsers.add(mentionedUser);
}
@@ -297,7 +302,7 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
mailManager.sendMailAsync(
Lists.newArrayList(), Lists.newArrayList(),
bccEmailAddresses, subject, htmlBody, textBody,
- replyAddress, threadingReferences);
+ replyAddress, senderName, threadingReferences);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java
index 6cf6d9285b..769d808503 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultDataManager.java
@@ -1051,7 +1051,7 @@ public class DefaultDataManager implements DataManager, Serializable {
if (emailAddress != null && emailAddress.isVerified()) {
mailManager.sendMail(Lists.newArrayList(emailAddress.getValue()), Lists.newArrayList(),
Lists.newArrayList(), "[Backup] OneDev Database Auto-backup Failed",
- htmlBody, textBody, null, null);
+ htmlBody, textBody, null, null, null);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
index e465338d21..6c9f55be9f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
@@ -117,7 +117,8 @@ public class MailSettingPage extends AdministrationPage {
logger.log("Sending test mail to " + subAddressed + "...");
mailManager.sendMail(mailSetting.getSendSetting(),
Sets.newHashSet(subAddressed), Lists.newArrayList(), Lists.newArrayList(), uuid,
- "[Test] Test Email From OneDev", "This is a test email from OneDev", null, null);
+ "[Test] Test Email From OneDev", "This is a test email from OneDev",
+ null, null, null);
logger.log("Waiting for test mail to come back...");
@@ -140,7 +141,7 @@ public class MailSettingPage extends AdministrationPage {
String body = "Great, your mail settings are working!";
mailManager.sendMail(mailSettingHolder.getMailSetting().getSendSetting(), Sets.newHashSet(emailAddress.getValue()),
Lists.newArrayList(), Lists.newArrayList(), "[Test] Test Email From OneDev",
- body, body, null, null);
+ body, body, null, null, null);
return "Test mail has been sent to " + emailAddress.getValue() + ", please check your mail box";
} else {
throw new ExplicitException("Primary email address of your account is not specified yet");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
index ca4d16471a..d0060f0d22 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
@@ -119,7 +119,7 @@ public class PasswordResetPage extends SimplePage {
Arrays.asList(emailAddressValue),
Lists.newArrayList(), Lists.newArrayList(),
"[Password Reset] Your OneDev Password Has Been Reset",
- htmlBody, textBody, null, null);
+ htmlBody, textBody, null, null, null);
return "Please check your email " + emailAddressValue + " for the reset password";
} else {