Disable follow button if blocked by user

Add indicator if user blocks you
2023-01-27 00:28:27 +00:00 · 2023-01-26 20:49:07 +00:00
52 changed files with 396 additions and 837 deletions
--- a/README.md
+++ b/README.md
@ -1,22 +1,22 @@
-# Akkoma-FE 
+# Pleroma-FE 

 ![English OK](https://img.shields.io/badge/English-OK-blueviolet) ![日本語OK](https://img.shields.io/badge/%E6%97%A5%E6%9C%AC%E8%AA%9E-OK-blueviolet)

-This is a fork of Akkoma-FE from the Pleroma project, with support for new Akkoma features such as:
+This is a fork of Pleroma-FE from the Pleroma project, with support for new Akkoma features such as:
 - MFM support via [marked-mfm](https://akkoma.dev/sfr/marked-mfm)
 - Custom emoji reactions

 # For Translators

-The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Akkoma-FE. 
+The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Pleroma-FE. 

 Alternatively, edit/create `src/i18n/$LANGUAGE_CODE.json` (where `$LANGUAGE_CODE` is the [ISO 639-1 code](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) for your language), then add your language to [src/i18n/messages.js](https://akkoma.dev/AkkomaGang/pleroma-fe/src/branch/develop/src/i18n/messages.js) if it doesn't already exist there.

-Akkoma-FE will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js.
+Pleroma-FE will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js.

 # FOR ADMINS

-To use Akkoma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/administration/CLI_tasks/frontend/) CLI task to install Akkoma-FE, then modify your configuration as described in the [Frontend Management](https://docs.akkoma.dev/stable/configuration/frontend_management/) doc.
+To use Pleroma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/administration/CLI_tasks/frontend/) CLI task to install Pleroma-FE, then modify your configuration as described in the [Frontend Management](https://docs.akkoma.dev/stable/configuration/frontend_management/) doc.

 ## Build Setup

@ -52,4 +52,4 @@ Edit config.json for configuration.

 ### Login methods

-```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations. 
+```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations.
--- a/index.html
+++ b/index.html
@ -4,11 +4,12 @@
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
    <title>Akkoma</title>
+    <link rel="stylesheet" href="/static/font/css/fontello.css">
+    <link rel="stylesheet" href="/static/font/css/animation.css">
    <link rel="stylesheet" href="/static/font/tiresias.css">
    <link rel="stylesheet" href="/static/font/css/lato.css">
    <link rel="stylesheet" href="/static/mfm.css">
    <link rel="stylesheet" href="/static/custom.css">
-    <link rel="stylesheet" href="/static/theme-holder.css" id="theme-holder">
    <!--server-generated-meta-->
    <link rel="icon" type="image/png" href="/favicon.png">
    <link rel="manifest" href="/manifest.json">
--- a/package.json
+++ b/package.json
@ -22,7 +22,7 @@
    "@fortawesome/free-regular-svg-icons": "^6.1.2",
    "@fortawesome/free-solid-svg-icons": "^6.2.0",
    "@fortawesome/vue-fontawesome": "3.0.1",
-    "@floatingghost/pinch-zoom-element": "^1.3.1",
+    "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
    "@vuelidate/core": "^2.0.0",
    "@vuelidate/validators": "^2.0.0",
    "body-scroll-lock": "2.7.1",
--- a/src/App.scss
+++ b/src/App.scss
@ -1,7 +1,6 @@
 // stylelint-disable rscss/class-format
@import './_variables.scss';
-@import '@fortawesome/fontawesome-svg-core/styles.css';
-@import '@floatingghost/pinch-zoom-element/dist/pinch-zoom.css';
+
 :root {
  --navbar-height: 3.5rem;
  --post-line-height: 1.4;
@ -469,7 +468,7 @@ textarea,
  color: $fallback--lightText;
  color: var(--inputText, $fallback--lightText);
  font-family: sans-serif;
-  font-family: var(--interfaceFont, sans-serif);
+  font-family: var(--inputFont, sans-serif);
  font-size: 1em;
  margin: 0;
  box-sizing: border-box;
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -4,8 +4,6 @@ import { createRouter, createWebHistory } from 'vue-router'
 import vClickOutside from 'click-outside-vue3'

 import { FontAwesomeIcon, FontAwesomeLayers } from '@fortawesome/vue-fontawesome'
-import { config } from '@fortawesome/fontawesome-svg-core';
-config.autoAddCss = false

 import App from '../App.vue'
 import routes from './routes'
@ -396,6 +394,9 @@ const afterStoreSetup = async ({ store, i18n }) => {
  ])

  // Start fetching things that don't need to block the UI
+  store.dispatch('fetchMutes')
+  store.dispatch('startFetchingAnnouncements')
+  store.dispatch('startFetchingReports')
  getTOS({ store })
  getStickers({ store })

--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@ -98,11 +98,15 @@ export default {
    logoLeft () { return this.$store.state.instance.logoLeft },
    currentUser () { return this.$store.state.users.currentUser },
    privateMode () { return this.$store.state.instance.private },
+    federating () { return this.$store.state.instance.federating },
    shouldConfirmLogout () {
      return this.$store.getters.mergedConfig.modalOnLogout
    },
    showBubbleTimeline () {
      return this.$store.state.instance.localBubbleInstances.length > 0
+    },
+    restrictedTimelines () {
+      return this.$store.state.instance.restrict_unauthenticated.timelines
    }
  },
  methods: {
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@ -44,6 +44,7 @@
            />
          </router-link>
          <router-link
+            v-if="currentUser || !(privateMode || restrictedTimelines.public)"
            :to="{ name: 'public-timeline' }"
            class="nav-icon"
          >
@ -55,6 +56,7 @@
            />
          </router-link>
          <router-link
+            v-if="federating && (currentUser || !(privateMode || restrictedTimelines.federated))"
            :to="{ name: 'public-external-timeline' }"
            class="nav-icon"
          >
--- a/src/components/emoji_grid/emoji_grid.js
+++ b/src/components/emoji_grid/emoji_grid.js
@ -1,133 +0,0 @@
-const EMOJI_SIZE = 32 + 8
-const GROUP_TITLE_HEIGHT = 24
-const BUFFER_SIZE = 3 * EMOJI_SIZE
-
-const EmojiGrid = {
-  props: {
-    groups: {
-      required: true,
-      type: Array
-    }
-  },
-  data () {
-    return {
-      containerWidth: 0,
-      containerHeight: 0,
-      scrollPos: 0,
-      resizeObserver: null
-    }
-  },
-  mounted () {
-    const rect = this.$refs.container.getBoundingClientRect()
-    this.containerWidth = rect.width
-    this.containerHeight = rect.height
-    this.resizeObserver = new ResizeObserver((entries) => {
-      for (const entry of entries) {
-        this.containerWidth = entry.contentRect.width
-        this.containerHeight = entry.contentRect.height
-      }
-    })
-    this.resizeObserver.observe(this.$refs.container)
-  },
-  beforeUnmount () {
-    this.resizeObserver.disconnect()
-    this.resizeObserver = null
-  },
-  watch: {
-    groups () {
-      // Scroll to top when grid content changes
-      if (this.$refs.container) {
-        this.$refs.container.scrollTo(0, 0)
-      }
-    },
-    activeGroup (group) {
-      this.$emit('activeGroup', group)
-    }
-  },
-  methods: {
-    onScroll () {
-      this.scrollPos = this.$refs.container.scrollTop
-    },
-    onEmoji (emoji) {
-      this.$emit('emoji', emoji)
-    },
-    scrollToItem (itemId) {
-      const container = this.$refs.container
-      if (!container) return
-
-      for (const item of this.itemList) {
-        if (item.id === itemId) {
-          container.scrollTo(0, item.position.y)
-          return
-        }
-      }
-    }
-  },
-  computed: {
-    // Total height of scroller content
-    gridHeight () {
-      if (this.itemList.length === 0) return 0
-      const lastItem = this.itemList[this.itemList.length - 1]
-      return (
-        lastItem.position.y +
-        ('title' in lastItem ? GROUP_TITLE_HEIGHT : EMOJI_SIZE)
-      )
-    },
-    activeGroup () {
-      const items = this.itemList
-      for (let i = items.length - 1; i >= 0; i--) {
-        const item = items[i]
-        if ('title' in item && item.position.y <= this.scrollPos) {
-          return item.id
-        }
-      }
-      return null
-    },
-    itemList () {
-      const items = []
-      let x = 0
-      let y = 0
-      for (const group of this.groups) {
-        items.push({ position: { x, y }, id: group.id, title: group.text })
-        if (group.text.length) {
-          y += GROUP_TITLE_HEIGHT
-        }
-        for (const emoji of group.emojis) {
-          items.push({
-            position: { x, y },
-            id: `${group.id}-${emoji.displayText}`,
-            emoji
-          })
-          x += EMOJI_SIZE
-          if (x + EMOJI_SIZE > this.containerWidth) {
-            y += EMOJI_SIZE
-            x = 0
-          }
-        }
-        if (x > 0) {
-          y += EMOJI_SIZE
-          x = 0
-        }
-      }
-      return items
-    },
-    visibleItems () {
-      const startPos = this.scrollPos - BUFFER_SIZE
-      const endPos = this.scrollPos + this.containerHeight + BUFFER_SIZE
-      return this.itemList.filter((i) => {
-        return i.position.y >= startPos && i.position.y < endPos
-      })
-    },
-    scrolledClass () {
-      if (this.scrollPos <= 5) {
-        return 'scrolled-top'
-      } else if (this.scrollPos >= this.gridHeight - this.containerHeight - 5) {
-        return 'scrolled-bottom'
-      } else {
-        return 'scrolled-middle'
-      }
-    }
-  }
-}
-
-export default EmojiGrid
--- a/src/components/emoji_grid/emoji_grid.scss
+++ b/src/components/emoji_grid/emoji_grid.scss
@ -1,60 +0,0 @@
-.emoji {
-  &-grid {
-    flex: 1 1 1px;
-    position: relative;
-    overflow: auto;
-    user-select: none;
-    mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
-          linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
-          linear-gradient(to top, white, white);
-    transition: mask-size 150ms;
-    mask-size: 100% 20px, 100% 20px, auto;
-    // Autoprefixed seem to ignore this one, and also syntax is different
-    -webkit-mask-composite: xor;
-    mask-composite: exclude;
-    &.scrolled {
-      &-top {
-        mask-size: 100% 20px, 100% 0, auto;
-      }
-      &-bottom {
-        mask-size: 100% 0, 100% 20px, auto;
-      }
-    }
-    margin-left: 5px;
-    min-height: 200px;
-  }
-
-  &-group-title {
-    position: absolute;
-    font-size: 0.85em;
-    width: 100%;
-    margin: 0;
-    height: 24px;
-    display: flex;
-    align-items: end;
-
-    &.disabled {
-        display: none;
-    }
-  }
-
-  &-item {
-    position: absolute;
-    width: 32px;
-    height: 32px;
-    box-sizing: border-box;
-    display: flex;
-    font-size: 32px;
-    align-items: center;
-    justify-content: center;
-    margin: 4px;
-
-    cursor: pointer;
-
-    img {
-      object-fit: contain;
-      max-width: 100%;
-      max-height: 100%;
-    }
-  }
-}
--- a/src/components/emoji_grid/emoji_grid.vue
+++ b/src/components/emoji_grid/emoji_grid.vue
@ -1,48 +0,0 @@
-<template>
-  <div
-    ref="container"
-    class="emoji-grid"
-    :class="scrolledClass"
-    @scroll.passive="onScroll"
-  >
-    <div
-      :style="{
-        height: `${gridHeight}px`,
-      }"
-    >
-      <template v-for="item in visibleItems">
-        <h6
-          v-if="'title' in item && item.title.length"
-          :key="'title-' + item.id"
-          class="emoji-group-title"
-          :style="{
-            top: item.position.y + 'px',
-            left: item.position.x + 'px'
-          }"
-        >
-          {{ item.title }}
-        </h6>
-        <span
-          v-else-if="'emoji' in item"
-          :key="'emoji-' + item.id"
-          class="emoji-item"
-          :title="item.emoji.displayText"
-          :style="{
-            top: item.position.y + 'px',
-            left: item.position.x + 'px'
-          }"
-          @click.stop.prevent="onEmoji(item.emoji)"
-        >
-          <span v-if="!item.emoji.imageUrl">{{ item.emoji.replacement }}</span>
-          <img
-            v-else
-            :src="item.emoji.imageUrl"
-          >
-        </span>
-      </template>
-    </div>
-  </div>
-</template>
-
-<script src="./emoji_grid.js"></script>
-<style lang="scss" src="./emoji_grid.scss"></style>
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@ -205,6 +205,7 @@ const EmojiInput = {
    },
    triggerShowPicker () {
      this.showPicker = true
+      this.$refs.picker.startEmojiLoad()
      this.$nextTick(() => {
        this.scrollIntoView()
        this.focusPickerInput()
@ -222,6 +223,7 @@ const EmojiInput = {
      this.showPicker = !this.showPicker
      if (this.showPicker) {
        this.scrollIntoView()
+        this.$refs.picker.startEmojiLoad()
        this.$nextTick(this.focusPickerInput)
      }
    },
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@ -18,7 +18,6 @@
      <EmojiPicker
        v-if="enableEmojiPicker"
        ref="picker"
-        show-keep-open
        :class="{ hide: !showPicker }"
        :enable-sticker-picker="enableStickerPicker"
        class="emoji-picker-panel"
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@ -1,6 +1,5 @@
 import { defineAsyncComponent } from 'vue'
 import Checkbox from '../checkbox/checkbox.vue'
-import EmojiGrid from '../emoji_grid/emoji_grid.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
  faBoxOpen,
@ -15,17 +14,19 @@ library.add(
  faSmileBeam
 )

+// At widest, approximately 20 emoji are visible in a row,
+// loading 3 rows, could be overkill for narrow picker
+const LOAD_EMOJI_BY = 60
+
+// When to start loading new batch emoji, in pixels
+const LOAD_EMOJI_MARGIN = 64
+
 const EmojiPicker = {
  props: {
    enableStickerPicker: {
      required: false,
      type: Boolean,
      default: false
-    },
-    showKeepOpen: {
-      required: false,
-      type: Boolean,
-      default: false
    }
  },
  data () {
@ -33,13 +34,16 @@ const EmojiPicker = {
      keyword: '',
      activeGroup: 'standard',
      showingStickers: false,
-      keepOpen: false
+      groupsScrolledClass: 'scrolled-top',
+      keepOpen: false,
+      customEmojiBufferSlice: LOAD_EMOJI_BY,
+      customEmojiTimeout: null,
+      customEmojiLoadAllConfirmed: false
    }
  },
  components: {
    StickerPicker: defineAsyncComponent(() => import('../sticker_picker/sticker_picker.vue')),
-    Checkbox,
-    EmojiGrid
+    Checkbox
  },
  methods: {
    onStickerUploaded (e) {
@ -51,7 +55,12 @@ const EmojiPicker = {
    onEmoji (emoji) {
      const value = emoji.imageUrl ? `:${emoji.displayText}:` : emoji.replacement
      this.$emit('emoji', { insertion: value, keepOpen: this.keepOpen })
-      this.$store.commit('emojiUsed', emoji)
+    },
+    onScroll (e) {
+      const target = (e && e.target) || this.$refs['emoji-groups']
+      this.updateScrolledClass(target)
+      this.scrolledGroup(target)
+      this.triggerLoadMore(target)
    },
    onWheel (e) {
      e.preventDefault()
@ -60,12 +69,68 @@ const EmojiPicker = {
    highlight (key) {
      this.setShowStickers(false)
      this.activeGroup = key
-      if (this.keyword.length) {
-        this.$refs.emojiGrid.scrollToItem(key)
+    },
+    updateScrolledClass (target) {
+      if (target.scrollTop <= 5) {
+        this.groupsScrolledClass = 'scrolled-top'
+      } else if (target.scrollTop >= target.scrollTopMax - 5) {
+        this.groupsScrolledClass = 'scrolled-bottom'
+      } else {
+        this.groupsScrolledClass = 'scrolled-middle'
      }
    },
-    onActiveGroup (group) {
-      this.activeGroup = group
+    triggerLoadMore (target) {
+      const ref = this.$refs['group-end-custom']
+      if (!ref) return
+      const bottom = ref.offsetTop + ref.offsetHeight
+
+      const scrollerBottom = target.scrollTop + target.clientHeight
+      const scrollerTop = target.scrollTop
+      const scrollerMax = target.scrollHeight
+
+      // Loads more emoji when they come into view
+      const approachingBottom = bottom - scrollerBottom < LOAD_EMOJI_MARGIN
+      // Always load when at the very top in case there's no scroll space yet
+      const atTop = scrollerTop < 5
+      // Don't load when looking at unicode category or at the very bottom
+      const bottomAboveViewport = bottom < scrollerTop || scrollerBottom === scrollerMax
+      if (!bottomAboveViewport && (approachingBottom || atTop)) {
+        this.loadEmoji()
+      }
+    },
+    scrolledGroup (target) {
+      const top = target.scrollTop + 5
+      this.$nextTick(() => {
+        this.emojisView.forEach(group => {
+          const ref = this.$refs['group-' + group.id]
+          if (ref.offsetTop <= top) {
+            this.activeGroup = group.id
+          }
+        })
+      })
+    },
+    loadEmoji () {
+      const allLoaded = this.customEmojiBuffer.length === this.filteredEmoji.length
+
+      if (allLoaded) {
+        return
+      }
+
+      this.customEmojiBufferSlice += LOAD_EMOJI_BY
+    },
+    startEmojiLoad (forceUpdate = false) {
+      if (!forceUpdate) {
+        this.keyword = ''
+      }
+      this.$nextTick(() => {
+        this.$refs['emoji-groups'].scrollTop = 0
+      })
+      const bufferSize = this.customEmojiBuffer.length
+      const bufferPrefilledAll = bufferSize === this.filteredEmoji.length
+      if (bufferPrefilledAll && !forceUpdate) {
+        return
+      }
+      this.customEmojiBufferSlice = LOAD_EMOJI_BY
    },
    toggleStickers () {
      this.showingStickers = !this.showingStickers
@ -81,6 +146,13 @@ const EmojiPicker = {
      })
    }
  },
+  watch: {
+    keyword () {
+      this.customEmojiLoadAllConfirmed = false
+      this.onScroll()
+      this.startEmojiLoad(true)
+    }
+  },
  computed: {
    activeGroupView () {
      return this.showingStickers ? '' : this.activeGroup
@ -96,8 +168,10 @@ const EmojiPicker = {
        this.$store.state.instance.customEmoji || []
      )
    },
+    customEmojiBuffer () {
+      return this.filteredEmoji.slice(0, this.customEmojiBufferSlice)
+    },
    emojis () {
-      const recentEmojis = this.$store.getters.recentEmojis
      const standardEmojis = this.$store.state.instance.emoji || []
      const customEmojis = this.sortedEmoji
      const emojiPacks = []
@ -110,15 +184,6 @@ const EmojiPicker = {
        })
      })
      return [
-        {
-          id: 'recent',
-          text: this.$t('emoji.recent'),
-          first: {
-            imageUrl: '',
-            replacement: '🕒',
-          },
-          emojis: this.filterByKeyword(recentEmojis)
-        },
        {
          id: 'standard',
          text: this.$t('emoji.unicode'),
--- a/src/components/emoji_picker/emoji_picker.scss
+++ b/src/components/emoji_picker/emoji_picker.scss
@ -1,16 +1,5 @@
@import '../../_variables.scss';

-// The worst query selector ever
-// selects ONLY emojis pickers in replies in notifications
-// who thought this was a good idea?
-.notification > .Status > .status-container > .post-status-form > form > .form-group > .emoji-input > .emoji-picker {
-  max-width: 100%;
-  left: 0;
-  @media (min-width: 1300px) {
-    left: -30px;
-  }
-}
-
 .Notification {
  .emoji-picker {
    min-width: 160%;
@ -29,10 +18,6 @@
      min-width: 50%;
      max-width: 130%;
    }
-
-    .Status > .emoji-picker {
-      z-index: 1000;
-    }
  }
 }
 .emoji-picker {
@ -89,6 +74,10 @@
    flex-grow: 1;
  }

+  .emoji-groups {
+    min-height: 200px;
+  }
+
  .additional-tabs {
    border-left: 1px solid;
    border-left-color: $fallback--icon;
@ -167,12 +156,76 @@
    }
  }

-  .emoji-search {
-    padding: 5px;
-    flex: 0 0 auto;
+  .emoji {
+    &-search {
+      padding: 5px;
+      flex: 0 0 auto;

-    input {
-      width: 100%;
+      input {
+        width: 100%;
+      }
    }
+
+    &-groups {
+      flex: 1 1 1px;
+      position: relative;
+      overflow: auto;
+      user-select: none;
+      mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
+            linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
+            linear-gradient(to top, white, white);
+      transition: mask-size 150ms;
+      mask-size: 100% 20px, 100% 20px, auto;
+      // Autoprefixed seem to ignore this one, and also syntax is different
+      -webkit-mask-composite: xor;
+      mask-composite: exclude;
+      &.scrolled {
+        &-top {
+          mask-size: 100% 20px, 100% 0, auto;
+        }
+        &-bottom {
+          mask-size: 100% 0, 100% 20px, auto;
+        }
+      }
+    }
+
+    &-group {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+      padding-left: 5px;
+      justify-content: left;
+
+      &-title {
+        font-size: 0.85em;
+        width: 100%;
+        margin: 0;
+
+        &.disabled {
+          display: none;
+        }
+      }
+    }
+
+    &-item {
+      width: 32px;
+      height: 32px;
+      box-sizing: border-box;
+      display: flex;
+      font-size: 32px;
+      align-items: center;
+      justify-content: center;
+      margin: 4px;
+
+      cursor: pointer;
+
+      img {
+        object-fit: contain;
+        max-width: 100%;
+        max-height: 100%;
+      }
+    }
+
  }
+
 }
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@ -3,9 +3,9 @@
    <div class="heading">
      <span class="emoji-header">Emoji Packs</span>
      <span
-        ref="emoji-tabs"
        class="emoji-tabs"
        @wheel="onWheel"
+        ref="emoji-tabs"
      >
        <span
          v-for="group in emojis"
@ -52,16 +52,40 @@
            @input="$event.target.composing = false"
          >
        </div>
-        <EmojiGrid
-          ref="emojiGrid"
-          :groups="emojisView"
-          @emoji="onEmoji"
-          @active-group="onActiveGroup"
-        />
        <div
-          v-if="showKeepOpen"
-          class="keep-open"
+          ref="emoji-groups"
+          class="emoji-groups"
+          :class="groupsScrolledClass"
+          @scroll="onScroll"
        >
+          <div
+            v-for="group in emojisView"
+            :key="group.id"
+            class="emoji-group"
+          >
+            <h6
+              :ref="'group-' + group.id"
+              class="emoji-group-title"
+            >
+              {{ group.text }}
+            </h6>
+            <span
+              v-for="emoji in group.emojis"
+              :key="group.id + emoji.displayText"
+              :title="emoji.displayText"
+              class="emoji-item"
+              @click.stop.prevent="onEmoji(emoji)"
+            >
+              <span v-if="!emoji.imageUrl">{{ emoji.replacement }}</span>
+              <img
+                v-else
+                :src="emoji.imageUrl"
+              >
+            </span>
+            <span :ref="'group-end-' + group.id" />
+          </div>
+        </div>
+        <div class="keep-open">
          <Checkbox v-model="keepOpen">
            {{ $t('emoji.keep_open') }}
          </Checkbox>
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@ -3,11 +3,6 @@ import UserListPopover from '../user_list_popover/user_list_popover.vue'

 const EMOJI_REACTION_COUNT_CUTOFF = 12

-const findEmojiByReplacement = (state, replacement) => {
-  const allEmojis = state.instance.emoji.concat(state.instance.customEmoji)
-  return allEmojis.find(emoji => emoji.replacement === replacement)
-}
-
 const EmojiReactions = {
  name: 'EmojiReactions',
  components: {
@ -59,8 +54,6 @@ const EmojiReactions = {
    },
    reactWith (emoji) {
      this.$store.dispatch('reactWithEmoji', { id: this.status.id, emoji })
-      const emojiObject = findEmojiByReplacement(this.$store.state, emoji)
-      this.$store.commit('emojiUsed', emojiObject)
    },
    unreact (emoji) {
      this.$store.dispatch('unreactWithEmoji', { id: this.status.id, emoji })
--- a/src/components/follow_request_card/follow_request_card.js
+++ b/src/components/follow_request_card/follow_request_card.js
@ -43,7 +43,6 @@ const FollowRequestCard = {
    doApprove () {
      this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
      this.$store.dispatch('removeFollowRequest', this.user)
-      this.$store.dispatch('decrementFollowRequestsCount')

      const notifId = this.findFollowRequestNotificationId()
      this.$store.dispatch('markSingleNotificationAsSeen', { id: notifId })
@ -67,7 +66,6 @@ const FollowRequestCard = {
      this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
        .then(() => {
          this.$store.dispatch('dismissNotificationLocal', { id: notifId })
-          this.$store.dispatch('decrementFollowRequestsCount')
          this.$store.dispatch('removeFollowRequest', this.user)
        })
      this.hideDenyConfirmDialog()
@ -82,11 +80,6 @@ const FollowRequestCard = {
    },
    shouldConfirmDeny () {
      return this.mergedConfig.modalOnDenyFollow
-    },
-    show () {
-      const notifId = this.$store.state.api.followRequests.find(req => req.id === this.user.id)
-
-      return notifId !== undefined
    }
  }
 }
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@ -1,5 +1,5 @@
 <template>
-  <basic-user-card :user="user" v-if="show">
+  <basic-user-card :user="user">
    <div class="follow-request-card-content-container">
      <button
        class="btn button-default"
--- a/src/components/follow_requests/follow_requests.js
+++ b/src/components/follow_requests/follow_requests.js
@ -1,26 +1,10 @@
 import FollowRequestCard from '../follow_request_card/follow_request_card.vue'
-import withLoadMore from '../../hocs/with_load_more/with_load_more'
-import List from '../list/list.vue'
-import get from 'lodash/get'
-
-const FollowRequestList = withLoadMore({
-  fetch: (props, $store) => $store.dispatch('fetchFollowRequests'),
-  select: (props, $store) => get($store.state.api, 'followRequests', []).map(req => $store.getters.findUser(req.id)),
-  destroy: (props, $store) => $store.dispatch('clearFollowRequests'),
-  childPropName: 'items',
-  additionalPropNames: ['userId']
-})(List);
-

 const FollowRequests = {
  components: {
-    FollowRequestCard,
-    FollowRequestList
+    FollowRequestCard
  },
  computed: {
-    userId () {
-      return this.$store.state.users.currentUser.id
-    },
    requests () {
      return this.$store.state.api.followRequests
    }
--- a/src/components/follow_requests/follow_requests.vue
+++ b/src/components/follow_requests/follow_requests.vue
@ -6,11 +6,12 @@
      </div>
    </div>
    <div class="panel-body">
-      <FollowRequestList :user-id="userId">
-        <template #item="{item}">
-          <FollowRequestCard :user="item" />
-        </template>
-      </FollowRequestList>
+      <FollowRequestCard
+        v-for="request in requests"
+        :key="request.id"
+        :user="request"
+        class="list-item"
+      />
    </div>
  </div>
 </template>
--- a/src/components/followed_tag_card/FollowedTagCard.vue
+++ b/src/components/followed_tag_card/FollowedTagCard.vue
@ -1,77 +0,0 @@
-<template>
-  <div class="followed-tag-card">
-    <span>
-      <router-link :to="{ name: 'tag-timeline', params: {tag: tag.name}}">
-        <span class="tag-link">#{{ tag.name }}</span>
-      </router-link>
-      <span class="unfollow-tag">
-        <button
-          v-if="isFollowing"
-          class="button-default unfollow-tag-button"
-          :title="$t('user_card.unfollow_tag')"
-          @click="unfollowTag(tag.name)"
-        >
-          {{ $t('user_card.unfollow_tag') }}
-        </button>
-        <button
-          v-else
-          class="button-default follow-tag-button"
-          :title="$t('user_card.follow_tag')"
-          @click="followTag(tag.name)"
-        >
-          {{ $t('user_card.follow_tag') }}
-        </button>
-      </span>
-    </span>
-  </div>
-</template>
-
-<script>
-export default {
-  name: 'FollowedTagCard',
-  props: {
-    tag: {
-      type: Object,
-      required: true
-    },
-  },
-  // this is a hack to update the state of the button
-  // for some reason, List does not update on changes to the tag object
-  data: () => ({
-    isFollowing: true
-  }),
-  mounted () {
-    this.isFollowing = this.tag.following
-  },
-  methods: {
-    unfollowTag (tag) {
-      this.$store.dispatch('unfollowTag', tag)
-      this.isFollowing = false
-    },
-    followTag (tag) {
-      this.$store.dispatch('followTag', tag)
-      this.isFollowing = true
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .followed-tag-card {
-    margin-left: 1rem;
-    margin-top: 1rem;
-    margin-bottom: 1rem;
-  }
-  .unfollow-tag {
-    position: absolute;
-    right: 1rem;
-  }
-
-  .tag-link {
-    font-size: large;
-  }
-
-  .unfollow-tag-button, .follow-tag-button {
-    font-size: medium;
-  }
-</style>
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@ -33,6 +33,11 @@ library.add(
 )

 const NavPanel = {
+  created () {
+    if (this.currentUser && this.currentUser.locked) {
+      this.$store.dispatch('startFetchingFollowRequests')
+    }
+  },
  components: {
    TimelineMenuContent
  },
@ -49,13 +54,11 @@ const NavPanel = {
  computed: {
    ...mapState({
      currentUser: state => state.users.currentUser,
+      followRequestCount: state => state.api.followRequests.length,
      privateMode: state => state.instance.private,
      federating: state => state.instance.federating
    }),
-    ...mapGetters(['unreadAnnouncementCount']),
-    followRequestCount () {
-      return this.$store.state.users.currentUser.follow_requests_count
-    }
+    ...mapGetters(['unreadAnnouncementCount'])
  }
 }

--- a/src/components/pinch_zoom/pinch_zoom.js
+++ b/src/components/pinch_zoom/pinch_zoom.js
@ -1,4 +1,4 @@
-import PinchZoom from '@floatingghost/pinch-zoom-element'
+import PinchZoom from '@kazvmoe-infra/pinch-zoom-element'

 export default {
  methods: {
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@ -114,7 +114,7 @@
      svg {
        width: 22px;
        margin-right: 0.75rem;
-        color: var(--popoverIcon, $fallback--icon)
+        color: var(--menuPopoverIcon, $fallback--icon)
      }
    }

--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -53,14 +53,6 @@ const pxStringToNumber = (str) => {
  return Number(str.substring(0, str.length - 2))
 }

-const deleteDraft = (draftKey) => {
-	const draftData = JSON.parse(localStorage.getItem('drafts') || '{}');
-
-	delete draftData[draftKey];
-
-	localStorage.setItem('drafts', JSON.stringify(draftData));
-}
-
 const PostStatusForm = {
  props: [
    'statusId',
@ -165,36 +157,6 @@ const PostStatusForm = {
      }
    }

-    if (!this.statusId) {
-      let draftKey = 'status';
-      if (this.replyTo) {
-        draftKey = 'reply:' + this.replyTo;
-      } else if (this.quoteId) {
-        draftKey = 'quote:' + this.quoteId;
-      }
-
-      const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[draftKey];
-
-      if (draft) {
-        statusParams = {
-          spoilerText: draft.data.spoilerText,
-          status: draft.data.status,
-          sensitiveIfSubject,
-          nsfw: draft.data.nsfw,
-          files: draft.data.files,
-          poll: draft.data.poll,
-          mediaDescriptions: draft.data.mediaDescriptions,
-          visibility: draft.data.visibility,
-          language: draft.data.language,
-          contentType: draft.data.contentType
-        }
-
-        if (draft.data.poll) {
-          this.togglePollForm();
-        }
-      }
-    }
-
    return {
      dropFiles: [],
      uploadingFiles: false,
@ -311,7 +273,6 @@ const PostStatusForm = {
    statusChanged () {
      this.autoPreview()
      this.updateIdempotencyKey()
-      this.saveDraft()
    },
    clearStatus () {
      const newStatus = this.newStatus
@ -430,38 +391,8 @@ const PostStatusForm = {
      }).finally(() => {
        this.previewLoading = false
      })
-
-      let draftKey = 'status';
-      if (this.replyTo) {
-        draftKey = 'reply:' + this.replyTo;
-      } else if (this.quoteId) {
-        draftKey = 'quote:' + this.quoteId;
-      }
-      deleteDraft(draftKey)
    },
    debouncePreviewStatus: debounce(function () { this.previewStatus() }, 500),
-    saveDraft() {
-      const draftData = JSON.parse(localStorage.getItem('drafts') || '{}');
-
-      let draftKey = 'status';
-      if (this.replyTo) {
-        draftKey = 'reply:' + this.replyTo;
-      } else if (this.quoteId) {
-        draftKey = 'quote:' + this.quoteId;
-      }
-
-      if (this.newStatus.status || this.newStatus.spoilerText || this.newStatus.files.length > 0 || this.newStatus.poll.length > 0) {
-          draftData[draftKey] = {
-          updatedAt: new Date(),
-          data: this.newStatus,
-        };
-
-        localStorage.setItem('drafts', JSON.stringify(draftData));
-
-      } else {
-        deleteDraft(draftKey);
-      }
-    },
    autoPreview () {
      if (!this.preview) return
      this.previewLoading = true
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -274,14 +274,12 @@
        >
          {{ $t('post_status.post') }}
        </button>
-        <!-- To keep the OSK at the same position after a message send, -->
-        <!-- @touchstart.stop.prevent was used. But while OSK position is -->
-        <!-- quirky, accidental mobile posts caused by the workaround -->
-        <!-- when people tried to scroll were a more serious bug. -->
+        <!-- touchstart is used to keep the OSK at the same position after a message send -->
        <button
          v-else
          :disabled="uploadingFiles || disableSubmit"
          class="btn button-default"
+          @touchstart.stop.prevent="postStatus($event, newStatus)"
          @click.stop.prevent="postStatus($event, newStatus)"
        >
          {{ $t('post_status.post') }}
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@ -38,7 +38,7 @@ label.Select {
    margin: 0;
    padding: 0 2em 0 .2em;
    font-family: sans-serif;
-    font-family: var(--interfaceFont, sans-serif);
+    font-family: var(--inputFont, sans-serif);
    font-size: 1em;
    width: 100%;
    z-index: 1;
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@ -21,6 +21,7 @@
            >
              {{ $t('settings.settings_profile_force_sync') }}
            </button>
+
          </p>
          <div
            @click="toggleExpandedSettings"
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@ -12,7 +12,6 @@ import InterfaceLanguageSwitcher from 'src/components/interface_language_switche
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import localeService from 'src/services/locale/locale.service.js'
-import ChoiceSetting from '../helpers/choice_setting.vue'

 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@ -47,16 +46,9 @@ const ProfileTab = {
      emailLanguage: this.$store.state.users.currentUser.language || '',
      newPostTTLDays: this.$store.state.users.currentUser.status_ttl_days,
      expirePosts: this.$store.state.users.currentUser.status_ttl_days !== null,
-      userAcceptsDirectMessagesFrom: this.$store.state.users.currentUser.accepts_direct_messages_from,
-      userAcceptsDirectMessagesFromOptions: ["everybody", "nobody", "people_i_follow"].map(mode => ({
-        key: mode,
-        value: mode,
-        label: this.$t(`settings.user_accepts_direct_messages_from_${mode}`)
-      }))
    }
  },
  components: {
-    ChoiceSetting,
    ScopeSelector,
    ImageCropper,
    EmojiInput,
@ -134,8 +126,7 @@ const ProfileTab = {
        fields_attributes: this.newFields.filter(el => el != null),
        bot: this.bot,
        show_role: this.showRole,
-        status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1,
-        accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom
+        status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1
        /* eslint-enable camelcase */
      }

--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@ -89,15 +89,6 @@
          {{ $t('settings.bot') }}
        </Checkbox>
      </p>
-      <p>
-        <ChoiceSetting
-          id="userAcceptsDirectMessagesFrom"
-          path="userAcceptsDirectMessagesFrom"
-          :options="userAcceptsDirectMessagesFromOptions"
-        >
-          {{ $t('settings.user_accepts_direct_messages_from') }}
-        </ChoiceSetting>
-      </p>
      <p>
        <Checkbox v-model="expirePosts">
          {{ $t('settings.expire_posts_enabled') }}
@ -111,9 +102,6 @@
          class="expire-posts-days"
          :placeholder="$t('settings.expire_posts_input_placeholder')"
        />
-      </p>
-      <p>
-
      </p>
      <p>
        <interface-language-switcher
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.scss
@ -89,10 +89,6 @@
    margin: 1em 1em 0;
  }

-  .presets {
-    text-align: center;
-  }
-
  .tab-header {
    display: flex;
    justify-content: space-between;
--- a/src/components/timeline_menu/timeline_menu_content.js
+++ b/src/components/timeline_menu/timeline_menu_content.js
@ -24,7 +24,8 @@ const TimelineMenuContent = {
      currentUser: state => state.users.currentUser,
      privateMode: state => state.instance.private,
      federating: state => state.instance.federating,
-      showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0)
+      showBubbleTimeline: state => (state.instance.localBubbleInstances.length > 0),
+      restrictedTimelines: state => state.instance.restrict_unauthenticated.timelines
    })
  }
 }
--- a/src/components/timeline_menu/timeline_menu_content.vue
+++ b/src/components/timeline_menu/timeline_menu_content.vue
@ -16,7 +16,7 @@
        >{{ $t("nav.home_timeline") }}</span>
      </router-link>
    </li>
-    <li v-if="currentUser || !privateMode">
+    <li v-if="currentUser || !(privateMode || restrictedTimelines.public)">
      <router-link
        class="menu-item"
        :to="{ name: 'public-timeline' }"
@ -32,7 +32,7 @@
        >{{ $t("nav.public_tl") }}</span>
      </router-link>
    </li>
-    <li v-if="federating && (currentUser || !privateMode)">
+    <li v-if="federating && (currentUser || !(privateMode || restrictedTimelines.federated))">
      <router-link
        class="menu-item"
        :to="{ name: 'public-external-timeline' }"
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@ -10,14 +10,11 @@ import withLoadMore from '../../hocs/with_load_more/with_load_more'
 import { debounce } from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
-  faCircleNotch,
-  faCircleCheck
+  faCircleNotch
 } from '@fortawesome/free-solid-svg-icons'
-import FollowedTagCard from '../followed_tag_card/FollowedTagCard.vue'

 library.add(
-  faCircleNotch,
-  faCircleCheck
+  faCircleNotch
 )

 const FollowerList = withLoadMore({
@ -36,14 +33,6 @@ const FriendList = withLoadMore({
  additionalPropNames: ['userId']
 })(List)

-const FollowedTagList = withLoadMore({
-  fetch: (props, $store) => $store.dispatch('fetchFollowedTags', props.userId),
-  select: (props, $store) => get($store.getters.findUser(props.userId), 'followedTagIds', []).map(id => $store.getters.findTag(id)),
-  destroy: (props, $store) => $store.dispatch('clearFollowedTags', props.userId),
-  childPropName: 'items',
-  additionalPropNames: ['userId']
-})(List)
-
 const isUserPage = ({ name }) => name === 'user-profile' || name === 'external-user-profile'

 const UserProfile = {
@ -52,7 +41,6 @@ const UserProfile = {
      error: false,
      userId: null,
      tab: 'statuses',
-      followsTab: 'users',
      footerRef: null,
      note: null,
      noteLoading: false
@ -177,9 +165,6 @@ const UserProfile = {
      this.tab = tab
      this.$router.replace({ hash: `#${tab}` })
    },
-    onFollowsTabSwitch (tab) {
-      this.followsTab = tab
-    },
    linkClicked ({ target }) {
      if (target.tagName === 'SPAN') {
        target = target.parentNode
@ -215,7 +200,6 @@ const UserProfile = {
    }
  },
  components: {
-    FollowedTagCard,
    UserCard,
    Timeline,
    FollowerList,
@ -223,8 +207,7 @@ const UserProfile = {
    FollowCard,
    TabSwitcher,
    Conversation,
-    RichContent,
-    FollowedTagList
+    RichContent
  }
 }

--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@ -37,15 +37,6 @@
              :html="field.value"
              :emoji="user.emoji"
            />
-            <span
-              v-if="field.verified_at"
-              class="user-profile-field-validated"
-            >
-              <FAIcon
-                icon="check-circle"
-                :title="$t('user_profile.field_validated')"
-              />
-            </span>
          </dd>
        </dl>
      </div>
@ -105,48 +96,22 @@
          v-if="followsTabVisible"
          key="followees"
          :label="$t('user_card.followees')"
+          :disabled="!user.friends_count"
        >
-          <tab-switcher
-            :active-tab="followsTab"
-            :render-only-focused="true"
-            :on-switch="onFollowsTabSwitch"
-          >
-            <div
-              key="users"
-              :label="$t('user_card.followed_users')"
-            >
-              <FriendList :user-id="userId">
-                <template #item="{item}">
-                  <FollowCard :user="item" />
-                </template>
-              </FriendList>
-            </div>
-            <div
-              key="tags"
-              v-if="isUs"
-              :label="$t('user_card.followed_tags')"
-            >
-              <FollowedTagList
-                :user-id="userId"
-                :get-key="(item) => item.name"
-              >
-                <template #item="{item}">
-                  <FollowedTagCard :tag="item" />
-                </template>
-                <template #empty>
-                  {{ $t('user_card.not_following_any_hashtags')}}
-                </template>
-              </FollowedTagList>
-            </div>
-          </tab-switcher>
+          <FriendList :user-id="userId">
+            <template v-slot:item="{item}">
+              <FollowCard :user="item" />
+            </template>
+          </FriendList>
        </div>
        <div
          v-if="followersTabVisible"
          key="followers"
          :label="$t('user_card.followers')"
+          :disabled="!user.followers_count"
        >
          <FollowerList :user-id="userId">
-            <template #item="{item}">
+            <template v-slot:item="{item}">
              <FollowCard
                :user="item"
                :no-follows-you="isUs"
@ -262,11 +227,6 @@
        padding: 0.5em 1.5em;
        box-sizing: border-box;
      }
-
-      .user-profile-field-validated {
-        margin-left: 1rem;
-        color: green;
-      }
    }
  }

--- a/src/hocs/with_load_more/with_load_more.jsx
+++ b/src/hocs/with_load_more/with_load_more.jsx
@ -59,8 +59,7 @@ const withLoadMore = ({
              this.loading = false
              this.bottomedOut = isEmpty(newEntries)
            })
-            .catch((e) => {
-              console.error(e)
+            .catch(() => {
              this.loading = false
              this.error = true
            })
@ -89,7 +88,7 @@ const withLoadMore = ({
      const children = this.$slots
      return (
        <div class="with-load-more">
-          <WrappedComponent {...props} >
+          <WrappedComponent {...props}>
            {children}
          </WrappedComponent>
          <div class="with-load-more-footer">
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -86,8 +86,7 @@
        "load_all_hint": "Loaded first {saneAmount} emoji, loading all emoji may cause performance issues.",
        "search_emoji": "Search for an emoji",
        "stickers": "Stickers",
-        "unicode": "Unicode emoji",
-        "recent": "Recently used"
+        "unicode": "Unicode emoji"
    },
    "errors": {
        "storage_unavailable": "Pleroma could not access browser storage. Your login or your local settings won't be saved and you might encounter unexpected issues. Try enabling cookies."
@ -929,10 +928,6 @@
        "user_profile_default_tab": "Default Tab on User Profile",
        "user_profiles": "User Profiles",
        "user_settings": "User Settings",
-        "user_accepts_direct_messages_from": "Accept DMs From",
-        "user_accepts_direct_messages_from_everybody": "Everybody",
-        "user_accepts_direct_messages_from_nobody": "Nobody",
-        "user_accepts_direct_messages_from_people_i_follow": "People I follow",
        "valid_until": "Valid until",
        "values": {
            "false": "no",
@ -1061,7 +1056,6 @@
        "show_new": "Show new",
        "socket_broke": "Realtime connection lost: CloseEvent code {0}",
        "socket_reconnected": "Realtime connection established",
-        "follow_tag": "Follow hashtag",
        "unfollow_tag": "Unfollow hashtag",
        "up_to_date": "Up-to-date"
    },
@ -1145,8 +1139,6 @@
        "follow_unfollow": "Unfollow",
        "followees": "Following",
        "followers": "Followers",
-        "followed_tags": "Followed hashtags",
-        "followed_users": "Followed users",
        "following": "Following!",
        "follows_you": "Follows you!",
        "hidden": "Hidden",
@ -1185,9 +1177,6 @@
        "unfollow_confirm_accept_button": "Yes, unfollow",
        "unfollow_confirm_cancel_button": "No, don't unfollow",
        "unfollow_confirm_title": "Unfollow user",
-        "not_following_any_hashtags": "You are not following any hashtags",
-        "follow_tag": "Follow hashtag",
-        "unfollow_tag": "Unfollow hashtag",
        "unmute": "Unmute",
        "unmute_progress": "Unmuting…",
        "unsubscribe": "Unsubscribe"
@ -1195,8 +1184,7 @@
    "user_profile": {
        "profile_does_not_exist": "Sorry, this profile does not exist.",
        "profile_loading_error": "Sorry, there was an error loading this profile.",
-        "timeline_title": "User timeline",
-        "field_validated": "Link Verified"
+        "timeline_title": "User timeline"
    },
    "user_reporting": {
        "add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@ -19,8 +19,7 @@ const saveImmedeatelyActions = [
  'setOption',
  'setClientData',
  'setToken',
-  'clearToken',
-  'emojiUsed',
+  'clearToken'
 ]

 const defaultStorage = (() => {
--- a/src/main.js
+++ b/src/main.js
@ -22,7 +22,6 @@ import announcementsModule from './modules/announcements.js'
 import editStatusModule from './modules/editStatus.js'
 import statusHistoryModule from './modules/statusHistory.js'
 import tagModule from './modules/tags.js'
-import recentEmojisModule from './modules/recentEmojis.js'

 import { createI18n } from 'vue-i18n'

@ -48,8 +47,7 @@ const persistedStateOptions = {
  paths: [
    'config',
    'users.lastLoginName',
-    'oauth',
-    'recentEmojis.emojis',
+    'oauth'
  ]
 };

@ -100,8 +98,7 @@ const persistedStateOptions = {
      announcements: announcementsModule,
      editStatus: editStatusModule,
      statusHistory: statusHistoryModule,
-      tags: tagModule,
-      recentEmojis: recentEmojisModule,
+      tags: tagModule
    },
    plugins,
    strict: false // Socket modifies itself, let's ignore this for now.
--- a/src/modules/api.js
+++ b/src/modules/api.js
@ -1,6 +1,5 @@
 import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
 import { WSConnectionStatus } from '../services/api/api.service.js'
-import { map } from 'lodash'

 const retryTimeout = (multiplier) => 1000 * multiplier

@ -41,6 +40,9 @@ const api = {
    setSocket (state, socket) {
      state.socket = socket
    },
+    setFollowRequests (state, value) {
+      state.followRequests = value
+    },
    setMastoUserSocketStatus (state, value) {
      state.mastoUserSocketStatus = value
    },
@ -49,15 +51,6 @@ const api = {
    },
    resetRetryMultiplier (state) {
      state.retryMultiplier = 1
-    },
-    setFollowRequests (state, value) {
-      state.followRequests = [...value]
-    },
-    saveFollowRequests (state, requests) {
-      state.followRequests = [...state.followRequests, ...requests]
-    },
-    saveFollowRequestPagination (state, pagination) {
-      state.followRequestsPagination = pagination
    }
  },
  actions: {
@ -247,22 +240,24 @@ const api = {
        ...rest
      })
    },
+
+    // Follow requests
+    startFetchingFollowRequests (store) {
+      if (store.state.fetchers['followRequests']) return
+      const fetcher = store.state.backendInteractor.startFetchingFollowRequests({ store })
+
+      store.commit('addFetcher', { fetcherName: 'followRequests', fetcher })
+    },
+    stopFetchingFollowRequests (store) {
+      const fetcher = store.state.fetchers.followRequests
+      if (!fetcher) return
+      store.commit('removeFetcher', { fetcherName: 'followRequests', fetcher })
+    },
    removeFollowRequest (store, request) {
-      let requests = [...store.state.followRequests].filter((it) => it.id !== request.id)
+      let requests = store.state.followRequests.filter((it) => it !== request)
      store.commit('setFollowRequests', requests)
    },
-    fetchFollowRequests ({ rootState, commit }) {
-      const pagination = rootState.api.followRequestsPagination
-      return rootState.api.backendInteractor.getFollowRequests({ pagination })
-        .then((requests) => {
-          if (requests.data.length > 0) {
-            commit('addNewUsers', requests.data)
-            commit('saveFollowRequests', requests.data)
-            commit('saveFollowRequestPagination', requests.pagination)
-          }
-          return requests
-        })
-    },
+
    // Lists
    startFetchingLists (store) {
      if (store.state.fetchers['lists']) return
--- a/src/modules/recentEmojis.js
+++ b/src/modules/recentEmojis.js
@ -1,50 +0,0 @@
-// each row is 7 emojis, 6 rows chosen arbitrarily. i don't think more than
-// that are going to be useful.
-const RECENT_MAX = 7 * 6
-
-const defaultState = {
-  emojis: [],
-}
-
-const recentEmojis = {
-  state: defaultState,
-
-  mutations: {
-    emojiUsed ({ emojis }, emoji) {
-      if (emoji.displayText === undefined || emoji.displayText === null) {
-        console.error('emojiUsed was called with a bad emoji object: ', emoji)
-        return
-      } else if (emoji.displayText.includes('@')) {
-        console.error('emojiUsed was called with a remote emoji: ', emoji)
-        return
-      }
-
-      const i = emojis.indexOf(emoji.displayText)
-
-      if (i === -1) {
-        // not in `emojis` yet, insert and truncate if necessary
-        const newLength = emojis.unshift(emoji.displayText)
-        if (newLength > RECENT_MAX) {
-          emojis.pop()
-        }
-      } else if (i !== 0) {
-        // emoji is already in `emojis` but needs to be bumped to the top
-        emojis.splice(i, 1)
-        emojis.unshift(emoji.displayText)
-      }
-    },
-  },
-
-  getters: {
-    recentEmojis: (state, getters, rootState) => state.emojis.reduce((objects, displayText) => {
-      const allEmojis = rootState.instance.emoji.concat(rootState.instance.customEmoji)
-      let emojiObject = allEmojis.find(emoji => emoji.displayText === displayText)
-      if (emojiObject !== undefined) {
-        objects.push(emojiObject)
-      }
-      return objects
-    }, []),
-  },
-}
-
-export default recentEmojis
--- a/src/modules/tags.js
+++ b/src/modules/tags.js
@ -2,15 +2,9 @@ import { merge } from 'lodash'

 const tags = {
  state: {
-    // Contains key = name, value = tag json
+    // Contains key = id, value = number of trackers for this poll
    tags: {}
  },
-  getters: {
-    findTag: state => query => {
-      const result = state.tags[query]
-      return result
-    },
-  },
  mutations: {
    setTag (state, { name, data }) {
      state.tags[name] = data
@ -23,17 +17,17 @@ const tags = {
        return tag
      })
    },
-    followTag ({ rootState, commit }, tagName) {
-      return rootState.api.backendInteractor.followHashtag({ tag: tagName })
+    followTag (store, tagName) {
+      return store.rootState.api.backendInteractor.followHashtag({ tag: tagName })
        .then((resp) => {
-          commit('setTag', { name: tagName, data: resp })
+          store.commit('setTag', { name: tagName, data: resp })
          return resp
        })
    },
-    unfollowTag ({ rootState, commit }, tagName) {
-      return rootState.api.backendInteractor.unfollowHashtag({ tag: tagName })
+    unfollowTag ({ rootState, commit }, tag) {
+      return rootState.api.backendInteractor.unfollowHashtag({ tag })
        .then((resp) => {
-          commit('setTag', { name: tagName, data: resp })
+          commit('setTag', { name: tag, data: resp })
          return resp
        })
    }
--- a/src/modules/users.js
+++ b/src/modules/users.js
@ -5,9 +5,9 @@ import { compact, map, each, mergeWith, last, concat, uniq, isArray } from 'loda
 import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'

 // TODO: Unify with mergeOrAdd in statuses.js
-export const mergeOrAdd = (arr, obj, item, key = 'id') => {
+export const mergeOrAdd = (arr, obj, item) => {
  if (!item) { return false }
-  const oldItem = obj[item[key]]
+  const oldItem = obj[item.id]
  if (oldItem) {
    // We already have this, so only merge the new info.
    mergeWith(oldItem, item, mergeArrayLength)
@ -15,7 +15,7 @@ export const mergeOrAdd = (arr, obj, item, key = 'id') => {
  } else {
    // This is a new item, prepare it
    arr.push(item)
-    obj[item[key]] = item
+    obj[item.id] = item
    if (item.screen_name && !item.screen_name.includes('@')) {
      obj[item.screen_name.toLowerCase()] = item
    }
@ -157,14 +157,6 @@ export const mutations = {
    const user = state.usersObject[id]
    user.followerIds = uniq(concat(user.followerIds || [], followerIds))
  },
-  saveFollowedTagIds (state, { id, followedTagIds }) {
-    const user = state.usersObject[id]
-    user.followedTagIds = uniq(concat(user.followedTagIds || [], followedTagIds))
-  },
-  saveFollowedTagPagination (state, { id, pagination }) {
-    const user = state.usersObject[id]
-    user.followedTagPagination = pagination
-  },
  // Because frontend doesn't have a reason to keep these stuff in memory
  // outside of viewing someones user profile.
  clearFriends (state, userId) {
@ -179,12 +171,6 @@ export const mutations = {
      user['followerIds'] = []
    }
  },
-  clearFollowedTags (state, userId) {
-    const user = state.usersObject[userId]
-    if (user) {
-      user['followedTagIds'] = []
-    }
-  },
  addNewUsers (state, users) {
    each(users, (user) => {
      if (user.relationship) {
@ -265,12 +251,6 @@ export const mutations = {
  signUpFailure (state, errors) {
    state.signUpPending = false
    state.signUpErrors = errors
-  },
-  decrementFollowRequestsCount (store) {
-    store.currentUser.follow_requests_count--
-  },
-  incrementFollowRequestsCount (store) {
-    store.currentUser.follow_requests_count++
  }
 }

@ -291,7 +271,7 @@ export const getters = {
  relationship: state => id => {
    const rel = id && state.relationships[id]
    return rel || { id, loading: true }
-  },
+  }
 }

 export const defaultState = {
@ -302,9 +282,7 @@ export const defaultState = {
  usersObject: {},
  signUpPending: false,
  signUpErrors: [],
-  relationships: {},
-  tags: [],
-  tagsObject: {}
+  relationships: {}
 }

 const users = {
@ -424,27 +402,12 @@ const users = {
          return followers
        })
    },
-    fetchFollowedTags ({ rootState, commit }, id) {
-      const user = rootState.users.usersObject[id]
-      const pagination = user.followedTagPagination
-
-      return rootState.api.backendInteractor.getFollowedHashtags({ pagination })
-        .then(({ data: tags, pagination }) => {
-          each(tags, tag => commit('setTag', { name: tag.name, data: tag }))
-          commit('saveFollowedTagIds', { id, followedTagIds: tags.map(tag => tag.name) })
-          commit('saveFollowedTagPagination', { id, pagination })
-          return tags
-        })
-    },
    clearFriends ({ commit }, userId) {
      commit('clearFriends', userId)
    },
    clearFollowers ({ commit }, userId) {
      commit('clearFollowers', userId)
    },
-    clearFollowedTags ({ commit }, userId) {
-      commit('clearFollowedTags', userId)
-    },
    subscribeUser ({ rootState, commit }, id) {
      return rootState.api.backendInteractor.subscribeUser({ id })
        .then((relationship) => commit('updateUserRelationship', [relationship]))
@ -510,12 +473,6 @@ const users = {
        store.commit('setUserForNotification', notification)
      })
    },
-    decrementFollowRequestsCount (store) {
-      store.commit('decrementFollowRequestsCount')
-    },
-    incrementFollowRequestsCount (store) {
-      store.commit('incrementFollowRequestsCount')
-    },
    searchUsers ({ rootState, commit }, { query }) {
      return rootState.api.backendInteractor.searchUsers({ query })
        .then((users) => {
@ -579,6 +536,7 @@ const users = {
          store.dispatch('stopFetchingTimeline', 'friends')
          store.commit('setBackendInteractor', backendInteractorService(store.getters.getToken()))
          store.dispatch('stopFetchingNotifications')
+          store.dispatch('stopFetchingFollowRequests')
          store.dispatch('stopFetchingConfig')
          store.commit('clearNotifications')
          store.commit('resetStatuses')
@ -637,16 +595,13 @@ const users = {

              // Get user mutes
              store.dispatch('fetchMutes')
+
              store.dispatch('setLayoutWidth', windowWidth())
              store.dispatch('setLayoutHeight', windowHeight())
              store.dispatch('getSupportedTranslationlanguages')
              store.dispatch('getSettingsProfile')
              store.dispatch('listSettingsProfiles')
              store.dispatch('startFetchingConfig')
-              store.dispatch('startFetchingAnnouncements')
-              if (user.role === 'admin' || user.role === 'moderator') {
-                store.dispatch('startFetchingReports')
-              }

              // Fetch our friends
              store.rootState.api.backendInteractor.fetchFriends({ id: user.id })
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -1,7 +1,6 @@
 import { each, map, concat, last, get } from 'lodash'
 import { parseStatus, parseSource, parseUser, parseNotification, parseReport, parseAttachment, parseLinkHeaderPagination } from '../entity_normalizer/entity_normalizer.service.js'
 import { RegistrationError, StatusCodeError } from '../errors/errors'
-import { Url } from 'url'

 /* eslint-env browser */
 const MUTES_IMPORT_URL = '/api/pleroma/mutes_import'
@ -112,7 +111,6 @@ const AKKOMA_SETTING_PROFILE_LIST = `/api/v1/akkoma/frontend_settings/pleroma-fe
 const MASTODON_TAG_URL = (name) => `/api/v1/tags/${name}`
 const MASTODON_FOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/follow`
 const MASTODON_UNFOLLOW_TAG_URL = (name) => `/api/v1/tags/${name}/unfollow`
-const MASTODON_FOLLOWED_TAGS_URL = '/api/v1/followed_tags'

 const oldfetch = window.fetch

@ -406,6 +404,14 @@ const fetchFollowers = ({ id, maxId, sinceId, limit = 20, credentials }) => {
    .then((data) => data.json())
    .then((data) => data.map(parseUser))
 }
+
+const fetchFollowRequests = ({ credentials }) => {
+  const url = MASTODON_FOLLOW_REQUESTS_URL
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((data) => data.json())
+    .then((data) => data.map(parseUser))
+}
+
 const fetchLists = ({ credentials }) => {
  const url = MASTODON_LISTS_URL
  return fetch(url, { headers: authHeaders(credentials) })
@ -1569,48 +1575,6 @@ const unfollowHashtag = ({ tag, credentials }) => {
  })
 }

-const getFollowedHashtags = ({ credentials, pagination: savedPagination }) => {
-  const queryParams = new URLSearchParams()
-  if (savedPagination?.maxId) {
-    queryParams.append('max_id', savedPagination.maxId)
-  }
-  const url = `${MASTODON_FOLLOWED_TAGS_URL}?${queryParams.toString()}`
-  let pagination = {};
-  return fetch(url, {
-    credentials
-  }).then((data) => {
-    pagination = parseLinkHeaderPagination(data.headers.get('Link'), {
-      flakeId: false
-    });
-    return data.json()
-  }).then((data) => {
-    return {
-      pagination,
-      data
-    }
-  });
-}
-
-const getFollowRequests = ({ credentials, pagination: savedPagination }) => {
-  const queryParams = new URLSearchParams()
-  if (savedPagination?.maxId) {
-    queryParams.append('max_id', savedPagination.maxId)
-  }
-  const url = `${MASTODON_FOLLOW_REQUESTS_URL}?${queryParams.toString()}`
-  let pagination = {};
-  return fetch(url, {
-    credentials
-  }).then((data) => {
-    pagination = parseLinkHeaderPagination(data.headers.get('Link'), { flakeId: true });
-    return data.json()
-  }).then((data) => {
-    return {
-      pagination,
-      data: data.map(parseUser)
-    }
-  });
-}
-
 export const getMastodonSocketURI = ({ credentials, stream, args = {} }) => {
  return Object.entries({
    ...(credentials
@ -1800,6 +1764,7 @@ const apiService = {
  mfaConfirmOTP,
  addBackup,
  listBackups,
+  fetchFollowRequests,
  fetchLists,
  createList,
  getList,
@ -1848,9 +1813,7 @@ const apiService = {
  deleteNoteFromReport,
  getHashtag,
  followHashtag,
-  unfollowHashtag,
-  getFollowedHashtags,
-  getFollowRequests
+  unfollowHashtag
 }

 export default apiService
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@ -1,6 +1,7 @@
 import apiService, { getMastodonSocketURI, ProcessedWS } from '../api/api.service.js'
 import timelineFetcher from '../timeline_fetcher/timeline_fetcher.service.js'
 import notificationsFetcher from '../notifications_fetcher/notifications_fetcher.service.js'
+import followRequestFetcher from '../../services/follow_request_fetcher/follow_request_fetcher.service'
 import listsFetcher from '../../services/lists_fetcher/lists_fetcher.service.js'
 import announcementsFetcher from '../../services/announcements_fetcher/announcements_fetcher.service.js'
 import configFetcher from '../config_fetcher/config_fetcher.service.js'
@ -27,6 +28,10 @@ const backendInteractorService = credentials => ({
    return notificationsFetcher.fetchAndUpdate({ ...args, credentials })
  },

+  startFetchingFollowRequests ({ store }) {
+    return followRequestFetcher.startFetching({ store, credentials })
+  },
+
  startFetchingLists ({ store }) {
    return listsFetcher.startFetching({ store, credentials })
  },
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@ -68,15 +68,13 @@ export const parseUser = (data) => {
    output.fields_html = data.fields.map(field => {
      return {
        name: escape(field.name),
-        value: field.value,
-        verified_at: field.verified_at
+        value: field.value
      }
    })
    output.fields_text = data.fields.map(field => {
      return {
        name: unescape(field.name.replace(/<[^>]*>/g, '')),
-        value: unescape(field.value.replace(/<[^>]*>/g, '')),
-        verified_at: field.verified_at
+        value: unescape(field.value.replace(/<[^>]*>/g, ''))
      }
    })

@ -90,8 +88,6 @@ export const parseUser = (data) => {
    output.friends_count = data.following_count

    output.bot = data.bot
-    output.accepts_direct_messages_from = data.accepts_direct_messages_from
-    output.follow_requests_count = data.follow_requests_count
    if (data.akkoma) {
      output.instance = data.akkoma.instance
      output.status_ttl_days = data.akkoma.status_ttl_days
@ -412,10 +408,8 @@ export const parseNotification = (data) => {
  if (masto) {
    output.type = mastoDict[data.type] || data.type
    output.seen = data.pleroma.is_seen
-    if (data.status) {
-      output.status = isStatusNotification(output.type) ? parseStatus(data.status) : null
-      output.action = output.status // TODO: Refactor, this is unneeded
-    }
+    output.status = isStatusNotification(output.type) ? parseStatus(data.status) : null
+    output.action = output.status // TODO: Refactor, this is unneeded
    output.target = output.type !== 'move'
      ? null
      : parseUser(data.target)
--- a/src/services/follow_request_fetcher/follow_request_fetcher.service.js
+++ b/src/services/follow_request_fetcher/follow_request_fetcher.service.js
@ -0,0 +1,23 @@
+import apiService from '../api/api.service.js'
+import { promiseInterval } from '../promise_interval/promise_interval.js'
+
+const fetchAndUpdate = ({ store, credentials }) => {
+  return apiService.fetchFollowRequests({ credentials })
+    .then((requests) => {
+      store.commit('setFollowRequests', requests)
+      store.commit('addNewUsers', requests)
+    }, () => {})
+    .catch(() => {})
+}
+
+const startFetching = ({ credentials, store }) => {
+  const boundFetchAndUpdate = () => fetchAndUpdate({ credentials, store })
+  boundFetchAndUpdate()
+  return promiseInterval(boundFetchAndUpdate, 240000)
+}
+
+const followRequestFetcher = {
+  startFetching
+}
+
+export default followRequestFetcher
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@ -4,21 +4,19 @@ import { getColors, computeDynamicColor, getOpacitySlot } from '../theme_data/th

 export const applyTheme = (input) => {
  const { rules } = generatePreset(input)
+  const head = document.head
  const body = document.body
  body.classList.add('hidden')

-  /** @type {CSSStyleSheet} */
-  const styleSheet = document.getElementById('theme-holder').sheet
-
-  for (let i = styleSheet.cssRules.length; i--; ) {
-    styleSheet.deleteRule(0)
-  }
-
-  styleSheet.insertRule(
-    `:root { ${rules.radii}; ${rules.colors}; ${rules.shadows}; ${rules.fonts}; }`,
-    0
-  )
+  const styleEl = document.createElement('style')
+  head.appendChild(styleEl)
+  const styleSheet = styleEl.sheet

+  styleSheet.toString()
+  styleSheet.insertRule(`:root { ${rules.radii} }`, 'index-max')
+  styleSheet.insertRule(`:root { ${rules.colors} }`, 'index-max')
+  styleSheet.insertRule(`:root { ${rules.shadows} }`, 'index-max')
+  styleSheet.insertRule(`:root { ${rules.fonts} }`, 'index-max')
  body.classList.remove('hidden')
 }

--- a/static/.tos
+++ b/static/.tos
@ -0,0 +1,45 @@
+<h4>Terms of Service</h4>
+
+<p>It's mainly "be nice"</p>
+
+<ol>
+    <li>
+        <h3>Don't be a big meanie</h4>
+        <p>Arguments are cool and all but don't make them into flamewars. Try to act in good faith - we want to be at least on good terms with people. Please act with understanding towards others on this instance. Most people here are probably struggling with a lot, be mindful of that.</p>
+    </li>
+    <li>
+        <h3>Mark your lewds!</h3>
+	<p>Reminder that lewd is bad and nobody wants to be forced to see that. Just mark it sensitive, and post unlisted. That is to say, anything suggestive/ecchi upwards should be marked. If you wouldn't look at it with your parents/boss in the room, mark it. It goes without saying that if you're <em>going</em> to post lewd stuff, keep it sensible. Obviously nothing underaged or otherwise questionable. Or you could just not post lewd stuff. Either/or.</p>
+    </li>
+    <li>
+	    <h3>This is a <b>Kink Shame Zone</b></h3>
+	    <p>Being a lewdie will be met with many anime girl reaction images shaming you for your lewdness. Go think about icky things on someone else's webzone™</p>
+    </li>
+    <li>
+	   <h3>Keep it legal!</h3>
+	   <p>Server is hosted in france, keep content legal for there (+ wherever you're browsing from)</p>
+    </li>
+    <li>
+	    <h3>No ads/spambots</h3>
+	    <p>I didn't think I'd have to specify this, but please do not set up bots solely for trying to advertise.</h3>
+    </li>
+    <li>
+	    <h3>Non-TOS recommendations</h3>
+	    <p>This is stuff that'd I'd <em>like</em> you to do, but I won't outright ban you if you don't follow them</p>
+	    <ul>
+		    <li>If someone is sadposting, don't antagonise them - they probably just want to vent</li>
+		    <li>Put walls of text behind a subject (CW) - helps the timeline not get flooded with text</li>
+	    </ul>
+    </li>
+
+    <li>
+	    <h3>Other</h3>
+	    <p>If you're here and you happen to play minecraft, feel free to message me with your username and come play with us sometime!</p>
+   </li>
+
+</ol>
+
+<p>So I guess yeah, that's about it. Try to be nice, eh? We're probably all sad here.</p>
+
+<br>
+<img src="/static/logo.png" style="display: block; margin: auto; max-width: 100%; height: 50px; object-fit: contain;" />
--- a/static/logo.png
+++ b/static/logo.png
--- a/static/theme-holder.css
+++ b/static/theme-holder.css
@ -1 +0,0 @@
-// This file intentionally left blank
--- a/yarn.lock
+++ b/yarn.lock
@ -1350,13 +1350,6 @@
    minimatch "^3.0.4"
    strip-json-comments "^3.1.1"

-"@floatingghost/pinch-zoom-element@^1.3.1":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@floatingghost/pinch-zoom-element/-/pinch-zoom-element-1.3.1.tgz#5f327ad17ddf1f56777098aca088fdbf99cbd049"
-  integrity sha512-KnE7aBQdd/Fj1TzU5uzgwD9YAQ58DTMUks/PoTEBFW4zi0lBM9cN/j45wzcnzsT2VXG1S6qM7NMmq7NGm2//Fg==
-  dependencies:
-    pointer-tracker "^2.0.3"
-
 "@fortawesome/fontawesome-common-types@6.2.0":
  version "6.2.0"
  resolved "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.2.0.tgz"
@ -1523,6 +1516,13 @@
    "@jridgewell/resolve-uri" "^3.0.3"
    "@jridgewell/sourcemap-codec" "^1.4.10"

+"@kazvmoe-infra/pinch-zoom-element@1.2.0":
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/@kazvmoe-infra/pinch-zoom-element/-/pinch-zoom-element-1.2.0.tgz"
+  integrity sha512-HBrhH5O/Fsp2bB7EGTXzCsBAVcMjknSagKC5pBdGpKsF8meHISR0kjDIdw4YoE0S+0oNMwJ6ZUZyIBrdywxPPw==
+  dependencies:
+    pointer-tracker "^2.0.3"
+
 "@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1":
  version "5.1.1-v1"
  resolved "https://registry.yarnpkg.com/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz#dbf733a965ca47b1973177dc0bb6c889edcfb129"
Author	SHA1	Message	Date
eris	b3d2f15268	Disable follow button if blocked by user	2023-01-27 00:28:27 +00:00
eris	d8dff6062a	Add indicator if user blocks you	2023-01-26 20:49:07 +00:00