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: [PATCH 01/52] 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(+)

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 0005570733..c5ab5f26a9 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 14082e8394..f979eff467 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;

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: [PATCH 02/52] Fix emoji size

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index f979eff467..d5aa514e38 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;
 

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: [PATCH 03/52] Change profile fields design to horizontal

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index d5aa514e38..fdff0385fc 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;

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: [PATCH 04/52] Change css selectors to classname from elementname

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index fdff0385fc..c133741190 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;

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: [PATCH 05/52] Add tooltip

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index c133741190..20a644092b 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"

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: [PATCH 06/52] Use fields_html only

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 20a644092b..0268e5da35 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"

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: [PATCH 07/52] Change field name to right justify

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 0268e5da35..5bffba3acb 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;

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: [PATCH 08/52] Add fields_text for tooltip

---
 .../entity_normalizer/entity_normalizer.service.js  |  6 ++++++
 .../entity_normalizer/entity_normalizer.spec.js     | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index ca79df6f6f..ca2075a46b 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
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index cfb380bafc..9df84575d0 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -290,6 +290,19 @@ describe('API Entities normalizer', () => {
       expect(field).to.have.property('value').that.contains('<img')
     })
 
+    it('removes html tags from user profile fields', () => {
+      const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), fields: [{ name: 'user', value: '<a rel="me" href="https://example.com/@user">@user</a>' }] })
+
+      const parsedUser = parseUser(user)
+
+      expect(parsedUser).to.have.property('fields_text').to.be.an('array')
+
+      const field = parsedUser.fields_text[0]
+
+      expect(field).to.have.property('name').that.equal('user')
+      expect(field).to.have.property('value').that.equal('@user')
+    })
+
     it('adds hide_follows and hide_followers user settings', () => {
       const user = makeMockUserMasto({ pleroma: { hide_followers: true, hide_follows: false, hide_followers_count: false, hide_follows_count: true } })
 

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: [PATCH 09/52] 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(-)

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 5bffba3acb..54f2d4b3ee 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"

From 7dfa734665bbb74058e221af0f71a88b4f37936d Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Wed, 25 Mar 2020 20:06:48 +0300
Subject: [PATCH 10/52] after_store: Remove most of StatusNet config usage

Information under `pleromafe` key is equivalent to the one under
`pleroma_fe` key in  `/api/pleroma/frontend_configurations`.

All other information had equivalents in `/nodeinfo/2.0.json`, except
`textlimit` and `vapidPublicKey`.
---
 src/boot/after_store.js | 51 ++++++++++++++++++++++++++---------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index d70e10584b..b943ed95e2 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -13,28 +13,13 @@ const getStatusnetConfig = async ({ store }) => {
     const res = await window.fetch('/api/statusnet/config.json')
     if (res.ok) {
       const data = await res.json()
-      const { name, closed: registrationClosed, textlimit, uploadlimit, server, vapidPublicKey, safeDMMentionsEnabled } = data.site
+      const { textlimit, vapidPublicKey } = data.site
 
-      store.dispatch('setInstanceOption', { name: 'name', value: name })
-      store.dispatch('setInstanceOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
       store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) })
-      store.dispatch('setInstanceOption', { name: 'server', value: server })
-      store.dispatch('setInstanceOption', { name: 'safeDM', value: safeDMMentionsEnabled !== '0' })
-
-      // TODO: default values for this stuff, added if to not make it break on
-      // my dev config out of the box.
-      if (uploadlimit) {
-        store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadlimit.uploadlimit) })
-        store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadlimit.avatarlimit) })
-        store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadlimit.backgroundlimit) })
-        store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadlimit.bannerlimit) })
-      }
 
       if (vapidPublicKey) {
         store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
       }
-
-      return data.site.pleromafe
     } else {
       throw (res)
     }
@@ -44,6 +29,21 @@ const getStatusnetConfig = async ({ store }) => {
   }
 }
 
+const getBackendProvidedConfig = async ({ store }) => {
+  try {
+    const res = await window.fetch('/api/pleroma/frontend_configurations')
+    if (res.ok) {
+      const data = await res.json()
+      return data.pleroma_fe
+    } else {
+      throw (res)
+    }
+  } catch (error) {
+    console.error('Could not load backend-provided frontend config, potentially fatal')
+    console.error(error)
+  }
+}
+
 const getStaticConfig = async () => {
   try {
     const res = await window.fetch('/static/config.json')
@@ -200,13 +200,22 @@ const getNodeInfo = async ({ store }) => {
       const data = await res.json()
       const metadata = data.metadata
       const features = metadata.features
+      store.dispatch('setInstanceOption', { name: 'name', value: metadata.nodeName })
+      store.dispatch('setInstanceOption', { name: 'registrationOpen', value: data.openRegistrations })
       store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') })
+      store.dispatch('setInstanceOption', { name: 'safeDM', value: features.includes('safe_dm_mentions') })
       store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') })
       store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })
       store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: features.includes('polls') })
       store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits })
       store.dispatch('setInstanceOption', { name: 'mailerEnabled', value: metadata.mailerEnabled })
 
+      const uploadLimits = metadata.uploadLimits
+      store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadLimits.general) })
+      store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadLimits.avatar) })
+      store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadLimits.background) })
+      store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadLimits.banner) })
+
       store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
       store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })
 
