From ca4d5950d08aec6fe016b56f7125f7328c1e19a1 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Sat, 16 Nov 2019 03:12:16 +0900
Subject: Display user profile fields

---
 src/components/user_profile/user_profile.js  |  8 +++++
 src/components/user_profile/user_profile.vue | 50 ++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 00055707..c5ab5f26 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -123,6 +123,14 @@ const UserProfile = {
     onTabSwitch (tab) {
       this.tab = tab
       this.$router.replace({ query: { tab } })
+    },
+    linkClicked ({ target }) {
+      if (target.tagName === 'SPAN') {
+        target = target.parentNode
+      }
+      if (target.tagName === 'A') {
+        window.open(target.href, '_blank')
+      }
     }
   },
   watch: {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 14082e83..f979eff4 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -11,6 +11,44 @@
         :allow-zooming-avatar="true"
         rounded="top"
       />
+      <div
+        v-if="user.fields_html && user.fields_html.length > 0"
+        class="user-profile-fields"
+      >
+        <dl
+          v-for="(field, index) in user.fields_html"
+          :key="index"
+        >
+          <!-- eslint-disable vue/no-v-html -->
+          <dt
+            class="user-profile-field-name"
+            @click.prevent="linkClicked"
+            v-html="field.name"
+          />
+          <dd
+            class="user-profile-field-value"
+            @click.prevent="linkClicked"
+            v-html="field.value"
+          />
+          <!-- eslint-enable vue/no-v-html -->
+        </dl>
+      </div>
+      <div
+        v-else-if="user.fields && user.fields.length > 0"
+        class="user-card-fields"
+      >
+        <dl
+          v-for="(field, index) in user.fields"
+          :key="index"
+        >
+          <dt class="user-card-field-name">
+            {{ field.name }}
+          </dt>
+          <dd class="user-card-field-value">
+            {{ field.value }}
+          </dd>
+        </dl>
+      </div>
       <tab-switcher
         :active-tab="tab"
         :render-only-focused="true"
@@ -113,6 +151,18 @@
   flex: 2;
   flex-basis: 500px;
 
+  .user-profile-fields {
+    dl {
+      margin: 1em 1.5em;
+
+      dt, dd {
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+      }
+    }
+  }
+
   .userlist-placeholder {
     display: flex;
     justify-content: center;
-- 
cgit v1.2.3-70-g09d2


From 2bc549a66a0e189698e38c029cf8d0bfb19d0351 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Mon, 18 Nov 2019 00:27:14 +0900
Subject: Fix emoji size

---
 src/components/user_profile/user_profile.vue | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index f979eff4..d5aa514e 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -152,6 +152,18 @@
   flex-basis: 500px;
 
   .user-profile-fields {
+    img {
+      object-fit: contain;
+      vertical-align: middle;
+      max-width: 100%;
+      max-height: 400px;
+
+      &.emoji {
+        width: 32px;
+        height: 32px;
+      }
+    }
+
     dl {
       margin: 1em 1.5em;
 
-- 
cgit v1.2.3-70-g09d2


From 004827a7f17a0bc349baf1257aa5debe3c6f6060 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Mon, 18 Nov 2019 02:16:37 +0900
Subject: Change profile fields design to horizontal

---
 src/components/user_profile/user_profile.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index d5aa514e..fdff0385 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -159,15 +159,31 @@
       max-height: 400px;
 
       &.emoji {
-        width: 32px;
-        height: 32px;
+        width: 18px;
+        height: 18px;
       }
     }
 
     dl {
+      display: flex;
       margin: 1em 1.5em;
 
+      dt {
+        flex: 0 0 auto;
+        font-weight: 500;
+        color: var(--lightText);
+        width: 30%;
+        min-width: 120px;
+      }
+
+      dd {
+        flex: 1 1 auto;
+        color: var(--text);
+        margin-left: 10px;
+      }
+
       dt, dd {
+        line-height: 18px;
         text-overflow: ellipsis;
         white-space: nowrap;
         overflow: hidden;
-- 
cgit v1.2.3-70-g09d2


From 87940ead8a9bedd312f10635462933a02e0ffb1c Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 20 Nov 2019 18:59:37 +0900
Subject: Change css selectors to classname from elementname

---
 src/components/user_profile/user_profile.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index fdff0385..c1337411 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -18,6 +18,7 @@
         <dl
           v-for="(field, index) in user.fields_html"
           :key="index"
+          class="user-profile-field"
         >
           <!-- eslint-disable vue/no-v-html -->
           <dt
@@ -164,11 +165,11 @@
       }
     }
 
-    dl {
+    .user-profile-field {
       display: flex;
       margin: 1em 1.5em;
 
-      dt {
+      .user-profile-field-name {
         flex: 0 0 auto;
         font-weight: 500;
         color: var(--lightText);
@@ -176,13 +177,13 @@
         min-width: 120px;
       }
 
-      dd {
+      .user-profile-field-value {
         flex: 1 1 auto;
         color: var(--text);
         margin-left: 10px;
       }
 
-      dt, dd {
+      .user-profile-field-name, .user-profile-field-value {
         line-height: 18px;
         text-overflow: ellipsis;
         white-space: nowrap;
-- 
cgit v1.2.3-70-g09d2


From d2e334daa3891d42f77dd10283f0ea2dd23f08bc Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 20 Nov 2019 19:18:19 +0900
Subject: Add tooltip

---
 src/components/user_profile/user_profile.vue | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index c1337411..20a64409 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -22,11 +22,13 @@
         >
           <!-- eslint-disable vue/no-v-html -->
           <dt
+            :title="user.fields[index].name"
             class="user-profile-field-name"
             @click.prevent="linkClicked"
             v-html="field.name"
           />
           <dd
+            :title="user.fields[index].value"
             class="user-profile-field-value"
             @click.prevent="linkClicked"
             v-html="field.value"
-- 
cgit v1.2.3-70-g09d2


From a15baa8962a14dd8d0d3f72695be8b677a78b606 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 20 Nov 2019 19:22:20 +0900
Subject: Use fields_html only

---
 src/components/user_profile/user_profile.vue | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 20a64409..0268e5da 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -36,22 +36,6 @@
           <!-- eslint-enable vue/no-v-html -->
         </dl>
       </div>
-      <div
-        v-else-if="user.fields && user.fields.length > 0"
-        class="user-card-fields"
-      >
-        <dl
-          v-for="(field, index) in user.fields"
-          :key="index"
-        >
-          <dt class="user-card-field-name">
-            {{ field.name }}
-          </dt>
-          <dd class="user-card-field-value">
-            {{ field.value }}
-          </dd>
-        </dl>
-      </div>
       <tab-switcher
         :active-tab="tab"
         :render-only-focused="true"
-- 
cgit v1.2.3-70-g09d2


From bfdf7c876c015beb2748cf709d27b9f66df3fe61 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 20 Nov 2019 19:25:11 +0900
Subject: Change field name to right justify

---
 src/components/user_profile/user_profile.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 0268e5da..5bffba3a 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -158,6 +158,7 @@
       .user-profile-field-name {
         flex: 0 0 auto;
         font-weight: 500;
+        text-align: right;
         color: var(--lightText);
         width: 30%;
         min-width: 120px;
-- 
cgit v1.2.3-70-g09d2


From 064b59812c715d60526727d42c124375a2bc89d5 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 19 Feb 2020 21:00:39 +0900
Subject: Change to use tags removed fields instead of raw fields

---
 src/components/user_profile/user_profile.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 5bffba3a..54f2d4b3 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -22,13 +22,13 @@
         >
           <!-- eslint-disable vue/no-v-html -->
           <dt
-            :title="user.fields[index].name"
+            :title="user.fields_text[index].name"
             class="user-profile-field-name"
             @click.prevent="linkClicked"
             v-html="field.name"
           />
           <dd
-            :title="user.fields[index].value"
+            :title="user.fields_text[index].value"
             class="user-profile-field-value"
             @click.prevent="linkClicked"
             v-html="field.value"
-- 
cgit v1.2.3-70-g09d2


From 54fdc220017122c8e30e0fb16f0dd2534fc60947 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Wed, 10 Jun 2020 03:24:55 +0900
Subject: Add profile fields form

---
 src/boot/after_store.js                            |  2 +
 src/components/settings_modal/tabs/profile_tab.js  | 21 ++++++++++
 .../settings_modal/tabs/profile_tab.scss           | 17 ++++++++
 src/components/settings_modal/tabs/profile_tab.vue | 46 ++++++++++++++++++++++
 4 files changed, 86 insertions(+)

(limited to 'src/components')

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 0db03547..87c92a8a 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -207,6 +207,8 @@ const getNodeInfo = async ({ store }) => {
       store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits })
       store.dispatch('setInstanceOption', { name: 'mailerEnabled', value: metadata.mailerEnabled })
 
+      store.dispatch('setInstanceOption', { name: 'fieldsLimits', value: metadata.fieldsLimits })
+
       store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
       store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })
 
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 8658b097..896ff508 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -1,4 +1,5 @@
 import unescape from 'lodash/unescape'
+import merge from 'lodash/merge'
 import ImageCropper from 'src/components/image_cropper/image_cropper.vue'
 import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import fileSizeFormatService from 'src/components/../services/file_size_format/file_size_format.js'
@@ -16,6 +17,7 @@ const ProfileTab = {
       newLocked: this.$store.state.users.currentUser.locked,
       newNoRichText: this.$store.state.users.currentUser.no_rich_text,
       newDefaultScope: this.$store.state.users.currentUser.default_scope,
+      newFields: this.$store.state.users.currentUser.fields.map(field => ({ name: field.name, value: field.value })),
       hideFollows: this.$store.state.users.currentUser.hide_follows,
       hideFollowers: this.$store.state.users.currentUser.hide_followers,
       hideFollowsCount: this.$store.state.users.currentUser.hide_follows_count,
@@ -62,6 +64,12 @@ const ProfileTab = {
         ...this.$store.state.instance.emoji,
         ...this.$store.state.instance.customEmoji
       ] })
+    },
+    fieldsLimits () {
+      return this.$store.state.instance.fieldsLimits
+    },
+    maxFields () {
+      return this.fieldsLimits ? this.fieldsLimits.maxFields : 0
     }
   },
   methods: {
@@ -74,6 +82,7 @@ const ProfileTab = {
             // Backend notation.
             /* eslint-disable camelcase */
             display_name: this.newName,
+            fields_attributes: this.newFields.filter(el => el != null),
             default_scope: this.newDefaultScope,
             no_rich_text: this.newNoRichText,
             hide_follows: this.hideFollows,
@@ -85,6 +94,8 @@ const ProfileTab = {
             show_role: this.showRole
             /* eslint-enable camelcase */
           } }).then((user) => {
+          this.newFields.splice(user.fields.length)
+          merge(this.newFields, user.fields)
           this.$store.commit('addNewUsers', [user])
           this.$store.commit('setCurrentUser', user)
         })
@@ -92,6 +103,16 @@ const ProfileTab = {
     changeVis (visibility) {
       this.newDefaultScope = visibility
     },
+    addField () {
+      if (this.newFields.length < this.maxFields) {
+        this.newFields.push({ name: '', value: '' })
+        return true
+      }
+      return false
+    },
+    deleteField (index, event) {
+      this.$delete(this.newFields, index)
+    },
     uploadFile (slot, e) {
       const file = e.target.files[0]
       if (!file) { return }
diff --git a/src/components/settings_modal/tabs/profile_tab.scss b/src/components/settings_modal/tabs/profile_tab.scss
index 4aab81eb..b3dcf42c 100644
--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@@ -79,4 +79,21 @@
   .setting-subitem {
     margin-left: 1.75em;
   }
+
+  .profile-fields {
+    display: flex;
+
+    &>.emoji-input {
+      flex: 1 1 auto;
+      margin: 0 .2em .5em;
+    }
+
+    &>.icon-container {
+      width: 20px;
+
+      &>.icon-cancel {
+        vertical-align: sub;
+      }
+    }
+  }
 }
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index fff4f970..2fa3021e 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -95,6 +95,52 @@
           {{ $t('settings.discoverable') }}
         </Checkbox>
       </p>
+      <div v-if="maxFields > 0">
+        <p>{{ $t('settings.profile_fields.label') }}</p>
+        <div
+          v-for="(_, i) in newFields"
+          :key="i"
+          class="profile-fields"
+        >
+          <EmojiInput
+            v-model="newFields[i].name"
+            :suggest="emojiSuggestor"
+            hide-emoji-button
+          >
+            <input
+              v-model="newFields[i].name"
+              :placeholder="$t('settings.profile_fields.name')"
+            >
+          </EmojiInput>
+          <EmojiInput
+            v-model="newFields[i].value"
+            :suggest="emojiSuggestor"
+            hide-emoji-button
+          >
+            <input
+              v-model="newFields[i].value"
+              :placeholder="$t('settings.profile_fields.value')"
+            >
+          </EmojiInput>
+          <div
+            class="icon-container"
+          >
+            <i
+              v-show="newFields.length > 1"
+              class="icon-cancel"
+              @click="deleteField(i)"
+            />
+          </div>
+        </div>
+        <a
+          v-if="newFields.length < maxFields"
+          class="add-field faint"
+          @click="addField"
+        >
+          <i class="icon-plus" />
+          {{ $t("settings.profile_fields.add_field") }}
+        </a>
+      </div>
       <button
         :disabled="newName && newName.length === 0"
         class="btn btn-default"
-- 
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/components')

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 5cf1574fdb36e14e342e3cbdd9733e0a1817a7cb Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 16 Jun 2020 17:20:36 +0300
Subject: fix popovers cutting off in notifications, port popover changes from
 chats mr

---
 src/components/account_actions/account_actions.vue |  1 +
 src/components/extra_buttons/extra_buttons.vue     |  1 +
 src/components/popover/popover.js                  | 11 ++++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 744b77d5..029e7096 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -3,6 +3,7 @@
     <Popover
       trigger="click"
       placement="bottom"
+      :bound-to="{ x: 'container' }"
     >
       <div
         slot="content"
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index bca93ea7..68db6fd8 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -3,6 +3,7 @@
     trigger="click"
     placement="top"
     class="extra-button-popover"
+    :bound-to="{ x: 'container' }"
   >
     <div
       slot="content"
diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index 5881d266..f1abe3ad 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -10,6 +10,9 @@ const Popover = {
     // 'container' for using offsetParent as boundaries for either axis
     // or 'viewport'
     boundTo: Object,
+    // Takes a selector to use as a replacement for the parent container
+    // for getting boundaries for x an y axis
+    boundToSelector: String,
     // Takes a top/bottom/left/right object, how much space to leave
     // between boundary and popover element
     margin: Object,
@@ -27,6 +30,11 @@ const Popover = {
     }
   },
   methods: {
+    containerBoundingClientRect () {
+      const container = this.boundToSelector ? document.querySelector(this.boundToSelector) : this.$el.offsetParent
+      console.log('test', container)
+      return container.getBoundingClientRect()
+    },
     updateStyles () {
       if (this.hidden) {
         this.styles = {
@@ -45,7 +53,8 @@ const Popover = {
       // Minor optimization, don't call a slow reflow call if we don't have to
       const parentBounds = this.boundTo &&
         (this.boundTo.x === 'container' || this.boundTo.y === 'container') &&
-        this.$el.offsetParent.getBoundingClientRect()
+        this.containerBoundingClientRect()
+
       const margin = this.margin || {}
 
       // What are the screen bounds for the popover? Viewport vs container
-- 
cgit v1.2.3-70-g09d2


From 5a8a428c154984b953724214284c01f270af5eb8 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 16 Jun 2020 17:30:56 +0300
Subject: remove log whoops

---
 src/components/popover/popover.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index f1abe3ad..ded7066f 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -32,7 +32,6 @@ const Popover = {
   methods: {
     containerBoundingClientRect () {
       const container = this.boundToSelector ? document.querySelector(this.boundToSelector) : this.$el.offsetParent
-      console.log('test', container)
       return container.getBoundingClientRect()
     },
     updateStyles () {
-- 
cgit v1.2.3-70-g09d2


From 24e47eb604330a8858dac9761545e499f73be8c4 Mon Sep 17 00:00:00 2001
From: Shpuld Shpludson <shp@cock.li>
Date: Tue, 16 Jun 2020 15:12:44 +0000
Subject: Update popover.js

---
 src/components/popover/popover.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index ded7066f..a40a9195 100644
--- a/src/components/popover/popover.js
+++ b/src/components/popover/popover.js
@@ -1,4 +1,3 @@
-
 const Popover = {
   name: 'Popover',
   props: {
@@ -31,7 +30,7 @@ const Popover = {
   },
   methods: {
     containerBoundingClientRect () {
-      const container = this.boundToSelector ? document.querySelector(this.boundToSelector) : this.$el.offsetParent
+      const container = this.boundToSelector ? this.$el.closest(this.boundToSelector) : this.$el.offsetParent
       return container.getBoundingClientRect()
     },
     updateStyles () {
-- 
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/components')

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


From 632f62ee0f24fc87d29550b961b9e3b0230e3812 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Wed, 17 Jun 2020 18:34:24 +0300
Subject: resume the previous emoji size for now

---
 src/components/user_profile/user_profile.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 2892a121..445f0471 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -148,8 +148,8 @@
       max-height: 400px;
 
       &.emoji {
-        width: 24px;
-        height: 24px;
+        width: 18px;
+        height: 18px;
       }
     }
 
-- 
cgit v1.2.3-70-g09d2


From 9c884fef11e52541ab64508c9a9e0b8694432cbb Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 12:29:13 +0300
Subject: remove search blocker, fix debounce params

---
 src/components/emoji_input/suggestor.js |  8 ++++----
 src/modules/users.js                    | 20 ++++++++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

(limited to 'src/components')

diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 15a71eff..91d5cfb9 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -1,4 +1,4 @@
-import { debounce } from 'lodash'
+import debounce from 'lodash/debounce'
 /**
  * suggest - generates a suggestor function to be used by emoji-input
  * data: object providing source information for specific types of suggestions:
@@ -13,7 +13,7 @@ import { debounce } from 'lodash'
 
 const debounceUserSearch = debounce((data, input) => {
   data.updateUsersList(input)
-}, 500, { leading: true, trailing: false })
+}, 500)
 
 export default data => input => {
   const firstChar = input[0]
@@ -97,8 +97,8 @@ export const suggestUsers = data => input => {
     replacement: '@' + screen_name + ' '
   }))
 
-  // BE search users if there are no matches
-  if (newUsers.length === 0 && data.updateUsersList) {
+  // BE search users to get more comprehensive results
+  if (data.updateUsersList) {
     debounceUserSearch(data, noPrefix)
   }
   return newUsers
diff --git a/src/modules/users.js b/src/modules/users.js
index f9329f2a..a640fb3b 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -225,6 +225,12 @@ export const mutations = {
   signUpFailure (state, errors) {
     state.signUpPending = false
     state.signUpErrors = errors
+  },
+  addRecentQuery (state, query) {
+    state.recentQueries = state.recentQueries.concat(query)
+    if (state.recentQueries.length > 10) {
+      state.recentQueries = state.recentQueries.slice(1)
+    }
   }
 }
 
@@ -251,7 +257,8 @@ export const defaultState = {
   usersObject: {},
   signUpPending: false,
   signUpErrors: [],
-  relationships: {}
+  relationships: {},
+  recentQueries: []
 }
 
 const users = {
@@ -428,10 +435,15 @@ const users = {
         store.commit('setUserForNotification', notification)
       })
     },
-    searchUsers (store, { query }) {
-      return store.rootState.api.backendInteractor.searchUsers({ query })
+    searchUsers ({ rootState, commit }, { query }) {
+      // Don't fetch if this query was already done recently
+      if (rootState.users.recentQueries.includes(query)) {
+        return []
+      }
+      return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
-          store.commit('addNewUsers', users)
+          commit('addRecentQuery', query)
+          commit('addNewUsers', users)
           return users
         })
     },
-- 
cgit v1.2.3-70-g09d2


From f1175b4e9b9558e304bc56e1a3d4c9daafefd89f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 13:41:04 +0300
Subject: revert import style

---
 src/components/emoji_input/suggestor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 91d5cfb9..8330345b 100644
--- a/src/components/emoji_input/suggestor.js
+++ b/src/components/emoji_input/suggestor.js
@@ -1,4 +1,4 @@
-import debounce from 'lodash/debounce'
+import { debounce } from 'lodash'
 /**
  * suggest - generates a suggestor function to be used by emoji-input
  * data: object providing source information for specific types of suggestions:
-- 
cgit v1.2.3-70-g09d2


From bb513dd9615759668ae216042a85ca0d8f087fa0 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Thu, 18 Jun 2020 20:08:00 +0900
Subject: change key-value to look like one

---
 src/components/user_profile/user_profile.vue | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 445f0471..ccd7c794 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -157,6 +157,9 @@
       display: flex;
       margin: 0.25em auto;
       max-width: 32em;
+      border: 1px solid var(--border, $fallback--border);
+      border-radius: $fallback--inputRadius;
+      border-radius: var(--inputRadius, $fallback--inputRadius);
 
       .user-profile-field-name {
         flex: 0 1 30%;
@@ -164,6 +167,7 @@
         text-align: right;
         color: var(--lightText);
         min-width: 120px;
+        border-right: 1px solid var(--border, $fallback--border);
       }
 
       .user-profile-field-value {
@@ -179,12 +183,6 @@
         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;
       }
     }
   }
-- 
cgit v1.2.3-70-g09d2


From eed58a7b97bc8c6cddfd367c8d49972a96dfd08e Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Thu, 18 Jun 2020 20:13:44 +0900
Subject: fix width of long field value

---
 src/components/user_profile/user_profile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index ccd7c794..361a3b5c 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -171,7 +171,7 @@
       }
 
       .user-profile-field-value {
-        flex: 1 1 auto;
+        flex: 1 1 70%;
         color: var(--text);
         margin: 0 0 0 0.25em;
       }
-- 
cgit v1.2.3-70-g09d2


From b0b33be9ddeb96fe808770604f6fab9c4d8d15c0 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 18 Jun 2020 14:41:40 +0200
Subject: Poll, StatusContent: Move emoji css to status body.

---
 src/components/poll/poll.vue                     |  6 ------
 src/components/status_content/status_content.vue | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'src/components')

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 28f90006..adbb0555 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -75,12 +75,6 @@
 @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/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 8c2e8749..89f917dc 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -164,23 +164,23 @@ $status-margin: 0.75em;
     word-break: break-all;
   }
 
+  img, video {
+    max-width: 100%;
+    max-height: 400px;
+    vertical-align: middle;
+    object-fit: contain;
+
+    &.emoji {
+      width: 32px;
+      height: 32px;
+    }
+  }
+
   .status-content {
     font-family: var(--postFont, sans-serif);
     line-height: 1.4em;
     white-space: pre-wrap;
 
-    img, video {
-      max-width: 100%;
-      max-height: 400px;
-      vertical-align: middle;
-      object-fit: contain;
-
-      &.emoji {
-        width: 32px;
-        height: 32px;
-      }
-    }
-
     blockquote {
       margin: 0.2em 0 0.2em 2em;
       font-style: italic;
-- 
cgit v1.2.3-70-g09d2


From fd2157efe48e49f40f17b81cd79d9b45a304bc62 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Mon, 2 Dec 2019 23:03:06 +0900
Subject: Fix emoji input error

---
 src/components/emoji_input/emoji_input.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components')

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index f4c3479c..7974a66d 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -431,6 +431,7 @@ const EmojiInput = {
       const offsetBottom = offsetTop + offsetHeight
 
       panel.style.top = offsetBottom + 'px'
+      if (!picker) return
       picker.$el.style.top = offsetBottom + 'px'
       picker.$el.style.bottom = 'auto'
     }
-- 
cgit v1.2.3-70-g09d2


From bad3dacfac1ef3dd2c0f55b53fb78f4bf410a01e Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Fri, 19 Jun 2020 21:18:36 +0900
Subject: implement user suggestor for profile fields

---
 src/components/settings_modal/tabs/profile_tab.js  | 6 ++++++
 src/components/settings_modal/tabs/profile_tab.vue | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 896ff508..0874e0c8 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -65,6 +65,12 @@ const ProfileTab = {
         ...this.$store.state.instance.customEmoji
       ] })
     },
+    userSuggestor () {
+      return suggestor({
+        users: this.$store.state.users.users,
+        updateUsersList: (query) => this.$store.dispatch('searchUsers', { query })
+      })
+    },
     fieldsLimits () {
       return this.$store.state.instance.fieldsLimits
     },
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index 2fa3021e..20a68f7d 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -104,8 +104,9 @@
         >
           <EmojiInput
             v-model="newFields[i].name"
-            :suggest="emojiSuggestor"
+            enable-emoji-picker
             hide-emoji-button
+            :suggest="userSuggestor"
           >
             <input
               v-model="newFields[i].name"
@@ -114,8 +115,9 @@
           </EmojiInput>
           <EmojiInput
             v-model="newFields[i].value"
-            :suggest="emojiSuggestor"
+            enable-emoji-picker
             hide-emoji-button
+            :suggest="userSuggestor"
           >
             <input
               v-model="newFields[i].value"
-- 
cgit v1.2.3-70-g09d2


From 5aa65e32ef0b14d6a70257e35559360e696f878c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Fri, 19 Jun 2020 16:09:44 +0300
Subject: fix huge emoji in usernames

---
 src/components/status/status.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/components')

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 336f912a..7ec29b28 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -418,7 +418,7 @@ $status-margin: 0.75em;
     max-width: 85%;
     font-weight: bold;
 
-    img {
+    img.emoji {
       width: 14px;
       height: 14px;
       vertical-align: middle;
-- 
cgit v1.2.3-70-g09d2


From 2451956d838d132a14a3089546ceac59c07e1b3a Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko <suprunenko.s@gmail.com>
Date: Sun, 21 Jun 2020 14:59:05 +0200
Subject: Add 'bot' flag to Profile settings

---
 src/components/settings_modal/tabs/profile_tab.js  | 2 ++
 src/components/settings_modal/tabs/profile_tab.vue | 5 +++++
 src/i18n/en.json                                   | 1 +
 src/i18n/ru.json                                   | 1 +
 4 files changed, 9 insertions(+)

(limited to 'src/components')

diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 8658b097..56e956cd 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -23,6 +23,7 @@ const ProfileTab = {
       showRole: this.$store.state.users.currentUser.show_role,
       role: this.$store.state.users.currentUser.role,
       discoverable: this.$store.state.users.currentUser.discoverable,
+      bot: this.$store.state.users.currentUser.bot,
       allowFollowingMove: this.$store.state.users.currentUser.allow_following_move,
       pickAvatarBtnVisible: true,
       bannerUploading: false,
@@ -79,6 +80,7 @@ const ProfileTab = {
             hide_follows: this.hideFollows,
             hide_followers: this.hideFollowers,
             discoverable: this.discoverable,
+            bot: this.bot,
             allow_following_move: this.allowFollowingMove,
             hide_follows_count: this.hideFollowsCount,
             hide_followers_count: this.hideFollowersCount,
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index fff4f970..decdb389 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -95,6 +95,11 @@
           {{ $t('settings.discoverable') }}
         </Checkbox>
       </p>
+      <p>
+        <Checkbox v-model="bot">
+          {{ $t('settings.bot') }}
+        </Checkbox>
+      </p>
       <button
         :disabled="newName && newName.length === 0"
         class="btn btn-default"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index eefe10e5..4553d25d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -266,6 +266,7 @@
     "block_import_error": "Error importing blocks",
     "blocks_imported": "Blocks imported! Processing them will take a while.",
     "blocks_tab": "Blocks",
+    "bot": "This is a bot account",
     "btnRadius": "Buttons",
     "cBlue": "Blue (Reply, follow)",
     "cGreen": "Green (Retweet)",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index f9a72954..aa78db26 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -130,6 +130,7 @@
     "background": "Фон",
     "bio": "Описание",
     "btnRadius": "Кнопки",
+    "bot": "Это аккаунт бота",
     "cBlue": "Ответить, читать",
     "cGreen": "Повторить",
     "cOrange": "Нравится",
-- 
cgit v1.2.3-70-g09d2


From c04f8b2ccb29e02595e4abd7a75ed42feee5f640 Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko <suprunenko.s@gmail.com>
Date: Sun, 21 Jun 2020 15:02:44 +0200
Subject: Show a 'bot' badge on the service account page

---
 CHANGELOG.md                           |  1 +
 src/components/user_card/user_card.vue | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/components')

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b41a04d..feabbf06 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added private notifications option for push notifications
 - 'Copy link' button for statuses (in the ellipsis menu)
 - Autocomplete domains from list of known instances
+- 'Bot' settings option and badge
 
 ### Changed
 - Registration page no longer requires email if the server is configured not to require it
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index c4a5ce9d..243a46f1 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -70,10 +70,20 @@
               >
                 @{{ user.screen_name }}
               </router-link>
-              <span
-                v-if="!hideBio && !!visibleRole"
-                class="alert staff"
-              >{{ visibleRole }}</span>
+              <template v-if="!hideBio">
+                <span
+                  v-if="!!visibleRole"
+                  class="alert staff"
+                >
+                  {{ visibleRole }}
+                </span>
+                <span
+                  v-if="user.bot"
+                  class="alert staff"
+                >
+                  bot
+                </span>
+              </template>
               <span v-if="user.locked"><i class="icon icon-lock" /></span>
               <span
                 v-if="!mergedConfig.hideUserStats && !hideBio"
-- 
cgit v1.2.3-70-g09d2


From 2b6d16900b9f0bd515dbb616ef0f031f6c026dcc Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko <suprunenko.s@gmail.com>
Date: Sun, 21 Jun 2020 15:36:20 +0200
Subject: Use more correct class name for user badges

---
 src/components/user_card/user_card.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 243a46f1..9529d7f6 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -73,13 +73,13 @@
               <template v-if="!hideBio">
                 <span
                   v-if="!!visibleRole"
-                  class="alert staff"
+                  class="alert user-role"
                 >
                   {{ visibleRole }}
                 </span>
                 <span
                   v-if="user.bot"
-                  class="alert staff"
+                  class="alert user-role"
                 >
                   bot
                 </span>
@@ -468,7 +468,7 @@
       color: var(--text, $fallback--text);
     }
 
-    .staff {
+    .user-role {
       flex: none;
       text-transform: capitalize;
       color: $fallback--text;
-- 
cgit v1.2.3-70-g09d2