FreakU
/
pronounsfu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fix: don't copy custom preferences to default preferences' (#83) from fulmine/pronouns.cc:fix/custom-preferences into main 

Reviewed-on: https://codeberg.org/pronounscc/pronouns.cc/pulls/83
This commit is contained in:
sam 2023-07-26 22:51:50 +00:00
parent 969e06e31e dc73f8e3b1
commit f608b1046b
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/lib/components/PartialMemberCard.svelte
View File

@ -17,7 +17,7 @@
let pronouns: string | undefined;
let mergedPreferences: CustomPreferences;
$: mergedPreferences = Object.assign(defaultPreferences, user.custom_preferences);
$: mergedPreferences = Object.assign({}, defaultPreferences, user.custom_preferences);
const getPronouns = (member: PartialMember) => {
const filteredPronouns = member.pronouns.filter(

2
frontend/src/lib/components/StatusIcon.svelte
View File

@ -9,7 +9,7 @@
export let className: string | null = null;
let mergedPreferences: CustomPreferences;
$: mergedPreferences = Object.assign(defaultPreferences, preferences);
$: mergedPreferences = Object.assign({}, defaultPreferences, preferences);
let currentPreference: CustomPreference;
$: currentPreference =

2
frontend/src/lib/components/StatusLine.svelte
View File

@ -9,7 +9,7 @@
export let status: string;
let mergedPreferences: CustomPreferences;
$: mergedPreferences = Object.assign(defaultPreferences, preferences);
$: mergedPreferences = Object.assign({}, defaultPreferences, preferences);
let currentPreference: CustomPreference;
$: currentPreference =

2
frontend/src/routes/@[username]/+page.svelte
View File

@ -96,7 +96,7 @@
};
let mergedPreferences: CustomPreferences;
$: mergedPreferences = Object.assign(defaultPreferences, data.custom_preferences);
$: mergedPreferences = Object.assign({}, defaultPreferences, data.custom_preferences);
let favNames: FieldEntry[];
$: favNames = data.names.filter(

2
frontend/src/routes/@[username]/[memberName]/+page.svelte
View File

@ -29,7 +29,7 @@
$: bio = renderMarkdown(data.bio);
let mergedPreferences: CustomPreferences;
$: mergedPreferences = Object.assign(defaultPreferences, data.user.custom_preferences);
$: mergedPreferences = Object.assign({}, defaultPreferences, data.user.custom_preferences);
let favNames: FieldEntry[];
$: favNames = data.names.filter(

2
frontend/src/routes/edit/EditableName.svelte
View File

@ -21,7 +21,7 @@
let buttonElement: HTMLElement;
let mergedPreferences: CustomPreferences;
$: mergedPreferences = Object.assign(defaultPreferences, preferences);
$: mergedPreferences = Object.assign({}, defaultPreferences, preferences);
let currentPreference: CustomPreference;
$: currentPreference =

2
frontend/src/routes/edit/EditablePronouns.svelte
View File

@ -25,7 +25,7 @@
const toggleDisplay = () => (displayOpen = !displayOpen);
let mergedPreferences: CustomPreferences;
$: mergedPreferences = Object.assign(defaultPreferences, preferences);
$: mergedPreferences = Object.assign({}, defaultPreferences, preferences);
let currentPreference: CustomPreference;
$: currentPreference =

2
frontend/src/routes/edit/FieldEntry.svelte
View File

@ -21,7 +21,7 @@
let buttonElement: HTMLElement;
let mergedPreferences: CustomPreferences;
$: mergedPreferences = Object.assign(defaultPreferences, preferences);
$: mergedPreferences = Object.assign({}, defaultPreferences, preferences);
let currentPreference: CustomPreference;
$: currentPreference =