aboutsummaryrefslogtreecommitdiff
path: root/userapi/storage/accounts/sqlite3
diff options
context:
space:
mode:
authorNeil Alexander <neilalexander@users.noreply.github.com>2020-07-28 10:53:17 +0100
committerGitHub <noreply@github.com>2020-07-28 10:53:17 +0100
commitacc8e80a51515c953c6710cb24f36fd9d1f7aeb1 (patch)
treeb33ecfd8e4d7ed3ac7aa66226f8fd80c1cdcf649 /userapi/storage/accounts/sqlite3
parentc63286713570e1274759db971b15405665fa391a (diff)
User directory (#1225)
* User directory * Fix syncapi unit test * Make user directory only show remote users you know about from your joined rooms * Update sytest-whitelist * Review comments
Diffstat (limited to 'userapi/storage/accounts/sqlite3')
-rw-r--r--userapi/storage/accounts/sqlite3/profile_table.go31
-rw-r--r--userapi/storage/accounts/sqlite3/storage.go7
2 files changed, 38 insertions, 0 deletions
diff --git a/userapi/storage/accounts/sqlite3/profile_table.go b/userapi/storage/accounts/sqlite3/profile_table.go
index 68cea516..d4c404ca 100644
--- a/userapi/storage/accounts/sqlite3/profile_table.go
+++ b/userapi/storage/accounts/sqlite3/profile_table.go
@@ -17,8 +17,10 @@ package sqlite3
import (
"context"
"database/sql"
+ "fmt"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
+ "github.com/matrix-org/dendrite/internal"
"github.com/matrix-org/dendrite/internal/sqlutil"
)
@@ -46,6 +48,9 @@ const setAvatarURLSQL = "" +
const setDisplayNameSQL = "" +
"UPDATE account_profiles SET display_name = $1 WHERE localpart = $2"
+const selectProfilesBySearchSQL = "" +
+ "SELECT localpart, display_name, avatar_url FROM account_profiles WHERE localpart LIKE $1 OR display_name LIKE $1 LIMIT $2"
+
type profilesStatements struct {
db *sql.DB
writer *sqlutil.TransactionWriter
@@ -53,6 +58,7 @@ type profilesStatements struct {
selectProfileByLocalpartStmt *sql.Stmt
setAvatarURLStmt *sql.Stmt
setDisplayNameStmt *sql.Stmt
+ selectProfilesBySearchStmt *sql.Stmt
}
func (s *profilesStatements) prepare(db *sql.DB) (err error) {
@@ -74,6 +80,9 @@ func (s *profilesStatements) prepare(db *sql.DB) (err error) {
if s.setDisplayNameStmt, err = db.Prepare(setDisplayNameSQL); err != nil {
return
}
+ if s.selectProfilesBySearchStmt, err = db.Prepare(selectProfilesBySearchSQL); err != nil {
+ return
+ }
return
}
@@ -112,3 +121,25 @@ func (s *profilesStatements) setDisplayName(
_, err = s.setDisplayNameStmt.ExecContext(ctx, displayName, localpart)
return
}
+
+func (s *profilesStatements) selectProfilesBySearch(
+ ctx context.Context, searchString string, limit int,
+) ([]authtypes.Profile, error) {
+ var profiles []authtypes.Profile
+ // The fmt.Sprintf directive below is building a parameter for the
+ // "LIKE" condition in the SQL query. %% escapes the % char, so the
+ // statement in the end will look like "LIKE %searchString%".
+ rows, err := s.selectProfilesBySearchStmt.QueryContext(ctx, fmt.Sprintf("%%%s%%", searchString), limit)
+ if err != nil {
+ return nil, err
+ }
+ defer internal.CloseAndLogIfError(ctx, rows, "selectProfilesBySearch: rows.close() failed")
+ for rows.Next() {
+ var profile authtypes.Profile
+ if err := rows.Scan(&profile.Localpart, &profile.DisplayName, &profile.AvatarURL); err != nil {
+ return nil, err
+ }
+ profiles = append(profiles, profile)
+ }
+ return profiles, nil
+}
diff --git a/userapi/storage/accounts/sqlite3/storage.go b/userapi/storage/accounts/sqlite3/storage.go
index 2d09090f..72239014 100644
--- a/userapi/storage/accounts/sqlite3/storage.go
+++ b/userapi/storage/accounts/sqlite3/storage.go
@@ -343,3 +343,10 @@ func (d *Database) GetAccountByLocalpart(ctx context.Context, localpart string,
) (*api.Account, error) {
return d.accounts.selectAccountByLocalpart(ctx, localpart)
}
+
+// SearchProfiles returns all profiles where the provided localpart or display name
+// match any part of the profiles in the database.
+func (d *Database) SearchProfiles(ctx context.Context, searchString string, limit int,
+) ([]authtypes.Profile, error) {
+ return d.profiles.selectProfilesBySearch(ctx, searchString, limit)
+}