1 files changed, 10 insertions, 14 deletions
diff --git a/app/notification.go b/app/notification.go
index fdff13c4f..e707b3d22 100644
--- a/app/notification.go
+++ b/app/notification.go
@@ -196,22 +196,18 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe
 	}
 
 	if hereNotification {
-		if result := <-Srv.Store.Status().GetOnline(); result.Err != nil {
-			return nil, result.Err
-		} else {
-			statuses := result.Data.([]*model.Status)
-			for _, status := range statuses {
-				if status.UserId == post.UserId {
-					continue
-				}
+		statuses := GetAllStatuses()
+		for _, status := range statuses {
+			if status.UserId == post.UserId {
+				continue
+			}
 
-				_, profileFound := profileMap[status.UserId]
-				_, alreadyMentioned := mentionedUserIds[status.UserId]
+			_, profileFound := profileMap[status.UserId]
+			_, alreadyMentioned := mentionedUserIds[status.UserId]
 
-				if status.Status == model.STATUS_ONLINE && profileFound && !alreadyMentioned {
-					mentionedUsersList = append(mentionedUsersList, status.UserId)
-					updateMentionChans = append(updateMentionChans, Srv.Store.Channel().IncrementMentionCount(post.ChannelId, status.UserId))
-				}
+			if status.Status == model.STATUS_ONLINE && profileFound && !alreadyMentioned {
+				mentionedUsersList = append(mentionedUsersList, status.UserId)
+				updateMentionChans = append(updateMentionChans, Srv.Store.Channel().IncrementMentionCount(post.ChannelId, status.UserId))
 			}
 		}
 	}