From bd279a7dae2141c06cee1e3fe61ff448b2148529 Mon Sep 17 00:00:00 2001
From: Sam <sam@sam.wf>
Date: Fri, 21 Apr 2023 16:37:26 +0200
Subject: [PATCH] fix(frontend): use 'treat as favourite' preferences as
 favourites in member list

---
 .../src/lib/components/PartialMemberCard.svelte     | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/PartialMemberCard.svelte b/frontend/src/lib/components/PartialMemberCard.svelte
index 040e060..1d883d9 100644
--- a/frontend/src/lib/components/PartialMemberCard.svelte
+++ b/frontend/src/lib/components/PartialMemberCard.svelte
@@ -1,5 +1,11 @@
 <script lang="ts">
-  import { memberAvatars, WordStatus, type PartialMember, type User } from "$lib/api/entities";
+  import defaultPreferences from "$lib/api/default_preferences";
+  import {
+    memberAvatars,
+    type PartialMember,
+    type User,
+    type CustomPreferences,
+  } from "$lib/api/entities";
   import FallbackImage from "./FallbackImage.svelte";
 
   export let user: User;
@@ -7,9 +13,12 @@
 
   let pronouns: string | undefined;
 
+  let mergedPreferences: CustomPreferences;
+  $: mergedPreferences = Object.assign(defaultPreferences, user.custom_preferences);
+
   const getPronouns = (member: PartialMember) => {
     const filteredPronouns = member.pronouns.filter(
-      (pronouns) => pronouns.status === WordStatus.Favourite,
+      (entry) => (mergedPreferences[entry.status] || { favourite: false }).favourite,
     );
     if (filteredPronouns.length === 0) {
       return undefined;