diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
index 1a85643..619b509 100755
--- a/internal/handlers/handlers.go
+++ b/internal/handlers/handlers.go
@@ -93,7 +93,26 @@ func GetUserList(app application.App, user auth.User, r render.Render) {
var users []auth.UserModel
var tmp auth.UserModel
var tmpTime string
- var results, err = app.DB.Query(`SELECT id, name, surname, birthdate, gender, city FROM users`)
+ query := fmt.Sprintf(`SELECT
+ users.id as id,
+ users.name as name,
+ users.surname as surname,
+ users.birthdate as birthdate,
+ users.gender as gender,
+ users.city as city
+ FROM
+ users
+ WHERE
+ NOT users.id=%d
+ AND users.id NOT IN (
+ SELECT
+ relations.friendId
+ FROM
+ relations
+ WHERE
+ relations.userId=%d)`, int(user.(*auth.UserModel).Id), int(user.(*auth.UserModel).Id))
+
+ var results, err = app.DB.Query(query)
if err != nil || results == nil {
err500("can't get user list from DB: ", err, r)
}
diff --git a/templates/list.tmpl b/templates/list.tmpl
index f879c12..7f53aec 100644
--- a/templates/list.tmpl
+++ b/templates/list.tmpl
@@ -18,7 +18,7 @@
- List of all users
+ List of all unrelated users