mirror of
https://github.com/SableClient/Sable.git
synced 2026-11-20 09:01:17 -08:00
Merge pull request #181 from 7w1/patches
minor bug fixes related to current features
This commit is contained in:
2 files changed
+25
-9
No files matched your search
@@ -0,0 +1 @@
|
||||
* text=auto eol=lf
|
||||
@@ -1,15 +1,17 @@
|
||||
// helper function to convert a comma-separated pronouns string into an array of objects with summary and optional language
|
||||
export function parsePronounsInput(pronouns: string): { summary: string; language?: string }[] {
|
||||
if (!pronouns || typeof pronouns !== 'string') return [];
|
||||
|
||||
return pronouns
|
||||
.split(',')
|
||||
.map((s) => s.trim())
|
||||
.map((s) => s?.trim())
|
||||
.filter(Boolean)
|
||||
.map((s) => {
|
||||
const parts = s.split(':');
|
||||
|
||||
if (parts.length === 1) {
|
||||
return {
|
||||
summary: parts[0].slice(0, 16),
|
||||
summary: (parts[0] || '').slice(0, 16),
|
||||
language: 'en',
|
||||
};
|
||||
}
|
||||
@@ -17,8 +19,8 @@ export function parsePronounsInput(pronouns: string): { summary: string; languag
|
||||
const [language, summary] = parts;
|
||||
|
||||
return {
|
||||
language: language || 'en',
|
||||
summary: summary.slice(0, 16),
|
||||
language: (language || 'en').trim() || 'en',
|
||||
summary: (summary || '').trim().slice(0, 16),
|
||||
};
|
||||
});
|
||||
}
|
||||
@@ -29,21 +31,34 @@ export function filterPronounsByLanguage(
|
||||
enabled: boolean,
|
||||
languages: string[]
|
||||
): { summary: string; language?: string }[] {
|
||||
if (!Array.isArray(pronouns)) return [];
|
||||
|
||||
if (!enabled) {
|
||||
return pronouns.map((p) => ({ ...p, summary: p.summary.slice(0, 16) }));
|
||||
return pronouns.map((p) => ({
|
||||
...p,
|
||||
summary: (p?.summary || '').slice(0, 16),
|
||||
}));
|
||||
}
|
||||
|
||||
const normalizedLanguages = languages.map((lang) => lang.trim().toLowerCase());
|
||||
const normalizedLanguages = (languages || [])
|
||||
.filter(Boolean)
|
||||
.map((lang) => lang.trim().toLowerCase());
|
||||
|
||||
const filteredPronouns = pronouns
|
||||
.filter((p) => normalizedLanguages.includes((p.language || 'en').trim().toLowerCase()))
|
||||
.filter((p) => {
|
||||
const lang = (p?.language || 'en').trim().toLowerCase();
|
||||
return normalizedLanguages.includes(lang);
|
||||
})
|
||||
.map((p) => ({
|
||||
...p,
|
||||
summary: p.summary.slice(0, 16),
|
||||
summary: (p?.summary || '').slice(0, 16),
|
||||
}));
|
||||
|
||||
if (filteredPronouns.length === 0) {
|
||||
return pronouns.map((p) => ({ ...p, summary: p.summary.slice(0, 16) }));
|
||||
return pronouns.map((p) => ({
|
||||
...p,
|
||||
summary: (p?.summary || '').slice(0, 16),
|
||||
}));
|
||||
}
|
||||
|
||||
return filteredPronouns;
|
||||
|
||||
Reference in new issue
Block a user