mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-07 06:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Don't create a new FullyQualifiedProfile

Browse source
This commit is contained in:
Till Faelligen 2022-06-13 16:05:01 +02:00
parent c62bdaadab
commit 25a3ab8c79
1 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
clientapi/routing/userdirectory.go
View file

@ -82,14 +82,12 @@ knownUsersLoop:
if err := provider.QuerySearchProfiles(ctx, userReq, userRes); err != nil { if err := provider.QuerySearchProfiles(ctx, userReq, userRes); err != nil {
return util.ErrorResponse(fmt.Errorf("userAPI.QuerySearchProfiles: %w", err)) return util.ErrorResponse(fmt.Errorf("userAPI.QuerySearchProfiles: %w", err))
} }
for _, profile := range userRes.Profiles { for _, p := range userRes.Profiles {
if strings.Contains(userRes.Profiles[0].DisplayName, searchString) || if strings.Contains(p.DisplayName, searchString) ||
strings.Contains(userRes.Profiles[0].Localpart, searchString) { strings.Contains(p.Localpart, searchString) {
results[userID] = authtypes.FullyQualifiedProfile{ profile.DisplayName = p.DisplayName
UserID: userID, profile.AvatarURL = p.AvatarURL
DisplayName: profile.DisplayName, results[userID] = profile
AvatarURL: profile.AvatarURL,
}
if len(results) == limit { if len(results) == limit {
response.Limited = true response.Limited = true
break knownUsersLoop break knownUsersLoop
@ -97,20 +95,18 @@ knownUsersLoop:
} }
} }
} else { } else {
// If the username already contains the search string, don't bother hitting federation // If the username already contains the search string, don't bother hitting federation.
// This will result in missing avatars and displaynames, but saves the federation roundtrip.
if strings.Contains(localpart, searchString) { if strings.Contains(localpart, searchString) {
results[userID] = authtypes.FullyQualifiedProfile{ results[userID] = profile
UserID: userID,
DisplayName: profile.DisplayName,
AvatarURL: profile.AvatarURL,
}
if len(results) == limit { if len(results) == limit {
response.Limited = true response.Limited = true
break knownUsersLoop break knownUsersLoop
} }
continue
} }
// TODO: We should probably cache/store this // TODO: We should probably cache/store this
profile, fedErr := federation.LookupProfile(ctx, serverName, userID, "") fedProfile, fedErr := federation.LookupProfile(ctx, serverName, userID, "")
if fedErr != nil { if fedErr != nil {
if x, ok := fedErr.(gomatrix.HTTPError); ok { if x, ok := fedErr.(gomatrix.HTTPError); ok {
if x.Code == http.StatusNotFound { if x.Code == http.StatusNotFound {
@ -118,12 +114,10 @@ knownUsersLoop:
} }
} }
} }
if strings.Contains(profile.DisplayName, searchString) { if strings.Contains(fedProfile.DisplayName, searchString) {
results[userID] = authtypes.FullyQualifiedProfile{ profile.DisplayName = fedProfile.DisplayName
UserID: userID, profile.AvatarURL = fedProfile.AvatarURL
DisplayName: profile.DisplayName, results[userID] = profile
AvatarURL: profile.AvatarURL,
}
if len(results) == limit { if len(results) == limit {
response.Limited = true response.Limited = true
break knownUsersLoop break knownUsersLoop