From ce77ceebcda5db71b5e87c4585e75c84b6d77ea0 Mon Sep 17 00:00:00 2001
From: Andrea Vos <andrea@avris.it>
Date: Wed, 7 Feb 2024 20:26:25 +0100
Subject: [PATCH] (profile)(fix) better handling of custom opinions when
 listing pronouns on pronouns.page/@username

---
 routes/profile.vue | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/routes/profile.vue b/routes/profile.vue
index b6a121618..6756a0d92 100644
--- a/routes/profile.vue
+++ b/routes/profile.vue
@@ -215,7 +215,7 @@
                     </div>
                     <div class="d-flex align-items-center">
                         <ForeignPronoun
-                            v-for="pronoun in selectMainPronouns(user.profiles[locale].pronouns)"
+                            v-for="pronoun in selectMainPronouns(user.profiles[locale])"
                             :key="pronoun"
                             :pronoun="pronoun"
                             :locale="locale"
@@ -253,7 +253,7 @@ export default {
     mixins: [mainPronoun],
     async asyncData({ app, route }) {
         return {
-            user: await app.$axios.$get(`/profile/get/${encodeURIComponent(route.params.pathMatch)}?version=2&props=pronouns,flags&lprops[${app.context.env.LOCALE}]=all`),
+            user: await app.$axios.$get(`/profile/get/${encodeURIComponent(route.params.pathMatch)}?version=2&props=pronouns,flags,opinions&lprops[${app.context.env.LOCALE}]=all`),
         };
     },
     data() {
@@ -359,12 +359,24 @@ export default {
                 clearInterval(this.cardCheckHandle);
             }
         },
-        selectMainPronouns(pronouns) {
+        selectMainPronouns(profile) {
             const best = [];
-            for (const { value: pronoun, opinion } of pronouns) {
-                const opinionValue = opinions[opinion]?.value || 0;
-                if (opinionValue >= 0) {
-                    best.push(pronoun);
+            for (const { value: pronoun, opinion } of profile.pronouns) {
+                const opinionValue = opinions[opinion]?.value;
+                if (opinionValue !== undefined) {
+                    if (opinionValue >= 0) {
+                        best.push(pronoun);
+                    }
+                } else {
+                    const customOpinion = profile.opinions[opinion];
+                    if (customOpinion !== undefined
+                        && customOpinion.colour !== 'grey'
+                        && customOpinion.style !== 'small'
+                        && !['ban', 'slash'].includes()
+                        && (!customOpinion.icon || '').endsWith('-slash')
+                    ) {
+                        best.push(pronoun);
+                    }
                 }
             }