diff options
Diffstat (limited to 'app')
-rw-r--r-- | app/notification.go | 8 | ||||
-rw-r--r-- | app/user.go | 56 |
2 files changed, 26 insertions, 38 deletions
diff --git a/app/notification.go b/app/notification.go index e983f5e8c..195f808c7 100644 --- a/app/notification.go +++ b/app/notification.go @@ -95,7 +95,7 @@ func SendNotifications(post *model.Post, team *model.Team, channel *model.Channe if len(potentialOtherMentions) > 0 { if result := <-Srv.Store.User().GetProfilesByUsernames(potentialOtherMentions, team.Id); result.Err == nil { - outOfChannelMentions := result.Data.(map[string]*model.User) + outOfChannelMentions := result.Data.([]*model.User) go sendOutOfChannelMentions(sender, post, team.Id, outOfChannelMentions) } } @@ -592,13 +592,13 @@ func getMobileAppSessions(userId string) ([]*model.Session, *model.AppError) { } } -func sendOutOfChannelMentions(sender *model.User, post *model.Post, teamId string, profiles map[string]*model.User) *model.AppError { - if len(profiles) == 0 { +func sendOutOfChannelMentions(sender *model.User, post *model.Post, teamId string, users []*model.User) *model.AppError { + if len(users) == 0 { return nil } var usernames []string - for _, user := range profiles { + for _, user := range users { usernames = append(usernames, user.Username) } sort.Strings(usernames) diff --git a/app/user.go b/app/user.go index 827ad18f9..86e7cf0b0 100644 --- a/app/user.go +++ b/app/user.go @@ -430,11 +430,7 @@ func GetUsersPage(page int, perPage int, asAdmin bool) ([]*model.User, *model.Ap return nil, err } - for _, user := range users { - SanitizeProfile(user, asAdmin) - } - - return users, nil + return sanitizeProfiles(users, asAdmin), nil } func GetUsersEtag() string { @@ -479,11 +475,7 @@ func GetUsersInTeamPage(teamId string, page int, perPage int, asAdmin bool) ([]* return nil, err } - for _, user := range users { - SanitizeProfile(user, asAdmin) - } - - return users, nil + return sanitizeProfiles(users, asAdmin), nil } func GetUsersNotInTeamPage(teamId string, page int, perPage int, asAdmin bool) ([]*model.User, *model.AppError) { @@ -492,11 +484,7 @@ func GetUsersNotInTeamPage(teamId string, page int, perPage int, asAdmin bool) ( return nil, err } - for _, user := range users { - SanitizeProfile(user, asAdmin) - } - - return users, nil + return sanitizeProfiles(users, asAdmin), nil } func GetUsersInTeamEtag(teamId string) string { @@ -537,11 +525,7 @@ func GetUsersInChannelPage(channelId string, page int, perPage int, asAdmin bool return nil, err } - for _, user := range users { - SanitizeProfile(user, asAdmin) - } - - return users, nil + return sanitizeProfiles(users, asAdmin), nil } func GetUsersNotInChannel(teamId string, channelId string, offset int, limit int) ([]*model.User, *model.AppError) { @@ -574,11 +558,7 @@ func GetUsersNotInChannelPage(teamId string, channelId string, page int, perPage return nil, err } - for _, user := range users { - SanitizeProfile(user, asAdmin) - } - - return users, nil + return sanitizeProfiles(users, asAdmin), nil } func GetUsersWithoutTeamPage(page int, perPage int, asAdmin bool) ([]*model.User, *model.AppError) { @@ -587,11 +567,7 @@ func GetUsersWithoutTeamPage(page int, perPage int, asAdmin bool) ([]*model.User return nil, err } - for _, user := range users { - SanitizeProfile(user, asAdmin) - } - - return users, nil + return sanitizeProfiles(users, asAdmin), nil } func GetUsersWithoutTeam(offset int, limit int) ([]*model.User, *model.AppError) { @@ -607,13 +583,25 @@ func GetUsersByIds(userIds []string, asAdmin bool) ([]*model.User, *model.AppErr return nil, result.Err } else { users := result.Data.([]*model.User) + return sanitizeProfiles(users, asAdmin), nil + } +} - for _, u := range users { - SanitizeProfile(u, asAdmin) - } +func GetUsersByUsernames(usernames []string, asAdmin bool) ([]*model.User, *model.AppError) { + if result := <-Srv.Store.User().GetProfilesByUsernames(usernames, ""); result.Err != nil { + return nil, result.Err + } else { + users := result.Data.([]*model.User) + return sanitizeProfiles(users, asAdmin), nil + } +} - return users, nil +func sanitizeProfiles(users []*model.User, asAdmin bool) []*model.User { + for _, u := range users { + SanitizeProfile(u, asAdmin) } + + return users } func GenerateMfaSecret(userId string) (*model.MfaSecret, *model.AppError) { |