SAK-44486 Forums - email notification is sent to users who didn't par…

…ticipate in conversation (sakaiproject#8769)

msgcntr/messageforums-app/src/java/org/sakaiproject/tool/messageforums/DiscussionForumTool.java

@@ -3664,6 +3664,7 @@ public String processDfMsgPost()
     	this.composeTitle = null;
 
     	this.attachments.clear();
+    	this.selectedThread.clear();
 
     	// refresh page with unread status     
     	selectedTopic = getDecoratedTopic(selectedTopic.getTopic());
@@ -7375,13 +7376,14 @@ public void  sendEmailNotification(Message reply, DiscussionMessageBean currthre
 		while (iter.hasNext()){
 			DiscussionMessageBean decoMessage = (DiscussionMessageBean) iter.next();
 			String threadauthor = decoMessage.getMessage().getCreatedBy();
-			EmailNotification authorNotificationLevel = emailNotificationManager.getEmailNotification(threadauthor);
-			// only add level 1 users , since we've already got level2 users. 
-			if (EmailNotification.EMAIL_REPLY_TO_MY_MESSAGE.equalsIgnoreCase(authorNotificationLevel.getNotificationLevel())){
-				if (log.isDebugEnabled()){
-					log.debug("The author: " + threadauthor + " wants to be notified");
+			// don't include the reply author
+			if (!threadauthor.equals(reply.getCreatedBy())) {
+				EmailNotification authorNotificationLevel = emailNotificationManager.getEmailNotification(threadauthor);
+				// only add level 1 users , since we've already got level2 users.
+				if (EmailNotification.EMAIL_REPLY_TO_MY_MESSAGE.equalsIgnoreCase(authorNotificationLevel.getNotificationLevel())){
+					log.debug("The author: {} wants to be notified", threadauthor);
+					userlist.add(threadauthor);
 				}
-				userlist.add(threadauthor);
 			}
 		}
 
@@ -9254,4 +9256,3 @@ private void loadTopicDataInTopicBean(DiscussionTopic topic, DiscussionTopicBean
     }
 
 }
-