Allow Users to be notified using @all, @channel, and their first name when other notifications are disabled

1 files changed, 4 insertions, 4 deletions

diff --git a/api/post.go b/api/post.go
index e62591273..5b7983386 100644
--- a/api/post.go
+++ b/api/post.go
@@ -298,11 +298,11 @@ func fireAndForgetNotifications(post *model.Post, teamId, teamUrl string) {
 						for _, k := range splitKeys {
 							keywordMap[k] = append(keywordMap[strings.ToLower(k)], profile.Id)
 						}
+					}
 
-						// If turned on, add the user's case sensitive first name
-						if profile.NotifyProps["first_name"] == "true" {
-							keywordMap[profile.FirstName] = append(keywordMap[profile.FirstName], profile.Id)
-						}
+					// If turned on, add the user's case sensitive first name
+					if profile.NotifyProps["first_name"] == "true" {
+						keywordMap[profile.FirstName] = append(keywordMap[profile.FirstName], profile.Id)
 					}
 
 					// Add @all to keywords if user has them turned on