summaryrefslogtreecommitdiffstats
path: root/app/user.go
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-02-12 15:17:34 -0500
committerGitHub <noreply@github.com>2017-02-12 15:17:34 -0500
commitd05525e2164017da87cb119f85e9abfbd7db32f3 (patch)
tree824531f22d9a311a25c8a64793a81b7eaacee858 /app/user.go
parenteab15da32122ec421d22dbfb3ee2cd1844d07b5c (diff)
downloadchat-d05525e2164017da87cb119f85e9abfbd7db32f3.tar.gz
chat-d05525e2164017da87cb119f85e9abfbd7db32f3.tar.bz2
chat-d05525e2164017da87cb119f85e9abfbd7db32f3.zip
Fix copy/paste error for getting users (#5373)
Diffstat (limited to 'app/user.go')
-rw-r--r--app/user.go8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/user.go b/app/user.go
index 1d6fa9e34..3954a549c 100644
--- a/app/user.go
+++ b/app/user.go
@@ -321,7 +321,7 @@ func GetUser(userId string) (*model.User, *model.AppError) {
}
func GetUserByUsername(username string) (*model.User, *model.AppError) {
- if result := <-Srv.Store.User().GetByUsername(username); result.Err != nil && result.Err.Id == "store.sql_user.get_by_username.app_error" {
+ if result := <-Srv.Store.User().GetByUsername(username); result.Err != nil && result.Err.Id == "store.sql_user.get_by_username.app_error" {
result.Err.StatusCode = http.StatusNotFound
return nil, result.Err
} else {
@@ -331,7 +331,7 @@ func GetUserByUsername(username string) (*model.User, *model.AppError) {
func GetUserByEmail(email string) (*model.User, *model.AppError) {
- if result := <-Srv.Store.User().GetByEmail(email); result.Err != nil && result.Err.Id == "store.sql_user.missing_account.const"{
+ if result := <-Srv.Store.User().GetByEmail(email); result.Err != nil && result.Err.Id == "store.sql_user.missing_account.const" {
result.Err.StatusCode = http.StatusNotFound
return nil, result.Err
} else if result.Err != nil {
@@ -389,8 +389,8 @@ func GetUsers(offset int, limit int) ([]*model.User, *model.AppError) {
}
}
-func GetUsersMap(page int, perPage int, asAdmin bool) (map[string]*model.User, *model.AppError) {
- users, err := GetUsers(page*perPage, perPage)
+func GetUsersMap(offset int, limit int, asAdmin bool) (map[string]*model.User, *model.AppError) {
+ users, err := GetUsers(offset, limit)
if err != nil {
return nil, err
}