Fix group candidates fuzzy filter

b8a9a552463d5e889f0e22a0255048f01b702c73

Cohee <18619528+Cohee1207@users.noreply.github.com>

public/scripts/char-data.js+1 -0 Viewed

  * @property {string} [source_url] - The source URL associated with the character.
  * @property {{full_path: string}} [chub] - The Chub-specific data associated with the character.
  * @property {{source: string[]}} [risuai] - The RisuAI-specific data associated with the character.
+ * @property {{positive: string, negative: string}} [sd_character_prompt] - SD-specific data associated with the character.
  */
 /**

public/scripts/group-chats.js+3 -2 Viewed

     const thisGroup = openGroupId && groups.find((x) => x.id == openGroupId);
     let candidates = characters
         .filter((x) => isGroupMember(thisGroup, x.avatar) == onlyMembers)
-        .map((x, index) => ({ item: x, id: index, type: 'character' }));
+        .map((x) => ({ item: x, id: characters.indexOf(x), type: 'character' }));
     if (doFilter) {
         candidates = groupCandidatesFilter.applyFilters(candidates);

@@ -1275,9 +1275,10 @@ function getGroupCharacters({ doFilter, onlyMembers } = {}) {
1275	candidates.sort(sortMembersFn);	1275	candidates.sort(sortMembersFn);
1276	} else {	1276	} else {
1277	const useFilterOrder = doFilter && !!$('#rm_group_filter').val();	1277	const useFilterOrder = doFilter && !!$('#rm_group_filter').val();
1278	sortEntitiesList(candidates, useFilterOrder);	1278	sortEntitiesList(candidates, useFilterOrder, groupCandidatesFilter);
1279	}	1279	}
1280		1280
		1281	groupCandidatesFilter.clearFuzzySearchCaches();
1281	return candidates;	1282	return candidates;
1282	}	1283	}
1283		1284

public/scripts/power-user.js+10 -9 Viewed

  * Common function to perform fuzzy search with optional caching
  * @param {string} type - Type of search from fuzzySearchCategories
  * @param {any[]} data - Data array to search in
- * @param {Array<{name: string, weight: number, getFn?: Function}>} keys - Fuse.js keys configuration
+ * @param {Array<{name: string, weight: number, getFn?: (obj: any) => string}>} keys - Fuse.js keys configuration
  * @param {string} searchValue - The search term
  * @param {Object.<string, { resultMap: Map<string, any> }>} [fuzzySearchCaches=null] - Optional fuzzy search caches
  * @returns {import('fuse.js').FuseResult<any>[]} Results as items with their score

@@ -1850,7 +1850,6 @@ function performFuzzySearch(type, data, keys, searchValue, fuzzySearchCaches = n
1850	}	1850	}
1851	}	1851	}
1852		1852
1853	// @ts-ignore
1854	const fuse = new Fuse(data, {	1853	const fuse = new Fuse(data, {
1855	keys: keys,	1854	keys: keys,
1856	includeScore: true,	1855	includeScore: true,

     const mappedData = data.map(x => ({
         key: x,
         name: power_user.personas[x] ?? '',
-        description: power_user.persona_descriptions[x]?.description ?? ''
+        description: power_user.persona_descriptions[x]?.description ?? '',
     }));
     const keys = [

  * Sorts an array of entities based on the current sort settings
  * @param {any[]} entities An array of objects with an `item` property
  * @param {boolean} forceSearch Whether to force search sorting
+ * @param {import('./filters.js').FilterHelper} [filterHelper=null] Filter helper to use
  */
-export function sortEntitiesList(entities, forceSearch) {
+export function sortEntitiesList(entities, forceSearch, filterHelper = null) {
+    filterHelper = filterHelper ?? entitiesFilter;
     if (power_user.sort_field == undefined || entities.length === 0) {
         return;
+    }
-    if (power_user.sort_order === 'random') {
+    const isSearch = forceSearch || $('#character_sort_order option[data-field="search"]').is(':selected');
+    if (!isSearch && power_user.sort_order === 'random') {
         shuffle(entities);
         return;
+    }
-    const isSearch = forceSearch || $('#character_sort_order option[data-field="search"]').is(':selected');
     entities.sort((a, b) => {
         // Sort tags/folders will always be at the top
         if (a.type === 'tag' && b.type !== 'tag') {

         // If we have search sorting, we take scores and use those
         if (isSearch) {
-            const aScore = entitiesFilter.getScore(FILTER_TYPES.SEARCH, `${a.type}.${a.id}`);
+            const aScore = filterHelper.getScore(FILTER_TYPES.SEARCH, `${a.type}.${a.id}`);
-            const bScore = entitiesFilter.getScore(FILTER_TYPES.SEARCH, `${b.type}.${b.id}`);
+            const bScore = filterHelper.getScore(FILTER_TYPES.SEARCH, `${b.type}.${b.id}`);
             return (aScore - bScore);
+        }