From da55b0d4352d2daf4a8d9f4130d34546e9f01555 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 19 Feb 2020 20:57:58 +0900
Subject: Add fields_text for tooltip

---
 src/services/entity_normalizer/entity_normalizer.service.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/services/entity_normalizer/entity_normalizer.service.js')

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index ca79df6f..ca2075a4 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -53,6 +53,12 @@ export const parseUser = (data) => {
         value: addEmojis(field.value, data.emojis)
       }
     })
+    output.fields_text = data.fields.map(field => {
+      return {
+        name: field.name.replace(/<[^>]*>/g, ''),
+        value: field.value.replace(/<[^>]*>/g, '')
+      }
+    })
 
     // Utilize avatar_static for gif avatars?
     output.profile_image_url = data.avatar
-- 
cgit v1.2.3-70-g09d2


From d41c9a717ca3f52b0a67bbb2b0ab8b0c898bba4b Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 14 Jun 2020 13:16:08 +0200
Subject: Polls: Construct an html field during normalization.

---
 src/components/poll/poll.vue                                | 8 +++++++-
 src/services/entity_normalizer/entity_normalizer.service.js | 6 ++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'src/services/entity_normalizer/entity_normalizer.service.js')

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 56e91cca..28f90006 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -17,7 +17,7 @@
           <span class="result-percentage">
             {{ percentageForOption(option.votes_count) }}%
           </span>
-          <span>{{ option.title }}</span>
+          <span v-html="option.title_html"></span>
         </div>
         <div
           class="result-fill"
@@ -75,6 +75,12 @@
 @import '../../_variables.scss';
 
 .poll {
+  img.emoji {
+    vertical-align: middle;
+    object-fit: contain;
+    width: 32px;
+    height: 32px;
+  }
   .votes {
     display: flex;
     flex-direction: column;
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index c7ed65a4..e93eea5b 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -258,6 +258,12 @@ export const parseStatus = (data) => {
     output.summary_html = addEmojis(escape(data.spoiler_text), data.emojis)
     output.external_url = data.url
     output.poll = data.poll
+    if (output.poll) {
+      output.poll.options = (output.poll.options || []).map(field => {
+        field.title_html = addEmojis(field.title, data.emojis)
+        return field
+      })
+    }
     output.pinned = data.pinned
     output.muted = data.muted
   } else {
-- 
cgit v1.2.3-70-g09d2


From 72ee51c85c9ab74de2009b90cfd7e3e50a2e00af Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 14 Jun 2020 13:09:14 +0000
Subject: Apply suggestion to
 src/services/entity_normalizer/entity_normalizer.service.js

---
 src/services/entity_normalizer/entity_normalizer.service.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/services/entity_normalizer/entity_normalizer.service.js')

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index e93eea5b..883e7a02 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -259,10 +259,10 @@ export const parseStatus = (data) => {
     output.external_url = data.url
     output.poll = data.poll
     if (output.poll) {
-      output.poll.options = (output.poll.options || []).map(field => {
-        field.title_html = addEmojis(field.title, data.emojis)
-        return field
-      })
+      output.poll.options = (output.poll.options || []).map(field => ({
+        ...field,
+        title_html: addEmojis(field.title, data.emojis)
+      }))
     }
     output.pinned = data.pinned
     output.muted = data.muted
-- 
cgit v1.2.3-70-g09d2


From 580fcd3ad9508befbe93658c2ee7a4e8d776db4b Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 17 Jun 2020 18:26:06 +0300
Subject: restyle the fields

---
 src/components/user_profile/user_profile.vue       | 22 ++++++++++++++++------
 .../entity_normalizer/entity_normalizer.service.js |  4 ++--
 2 files changed, 18 insertions(+), 8 deletions(-)

(limited to 'src/services/entity_normalizer/entity_normalizer.service.js')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 0c36f2e2..2892a121 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -133,12 +133,14 @@
 <script src="./user_profile.js"></script>
 
 <style lang="scss">
+@import '../../_variables.scss';
 
 .user-profile {
   flex: 2;
   flex-basis: 500px;
 
   .user-profile-fields {
+    margin: 0 0.5em;
     img {
       object-fit: contain;
       vertical-align: middle;
@@ -146,28 +148,28 @@
       max-height: 400px;
 
       &.emoji {
-        width: 18px;
-        height: 18px;
+        width: 24px;
+        height: 24px;
       }
     }
 
     .user-profile-field {
       display: flex;
-      margin: 1em 1.5em;
+      margin: 0.25em auto;
+      max-width: 32em;
 
       .user-profile-field-name {
-        flex: 0 0 auto;
+        flex: 0 1 30%;
         font-weight: 500;
         text-align: right;
         color: var(--lightText);
-        width: 30%;
         min-width: 120px;
       }
 
       .user-profile-field-value {
         flex: 1 1 auto;
         color: var(--text);
-        margin-left: 10px;
+        margin: 0 0 0 0.25em;
       }
 
       .user-profile-field-name, .user-profile-field-value {
@@ -175,6 +177,14 @@
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
+        padding: 0.5em 1.5em;
+        box-sizing: border-box;
+
+        border: var(--border, $fallback--border);
+        border-radius: $fallback--inputRadius;
+        border-radius: var(--inputRadius, $fallback--inputRadius);
+        border-style: solid;
+        border-width: 1px;
       }
     }
   }
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index ff99e944..c30f6f0a 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -58,8 +58,8 @@ export const parseUser = (data) => {
     })
     output.fields_text = data.fields.map(field => {
       return {
-        name: field.name.replace(/<[^>]*>/g, ''),
-        value: field.value.replace(/<[^>]*>/g, '')
+        name: unescape(field.name.replace(/<[^>]*>/g, '')),
+        value: unescape(field.value.replace(/<[^>]*>/g, ''))
       }
     })
 
-- 
cgit v1.2.3-70-g09d2