SHA256
Поиск людей: по началу слова, а не по подстроке
«анна» находила и «Жанну» (подстрока), из-за чего нужный человек терялся среди чужих совпадений. Теперь в поиске по своим связям (карта и список «Связей», поиск по чатам, «Новый чат», списки друзей в профиле) совпадение – с началом любого слова имени, фамилии или логина: «анна» → Анна Гусева и anna_guseva, «гус ан» → тоже она, «q_tester» → q_tester1. Регистр и «ё» не важны. Поиск по всей сети (на сервере) не менялся. Общая функция – services/people-search.js.
This commit is contained in:
@@ -8,6 +8,7 @@ import { createLoadingState, createStateMessage } from '../components/feedback.j
|
||||
import { authService, normalizeDmChatId } from '../state.js';
|
||||
import { makeProfileRoute } from '../services/shine-routes.js';
|
||||
import { toUserMessage } from '../services/ui-error-texts.js';
|
||||
import { matchesPeopleQuery } from '../services/people-search.js';
|
||||
|
||||
export const pageMeta = { id: 'contact-search-view', title: 'Новый чат' };
|
||||
|
||||
@@ -70,7 +71,7 @@ export function render({ navigate, chrome }) {
|
||||
results.replaceChildren();
|
||||
const frag = document.createDocumentFragment();
|
||||
const ownMatches = mine.filter((person) => !query
|
||||
|| searchText(`${displayName(person)} ${person.login}`).includes(query));
|
||||
|| matchesPeopleQuery(`${displayName(person)} ${person.login} ${person.firstName} ${person.lastName}`, query));
|
||||
const ownShown = query ? ownMatches : ownMatches.filter((person) => person.relationFlag !== 'contact');
|
||||
if (ownShown.length) {
|
||||
frag.append(createListSection(query ? `Ваши связи · ${ownShown.length}` : 'Близкие и друзья'));
|
||||
|
||||
@@ -23,6 +23,7 @@ import { loadProfileSnapshot } from '../services/user-profile-params.js';
|
||||
import { parseDmTechBlocks } from '../services/dm-tech-blocks.js';
|
||||
import { formatListTime } from '../services/channels-ux.js';
|
||||
import { toUserMessage } from '../services/ui-error-texts.js';
|
||||
import { matchesPeopleQuery } from '../services/people-search.js';
|
||||
import { createErrorState, createLoadingState, createStateMessage } from '../components/feedback.js';
|
||||
import { openHistoryLayer } from '../router.js';
|
||||
|
||||
@@ -482,8 +483,7 @@ function renderRow(item) {
|
||||
}
|
||||
|
||||
function matchesChatQuery(item) {
|
||||
const hay = `${item.firstName || ''} ${item.lastName || ''} ${item.peerLogin || ''}`.toLowerCase().replaceAll('ё', 'е');
|
||||
return hay.includes(chatQuery);
|
||||
return matchesPeopleQuery(`${item.firstName || ''} ${item.lastName || ''} ${item.peerLogin || ''}`, chatQuery);
|
||||
}
|
||||
|
||||
function renderList() {
|
||||
|
||||
@@ -15,6 +15,7 @@ import { makeProfileRoute, makeProfileLinksRoute } from '../services/shine-route
|
||||
import { userDisplayName } from '../services/user-display.js';
|
||||
import { showToast } from '../services/channels-ux.js';
|
||||
import { actionErrorText, toUserMessage } from '../services/ui-error-texts.js';
|
||||
import { matchesPeopleQuery } from '../services/people-search.js';
|
||||
import { PEOPLE_NOTES_EVENT, getAllPersonNotes } from '../services/people-notes.js';
|
||||
import { createPersonNotePreview, openPersonNoteSheet } from '../components/person-note-sheet.js';
|
||||
import { createGraphCanvas } from './network/graph-canvas.js';
|
||||
@@ -1297,7 +1298,7 @@ export function render({ navigate, route, chrome } = {}) {
|
||||
|
||||
function matchesQuery(node, query) {
|
||||
if (!query) return true;
|
||||
return searchText(`${node.name} ${node.login} ${node.firstName || ''} ${node.lastName || ''}`).includes(query);
|
||||
return matchesPeopleQuery(`${node.name} ${node.login} ${node.firstName || ''} ${node.lastName || ''}`, query);
|
||||
}
|
||||
|
||||
function listGroups(people) {
|
||||
|
||||
@@ -7,6 +7,7 @@ import { authService } from '../state.js';
|
||||
import { navigateBack } from '../router.js';
|
||||
import { userDisplayName } from '../services/user-display.js';
|
||||
import { toUserMessage } from '../services/ui-error-texts.js';
|
||||
import { matchesPeopleQuery } from '../services/people-search.js';
|
||||
import { avatarReferenceToRenderModel, parseAvatarReference } from '../services/avatar-reference.js';
|
||||
|
||||
export const pageMeta = { id: 'user-profile-list-view', title: 'Список' };
|
||||
@@ -156,9 +157,9 @@ export function render({ navigate, route, chrome }) {
|
||||
|
||||
function renderRows() {
|
||||
body.replaceChildren();
|
||||
const matches = (row) => !query || searchText(isChannelsScreen
|
||||
? `${row.displayName} ${row.slug} ${row.ownerLogin}`
|
||||
: `${userDisplayName(row)} ${row.login}`).includes(query);
|
||||
const matches = (row) => (isChannelsScreen
|
||||
? !query || searchText(`${row.displayName} ${row.slug} ${row.ownerLogin}`).includes(query)
|
||||
: matchesPeopleQuery(`${userDisplayName(row)} ${row.login}`, query));
|
||||
const visible = rows.filter(matches);
|
||||
if (!rows.length) {
|
||||
body.append(createStateMessage({ icon: isChannelsScreen ? 'channels' : 'network', title: EMPTY_TEXT[activeKind] || 'Пока никого.' }));
|
||||
|
||||
Reference in New Issue
Block a user