@@ -254,7 +263,7 @@ const getNodeInfo = async ({ store }) => {
 
 const setConfig = async ({ store }) => {
   // apiConfig, staticConfig
-  const configInfos = await Promise.all([getStatusnetConfig({ store }), getStaticConfig()])
+  const configInfos = await Promise.all([getBackendProvidedConfig({ store }), getStaticConfig()])
   const apiConfig = configInfos[0]
   const staticConfig = configInfos[1]
 
@@ -277,6 +286,11 @@ const checkOAuthToken = async ({ store }) => {
 const afterStoreSetup = async ({ store, i18n }) => {
   const width = windowWidth()
   store.dispatch('setMobileLayout', width <= 800)
+
+  const overrides = window.___pleromafe_dev_overrides || {}
+  const server = (typeof overrides.target !== 'undefined') ? overrides.target : window.location.origin
+  store.dispatch('setInstanceOption', { name: 'server', value: server })
+
   await setConfig({ store })
 
   const { customTheme, customThemeSource } = store.state.config
@@ -301,7 +315,8 @@ const afterStoreSetup = async ({ store, i18n }) => {
     getTOS({ store }),
     getInstancePanel({ store }),
     getStickers({ store }),
-    getNodeInfo({ store })
+    getNodeInfo({ store }),
+    getStatusnetConfig({ store })
   ])
 
   const router = new VueRouter({

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: [PATCH 11/52] Add profile fields form

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

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 0db035475f..87c92a8a7d 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 8658b09770..896ff50816 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 4aab81eb7e..b3dcf42c86 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 fff4f970c0..2fa3021e6b 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"

From de9cc033df32a4668ac8d05a770312c029d20c4c Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Fri, 15 Nov 2019 22:52:20 +0900
Subject: [PATCH 12/52] Add i18n en

---
 src/i18n/en.json | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index c322e53869..ca49514e1c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -333,6 +333,12 @@
     "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
     "mutes_tab": "Mutes",
     "play_videos_in_modal": "Play videos in a popup frame",
+    "profile_fields": {
+      "label": "Profile metadata",
+      "add_field": "Add Field",
+      "name": "Label",
+      "value": "Content"
+    },
     "use_contain_fit": "Don't crop the attachment in thumbnails",
     "name": "Name",
     "name_bio": "Name & Bio",

From cc4691a4efec91318284869164419d286bda44a5 Mon Sep 17 00:00:00 2001
From: kPherox <admin@mail.kr-kp.com>
Date: Sun, 17 Nov 2019 22:34:00 +0900
Subject: [PATCH 13/52] Fix merging array field for users

---
 src/modules/users.js                  | 13 +++++++---
 test/unit/specs/modules/users.spec.js | 36 +++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/src/modules/users.js b/src/modules/users.js
index f9329f2a81..fca01a569a 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -1,6 +1,6 @@
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import oauthApi from '../services/new_api/oauth.js'
-import { compact, map, each, merge, last, concat, uniq } from 'lodash'
+import { compact, map, each, mergeWith, last, concat, uniq, isArray } from 'lodash'
 import { set } from 'vue'
 import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'
 
@@ -10,7 +10,7 @@ export const mergeOrAdd = (arr, obj, item) => {
   const oldItem = obj[item.id]
   if (oldItem) {
     // We already have this, so only merge the new info.
-    merge(oldItem, item)
+    mergeWith(oldItem, item, mergeArrayLength)
     return { item: oldItem, new: false }
   } else {
     // This is a new item, prepare it
@@ -23,6 +23,13 @@ export const mergeOrAdd = (arr, obj, item) => {
   }
 }
 
+const mergeArrayLength = (oldValue, newValue) => {
+  if (isArray(oldValue) && isArray(newValue)) {
+    oldValue.length = newValue.length
+    return mergeWith(oldValue, newValue, mergeArrayLength)
+  }
+}
+
 const getNotificationPermission = () => {
   const Notification = window.Notification
 
@@ -116,7 +123,7 @@ export const mutations = {
   },
   setCurrentUser (state, user) {
     state.lastLoginName = user.screen_name
-    state.currentUser = merge(state.currentUser || {}, user)
+    state.currentUser = mergeWith(state.currentUser || {}, user, mergeArrayLength)
   },
   clearCurrentUser (state) {
     state.currentUser = false
diff --git a/test/unit/specs/modules/users.spec.js b/test/unit/specs/modules/users.spec.js
index 670acfc822..dfa5684d15 100644
--- a/test/unit/specs/modules/users.spec.js
+++ b/test/unit/specs/modules/users.spec.js
@@ -18,6 +18,42 @@ describe('The users module', () => {
       expect(state.users).to.eql([user])
       expect(state.users[0].name).to.eql('Dude')
     })
+
+    it('merging array field in new information for old users', () => {
+      const state = cloneDeep(defaultState)
+      const user = {
+        id: '1',
+        fields: [
+          { name: 'Label 1', value: 'Content 1' }
+        ]
+      }
+      const firstModUser = {
+        id: '1',
+        fields: [
+          { name: 'Label 2', value: 'Content 2' },
+          { name: 'Label 3', value: 'Content 3' }
+        ]
+      }
+      const secondModUser = {
+        id: '1',
+        fields: [
+          { name: 'Label 4', value: 'Content 4' }
+        ]
+      }
+
+      mutations.addNewUsers(state, [user])
+      expect(state.users[0].fields).to.have.length(1)
+      expect(state.users[0].fields[0].name).to.eql('Label 1')
+
+      mutations.addNewUsers(state, [firstModUser])
+      expect(state.users[0].fields).to.have.length(2)
+      expect(state.users[0].fields[0].name).to.eql('Label 2')
+      expect(state.users[0].fields[1].name).to.eql('Label 3')
+
+      mutations.addNewUsers(state, [secondModUser])
+      expect(state.users[0].fields).to.have.length(1)
+      expect(state.users[0].fields[0].name).to.eql('Label 4')
+    })
   })
 
   describe('findUser', () => {

From a52a393266744560c6c6b2cbd24da812d35562fb Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 15:22:31 +0200
Subject: [PATCH 14/52] NotificationUtils: Extract preparation of notification
 object.

---
 src/modules/statuses.js                       | 41 ++----------------
 .../notification_utils/notification_utils.js  | 42 +++++++++++++++++++
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 9a2e0df1e9..073b15f1b6 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -13,7 +13,7 @@ import {
   omitBy
 } from 'lodash'
 import { set } from 'vue'
-import { isStatusNotification } from '../services/notification_utils/notification_utils.js'
+import { isStatusNotification, prepareNotificationObject } from '../services/notification_utils/notification_utils.js'
 import apiService from '../services/api/api.service.js'
 import { muteWordHits } from '../services/status_parser/status_parser.js'
 
@@ -344,42 +344,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
       state.notifications.idStore[notification.id] = notification
 
       if ('Notification' in window && window.Notification.permission === 'granted') {
-        const notifObj = {}
-        const status = notification.status
-        const title = notification.from_profile.name
-        notifObj.icon = notification.from_profile.profile_image_url
-        let i18nString
-        switch (notification.type) {
-          case 'like':
-            i18nString = 'favorited_you'
-            break
-          case 'repeat':
-            i18nString = 'repeated_you'
-            break
-          case 'follow':
-            i18nString = 'followed_you'
-            break
-          case 'move':
-            i18nString = 'migrated_to'
-            break
-          case 'follow_request':
-            i18nString = 'follow_request'
-            break
-        }
-
-        if (notification.type === 'pleroma:emoji_reaction') {
-          notifObj.body = rootGetters.i18n.t('notifications.reacted_with', [notification.emoji])
-        } else if (i18nString) {
-          notifObj.body = rootGetters.i18n.t('notifications.' + i18nString)
-        } else if (isStatusNotification(notification.type)) {
-          notifObj.body = notification.status.text
-        }
-
-        // Shows first attached non-nsfw image, if any. Should add configuration for this somehow...
-        if (status && status.attachments && status.attachments.length > 0 && !status.nsfw &&
-          status.attachments[0].mimetype.startsWith('image/')) {
-          notifObj.image = status.attachments[0].url
-        }
+        const notifObj = prepareNotificationObject(notification, rootGetters.i18n)
 
         const reasonsToMuteNotif = (
           notification.seen ||
@@ -393,7 +358,7 @@ const addNewNotifications = (state, { dispatch, notifications, older, visibleNot
             )
         )
         if (!reasonsToMuteNotif) {
-          let desktopNotification = new window.Notification(title, notifObj)
+          let desktopNotification = new window.Notification(notifObj.title, notifObj)
           // Chrome is known for not closing notifications automatically
           // according to MDN, anyway.
           setTimeout(desktopNotification.close.bind(desktopNotification), 5000)
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index eb479227ca..4576ea833a 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -43,3 +43,45 @@ export const filteredNotificationsFromStore = (store, types) => {
 
 export const unseenNotificationsFromStore = store =>
   filter(filteredNotificationsFromStore(store), ({ seen }) => !seen)
+
+export const prepareNotificationObject = (notification, i18n) => {
+  const notifObj = {}
+  const status = notification.status
+  const title = notification.from_profile.name
+  notifObj.title = title
+  notifObj.icon = notification.from_profile.profile_image_url
+  let i18nString
+  switch (notification.type) {
+    case 'like':
+      i18nString = 'favorited_you'
+      break
+    case 'repeat':
+      i18nString = 'repeated_you'
+      break
+    case 'follow':
+      i18nString = 'followed_you'
+      break
+    case 'move':
+      i18nString = 'migrated_to'
+      break
+    case 'follow_request':
+      i18nString = 'follow_request'
+      break
+  }
+
+  if (notification.type === 'pleroma:emoji_reaction') {
+    notifObj.body = i18n.t('notifications.reacted_with', [notification.emoji])
+  } else if (i18nString) {
+    notifObj.body = i18n.t('notifications.' + i18nString)
+  } else if (isStatusNotification(notification.type)) {
+    notifObj.body = notification.status.text
+  }
+
+  // Shows first attached non-nsfw image, if any. Should add configuration for this somehow...
+  if (status && status.attachments && status.attachments.length > 0 && !status.nsfw &&
+    status.attachments[0].mimetype.startsWith('image/')) {
+    notifObj.image = status.attachments[0].url
+  }
+
+  return notifObj
+}

From 5b0190bef5a9756453d0220b80a18469639c8fe9 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 15:22:58 +0200
Subject: [PATCH 15/52] ServiceWorker: Grab the notification and display it
 with i18n.

---
 src/sw.js | 76 +++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 68 insertions(+), 8 deletions(-)

diff --git a/src/sw.js b/src/sw.js
index 6cecb3f380..0aab275b6e 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -1,6 +1,48 @@
 /* eslint-env serviceworker */
 
 import localForage from 'localforage'
+import { parseNotification } from './services/entity_normalizer/entity_normalizer.service.js'
+import { prepareNotificationObject } from './services/notification_utils/notification_utils.js'
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+
+const messages = {
+  ar: require('./i18n/ar.json'),
+  ca: require('./i18n/ca.json'),
+  cs: require('./i18n/cs.json'),
+  de: require('./i18n/de.json'),
+  eo: require('./i18n/eo.json'),
+  es: require('./i18n/es.json'),
+  et: require('./i18n/et.json'),
+  eu: require('./i18n/eu.json'),
+  fi: require('./i18n/fi.json'),
+  fr: require('./i18n/fr.json'),
+  ga: require('./i18n/ga.json'),
+  he: require('./i18n/he.json'),
+  hu: require('./i18n/hu.json'),
+  it: require('./i18n/it.json'),
+  ja: require('./i18n/ja_pedantic.json'),
+  ja_easy: require('./i18n/ja_easy.json'),
+  ko: require('./i18n/ko.json'),
+  nb: require('./i18n/nb.json'),
+  nl: require('./i18n/nl.json'),
+  oc: require('./i18n/oc.json'),
+  pl: require('./i18n/pl.json'),
+  pt: require('./i18n/pt.json'),
+  ro: require('./i18n/ro.json'),
+  ru: require('./i18n/ru.json'),
+  te: require('./i18n/te.json'),
+  zh: require('./i18n/zh.json'),
+  en: require('./i18n/en.json')
+}
+
+Vue.use(VueI18n)
+const i18n = new VueI18n({
+  // By default, use the browser locale, we will update it if neccessary
+  locale: 'en',
+  fallbackLocale: 'en',
+  messages
+})
 
 function isEnabled () {
   return localForage.getItem('vuex-lz')
@@ -12,15 +54,33 @@ function getWindowClients () {
     .then((clientList) => clientList.filter(({ type }) => type === 'window'))
 }
 
-self.addEventListener('push', (event) => {
-  if (event.data) {
-    event.waitUntil(isEnabled().then((isEnabled) => {
-      return isEnabled && getWindowClients().then((list) => {
-        const data = event.data.json()
+const setLocale = async () => {
+  const state = await localForage.getItem('vuex-lz')
+  const locale = state.config.interfaceLanguage || 'en'
+  i18n.locale = locale
+}
 
-        if (list.length === 0) return self.registration.showNotification(data.title, data)
-      })
-    }))
+const maybeShowNotification = async (event) => {
+  const enabled = await isEnabled()
+  const activeClients = await getWindowClients()
+  await setLocale()
+  if (enabled && activeClients) {
+    const data = event.data.json()
+
+    const url = `${self.registration.scope}api/v1/notifications/${data.notification_id}`
+    const notification = await fetch(url, { headers: { Authorization: 'Bearer ' + data.access_token } })
+    let nj = await notification.json()
+    nj = parseNotification(nj)
+
+    const res = prepareNotificationObject(nj, i18n)
+
+    self.registration.showNotification(res.title, res)
+  }
+}
+
+self.addEventListener('push', async (event) => {
+  if (event.data) {
+    event.waitUntil(maybeShowNotification(event))
   }
 })
 

From e2ca107e01c5a0715aa1a1a68496fe514eb9e902 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 15:24:01 +0200
Subject: [PATCH 16/52] ServiceWorker: Don't show message via sw if a client is
 active.

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

diff --git a/src/sw.js b/src/sw.js
index 0aab275b6e..d0050b24e6 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -64,7 +64,7 @@ const maybeShowNotification = async (event) => {
   const enabled = await isEnabled()
   const activeClients = await getWindowClients()
   await setLocale()
-  if (enabled && activeClients) {
+  if (enabled && (activeClients.length === 0)) {
     const data = event.data.json()
 
     const url = `${self.registration.scope}api/v1/notifications/${data.notification_id}`

From 98819ae32c6f3962df955ee280cd6cc271625852 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 11 Jun 2020 15:49:39 +0200
Subject: [PATCH 17/52] NotificationUtils: Add tag to notifications.

---
 src/services/notification_utils/notification_utils.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 4576ea833a..5cc19215aa 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -45,7 +45,9 @@ export const unseenNotificationsFromStore = store =>
   filter(filteredNotificationsFromStore(store), ({ seen }) => !seen)
 
 export const prepareNotificationObject = (notification, i18n) => {
-  const notifObj = {}
+  const notifObj = {
+    tag: notification.id
+  }
   const status = notification.status
   const title = notification.from_profile.name
   notifObj.title = title

From 9bfb3754c1bc0d1033afda97f2884e721d1ab3d8 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 13 Jun 2020 11:47:34 +0200
Subject: [PATCH 18/52] ServiceWorker: Use loader to only notification
 messages.

This keeps the translation size very small and makes it easy to
integrate all the languages, as dynamically loading them isn't
easy in the service worker.
---
 src/lib/notification-i18n-loader.js |  9 +++++
 src/sw.js                           | 55 +++++++++++++++--------------
 2 files changed, 37 insertions(+), 27 deletions(-)
 create mode 100644 src/lib/notification-i18n-loader.js

diff --git a/src/lib/notification-i18n-loader.js b/src/lib/notification-i18n-loader.js
new file mode 100644
index 0000000000..a61755c800
--- /dev/null
+++ b/src/lib/notification-i18n-loader.js
@@ -0,0 +1,9 @@
+// This somewhat mysterious module
+module.exports = function(source) {
+  var object = JSON.parse(source)
+  var smol = {
+    notifications: object.notifications || {}
+  }
+
+  return JSON.stringify(smol)
+}
diff --git a/src/sw.js b/src/sw.js
index d0050b24e6..6e31516a80 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -1,4 +1,5 @@
 /* eslint-env serviceworker */
+/* eslint-disable import/no-webpack-loader-syntax */
 
 import localForage from 'localforage'
 import { parseNotification } from './services/entity_normalizer/entity_normalizer.service.js'
@@ -7,33 +8,33 @@ import Vue from 'vue'
 import VueI18n from 'vue-i18n'
 
 const messages = {
-  ar: require('./i18n/ar.json'),
-  ca: require('./i18n/ca.json'),
-  cs: require('./i18n/cs.json'),
-  de: require('./i18n/de.json'),
-  eo: require('./i18n/eo.json'),
-  es: require('./i18n/es.json'),
-  et: require('./i18n/et.json'),
-  eu: require('./i18n/eu.json'),
-  fi: require('./i18n/fi.json'),
-  fr: require('./i18n/fr.json'),
-  ga: require('./i18n/ga.json'),
-  he: require('./i18n/he.json'),
-  hu: require('./i18n/hu.json'),
-  it: require('./i18n/it.json'),
-  ja: require('./i18n/ja_pedantic.json'),
-  ja_easy: require('./i18n/ja_easy.json'),
-  ko: require('./i18n/ko.json'),
-  nb: require('./i18n/nb.json'),
-  nl: require('./i18n/nl.json'),
-  oc: require('./i18n/oc.json'),
-  pl: require('./i18n/pl.json'),
-  pt: require('./i18n/pt.json'),
-  ro: require('./i18n/ro.json'),
-  ru: require('./i18n/ru.json'),
-  te: require('./i18n/te.json'),
-  zh: require('./i18n/zh.json'),
-  en: require('./i18n/en.json')
+  ar: require('./lib/notification-i18n-loader.js!./i18n/ar.json'),
+  ca: require('./lib/notification-i18n-loader.js!./i18n/ca.json'),
+  cs: require('./lib/notification-i18n-loader.js!./i18n/cs.json'),
+  de: require('./lib/notification-i18n-loader.js!./i18n/de.json'),
+  eo: require('./lib/notification-i18n-loader.js!./i18n/eo.json'),
+  es: require('./lib/notification-i18n-loader.js!./i18n/es.json'),
+  et: require('./lib/notification-i18n-loader.js!./i18n/et.json'),
+  eu: require('./lib/notification-i18n-loader.js!./i18n/eu.json'),
+  fi: require('./lib/notification-i18n-loader.js!./i18n/fi.json'),
+  fr: require('./lib/notification-i18n-loader.js!./i18n/fr.json'),
+  ga: require('./lib/notification-i18n-loader.js!./i18n/ga.json'),
+  he: require('./lib/notification-i18n-loader.js!./i18n/he.json'),
+  hu: require('./lib/notification-i18n-loader.js!./i18n/hu.json'),
+  it: require('./lib/notification-i18n-loader.js!./i18n/it.json'),
+  ja: require('./lib/notification-i18n-loader.js!./i18n/ja_pedantic.json'),
+  ja_easy: require('./lib/notification-i18n-loader.js!./i18n/ja_easy.json'),
+  ko: require('./lib/notification-i18n-loader.js!./i18n/ko.json'),
+  nb: require('./lib/notification-i18n-loader.js!./i18n/nb.json'),
+  nl: require('./lib/notification-i18n-loader.js!./i18n/nl.json'),
+  oc: require('./lib/notification-i18n-loader.js!./i18n/oc.json'),
+  pl: require('./lib/notification-i18n-loader.js!./i18n/pl.json'),
+  pt: require('./lib/notification-i18n-loader.js!./i18n/pt.json'),
+  ro: require('./lib/notification-i18n-loader.js!./i18n/ro.json'),
+  ru: require('./lib/notification-i18n-loader.js!./i18n/ru.json'),
+  te: require('./lib/notification-i18n-loader.js!./i18n/te.json'),
+  zh: require('./lib/notification-i18n-loader.js!./i18n/zh.json'),
+  en: require('./lib/notification-i18n-loader.js!./i18n/en.json')
 }
 
 Vue.use(VueI18n)

From 1e57adf6d4a46ab5be677bba7ae3c7f0ba0fc520 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sat, 13 Jun 2020 11:53:16 +0200
Subject: [PATCH 19/52] Linting + docs

---
 src/lib/notification-i18n-loader.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/lib/notification-i18n-loader.js b/src/lib/notification-i18n-loader.js
index a61755c800..71f9156a87 100644
--- a/src/lib/notification-i18n-loader.js
+++ b/src/lib/notification-i18n-loader.js
@@ -1,5 +1,8 @@
-// This somewhat mysterious module
-module.exports = function(source) {
+// This somewhat mysterious module will load a json string
+// and then extract only the 'notifications' part. This is
+// meant to be used to load the partial i18n we need for
+// the service worker.
+module.exports = function (source) {
   var object = JSON.parse(source)
   var smol = {
     notifications: object.notifications || {}

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

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

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 56e91cca50..28f9000684 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 c7ed65a4d4..e93eea5bb7 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 {

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

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

diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index e93eea5bb7..883e7a02ae 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

From 8427c5a067a8b06ebb1e47d23ff3f70a16f921b8 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Mon, 15 Jun 2020 09:59:39 +0200
Subject: [PATCH 22/52] Changelog: Add info about poll option emoji.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad03c76021..829f408f8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Add better visual indication for drag-and-drop for files
 
 ### Fixed
+- Custom Emoji will display in poll options now.
 - Status ellipsis menu closes properly when selecting certain options
 - Cropped images look correct in Chrome
 - Newlines in the muted words settings work again

From 14540e2a078bd59ca8f13cd5c0b894acad3d639f Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 16 Jun 2020 13:27:36 +0200
Subject: [PATCH 23/52] Service Worker: Extract messages to own module.

---
 src/i18n/service_worker_messages.js | 35 +++++++++++++++++++++++++++++
 src/sw.js                           | 32 +-------------------------
 2 files changed, 36 insertions(+), 31 deletions(-)
 create mode 100644 src/i18n/service_worker_messages.js

diff --git a/src/i18n/service_worker_messages.js b/src/i18n/service_worker_messages.js
new file mode 100644
index 0000000000..270ed043c5
--- /dev/null
+++ b/src/i18n/service_worker_messages.js
@@ -0,0 +1,35 @@
+/* eslint-disable import/no-webpack-loader-syntax */
+// This module exports only the notification part of the i18n,
+// which is useful for the service worker
+
+const messages = {
+  ar: require('../lib/notification-i18n-loader.js!./ar.json'),
+  ca: require('../lib/notification-i18n-loader.js!./ca.json'),
+  cs: require('../lib/notification-i18n-loader.js!./cs.json'),
+  de: require('../lib/notification-i18n-loader.js!./de.json'),
+  eo: require('../lib/notification-i18n-loader.js!./eo.json'),
+  es: require('../lib/notification-i18n-loader.js!./es.json'),
+  et: require('../lib/notification-i18n-loader.js!./et.json'),
+  eu: require('../lib/notification-i18n-loader.js!./eu.json'),
+  fi: require('../lib/notification-i18n-loader.js!./fi.json'),
+  fr: require('../lib/notification-i18n-loader.js!./fr.json'),
+  ga: require('../lib/notification-i18n-loader.js!./ga.json'),
+  he: require('../lib/notification-i18n-loader.js!./he.json'),
+  hu: require('../lib/notification-i18n-loader.js!./hu.json'),
+  it: require('../lib/notification-i18n-loader.js!./it.json'),
+  ja: require('../lib/notification-i18n-loader.js!./ja_pedantic.json'),
+  ja_easy: require('../lib/notification-i18n-loader.js!./ja_easy.json'),
+  ko: require('../lib/notification-i18n-loader.js!./ko.json'),
+  nb: require('../lib/notification-i18n-loader.js!./nb.json'),
+  nl: require('../lib/notification-i18n-loader.js!./nl.json'),
+  oc: require('../lib/notification-i18n-loader.js!./oc.json'),
+  pl: require('../lib/notification-i18n-loader.js!./pl.json'),
+  pt: require('../lib/notification-i18n-loader.js!./pt.json'),
+  ro: require('../lib/notification-i18n-loader.js!./ro.json'),
+  ru: require('../lib/notification-i18n-loader.js!./ru.json'),
+  te: require('../lib/notification-i18n-loader.js!./te.json'),
+  zh: require('../lib/notification-i18n-loader.js!./zh.json'),
+  en: require('../lib/notification-i18n-loader.js!./en.json')
+}
+
+export default messages
diff --git a/src/sw.js b/src/sw.js
index 6e31516a80..c971222ed9 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -1,41 +1,11 @@
 /* eslint-env serviceworker */
-/* eslint-disable import/no-webpack-loader-syntax */
 
 import localForage from 'localforage'
 import { parseNotification } from './services/entity_normalizer/entity_normalizer.service.js'
 import { prepareNotificationObject } from './services/notification_utils/notification_utils.js'
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
-
-const messages = {
-  ar: require('./lib/notification-i18n-loader.js!./i18n/ar.json'),
-  ca: require('./lib/notification-i18n-loader.js!./i18n/ca.json'),
-  cs: require('./lib/notification-i18n-loader.js!./i18n/cs.json'),
-  de: require('./lib/notification-i18n-loader.js!./i18n/de.json'),
-  eo: require('./lib/notification-i18n-loader.js!./i18n/eo.json'),
-  es: require('./lib/notification-i18n-loader.js!./i18n/es.json'),
-  et: require('./lib/notification-i18n-loader.js!./i18n/et.json'),
-  eu: require('./lib/notification-i18n-loader.js!./i18n/eu.json'),
-  fi: require('./lib/notification-i18n-loader.js!./i18n/fi.json'),
-  fr: require('./lib/notification-i18n-loader.js!./i18n/fr.json'),
-  ga: require('./lib/notification-i18n-loader.js!./i18n/ga.json'),
-  he: require('./lib/notification-i18n-loader.js!./i18n/he.json'),
-  hu: require('./lib/notification-i18n-loader.js!./i18n/hu.json'),
-  it: require('./lib/notification-i18n-loader.js!./i18n/it.json'),
-  ja: require('./lib/notification-i18n-loader.js!./i18n/ja_pedantic.json'),
-  ja_easy: require('./lib/notification-i18n-loader.js!./i18n/ja_easy.json'),
-  ko: require('./lib/notification-i18n-loader.js!./i18n/ko.json'),
-  nb: require('./lib/notification-i18n-loader.js!./i18n/nb.json'),
-  nl: require('./lib/notification-i18n-loader.js!./i18n/nl.json'),
-  oc: require('./lib/notification-i18n-loader.js!./i18n/oc.json'),
-  pl: require('./lib/notification-i18n-loader.js!./i18n/pl.json'),
-  pt: require('./lib/notification-i18n-loader.js!./i18n/pt.json'),
-  ro: require('./lib/notification-i18n-loader.js!./i18n/ro.json'),
-  ru: require('./lib/notification-i18n-loader.js!./i18n/ru.json'),
-  te: require('./lib/notification-i18n-loader.js!./i18n/te.json'),
-  zh: require('./lib/notification-i18n-loader.js!./i18n/zh.json'),
-  en: require('./lib/notification-i18n-loader.js!./i18n/en.json')
-}
+import messages from './i18n/service_worker_messages.js'
 
 Vue.use(VueI18n)
 const i18n = new VueI18n({

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: [PATCH 24/52] 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(-)

diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index 744b77d539..029e70968a 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 bca93ea744..68db6fd8f1 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 5881d266b4..f1abe3add9 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

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: [PATCH 25/52] remove log whoops

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

diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index f1abe3add9..ded7066f91 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 () {

From c18a8ab308e6ebbc552e623d6e035032cec4a619 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 16 Jun 2020 17:35:12 +0300
Subject: [PATCH 26/52] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 623c642fbd..9a9a9046a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Newlines in the muted words settings work again
 - Clicking on non-latin hashtags won't open a new window
 - Uploading and drag-dropping multiple files works correctly now.
+- Fix status ellipsis menu being cut off in notifications column.
 
 ## [2.0.3] - 2020-05-02
 ### Fixed

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: [PATCH 27/52] Update popover.js

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

diff --git a/src/components/popover/popover.js b/src/components/popover/popover.js
index ded7066f91..a40a919521 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 () {

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: [PATCH 28/52] restyle the fields

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 0c36f2e282..2892a1212d 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 ff99e944e3..c30f6f0a5c 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, ''))
       }
     })
 

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: [PATCH 29/52] resume the previous emoji size for now

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 2892a1212d..445f047139 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;
       }
     }
 

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: [PATCH 30/52] 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(-)

diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 15a71effa1..91d5cfb942 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 f9329f2a81..a640fb3bec 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
         })
     },

From abbad84b00fbfe365ba6bf5015278b296265b98a Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 12:56:22 +0300
Subject: [PATCH 31/52] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dfe741c1d..f2580badb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Uploading and drag-dropping multiple files works correctly now.
 - Subject field now appears disabled when posting
 - Fix status ellipsis menu being cut off in notifications column
+- Fixed autocomplete sometimes not returning the right user when there's already some results
 
 ## [2.0.3] - 2020-05-02
 ### Fixed

From fa7bcb74cecb8af095e6e22271243f2d51835f39 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 13:00:09 +0300
Subject: [PATCH 32/52] return the correct promise type from action

---
 src/modules/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/users.js b/src/modules/users.js
index a640fb3bec..df710ac9c6 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -438,7 +438,7 @@ const users = {
     searchUsers ({ rootState, commit }, { query }) {
       // Don't fetch if this query was already done recently
       if (rootState.users.recentQueries.includes(query)) {
-        return []
+        return Promise.resolve([])
       }
       return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {

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: [PATCH 33/52] revert import style

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

diff --git a/src/components/emoji_input/suggestor.js b/src/components/emoji_input/suggestor.js
index 91d5cfb942..8330345bb0 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:

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: [PATCH 34/52] change key-value to look like one

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 445f047139..ccd7c79474 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;
       }
     }
   }

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: [PATCH 35/52] fix width of long field value

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

diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index ccd7c79474..361a3b5c80 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;
       }

From 4e0b4427a969b2d0584a3a1c1ffd3fe3fbfc2998 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Thu, 18 Jun 2020 14:19:21 +0300
Subject: [PATCH 36/52] remove recentqueries thing

---
 src/modules/users.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/modules/users.js b/src/modules/users.js
index df710ac9c6..5e32bb49c0 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -225,12 +225,6 @@ 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)
-    }
   }
 }
 
@@ -257,8 +251,7 @@ export const defaultState = {
   usersObject: {},
   signUpPending: false,
   signUpErrors: [],
-  relationships: {},
-  recentQueries: []
+  relationships: {}
 }
 
 const users = {
@@ -436,13 +429,8 @@ const users = {
       })
     },
     searchUsers ({ rootState, commit }, { query }) {
-      // Don't fetch if this query was already done recently
-      if (rootState.users.recentQueries.includes(query)) {
-        return Promise.resolve([])
-      }
       return rootState.api.backendInteractor.searchUsers({ query })
         .then((users) => {
-          commit('addRecentQuery', query)
           commit('addNewUsers', users)
           return users
         })

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

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

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 28f9000684..adbb05558e 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 8c2e87498f..89f917dc2a 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;

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: [PATCH 38/52] Fix emoji input error

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

diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index f4c3479c7d..7974a66d93 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'
     }

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: [PATCH 39/52] 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(-)

diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 896ff50816..0874e0c88d 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 2fa3021e6b..20a68f7d98 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"

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: [PATCH 40/52] fix huge emoji in usernames

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

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 336f912a70..7ec29b2884 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;

From aa725010c5a3eeeb2dae3e6618b057e08fc5fd49 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 19 Jun 2020 15:24:06 +0200
Subject: [PATCH 41/52] ServiceWorker: Use clearer variable names

---
 src/sw.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/sw.js b/src/sw.js
index c971222ed9..f5e34dd608 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -40,10 +40,10 @@ const maybeShowNotification = async (event) => {
 
     const url = `${self.registration.scope}api/v1/notifications/${data.notification_id}`
     const notification = await fetch(url, { headers: { Authorization: 'Bearer ' + data.access_token } })
-    let nj = await notification.json()
-    nj = parseNotification(nj)
+    const notificationJson = await notification.json()
+    const parsedNotification = parseNotification(notificationJson)
 
-    const res = prepareNotificationObject(nj, i18n)
+    const res = prepareNotificationObject(parsedNotification, i18n)
 
     self.registration.showNotification(res.title, res)
   }

From ed908e0195db26ec9c51d124315bc084c5576a29 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Fri, 19 Jun 2020 15:25:57 +0200
Subject: [PATCH 42/52] Changelog: Add info about push notifications.

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad03c76021..19ac4ba3e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Changed
 - Removed the use of with_move parameters when fetching notifications
+- Push notifications now are the same as normal notfication, and are localized.
 
 ### Fixed
 - Weird bug related to post being sent seemingly after pasting with keyboard (hopefully)

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: [PATCH 43/52] 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(+)

diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 8658b09770..56e956cdc7 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 fff4f970c0..decdb38962 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 eefe10e5ea..4553d25d56 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 f9a729544f..aa78db26e3 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -130,6 +130,7 @@
     "background": "Фон",
     "bio": "Описание",
     "btnRadius": "Кнопки",
+    "bot": "Это аккаунт бота",
     "cBlue": "Ответить, читать",
     "cGreen": "Повторить",
     "cOrange": "Нравится",

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: [PATCH 44/52] 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(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3b41a04df1..feabbf067e 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 c4a5ce9d6d..243a46f154 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"

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: [PATCH 45/52] Use more correct class name for user badges

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

diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 243a46f154..9529d7f6c0 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;

From 504d48fc5a707a60f5c7f5d5cf92ab2af762bb2e Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Wed, 24 Jun 2020 17:54:35 +0200
Subject: [PATCH 46/52] After Store: Remove last statusnet vestiges.

---
 src/boot/after_store.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 5213fbbde9..2398c43c88 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -8,14 +8,15 @@ import backendInteractorService from '../services/backend_interactor_service/bac
 import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { applyTheme } from '../services/style_setter/style_setter.js'
 
-const getStatusnetConfig = async ({ store }) => {
+const getInstanceConfig = async ({ store }) => {
   try {
-    const res = await window.fetch('/api/statusnet/config.json')
+    const res = await window.fetch('/api/v1/instance')
     if (res.ok) {
       const data = await res.json()
-      const { textlimit, vapidPublicKey } = data.site
+      const textlimit = data.max_toot_chars
+      const vapidPublicKey = data.pleroma.vapid_public_key
 
-      store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) })
+      store.dispatch('setInstanceOption', { name: 'textlimit', value: textlimit })
 
       if (vapidPublicKey) {
         store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
@@ -24,7 +25,7 @@ const getStatusnetConfig = async ({ store }) => {
       throw (res)
     }
   } catch (error) {
-    console.error('Could not load statusnet config, potentially fatal')
+    console.error('Could not load instance config, potentially fatal')
     console.error(error)
   }
 }
@@ -319,7 +320,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
     getInstancePanel({ store }),
     getStickers({ store }),
     getNodeInfo({ store }),
-    getStatusnetConfig({ store })
+    getInstanceConfig({ store })
   ])
 
   // Start fetching things that don't need to block the UI

From a2c5175d14b322062f8fc07b11a6a45f1d5aba4f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Fri, 26 Jun 2020 14:47:02 +0300
Subject: [PATCH 47/52] add basic preloading for nodeinfo/config

---
 src/boot/after_store.js | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 0db035475f..0c213ea397 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -8,9 +8,34 @@ import backendInteractorService from '../services/backend_interactor_service/bac
 import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { applyTheme } from '../services/style_setter/style_setter.js'
 
+let staticInitialResults = null
+
+const parsedInitialResults = () => {
+  if (!document.getElementById('initial-results')) {
+    return null
+  }
+  if (!staticInitialResults) {
+    staticInitialResults = JSON.parse(document.getElementById('initial-results').textContent)
+  }
+  return staticInitialResults
+}
+
+const preloadFetch = async (request) => {
+  const data = parsedInitialResults()
+  if (!data || !data[request]) {
+    return window.fetch(request)
+  }
+  const requestJson = atob(data[request])
+  return {
+    ok: true,
+    json: () => JSON.parse(requestJson),
+    text: () => requestJson
+  }
+}
+
 const getStatusnetConfig = async ({ store }) => {
   try {
-    const res = await window.fetch('/api/statusnet/config.json')
+    const res = await preloadFetch('/api/statusnet/config.json')
     if (res.ok) {
       const data = await res.json()
       const { name, closed: registrationClosed, textlimit, uploadlimit, server, vapidPublicKey, safeDMMentionsEnabled } = data.site
@@ -132,7 +157,7 @@ const getTOS = async ({ store }) => {
 
 const getInstancePanel = async ({ store }) => {
   try {
-    const res = await window.fetch('/instance/panel.html')
+    const res = await preloadFetch('/instance/panel.html')
     if (res.ok) {
       const html = await res.text()
       store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
@@ -195,7 +220,7 @@ const resolveStaffAccounts = ({ store, accounts }) => {
 
 const getNodeInfo = async ({ store }) => {
   try {
-    const res = await window.fetch('/nodeinfo/2.0.json')
+    const res = await preloadFetch('/nodeinfo/2.0.json')
     if (res.ok) {
       const data = await res.json()
       const metadata = data.metadata

From 4528b31256cc719c4f17ab5103af0d345ba5181a Mon Sep 17 00:00:00 2001
From: translate <jp+translate@supplntr.io>
Date: Sat, 27 Jun 2020 07:21:32 +0000
Subject: [PATCH 48/52] Translated using Weblate (Italian)

Currently translated at 72.7% (452 of 621 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
 src/i18n/it.json |  3 ++-
 src/i18n/nl.json | 20 ++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/i18n/it.json b/src/i18n/it.json
index 6c8be351f8..7311f0b69e 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -255,7 +255,8 @@
         "top_bar": "Barra superiore",
         "panel_header": "Titolo pannello",
         "badge_notification": "Notifica",
-        "popover": "Suggerimenti, menù, sbalzi"
+        "popover": "Suggerimenti, menù, sbalzi",
+        "toggled": "Scambiato"
       },
       "common_colors": {
         "rgbo": "Icone, accenti, medaglie",
diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index af728b6eb7..15ce5cbe43 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -28,7 +28,12 @@
     "enable": "Inschakelen",
     "confirm": "Bevestigen",
     "verify": "Verifiëren",
-    "generic_error": "Er is een fout opgetreden"
+    "generic_error": "Er is een fout opgetreden",
+    "peek": "Spiek",
+    "close": "Sluiten",
+    "retry": "Opnieuw proberen",
+    "error_retry": "Probeer het opnieuw",
+    "loading": "Laden…"
   },
   "login": {
     "login": "Log in",
@@ -90,7 +95,7 @@
       "text/bbcode": "BBCode"
     },
     "content_warning": "Onderwerp (optioneel)",
-    "default": "Zojuist geland in L.A.",
+    "default": "Tijd voor anime!",
     "direct_warning": "Deze post zal enkel zichtbaar zijn voor de personen die genoemd zijn.",
     "posting": "Plaatsen",
     "scope": {
@@ -377,7 +382,7 @@
         "button": "Knop",
         "text": "Nog een boel andere {0} en {1}",
         "mono": "inhoud",
-        "input": "Zojuist geland in L.A.",
+        "input": "Tijd voor anime!",
         "faint_link": "handige gebruikershandleiding",
         "fine_print": "Lees onze {0} om niets nuttig te leren!",
         "header_faint": "Alles komt goed",
@@ -451,7 +456,7 @@
     "user_mutes": "Gebruikers",
     "useStreamingApi": "Berichten en meldingen in real-time ontvangen",
     "useStreamingApiWarning": "(Afgeraden, experimenteel, kan berichten overslaan)",
-    "type_domains_to_mute": "Voer domeinen in om te negeren",
+    "type_domains_to_mute": "Zoek domeinen om te negeren",
     "upload_a_photo": "Upload een foto",
     "fun": "Plezier",
     "greentext": "Meme pijlen",
@@ -470,7 +475,8 @@
       "frontend_version": "Frontend Versie",
       "backend_version": "Backend Versie",
       "title": "Versie"
-    }
+    },
+    "mutes_and_blocks": "Negeringen en Blokkades"
   },
   "timeline": {
     "collapse": "Inklappen",
@@ -708,7 +714,9 @@
     "unpin": "Van profiel losmaken",
     "delete": "Status verwijderen",
     "repeats": "Herhalingen",
-    "favorites": "Favorieten"
+    "favorites": "Favorieten",
+    "thread_muted_and_words": ", heeft woorden:",
+    "thread_muted": "Thread genegeerd"
   },
   "time": {
     "years_short": "{0}j",

From 3113d904b921b1258c3709101d7e688767037079 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sat, 27 Jun 2020 10:34:28 +0300
Subject: [PATCH 49/52] update changelog with profile fields

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index feabbf067e..887588f32f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - 'Copy link' button for statuses (in the ellipsis menu)
 - Autocomplete domains from list of known instances
 - 'Bot' settings option and badge
+- Added profile meta data fields that can be set in profile settings
 
 ### Changed
 - Registration page no longer requires email if the server is configured not to require it

From a8cb5e71d9ab3025786838d7123ad676a1e7fb66 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sat, 27 Jun 2020 12:32:01 +0300
Subject: [PATCH 50/52] don't block ui with stickers or tos

---
 src/boot/after_store.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 01074b8c37..de7c3ef4d3 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -340,17 +340,18 @@ const afterStoreSetup = async ({ store, i18n }) => {
   }
 
   // Now we can try getting the server settings and logging in
+  // Most of these are preloaded into the index.html so blocking is minimized
   await Promise.all([
     checkOAuthToken({ store }),
-    getTOS({ store }),
     getInstancePanel({ store }),
-    getStickers({ store }),
     getNodeInfo({ store }),
     getInstanceConfig({ store })
   ])
 
   // Start fetching things that don't need to block the UI
   store.dispatch('fetchMutes')
+  getTOS({ store })
+  getStickers({ store })
 
   const router = new VueRouter({
     mode: 'history',

From 46cf50a4d653b9f9b2b9d3f13d88a7af7b950d18 Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Sat, 27 Jun 2020 12:59:24 +0300
Subject: [PATCH 51/52] rename variable requestJson when it's not actually json

---
 src/boot/after_store.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index de7c3ef4d3..1796eb1be9 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -25,11 +25,11 @@ const preloadFetch = async (request) => {
   if (!data || !data[request]) {
     return window.fetch(request)
   }
-  const requestJson = atob(data[request])
+  const requestData = atob(data[request])
   return {
     ok: true,
-    json: () => JSON.parse(requestJson),
-    text: () => requestJson
+    json: () => JSON.parse(requestData),
+    text: () => requestData
   }
 }
 

From 195e83d0c8ab660a1dd6b29137295c2a6a36dca9 Mon Sep 17 00:00:00 2001
From: Fristi <fristi@subcon.town>
Date: Sat, 27 Jun 2020 15:04:52 +0000
Subject: [PATCH 52/52] Translated using Weblate (Dutch)

Currently translated at 100.0% (626 of 626 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/nl/
---
 src/i18n/nl.json | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 15ce5cbe43..bf270f87d8 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -476,7 +476,14 @@
       "backend_version": "Backend Versie",
       "title": "Versie"
     },
-    "mutes_and_blocks": "Negeringen en Blokkades"
+    "mutes_and_blocks": "Negeringen en Blokkades",
+    "profile_fields": {
+      "value": "Inhoud",
+      "name": "Label",
+      "add_field": "Veld Toevoegen",
+      "label": "Profiel metadata"
+    },
+    "bot": "Dit is een bot account"
   },
   "timeline": {
     "collapse": "Inklappen",