remove IHBA link

.gitea/issue_template/bug.yml

@@ -1,49 +0,0 @@
-name: "Bug report"
-about: "Something isn't working as expected"
-title: "[bug] "
-body:
-  - type: markdown
-    attributes:
-      value: "Thanks for taking the time to file this bug report! Please try to be as specific and detailed as you can, so we can track down the issue and fix it as soon as possible."
-  - type: input
-    id: version
-    attributes:
-      label: "Version"
-      description: "Which version of pleroma-fe are you running? If running develop, specify the commit hash."
-      placeholder: "e.g. 2022.11, 40e86998e6"
-  - type: textarea
-    id: attempt
-    attributes:
-      label: "What were you trying to do?"
-      validations:
-        required: true
-  - type: textarea
-    id: expectation
-    attributes:
-      label: "What did you expect to happen?"
-      validations:
-        required: true
-  - type: textarea
-    id: reality
-    attributes:
-      label: "What actually happened?"
-      validations:
-        required: true
-  - type: dropdown
-    id: severity
-    attributes:
-      label: "Severity"
-      description: "Does this issue prevent you from using the software as normal?"
-      options:
-        - "I cannot use the software"
-        - "I cannot use it as easily as I'd like"
-        - "I can manage"
-      validations:
-        required: true
-  - type: checkboxes
-    id: searched
-    attributes:
-      label: "Have you searched for this issue?"
-      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev) or [the issue tracker](https://akkoma.dev/AkkomaGang/pleroma-fe/issues)."
-      options:
-        - label: "I have double-checked and have not found this issue mentioned anywhere."

.gitea/issue_template/feat.yml

@@ -1,29 +0,0 @@
-name: "Feature request"
-about: "I'd like something to be added to pleroma-fe"
-title: "[feat] "
-body:
-  - type: markdown
-    attributes:
-      value: "Thanks for taking the time to request a new feature! Please be as concise and clear as you can in your proposal, so we could understand what you're going for."
-  - type: textarea
-    id: idea
-    attributes:
-      label: "The idea"
-      description: "What do you think you should be able to do in pleroma-fe?"
-      validations:
-        required: true
-  - type: textarea
-    id: reason
-    attributes:
-      label: "The reasoning"
-      description: "Why would this be a worthwhile feature? Does it solve any problems? Have people talked about wanting it?"
-      validations:
-        required: true
-  - type: checkboxes
-    id: searched
-    attributes:
-      label: "Have you searched for this feature request?"
-      description: "Please double-check that your issue is not already being tracked on [the forums](https://meta.akkoma.dev), [the issue tracker](https://akkoma.dev/AkkomaGang/pleroma-fe/issues), or the one for [the backend](https://akkoma.dev/AkkomaGang/akkoma/issues)."
-      options:
-        - label: "I have double-checked and have not found this feature request mentioned anywhere."
-        - label: "This feature is related to the pleroma-fe Akkoma frontend specifically, and not the backend."

.tool-versions

@@ -1 +0,0 @@
-nodejs 20.12.2

.woodpecker.yml

@@ -1,12 +1,9 @@
-labels:
+pipeline:
-  platform: linux/amd64
-
-steps:
   lint:
     when:
       event:
       - pull_request
-    image: node:20
+    image: node:18
     commands:
     - yarn
     - yarn lint
@@ -16,11 +13,11 @@ steps:
     when:
       event:
       - pull_request
-    image: node:20
+    image: node:18
     commands:
     - apt update
     - apt install firefox-esr -y --no-install-recommends
-    - yarn
+    - yarn 
     - yarn unit
 
   build:
@@ -30,7 +27,7 @@ steps:
       branch:
       - develop
       - stable
-    image: node:20
+    image: node:18
     commands:
     - yarn
     - yarn build
@@ -42,15 +39,15 @@ steps:
       branch:
       - develop
       - stable
-    image: node:20
+    image: node:18
     secrets:
     - SCW_ACCESS_KEY
     - SCW_SECRET_KEY
     - SCW_DEFAULT_ORGANIZATION_ID
     commands:
       - apt-get update && apt-get install -y rclone wget zip
-      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.30.0/scaleway-cli_2.30.0_linux_amd64
+      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
-      - mv scaleway-cli_2.30.0_linux_amd64 scaleway-cli
+      - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
       - chmod +x scaleway-cli
       - ./scaleway-cli object config install type=rclone
       - zip akkoma-fe.zip -r dist
@@ -72,8 +69,8 @@ steps:
     - SCW_DEFAULT_ORGANIZATION_ID
     commands:
     - apt-get update && apt-get install -y rclone wget git zip
-    - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.30.0/scaleway-cli_2.30.0_linux_amd64
+    - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
-    - mv scaleway-cli_2.30.0_linux_amd64 scaleway-cli
+    - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
     - chmod +x scaleway-cli
     - ./scaleway-cli object config install type=rclone
     - cd docs
@@ -81,4 +78,4 @@ steps:
     - mkdocs build
     - zip -r docs.zip site/*
     - cd site
-    - rclone copy . scaleway:akkoma-docs/frontend/$CI_COMMIT_BRANCH/ 
+    - rclone copy . scaleway:akkoma-docs/frontend/$CI_COMMIT_BRANCH/

README.md

@@ -1,28 +1,28 @@
-# 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
 
 ``` bash
 # install dependencies
-corepack enable
+npm install -g yarn
 yarn
 
 # serve with hot reload at localhost:8080
@@ -37,7 +37,7 @@ npm run unit
 
 # For Contributors:
 
-You can create file `/config/local.json` (see [example](https://akkoma.dev/AkkomaGang/akkoma-fe/src/branch/develop/config/local.example.json)) to enable some convenience dev options:
+You can create file `/config/local.json` (see [example](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/config/local.example.json)) to enable some convenience dev options:
 
 * `target`: makes local dev server redirect to some existing instance's BE instead of local BE, useful for testing things in near-production environment and searching for real-life use-cases.
 * `staticConfigPreference`: makes FE's `/static/config.json` take preference of BE-served `/api/statusnet/config.json`. Only works in dev mode.

build/dev-server.js

@@ -31,13 +31,15 @@ var devMiddleware = require('webpack-dev-middleware')(compiler, {
 var hotMiddleware = require('webpack-hot-middleware')(compiler)
 
 // proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
+if (!process.env.NO_DEV_PROXY) {
-  var options = proxyTable[context]
+  Object.keys(proxyTable).forEach(function (context) {
-  if (typeof options === 'string') {
+    var options = proxyTable[context]
-    options = { target: options }
+    if (typeof options === 'string') {
-  }
+      options = { target: options }
-  app.use(proxyMiddleware(context, options))
+    }
-})
+    app.use(proxyMiddleware(context, options))
+  })
+}
 
 // handle fallback for HTML5 history API
 app.use(require('connect-history-api-fallback')())

config/cypress.json

@@ -0,0 +1,4 @@
+{
+  "target": "http://cypress.example.com",
+  "staticConfigPreference": false
+}

config/index.js

@@ -1,14 +1,16 @@
 // see http://vuejs-templates.github.io/webpack for documentation.
 const path = require('path')
 let settings = {}
+const localSettings = process.env.CONFIG || './local.json'
+console.log('Using settings', localSettings)
 try {
-  settings = require('./local.json')
+  settings = require(localSettings)
   if (settings.target && settings.target.endsWith('/')) {
     // replacing trailing slash since it can conflict with some apis
     // and that's how actual BE reports its url
     settings.target = settings.target.replace(/\/$/, '')
   }
-  console.log('Using local dev server settings (/config/local.json):')
+  console.log('Using local dev server settings:')
   console.log(JSON.stringify(settings, null, 2))
 } catch (e) {
   console.log('Local dev server settings not found (/config/local.json)')
@@ -38,11 +40,6 @@ module.exports = {
     assetsSubDirectory: 'static',
     assetsPublicPath: '/',
     proxyTable: {
-     '/manifest.json': {
-        target,
-        changeOrigin: true,
-        cookieDomainRewrite: 'localhost'
-      },
       '/api': {
         target,
         changeOrigin: true,

config/local.example.json

@@ -1,4 +1,4 @@
 {
-  "target": "https://otp.akkoma.dev/",
+  "target": "https://pleroma.soykaf.com/",
   "staticConfigPreference": false
 }

cypress.config.js

@@ -0,0 +1,20 @@
+const { defineConfig } = require("cypress");
+const config = require('./build/webpack.dev.conf');
+module.exports = defineConfig({
+  e2e: {
+    baseUrl: "http://localhost:8080",
+    setupNodeEvents(on, config) {
+      // implement node event listeners here
+    },
+    viewportHeight: 1080,
+    viewportWidth: 1920,
+  },
+
+  component: {
+    devServer: {
+      framework: "vue",
+      bundler: "webpack",
+      webpackConfig: config
+    },
+  },
+});

cypress/e2e/auth/auth.cy.js

@@ -0,0 +1,34 @@
+/// <reference types="cypress" />
+
+describe('signing in', () => {
+  beforeEach(async () => {
+    cy.clearLocalStorage()
+    await indexedDB.deleteDatabase('localforage')
+  })
+
+  it('registers an oauth application', async () => {
+    cy.defaultIntercepts();
+    cy.intercept('POST', '/oauth/token', { fixture: 'oauth_token.json'}).as('createToken')
+    cy.intercept('/api/v1/accounts/verify_credentials', { fixture: 'user.json' }).as('verifyCredentials')
+    cy.visit('/')
+    cy.wait('@getInstance')
+    cy.get('input#username').type('testuser');
+    cy.get('input#password').type('testpassword');
+    cy.get('button[type="submit"]').click();
+
+    cy.wait('@createApp')
+    cy.wait('@createToken').then((interception) => {
+      console.log(interception.request)
+      const form = interception.request.body.split('\r\n---')
+      cy.expectHtmlFormEntryToBe(form, 'grant_type', 'client_credentials')
+    });
+    cy.wait('@createToken').then((interception) => {
+      console.log(interception.request)
+      const form = interception.request.body.split('\r\n---')
+      cy.expectHtmlFormEntryToBe(form, 'grant_type', 'password')
+      cy.expectHtmlFormEntryToBe(form, 'username', 'testuser')
+      cy.expectHtmlFormEntryToBe(form, 'password', 'testpassword')
+    });
+    cy.wait('@verifyCredentials')
+  });
+})

cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

cypress/fixtures/frontend_configurations.json

@@ -0,0 +1,26 @@
+{
+  "masto_fe": {
+    "showInstanceSpecificPanel": true
+  },
+  "pleroma_fe": {
+    "alwaysShowSubjectInput": true,
+    "background": "/images/5cm.jpg",
+    "collapseMessageWithSubject": true,
+    "formattingOptionsEnabled": true,
+    "hidePostStats": false,
+    "hideSiteFavicon": true,
+    "hideUserStats": true,
+    "logo": "/static/logo.png",
+    "logoMask": false,
+    "redirectRootLogin": "/main/friends",
+    "redirectRootNoLogin": "/main/public",
+    "renderMisskeyMarkdown": true,
+    "scopeCopy": true,
+    "scopeOptionsEnabled": true,
+    "showInstanceSpecificPanel": true,
+    "showNavShortcuts": false,
+    "showPanelNavShortcuts": true,
+    "subjectLineBehavior": "email",
+    "theme": "ihatebeingalive"
+  }
+}

cypress/fixtures/instance.json

@@ -0,0 +1,133 @@
+{
+  "approval_required": false,
+  "avatar_upload_limit": 2000000,
+  "background_image": "/images/city.jpg",
+  "background_upload_limit": 4000000,
+  "banner_upload_limit": 4000000,
+  "description": "A Test Instace",
+  "description_limit": 5000,
+  "email": "somewhere@example.com",
+  "languages": [
+    "en",
+    "ja"
+  ],
+  "max_toot_chars": 5000,
+  "pleroma": {
+    "metadata": {
+      "account_activation_required": false,
+      "features": [
+        "pleroma_api",
+        "akkoma_api",
+        "mastodon_api",
+        "mastodon_api_streaming",
+        "polls",
+        "v2_suggestions",
+        "pleroma_explicit_addressing",
+        "shareable_emoji_packs",
+        "multifetch",
+        "pleroma:api/v1/notifications:include_types_filter",
+        "editing",
+        "media_proxy",
+        "pleroma_emoji_reactions",
+        "exposable_reactions",
+        "profile_directory",
+        "akkoma:machine_translation",
+        "custom_emoji_reactions",
+        "pleroma:get:main/ostatus"
+      ],
+      "federation": {
+        "enabled": true,
+        "exclusions": true,
+        "mrf_hashtag": {
+          "federated_timeline_removal": [],
+          "reject": [],
+          "sensitive": [
+            "nsfw"
+          ]
+        },
+        "mrf_hellthread": {
+          "delist_threshold": 5,
+          "reject_threshold": 10
+        },
+        "mrf_keyword": {
+          "federated_timeline_removal": [],
+          "reject": [
+            "rejectme"
+          ],
+          "replace": []
+        },
+        "mrf_policies": [
+          "SimplePolicy",
+          "HellthreadPolicy",
+          "KeywordPolicy",
+          "TagPolicy",
+          "InlineQuotePolicy",
+          "HashtagPolicy"
+        ],
+        "mrf_simple": {
+          "accept": [],
+          "avatar_removal": [],
+          "banner_removal": [],
+          "federated_timeline_removal": [],
+          "followers_only": [],
+          "media_nsfw": [],
+          "media_removal": [],
+          "reject": [
+            "badinstance.com"
+          ],
+          "reject_deletes": [],
+          "report_removal": []
+        },
+        "mrf_simple_info": {
+          "reject": {
+            "badinstance.com": {
+              "reason": "This instance is bad"
+            }
+          }
+        },
+        "quarantined_instances": [],
+        "quarantined_instances_info": {
+          "quarantined_instances": {}
+        }
+      },
+      "fields_limits": {
+        "max_fields": 10,
+        "max_remote_fields": 20,
+        "name_length": 512,
+        "value_length": 2048
+      },
+      "post_formats": [
+        "text/plain",
+        "text/html",
+        "text/markdown",
+        "text/bbcode",
+        "text/x.misskeymarkdown"
+      ],
+      "privileged_staff": false
+    },
+    "stats": {
+      "mau": 27
+    },
+    "vapid_public_key": "BDgd8xcYuskwMLnr-3Gi-xOU_Jz9IOxhHIW0VWgBMM47wB8qfC_Hw26eNd3sGDSEoXk06ZY-L5qKHqLLNzZSdnw"
+  },
+  "poll_limits": {
+    "max_expiration": 31536000,
+    "max_option_chars": 200,
+    "max_options": 20,
+    "min_expiration": 0
+  },
+  "registrations": false,
+  "stats": {
+    "domain_count": 14557,
+    "status_count": 284658,
+    "user_count": 72
+  },
+  "thumbnail": "thumb.png",
+  "title": "Test Instance",
+  "upload_limit": 100000000,
+  "uri": "http://localhost:8080/",
+  "urls": {
+    "streaming_api": "ws://localhost:8080"
+  },
+  "version": "2.7.2 (compatible; Akkoma 3.4.0-118-g41241bbb-develop)"
+}

cypress/fixtures/instance_panel.html

@@ -0,0 +1 @@
+<h4>Testing Panel</h4>

cypress/fixtures/nodeinfo.json

@@ -0,0 +1,141 @@
+{
+  "metadata": {
+    "accountActivationRequired": false,
+    "features": [
+      "pleroma_api",
+      "akkoma_api",
+      "mastodon_api",
+      "mastodon_api_streaming",
+      "polls",
+      "v2_suggestions",
+      "pleroma_explicit_addressing",
+      "shareable_emoji_packs",
+      "multifetch",
+      "pleroma:api/v1/notifications:include_types_filter",
+      "editing",
+      "media_proxy",
+      "pleroma_emoji_reactions",
+      "exposable_reactions",
+      "profile_directory",
+      "akkoma:machine_translation",
+      "custom_emoji_reactions",
+      "pleroma:get:main/ostatus"
+    ],
+    "federation": {
+      "enabled": true,
+      "exclusions": true,
+      "mrf_hashtag": {
+        "federated_timeline_removal": [],
+        "reject": [],
+        "sensitive": [
+          "nsfw"
+        ]
+      },
+      "mrf_hellthread": {
+        "delist_threshold": 5,
+        "reject_threshold": 10
+      },
+      "quarantined_instances": [],
+      "quarantined_instances_info": {
+        "quarantined_instances": {}
+      }
+    },
+    "fieldsLimits": {
+      "maxFields": 10,
+      "maxRemoteFields": 20,
+      "nameLength": 512,
+      "valueLength": 2048
+    },
+    "invitesEnabled": true,
+    "localBubbleInstances": [
+      "bubble.example.com"
+    ],
+    "mailerEnabled": true,
+    "nodeDescription": "A Test Instance",
+    "nodeName": "Test",
+    "pollLimits": {
+      "max_expiration": 31536000,
+      "max_option_chars": 200,
+      "max_options": 20,
+      "min_expiration": 0
+    },
+    "postFormats": [
+      "text/plain",
+      "text/html",
+      "text/markdown",
+      "text/bbcode",
+      "text/x.misskeymarkdown"
+    ],
+    "private": false,
+    "restrictedNicknames": [
+      ".well-known",
+      "~",
+      "about",
+      "activities",
+      "api",
+      "auth",
+      "check_password",
+      "dev",
+      "friend-requests",
+      "inbox",
+      "internal",
+      "main",
+      "media",
+      "nodeinfo",
+      "notice",
+      "oauth",
+      "objects",
+      "ostatus_subscribe",
+      "pleroma",
+      "proxy",
+      "push",
+      "registration",
+      "relay",
+      "settings",
+      "status",
+      "tag",
+      "user-search",
+      "user_exists",
+      "users",
+      "web",
+      "verify_credentials",
+      "update_credentials",
+      "relationships",
+      "search",
+      "confirmation_resend",
+      "mfa"
+    ],
+    "skipThreadContainment": true,
+    "staffAccounts": [
+      "http://localhost:8080/users/admin"
+    ],
+    "suggestions": {
+      "enabled": false
+    },
+    "uploadLimits": {
+      "avatar": 2000000,
+      "background": 4000000,
+      "banner": 4000000,
+      "general": 100000000
+    }
+  },
+  "openRegistrations": false,
+  "protocols": [
+    "activitypub"
+  ],
+  "services": {
+    "inbound": [],
+    "outbound": []
+  },
+  "software": {
+    "name": "akkoma",
+    "version": "3.4.0-118-g41241bbb-develop"
+  },
+  "usage": {
+    "localPosts": 284658,
+    "users": {
+      "total": 72
+    }
+  },
+  "version": "2.0"
+}

cypress/fixtures/oauth_app.json

@@ -0,0 +1,9 @@
+{
+  "id": "563419",
+  "name": "test app",
+  "website": null,
+  "redirect_uri": "urn:ietf:wg:oauth:2.0:oob",
+  "client_id": "TWhM-tNSuncnqN7DBJmoyeLnk6K3iJJ71KKXxgL1hPM",
+  "client_secret": "ZEaFUFmF0umgBX1qKJDjaU99Q31lDkOU8NutzTOoliw",
+  "vapid_key": "BCk-QqERU0q-CfYZjcuB6lnyyOYfJ2AifKqfeGIm7Z-HiTU5T9eTG5GxVA0_OH5mMlI4UkkDTpaZwozy0TzdZ2M="
+}

cypress/fixtures/oauth_token.json

@@ -0,0 +1,6 @@
+{
+  "access_token": "ZA-Yj3aBD8U8Cm7lKUp-lm9O9BmDgdhHzDeqsY8tlL0",
+  "token_type": "Bearer",
+  "scope": "read write follow push",
+  "created_at": 1573979017
+}

cypress/fixtures/public_timeline.json

@@ -0,0 +1 @@
+[]

cypress/fixtures/user.json

@@ -0,0 +1,198 @@
+{
+  "acct": "test",
+  "akkoma": {
+    "instance": {
+      "favicon": "favicon.png",
+      "name": "cypress.example.com",
+      "nodeinfo": {
+        "metadata": {
+          "accountActivationRequired": false,
+          "features": [
+            "pleroma_api",
+            "akkoma_api",
+            "mastodon_api",
+            "mastodon_api_streaming",
+            "polls",
+            "v2_suggestions",
+            "pleroma_explicit_addressing",
+            "shareable_emoji_packs",
+            "multifetch",
+            "pleroma:api/v1/notifications:include_types_filter",
+            "editing",
+            "media_proxy",
+            "pleroma_emoji_reactions",
+            "exposable_reactions",
+            "profile_directory",
+            "akkoma:machine_translation",
+            "custom_emoji_reactions",
+            "pleroma:get:main/ostatus"
+          ],
+          "federation": {
+            "enabled": true,
+            "exclusions": true
+          },
+          "fieldsLimits": {
+            "maxFields": 10,
+            "maxRemoteFields": 20,
+            "nameLength": 512,
+            "valueLength": 2048
+          },
+          "invitesEnabled": true,
+          "localBubbleInstances": [
+            "bubble.exaple.com"
+          ],
+          "mailerEnabled": true,
+          "nodeDescription": "An Akkoma Instance",
+          "nodeName": "Test Instance",
+          "pollLimits": {
+            "max_expiration": 31536000,
+            "max_option_chars": 200,
+            "max_options": 20,
+            "min_expiration": 0
+          },
+          "postFormats": [
+            "text/plain",
+            "text/html",
+            "text/markdown",
+            "text/bbcode",
+            "text/x.misskeymarkdown"
+          ],
+          "private": false,
+          "restrictedNicknames": [
+            ".well-known",
+            "~",
+            "about",
+            "activities",
+            "api",
+            "auth",
+            "check_password",
+            "dev",
+            "friend-requests",
+            "inbox",
+            "internal",
+            "main",
+            "media",
+            "nodeinfo",
+            "notice",
+            "oauth",
+            "objects",
+            "ostatus_subscribe",
+            "pleroma",
+            "proxy",
+            "push",
+            "registration",
+            "relay",
+            "settings",
+            "status",
+            "tag",
+            "user-search",
+            "user_exists",
+            "users",
+            "web",
+            "verify_credentials",
+            "update_credentials",
+            "relationships",
+            "search",
+            "confirmation_resend",
+            "mfa"
+          ],
+          "skipThreadContainment": true,
+          "staffAccounts": [
+            "http://cypress.example.com/users/test"
+          ],
+          "suggestions": {
+            "enabled": false
+          },
+          "uploadLimits": {
+            "avatar": 2000000,
+            "background": 4000000,
+            "banner": 4000000,
+            "general": 100000000
+          }
+        },
+        "openRegistrations": false,
+        "protocols": [
+          "activitypub"
+        ],
+        "services": {
+          "inbound": [],
+          "outbound": []
+        },
+        "software": {
+          "name": "akkoma",
+          "version": "3.4.0-136-g98d4d691-develop"
+        },
+        "usage": {
+          "localPosts": 284709,
+          "users": {
+            "total": 72
+          }
+        },
+        "version": "2.0"
+      }
+    }
+  },
+  "avatar": "3ba406a0f1ce44b2379029f322cacb77b78951f515495739bd65bbfcee297931.jpg",
+  "avatar_static": "3ba406a0f1ce44b2379029f322cacb77b78951f515495739bd65bbfcee297931.jpg",
+  "bot": false,
+  "created_at": "2018-11-27T18:04:50.000Z",
+  "display_name": "Test User",
+  "emojis": [
+  ],
+  "fields": [
+  ],
+  "follow_requests_count": 1,
+  "followers_count": 1,
+  "following_count": 1,
+  "fqn": "test@cypress.example.com",
+  "header": "header.gif",
+  "header_static": "header.gif",
+  "id": "1",
+  "last_status_at": "2022-11-27T15:17:03",
+  "locked": true,
+  "note": "A test user",
+"pleroma": {
+    "allow_following_move": true,
+    "also_known_as": [],
+    "ap_id": "http://cypress.example.com/users/example",
+    "background_image": "something.jpg",
+    "deactivated": false,
+    "email": "somewhere@example.com",
+    "favicon": "/favicon.png",
+    "hide_favorites": true,
+    "hide_followers": true,
+    "hide_followers_count": false,
+    "hide_follows": true,
+    "hide_follows_count": false,
+    "is_admin": true,
+    "is_confirmed": true,
+    "is_moderator": true,
+    "is_suggested": false,
+    "notification_settings": {
+      "block_from_strangers": false,
+      "hide_notification_contents": false
+    },
+    "relationship": {},
+    "settings_store": {},
+    "skip_thread_containment": false,
+    "tags": [],
+    "unread_conversation_count": 2108,
+    "unread_notifications_count": 18
+  },
+  "source": {
+    "fields": [
+    ],
+    "note": "Test user",
+    "pleroma": {
+      "actor_type": "Person",
+      "discoverable": true,
+      "no_rich_text": false,
+      "show_role": true
+    },
+    "privacy": "private",
+    "sensitive": false
+  },
+  "statuses_count": 10166,
+  "url": "http://cypress.example.com/users/test",
+  "username": "test"
+}

cypress/support/commands.js

@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })

cypress/support/component-index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <title>Components App</title>
+  </head>
+  <body>
+    <div data-cy-root></div>
+  </body>
+</html>

cypress/support/component.js

@@ -0,0 +1,19 @@
+import './commands'
+import Vuex from 'vuex'
+import getStore from '../../src/store'
+
+
+import { mount } from 'cypress/vue'
+
+Cypress.Commands.add('mount', (component, options = {}) => {
+  // Setup options object
+  options.extensions = options.extensions || {}
+  options.extensions.plugins = options.extensions.plugins || []
+  // Use store passed in from options, or initialize a new one
+  options.store = options.store || getStore()
+
+  // Add Vuex plugin
+  options.extensions.plugins.push(Vuex)
+
+  return mount(component, options)
+})

cypress/support/e2e.js

@@ -0,0 +1,48 @@
+// ***********************************************************
+// This example support/e2e.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'
+
+// Alternatively you can use CommonJS syntax:
+// require('./commands')
+Cypress.Commands.add('defaultIntercepts', () => {
+  const notAuthorized = {
+    body: { error: "not_authorized" },
+    statusCode: 403
+  }
+  cy.intercept('/api/pleroma/frontend_configurations', { fixture: 'frontend_configurations.json' });
+  cy.intercept('/instance/panel.html', { fixture: 'instance_panel.html' })
+  cy.intercept('/api/v1/instance', { fixture: 'instance.json' }).as('getInstance')
+  cy.intercept('/nodeinfo/2.0.json', { fixture: 'nodeinfo.json' })
+  cy.intercept('/api/v1/timelines/public*', { fixture: 'public_timeline.json' })
+  cy.intercept('/static/stickers.json', { body: {} })
+
+  cy.intercept('POST', 'http://cypress.example.com/oauth/token', notAuthorized);
+  cy.intercept('/api/v1/mutes', notAuthorized);
+  cy.intercept('/api/v1/announcements', notAuthorized);
+  cy.intercept('POST', 'http://cypress.example.com/api/v1/apps', { fixture: 'oauth_app.json' }).as('createApp');
+
+});
+
+Cypress.Commands.add('authenticatedIntercepts', () => {
+  cy.intercept('POST', '/oauth/token', { fixture: 'oauth_token.json'})
+  cy.intercept('/api/v1/announcements', { body: [] })
+  cy.intercept('/api/v1/mutes', { body: [] })
+});
+
+Cypress.Commands.add('expectHtmlFormEntryToBe', (form, key, value) => {
+  expect(form.find((line) => line.includes(`name="${key}"`))).to.include(value)
+});

docs/docs/CONFIGURATION.md

@@ -1,15 +1,15 @@
-# Akkoma-FE configuration and customization for instance administrators
+# Pleroma-FE configuration and customization for instance administrators
 
-* *For user configuration, see [Akkoma-FE user guide](../user_guide)*
+* *For user configuration, see [Pleroma-FE user guide](../user_guide)*
 * *For local development server configuration, see [Hacking, tweaking, contributing](HACKING.md)*
 
 ## Where configuration is stored
 
-Akkoma-FE gets its configuration from several sources, in order of preference (the one above overrides ones below it)
+PleromaFE gets its configuration from several sources, in order of preference (the one above overrides ones below it)
 
-1. `/api/statusnet/config.json` - this is generated on Backend and contains multiple things including instance name, char limit etc. It also contains FE/Client-specific data, Akkoma-FE uses `pleromafe` field of it. For more info on changing config on BE, look [here](https://docs.akkoma.dev/stable/configuration/cheatsheet.md#frontend_configurations)
+1. `/api/statusnet/config.json` - this is generated on Backend and contains multiple things including instance name, char limit etc. It also contains FE/Client-specific data, PleromaFE uses `pleromafe` field of it. For more info on changing config on BE, look [here](https://docs.akkoma.dev/stable/configuration/cheatsheet.md#frontend_configurations)
-2. `/static/config.json` - this is a static FE-provided file, containing only FE specific configuration. This file is completely optional and could be removed but is useful as a fallback if some configuration JSON property isn't present in BE-provided config. It's also a reference point to check what default configuration are and what JSON properties even exist. In local dev mode it could be used to override BE configuration, more about that in HACKING.md. File is located [here](https://akkoma.dev/AkkomaGang/akkoma-fe/src/branch/develop/static/config.json).
+2. `/static/config.json` - this is a static FE-provided file, containing only FE specific configuration. This file is completely optional and could be removed but is useful as a fallback if some configuration JSON property isn't present in BE-provided config. It's also a reference point to check what default configuration are and what JSON properties even exist. In local dev mode it could be used to override BE configuration, more about that in HACKING.md. File is located [here](https://akkoma.dev/AkkomaGang/pleroma-fe/src/branch/develop/static/config.json).
-3. Built-in defaults. Those are hard-coded defaults that are used when `/static/config.json` is not available and BE-provided configuration JSON is missing some JSON properties. ( [Code](https://akkoma.dev/AkkomaGang/akkoma-fe/src/branch/develop/src/modules/instance.js) )
+3. Built-in defaults. Those are hard-coded defaults that are used when `/static/config.json` is not available and BE-provided configuration JSON is missing some JSON properties. ( [Code](https://akkoma.dev/AkkomaGang/pleroma-fe/src/branch/develop/src/modules/instance.js) )
 
 ## Instance-defaults
 
@@ -59,7 +59,7 @@ Instance `logo`, could be any image, including svg. By default it assumes logo u
 `logoMargin` allows you to adjust vertical margins between logo boundary and navbar borders. The idea is that to have logo's image without any extra margins and instead adjust them to your need in layout.
 
 ### `minimalScopesMode`
-Limit scope selection to *Direct*, *User default* and *Scope of post replying to*. This also makes it impossible to reply to a DM with a non-DM post from Akkoma-FE.
+Limit scope selection to *Direct*, *User default* and *Scope of post replying to*. This also makes it impossible to reply to a DM with a non-DM post from PleromaFE.
 
 ### `nsfwCensorImage`
 Use custom image for NSFW'd images
@@ -77,7 +77,7 @@ Change alignment of sidebar and panels to the right. Defaults to `false`.
 Show panel showcasing instance features/settings to logged-out visitors
 
 ### `showInstanceSpecificPanel`
-This allows you to include arbitrary HTML content in a panel below navigation menu. Akkoma-FE looks for an html page `instance/panel.html`, by default it's not provided in FE, but BE bundles some [default one](https://git.pleroma.social/pleroma/pleroma/blob/develop/priv/static/instance/panel.html). De-facto instance-defaults, since user can hide instance-specific panel.
+This allows you to include arbitrary HTML content in a panel below navigation menu. PleromaFE looks for an html page `instance/panel.html`, by default it's not provided in FE, but BE bundles some [default one](https://git.pleroma.social/pleroma/pleroma/blob/develop/priv/static/instance/panel.html). De-facto instance-defaults, since user can hide instance-specific panel.
 
 ### `subjectLineBehavior`
 How to handle subject line (CW) when replying to a post.

docs/docs/HACKING.md

@@ -1,8 +1,8 @@
 # Hacking, tweaking, contributing
 
-## What Akkoma-FE even is, how it works
+## What PleromaFE even is, how it works
 
-Akkoma-FE is an SPA (Single-Page Application) backed by [Vue](https://vuejs.org/) framework. It means that it's just a nearly-empty HTML page with bunch of JavaScript that actually generates and controls DOM (i.e. html elements) in Runtime. Currently, there's no way around it - you have to have Javascript enabled in the browser to make it work, there is a theoretical possibility to generate some HTML server-side but it's not implemented yet.
+PleromaFE is an SPA (Single-Page Application) backed by [Vue](https://vuejs.org/) framework. It means that it's just a nearly-empty HTML page with bunch of JavaScript that actually generates and controls DOM (i.e. html elements) in Runtime. Currently, there's no way around it - you have to have Javascript enabled in the browser to make it work, there is a theoretical possibility to generate some HTML server-side but it's not implemented yet.
 
 You can serve static html page and everything from any HTTP(S) server but currently it will try to access /api/ path at same domain it's running on, meaning that as of right now you cannot put it on one domain and access the other without proxying requests.
 
@@ -67,19 +67,19 @@ server {
 
 ### API, Data, Operations
 
-In 99% cases Akkoma-FE uses [MastoAPI](https://docs.joinmastodon.org/api/) with [Pleroma Extensions](https://docs.akkoma.dev/stable/differences_in_mastoapi_responses.md) to fetch the data. The rest is either QvitterAPI leftovers or pleroma-exclusive APIs. QvitterAPI doesn't exactly have documentation and uses different JSON structure and sometimes different parameters and workflows, [this](https://twitter-api.readthedocs.io/en/latest/index.html) could be a good reference though. Some pleroma-exclusive API may still be using QvitterAPI JSON structure.
+In 99% cases PleromaFE uses [MastoAPI](https://docs.joinmastodon.org/api/) with [Pleroma Extensions](https://docs.akkoma.dev/stable/differences_in_mastoapi_responses.md) to fetch the data. The rest is either QvitterAPI leftovers or pleroma-exclusive APIs. QvitterAPI doesn't exactly have documentation and uses different JSON structure and sometimes different parameters and workflows, [this](https://twitter-api.readthedocs.io/en/latest/index.html) could be a good reference though. Some pleroma-exclusive API may still be using QvitterAPI JSON structure.
 
-Akkoma-FE supports both formats by transforming them into internal format which is basically QvitterAPI one with some additions and renaming. All data is passed trough [Entity Normalizer](https://akkoma.dev/AkkomaGang/akkoma-fe/src/branch/develop/src/services/entity_normalizer/entity_normalizer.service.js) which can serve as a reference of API and what's actually used, it's also a host for all the hacks and data transformation.
+PleromaFE supports both formats by transforming them into internal format which is basically QvitterAPI one with some additions and renaming. All data is passed trough [Entity Normalizer](https://git.pleroma.social/pleroma/pleroma-fe/-/blob/develop/src/services/entity_normalizer/entity_normalizer.service.js) which can serve as a reference of API and what's actually used, it's also a host for all the hacks and data transformation.
 
-For most part, Akkoma-FE tries to store all the info it can get in global vuex store - every user and post are passed trough updating mechanism where data is either added or merged with existing data, reactively updating the information throughout UI, so if in newest request user's post counter increased, it will be instantly updated in open user profile cards. This is also used to find users, posts and sometimes to build timelines and/or request parameters.
+For most part, PleromaFE tries to store all the info it can get in global vuex store - every user and post are passed trough updating mechanism where data is either added or merged with existing data, reactively updating the information throughout UI, so if in newest request user's post counter increased, it will be instantly updated in open user profile cards. This is also used to find users, posts and sometimes to build timelines and/or request parameters.
 
-Akkoma-FE also tries to persist this store, however only stable data is stored, such as user authentication and preferences, user highlights. Persistence is performed by saving and loading chunk of vuex store in browser's LocalStorage/IndexedDB.
+PleromaFE also tries to persist this store, however only stable data is stored, such as user authentication and preferences, user highlights. Persistence is performed by saving and loading chunk of vuex store in browser's LocalStorage/IndexedDB.
 
 TODO: Refactor API code and document it here
 
 ### Themes
 
-Akkoma-FE uses custom theme "framework" which is pretty much just a style tag rendered by vue which only contains CSS3 variables. Every color used in UI should be derived from theme. Theme is stored in a JSON object containing color, opacity, shadow and font information, with most of it being optional.
+PleromaFE uses custom theme "framework" which is pretty much just a style tag rendered by vue which only contains CSS3 variables. Every color used in UI should be derived from theme. Theme is stored in a JSON object containing color, opacity, shadow and font information, with most of it being optional.
 
 The most basic theme can consist of 4 to 8 "basic colors", which is also what previous version of themes allowed, with all other colors being derived from those basic colors, i.e. "light background" will be "background" color lightened/darkened, "panel header" will be same as "foreground". The idea is that you can specify just basic color palette and everything else will be generated automatically, but if you really need to tweak some specific color - you can.
 

docs/docs/images/akkoma_logo_vector_nobg.svg

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 362.83 362.83">
-  <defs>
-    <style>
-      .cls-1, .cls-2 {
-        fill: #fff;
-      }
-
-      .cls-2 {
-        stroke: #fff;
-        stroke-miterlimit: 10;
-      }
-    </style>
-  </defs>
-  <g id="Layer_6" data-name="Layer 6">
-    <path class="cls-1" d="M115.2,131.89c6.26-6.54,20.19-20.63,42.39-26.14,15.79-3.92,28.51-1.28,33.51,0,83.72,21.41,116.03,201.78,77.79,226.32-10.28,6.6-26.86,2.7-36.77-3.3-32.63-19.78-29.3-72.87-44.44-73.73-5.11-.29-7.15,5.8-20.91,24.94-19.63,27.3-31.49,43.44-49.21,50.87-2.53,1.06-26.91,12.07-41.84,1.23-38.55-28-2.96-155.84,39.49-200.18Zm56.31,10.45c-27.39-.52-46.38,38.21-37.98,54.55,10.09,19.62,65.5,18.26,74.77-3.3,7.21-16.78-11.38-50.77-36.79-51.24Z"/>
-  </g>
-  <g id="Layer_4" data-name="Layer 4">
-    <path class="cls-1" d="M68.93,86.51c-6.55,27.74,252.45,113.97,267.56,89.66,9.24-14.87-64.9-83.62-163.53-97.57-39.06-5.52-100.95-5.14-104.03,7.91Z"/>
-  </g>
-  <g id="Layer_5" data-name="Layer 5">
-    <path class="cls-2" d="M138.96,93.76c.41-5.25,6.51-5.74,28.85-19.42,26.97-16.51,28.85-22.38,56.86-40.83,30.07-19.81,48.46-31.94,54.82-26.61,9.72,8.15-25.18,43.33-21.31,99.35,.87,12.61,3.12,17.79-.86,23.01-18.25,23.95-120.07-13.68-118.35-35.5Z"/>
-  </g>
-</svg>

docs/docs/images/pleroma_logo_vector_nobg.svg

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg4485"
+   width="512"
+   height="512"
+   viewBox="0 0 512 512"
+   sodipodi:docname="pleroma_logo_vector_nobg.svg"
+   inkscape:version="0.92.1 r15371">
+  <metadata
+     id="metadata4491">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4489" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="997"
+     id="namedview4487"
+     showgrid="false"
+     inkscape:zoom="0.70710678"
+     inkscape:cx="26.131594"
+     inkscape:cy="235.37499"
+     inkscape:window-x="1912"
+     inkscape:window-y="22"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4485" />
+  <g
+     id="g4612">
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path4495"
+       d="M 235,89 V 423 H 152 V 115 l 26,-26 z"
+       style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.17587938" />
+    <circle
+       r="26"
+       cx="178"
+       cy="115"
+       id="path4497"
+       style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.17587938" />
+    <circle
+       r="26"
+       cx="335"
+       cy="230"
+       id="path4497-0"
+       style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.17587938" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path4516"
+       d="M 277,256 V 89 l 84,3e-6 L 361.00002,230 335,256 Z"
+       style="fill:#fba457;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <circle
+       r="26"
+       cx="335"
+       cy="397"
+       id="path4497-0-6"
+       style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#009bff;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.17587938" />
+    <path
+       sodipodi:nodetypes="cccccc"
+       inkscape:connector-curvature="0"
+       id="path4516-5"
+       d="m 277,423 v -83 h 84 l 2e-5,57 L 335,423 Z"
+       style="opacity:1;fill:#fba457;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  </g>
+</svg>

docs/docs/index.md

@@ -1,8 +1,8 @@
-# Introduction to Akkoma-FE
+# Introduction to Pleroma-FE
-## What is Akkoma-FE?
+## What is Pleroma-FE?
 
-Akkoma-FE is the default user-facing frontend for Pleroma. It's user interface is modeled after Qvitter which is modeled after an older Twitter design. It provides a simple 2-column interface for microblogging. While being simple by default it also provides many powerful customization options.
+Pleroma-FE is the default user-facing frontend for Pleroma. It's user interface is modeled after Qvitter which is modeled after an older Twitter design. It provides a simple 2-column interface for microblogging. While being simple by default it also provides many powerful customization options.
 
 ## How can I use it?
 
-If your instance uses Akkoma-FE, you can acces it by going to your instance (e.g. <https://pleroma.soykaf.com>). You can read more about it's basic functionality in the [Akkoma-FE User Guide](./user_guide/). We also have [a guide for administrators](./CONFIGURATION.md) and for [hackers/contributors](./HACKING.md).
+If your instance uses Pleroma-FE, you can acces it by going to your instance (e.g. <https://pleroma.soykaf.com>). You can read more about it's basic functionality in the [Pleroma-FE User Guide](./user_guide/). We also have [a guide for administrators](./CONFIGURATION.md) and for [hackers/contributors](./HACKING.md).

docs/docs/stickers.md

@@ -1,13 +1,13 @@
 # Adding stickers
 
-Akkoma-FE supports stickers, which are essentially little images stored server-side
+Pleroma-fe supports stickers, which are essentially little images stored server-side
 which can be selected by a user to automatically attach them to a post.
 
 There's no explicit setting for these, they just rely on the existence of certain files.
 
 ## Initialising the sticker config file
 
-You're probably serving Akkoma-FE from your instance's `instance/static/` directory -
+You're probably serving pleroma-fe from your instance's `instance/static/` directory - 
 this directy can also override files served at a given path.
 
 The first thing we need to do is set up our `stickers.json` file. At `instance/static/static/stickers.json`,
@@ -50,4 +50,4 @@ The `tabIcon` will appear on the sticker picker itself as a representative of th
 
 You can add as many stickers as you like. They should all be in the same directory as your `pack.json`.
 
-Now you should find that there's a sticky note icon on the emoji picker on Akkoma-FE that allows you to attach stickers.
+Now you should find that there's a sticky note icon on the emoji picker on pleroma-fe that allows you to attach stickers.

docs/docs/user_guide/index.md

@@ -8,13 +8,13 @@
 >
 > --Catbag
 
-Akkoma-FE is the default user-facing frontend for Pleroma. If your instance uses Akkoma-FE, you can access it by going to your instance (e.g. <https://pleroma.soykaf.com>). After logging in you will have two columns in front of you. Here we're going to keep it to the default behaviour, but some instances swap the left and right columns. If you're on such an instance what we refer to as the left column will be on your right and vice versa.
+Pleroma-FE is the default user-facing frontend for Pleroma. If your instance uses Pleroma-FE, you can access it by going to your instance (e.g. <https://pleroma.soykaf.com>). After logging in you will have two columns in front of you. Here we're going to keep it to the default behaviour, but some instances swap the left and right columns. If you're on such an instance what we refer to as the left column will be on your right and vice versa.
 
 ### Left column
 
 - first block: This section is dedicated to [posting](posting_reading_basic_functions.md)
 - second block: Here you can switch between the different views for the right column.
-- Optional third block: This is the Instance panel that can be activated, but is deactivated by default. It's fully customisable by instance admins and by default has links to the Akkoma-FE and Mastodon-FE.
+- Optional third block: This is the Instance panel that can be activated, but is deactivated by default. It's fully customisable by instance admins and by default has links to the Pleroma-FE and Mastodon-FE.
 - fourth block: This is the Notifications block, here you will get notified whenever somebody mentions you, follows you, repeats or favorites one of your statuses
 
 ### Right column

docs/docs/user_guide/posting_reading_basic_functions.md

@@ -15,13 +15,13 @@ Posts will contain the text you are posting, but some content will be modified:
 Let's clear up some basic stuff. When you post something it's called a **post** or it could be called a **status** or even a **toot** or a **prööt** depending on whom you ask. Post has body/content but it also has some other stuff in it - from attachments, visibility scope, subject line...
 
 **Emoji** are small images embedded in text, there are two major types of emoji: [unicode emoji](https://en.wikipedia.org/wiki/Emoji) and custom emoji. While unicode emoji are universal and standardized, they can appear differently depending on where you are using them or may not appear at all on older systems. Custom emoji are a more *fun* kind - instance administrator can define many images as *custom emoji* for their users. This works very simple - custom emoji is defined by its *shortcode* and an image, so that any shortcode enclosed in colons get replaced with image if such shortcode exist.
-Let's say there's a `:akkoma:` emoji defined on an instance. That means
+Let's say there's a `:pleroma:` emoji defined on an instance. That means  
-> First time using :akkoma: akkoma!
+> First time using :pleroma: pleroma!  
 
-will become
+will become  
-> First time using ![akkoma](../assets/example_emoji.png) akkoma!
+> First time using ![pleroma](../assets/example_emoji.png) pleroma!  
 
-Note that you can only use emoji defined on your instance, you cannot "copy" someone else's emoji, and will have to ask your administrator to copy emoji from other instance to yours.
+Note that you can only use emoji defined on your instance, you cannot "copy" someone else's emoji, and will have to ask your administrator to copy emoji from other instance to yours.  
 Lastly, there's two convenience options for emoji: an emoji picker (smiley face to the right of "submit" button) and autocomplete suggestions - when you start typing :shortcode: it will automatically try to suggest you emoji and complete the shortcode for you if you select one. If emoji doesn't show up in suggestions nor in emoji picker it means there's no such emoji on your instance, if shortcode doesn't match any defined emoji it will appear as text.
 
 **Attachments** are fairly simple - you can attach any file to a post as long as the file is within maximum size limits. If you're uploading explicit material you can mark all of your attachments as sensitive (or add the `#nsfw` tag) - it will hide the images and videos behind a warning so that it won't be displayed instantly.
@@ -42,7 +42,7 @@ A few things to consider about the security and usage of these scopes:
 - Changing scopes during a thread or adding people to a direct message will not retroactively make them see the whole conversation. If you add someone to a direct message conversation, they will not see the post that happened before they were mentioned.
 * **Reply-to** if you are replying to someone, your post will also contain a note that your post is referring to the post you're replying to. Person you're replying to will receive a notification *even* if you remove them from mentioned people. You won't receive notifications when replying to your own posts, but it's useful to reply to your own posts to provide people some context if it's a follow-up to a previous post. There's a small "Reply to ..." label under post author's name which you can hover on to see what post it's referring to.
 
-Sometimes you may encounter posts that seem different than what they are supposed to. For example, you might see a direct message without any mentions in the text. This can happen because internally, the Fediverse has a different addressing mechanism similar to email, with `to` and `cc` fields. While these are not directly accessible in Akkoma-FE, other software in the Fediverse might generate those posts. Do not worry in these cases, these are normal and not a bug.
+Sometimes you may encounter posts that seem different than what they are supposed to. For example, you might see a direct message without any mentions in the text. This can happen because internally, the Fediverse has a different addressing mechanism similar to email, with `to` and `cc` fields. While these are not directly accessible in PleromaFE, other software in the Fediverse might generate those posts. Do not worry in these cases, these are normal and not a bug.
 
 ## Rich text
 
@@ -51,7 +51,7 @@ By default new posts you make are plaintext, meaning you can't make text **bold*
 Here is a small example of some text in markdown.
 
 ```
-This is an example of markdown text using **bold** and *cursive* text.
+This is an example of markdown text using **bold** and *cursive* text.  
 To get a newline we add two spaces at the end of the previous line.
 
 Let's also add a list
@@ -67,7 +67,7 @@ If you set the input-method to Markdown, and post this, it will look something l
 
 ## Misskey markdown
 
-Akkoma-FE includes support for writing and rendering
+The akkoma version of pleroma-fe includes support for writing and rendering
 misskey markdown (MFM). To write this you will need to select "MFM" from
 the content type dropdown (if supported), and then you can format text
 [in MFM](https://akkoma.dev/sfr/marked-mfm/src/branch/master/docs/syntax.md).

docs/docs/user_guide/settings.md

@@ -83,7 +83,7 @@ Here you can change your password, revoke access tokens, configure 2-factor auth
 
 ## Theme
 
-Here you can change the look and feel of Akkoma-FE. You can choose from several instance-provided presets and you can load one from file and save current theme to file. Before you apply new theme you can see what it will look like approximately in preview section.
+Here you can change the look and feel of Pleroma-FE. You can choose from several instance-provided presets and you can load one from file and save current theme to file. Before you apply new theme you can see what it will look like approximately in preview section.
 
 The themes engine was made to be easy to use while giving an option for powerful in-depth customization - you can just tweak colors on "Common" tab and leave everything else as is.
 

docs/docs/user_guide/users_follow_mute_block.md

@@ -4,7 +4,7 @@ When you see someone, you can click on their user picture to view their profile,
 
 **Following** is self-explanatory, it adds them to your Home Timeline, lists you as a follower and gives you access to follower-only posts if they have any.
 
-**Muting** collapses posts and notifications made by them, giving you an option to see the post if you're curious. Clients other than Akkoma-FE may completely remove their posts.
+**Muting** collapses posts and notifications made by them, giving you an option to see the post if you're curious. Clients other than PleromaFE may completely remove their posts.
 
 **Blocking** a user removes them from your timeline and notifications and prevents them from following you (automatically unfollows them from you).
 

docs/mkdocs.yml

@@ -1,11 +1,11 @@
-site_name: Akkoma-FE Documentation
+site_name: Pleroma-FE Documentation
 theme:
-  favicon: 'images/akkoma_logo_vector_bg_32.png'
+  favicon: 'images/pleroma_logo_vector_bg_32.png'
   name: 'material'
   custom_dir: 'theme'
   # Disable google fonts
   font: false
-  logo: 'images/akkoma_logo_vector_nobg.svg'
+  logo: 'images/pleroma_logo_vector_nobg.svg'
   features:
     - tabs
   palette:
@@ -14,8 +14,8 @@ theme:
 
 extra_css:
   - css/extra.css
-repo_name: 'AkkomaGang/akkoma-fe'
+repo_name: 'AkkomaGang/pleroma-fe'
-repo_url: 'https://akkoma.dev/AkkomaGang/akkoma-fe'
+repo_url: 'https://akkoma.dev/AkkomaGang/pleroma-fe'
 
 extra:
   repo_icon: gitea

docs/theme/partials/source.html

@@ -38,11 +38,11 @@
 {% endif %}
 
 {% if page and page.url.startswith('backend') %}
-  {% set repo_url = "https://akkoma.dev/AkkomaGang/akkoma" %}
+  {% set repo_url = "https://git.pleroma.social/pleroma/pleroma" %}
-  {% set repo_name = "AkkomaGang/akkoma" %}
+  {% set repo_name = "pleroma/pleroma" %}
 {% elif page and page.url.startswith('frontend') %}
-  {% set repo_url = "https://akkoma.dev/AkkomaGang/akkoma-fe" %}
+  {% set repo_url = "https://git.pleroma.social/pleroma/pleroma-fe" %}
-  {% set repo_name = "AkkomaGang/akkoma-fe" %}
+  {% set repo_name = "pleroma/pleroma-fe" %}
 {% else %}
   {% set repo_url = config.repo_url %}
   {% set repo_name = config.repo_name %}

index.html

@@ -4,14 +4,13 @@
     <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">
   </head>
   <body class="hidden">
     <noscript>To use Akkoma, please enable JavaScript.</noscript>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "3.10.0",
+  "version": "3.2.0",
   "description": "A frontend for Akkoma instances",
   "author": "Roger Braun <roger@rogerbraun.net>",
   "private": true,
@@ -13,26 +13,25 @@
     "test": "npm run unit && npm run e2e",
     "stylelint": "stylelint src/**/*.scss",
     "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
-    "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
+    "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs",
+    "run:cypress": "CONFIG='./cypress.json' NO_DEV_SERVER=true yarn dev"
   },
   "dependencies": {
     "@babel/runtime": "7.17.8",
     "@chenfengyuan/vue-qrcode": "2.0.0",
-    "@floatingghost/pinch-zoom-element": "^1.3.1",
     "@fortawesome/fontawesome-svg-core": "1.3.0",
     "@fortawesome/free-regular-svg-icons": "^6.1.2",
     "@fortawesome/free-solid-svg-icons": "^6.2.0",
     "@fortawesome/vue-fontawesome": "3.0.1",
+    "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
     "@vuelidate/core": "^2.0.0",
     "@vuelidate/validators": "^2.0.0",
-    "blurhash": "^2.0.4",
     "body-scroll-lock": "2.7.1",
     "chromatism": "3.0.0",
     "click-outside-vue3": "4.0.1",
     "cropperjs": "1.5.12",
     "diff": "3.5.0",
     "escape-html": "1.0.3",
-    "iso-639-1": "^2.1.15",
     "js-cookie": "^3.0.1",
     "localforage": "1.10.0",
     "parse-link-header": "^2.0.0",
@@ -68,6 +67,7 @@
     "cross-spawn": "^7.0.3",
     "css-loader": "^6.7.2",
     "custom-event-polyfill": "^1.0.7",
+    "cypress": "^11.2.0",
     "eslint": "^7.32.0",
     "eslint-config-standard": "^17.0.0",
     "eslint-friendly-formatter": "^4.0.1",
@@ -84,6 +84,7 @@
     "html-webpack-plugin": "^5.5.0",
     "http-proxy-middleware": "0.21.0",
     "inject-loader": "2.0.1",
+    "iso-639-1": "2.1.15",
     "isparta-loader": "2.0.0",
     "json-loader": "0.5.7",
     "karma": "6.3.17",

src/App.js

@@ -64,11 +64,6 @@ export default {
         '-' + this.layoutType
       ]
     },
-    pageBackground () {
-      return this.mergedConfig.displayPageBackgrounds
-        ? this.$store.state.users.displayBackground
-        : null
-    },
     currentUser () { return this.$store.state.users.currentUser },
     userBackground () { return this.currentUser.background_image },
     instanceBackground () {
@@ -76,7 +71,7 @@ export default {
         ? null
         : this.$store.state.instance.background
     },
-    background () { return this.pageBackground || this.userBackground || this.instanceBackground },
+    background () { return this.userBackground || this.instanceBackground },
     bgStyle () {
       if (this.background) {
         return {

src/App.scss

@@ -1,14 +1,13 @@
 // 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;
 }
 
 html {
-  font-size: 0.875rem;
+  font-size: 14px;
   // overflow-x: clip causes my browser's tab to crash with SIGILL lul
 }
 
@@ -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;

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'
@@ -322,9 +320,6 @@ const getNodeInfo = async ({ store }) => {
           : federation.enabled
       })
 
-      store.dispatch('setInstanceOption', { name: 'publicTimelineVisibility', value: metadata.publicTimelineVisibility })
-      store.dispatch('setInstanceOption', { name: 'federatedTimelineAvailable', value: metadata.federatedTimelineAvailable })
-
       const accountActivationRequired = metadata.accountActivationRequired
       store.dispatch('setInstanceOption', { name: 'accountActivationRequired', value: accountActivationRequired })
 
@@ -398,7 +393,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
     getInstanceConfig({ store })
   ])
 
-  // Start fetching things that don't need to block the UI
+
   getTOS({ store })
   getStickers({ store })
 

src/components/attachment/attachment.js

@@ -18,7 +18,6 @@ import {
   faPencilAlt,
   faAlignRight
 } from '@fortawesome/free-solid-svg-icons'
-import Blurhash from '../blurhash/Blurhash.vue'
 
 library.add(
   faFile,
@@ -64,8 +63,7 @@ const Attachment = {
   components: {
     Flash,
     StillImage,
-    VideoAttachment,
+    VideoAttachment
-    Blurhash
   },
   computed: {
     classNames () {
@@ -86,9 +84,6 @@ const Attachment = {
     useContainFit () {
       return this.$store.getters.mergedConfig.useContainFit
     },
-    useBlurhash () {
-      return this.$store.getters.mergedConfig.useBlurhash
-    },
     placeholderName () {
       if (this.attachment.description === '' || !this.attachment.description) {
         return this.type.toUpperCase()

src/components/attachment/attachment.scss

@@ -37,7 +37,7 @@
       white-space: pre-line;
       word-break: break-word;
       text-overflow: ellipsis;
-      overflow: auto;
+      overflow: scroll;
     }
 
     &.-static {

src/components/attachment/attachment.vue

@@ -64,15 +64,7 @@
         :title="attachment.description"
         @click.prevent.stop="toggleHidden"
       >
-        <Blurhash
-          v-if="useBlurhash && attachment.blurhash"
-          :height="512"
-          :width="1024"
-          :hash="attachment.blurhash"
-          :punch="1"
-        />
         <img
-          v-else
           :key="nsfwImage"
           class="nsfw"
           :src="nsfwImage"

src/components/basic_user_card/basic_user_card.js

@@ -21,7 +21,7 @@ const BasicUserCard = {
     toggleUserExpanded () {
       this.userExpanded = !this.userExpanded
     },
-    userProfileLink (user) {
+    userProfileLink(user) {
       return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
     }
   }

src/components/blurhash/Blurhash.vue

@@ -1,66 +0,0 @@
-<template>
-  <canvas
-    ref="canvas"
-    class="blurhash"
-  />
-</template>
-
-<script>
-import { decode } from "blurhash";
-
-export default {
-  name: 'Blurhash',
-  props: {
-    hash: {
-      type: String,
-      required: true,
-    },
-    width: {
-      type: Number,
-      required: true,
-    },
-    height: {
-      type: Number,
-      required: true,
-    },
-    punch: {
-      type: Number,
-      default: null,
-    },
-  },
-  data() {
-    return {
-      canvas: null,
-      ctx: null,
-    };
-  },
-  mounted() {
-    this.canvas = this.$refs.canvas;
-    this.ctx = this.canvas.getContext('2d');
-    this.canvas.width = 1024;
-    this.canvas.height = 512;
-    this.draw();
-  },
-  methods: {
-    draw() {
-      const pixels = decode(this.hash, this.width, this.height, this.punch);
-      const imageData = this.ctx.createImageData(this.width, this.height);
-      imageData.data.set(pixels);
-      this.ctx.putImageData(imageData, 0, 0);
-      fetch("/static/blurhash-overlay.png")
-        .then((response) => response.blob())
-        .then((blob) => {
-          const img = new Image();
-          img.src = URL.createObjectURL(blob);
-          img.onload = () => {
-            this.ctx.drawImage(img, 0, 0, this.width, this.height);
-          };
-        });
-    },
-  }
-}
-</script>
-
-<style scoped>
-
-</style>

src/components/desktop_nav/desktop_nav.js

@@ -1,11 +1,6 @@
 import SearchBar from 'components/search_bar/search_bar.vue'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  publicTimelineVisible,
-  federatedTimelineVisible,
-  bubbleTimelineVisible,
-} from '../../lib/timeline_visibility'
 import {
   faSignInAlt,
   faSignOutAlt,
@@ -24,7 +19,6 @@ import {
   faInfoCircle,
   faUserTie
 } from '@fortawesome/free-solid-svg-icons'
-import { mapState } from 'vuex'
 
 library.add(
   faSignInAlt,
@@ -109,12 +103,7 @@ export default {
     },
     showBubbleTimeline () {
       return this.$store.state.instance.localBubbleInstances.length > 0
-    },
+    }
-    ...mapState({
-      publicTimelineVisible,
-      federatedTimelineVisible,
-      bubbleTimelineVisible,
-    })
   },
   methods: {
     scrollToTop () {

src/components/desktop_nav/desktop_nav.vue

@@ -46,7 +46,6 @@
           <router-link
             :to="{ name: 'public-timeline' }"
             class="nav-icon"
-            v-if="publicTimelineVisible"
           >
             <FAIcon
               fixed-width
@@ -56,7 +55,7 @@
             />
           </router-link>
           <router-link
-            v-if="bubbleTimelineVisible"
+            v-if="currentUser && showBubbleTimeline"
             :to="{ name: 'bubble-timeline' }"
             class="nav-icon"
           >
@@ -70,7 +69,6 @@
           <router-link
             :to="{ name: 'public-external-timeline' }"
             class="nav-icon"
-            v-if="federatedTimelineVisible"
           >
             <FAIcon
               fixed-width

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

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%;
-    }
-  }
-}

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>

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)
       }
     },

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"

src/components/emoji_picker/emoji_picker.js

@@ -1,13 +1,12 @@
 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,
   faStickyNote,
   faSmileBeam
 } from '@fortawesome/free-solid-svg-icons'
-import { trim, escapeRegExp, startCase, debounce } from 'lodash'
+import { trim, escapeRegExp, startCase } from 'lodash'
 
 library.add(
   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,18 +34,18 @@ 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,
+    Checkbox
-    EmojiGrid
   },
   methods: {
-    debouncedSearch: debounce(function (e) {
-      this.keyword = e.target.value
-    }, 500),
     onStickerUploaded (e) {
       this.$emit('sticker-uploaded', e)
     },
@@ -54,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()
@@ -63,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) {
+    triggerLoadMore (target) {
-      this.activeGroup = group
+      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
@@ -84,12 +146,32 @@ const EmojiPicker = {
       })
     }
   },
+  watch: {
+    keyword () {
+      this.customEmojiLoadAllConfirmed = false
+      this.onScroll()
+      this.startEmojiLoad(true)
+    }
+  },
   computed: {
     activeGroupView () {
       return this.showingStickers ? '' : this.activeGroup
     },
+    stickersAvailable () {
+      if (this.$store.state.instance.stickers) {
+        return this.$store.state.instance.stickers.length > 0
+      }
+      return 0
+    },
+    filteredEmoji () {
+      return this.filterByKeyword(
+        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 = []
@@ -102,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'),

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%;
@@ -18,7 +7,7 @@
     overflow: hidden;
     left: -70%;
     max-width: 100%;
-    @media (min-width: 800px) and (max-width: 1280px) {
+    @media (min-width: 800px) and (max-width: 1300px) {
       left: -50%;
       min-width: 50%;
       max-width: 130%;
@@ -29,10 +18,6 @@
       min-width: 50%;
       max-width: 130%;
     }
-
-    .Status > .emoji-picker {
-      z-index: 1000;
-    }
   }
 }
 .emoji-picker {
@@ -85,6 +70,10 @@
     flex-grow: 1;
   }
 
+  .emoji-groups {
+    min-height: 200px;
+  }
+
   .additional-tabs {
     border-left: 1px solid;
     border-left-color: $fallback--icon;
@@ -163,12 +152,76 @@
     }
   }
 
-  .emoji-search {
+  .emoji {
-    padding: 5px;
+    &-search {
-    flex: 0 0 auto;
+      padding: 5px;
+      flex: 0 0 auto;
 
-    input {
+      input {
-      width: 100%;
+        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%;
+      }
+    }
+
   }
+
 }

src/components/emoji_picker/emoji_picker.vue

@@ -2,9 +2,9 @@
   <div class="emoji-picker panel panel-default panel-body">
     <div class="heading">
       <span
-        ref="emoji-tabs"
         class="emoji-tabs"
         @wheel="onWheel"
+        ref="emoji-tabs"
       >
         <span
           v-for="group in emojis"
@@ -44,22 +44,47 @@
       >
         <div class="emoji-search">
           <input
+            v-model="keyword"
             type="text"
             class="form-control"
             :placeholder="$t('emoji.search_emoji')"
-            @input="debouncedSearch"
+            @input="$event.target.composing = false"
           >
         </div>
-        <EmojiGrid
-          ref="emojiGrid"
-          :groups="emojisView"
-          @emoji="onEmoji"
-          @active-group="onActiveGroup"
-        />
         <div
-          v-if="showKeepOpen"
+          ref="emoji-groups"
-          class="keep-open"
+          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>

src/components/emoji_reactions/emoji_reactions.js

@@ -1,20 +1,13 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserListPopover from '../user_list_popover/user_list_popover.vue'
-import StillImage from '../still-image/still-image.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: {
     UserAvatar,
-    UserListPopover,
+    UserListPopover
-    StillImage
   },
   props: ['status'],
   data: () => ({
@@ -61,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 })

src/components/emoji_reactions/emoji_reactions.vue

@@ -14,13 +14,12 @@
         <span
           v-if="reaction.url !== null"
         >
-          <StillImage
+          <img
             :src="reaction.url"
             :title="reaction.name"
-            :alt="reaction.name"
             class="reaction-emoji"
-            height="2.55em"
+            width="2.55em"
-          />
+          >
           {{ reaction.count }}
         </span>
         <span v-else>
@@ -50,7 +49,6 @@
   display: flex;
   margin-top: 0.25em;
   flex-wrap: wrap;
-  container-type: inline-size;
 }
 
 .unicode-emoji {
@@ -66,9 +64,7 @@
   justify-content: center;
   box-sizing: border-box;
   .reaction-emoji {
-    width: auto;
+    width: 2.55em !important;
-    max-width: 96cqw;
-    height: 2.55em !important;
     margin-right: 0.25em;
   }
   &:focus {

src/components/extra_buttons/extra_buttons.js

@@ -15,7 +15,6 @@ import {
   faBookmark as faBookmarkReg,
   faFlag
 } from '@fortawesome/free-regular-svg-icons'
-import { mapState } from 'vuex'
 
 library.add(
   faEllipsisH,
@@ -136,26 +135,17 @@ const ExtraButtons = {
     },
     doRedraftStatus () {
       this.$store.dispatch('fetchStatusSource', { id: this.status.id })
-        .then(data => {
+        .then(data => this.$store.dispatch('openPostStatusModal', {
-          let repliedUserId = this.status.in_reply_to_user_id;
+          isRedraft: true,
-          let repliedUser = this.status.attentions.filter(user =>
+          statusId: this.status.id,
-            user.id === repliedUserId);
+          subject: data.spoiler_text,
-          this.$store.dispatch('openPostStatusModal', {
+          statusText: data.text,
-            isRedraft: true,
+          statusIsSensitive: this.status.nsfw,
-            attentions: this.status.attentions,
+          statusPoll: this.status.poll,
-            statusId: this.status.id,
+          statusFiles: [...this.status.attachments],
-            subject: data.spoiler_text,
+          statusScope: this.status.visibility,
-            statusText: data.text,
+          statusContentType: data.content_type
-            statusIsSensitive: this.status.nsfw,
+        }))
-            statusPoll: this.status.poll,
-            statusFiles: [...this.status.attachments],
-            statusScope: this.status.visibility,
-            statusLanguage: this.status.language,
-            statusContentType: data.content_type,
-            replyTo: this.status.in_reply_to_status_id,
-            repliedUser: repliedUser
-          })
-        })
       this.doDeleteStatus()
     },
     showRedraftStatusConfirmDialog () {
@@ -200,7 +190,7 @@ const ExtraButtons = {
     isEdited () {
       return this.status.edited_at !== null
     },
-    editingAvailable () { return this.$store.state.instance.editingAvailable },
+    editingAvailable () { return this.$store.state.instance.editingAvailable }
   }
 }
 

src/components/favorite_button/favorite_button.vue

@@ -55,9 +55,6 @@
 
   .interactive {
     .svg-inline--fa {
-      @media (prefers-reduced-motion: reduce) {
-        animation: unset;
-      }
       animation-duration: 0.6s;
     }
 

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
     }
   }
 }

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"

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,
+    FollowRequestCard
-    FollowRequestList
   },
   computed: {
-    userId () {
-      return this.$store.state.users.currentUser.id
-    },
     requests () {
       return this.$store.state.api.followRequests
     }

src/components/follow_requests/follow_requests.vue

@@ -6,11 +6,12 @@
       </div>
     </div>
     <div class="panel-body">
-      <FollowRequestList :user-id="userId">
+      <FollowRequestCard
-        <template #item="{item}">
+        v-for="request in requests"
-          <FollowRequestCard :user="item" />
+        :key="request.id"
-        </template>
+        :user="request"
-      </FollowRequestList>
+        class="list-item"
+      />
     </div>
   </div>
 </template>

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>

src/components/list/list.vue

@@ -1,13 +1,9 @@
 <template>
-  <div
+  <div class="list">
-    class="list"
-    role="list"
-  >
     <div
       v-for="item in items"
       :key="getKey(item)"
       class="list-item"
-      role="listitem"
     >
       <slot
         name="item"

src/components/mention_link/mention_link.js

@@ -93,6 +93,9 @@ const MentionLink = {
         this.highlightType
       ]
     },
+    useAtIcon () {
+      return this.mergedConfig.useAtIcon
+    },
     isRemote () {
       return this.userName !== this.userNameFull
     },

src/components/mobile_nav/mobile_nav.vue

@@ -157,9 +157,6 @@
     box-shadow: var(--panelShadow);
     transition-property: transform;
     transition-duration: 0.25s;
-    @media (prefers-reduced-motion: reduce) {
-      transition: unset;
-    }
     transform: translateX(0);
     z-index: 1001;
     -webkit-overflow-scrolling: touch;

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,
+      federating: state => state.instance.federating
     }),
-    ...mapGetters(['unreadAnnouncementCount']),
+    ...mapGetters(['unreadAnnouncementCount'])
-    followRequestCount () {
-      return this.$store.state.users.currentUser.follow_requests_count
-    }
   }
 }
 

src/components/notification/notification.js

@@ -6,7 +6,6 @@ import UserCard from '../user_card/user_card.vue'
 import Timeago from '../timeago/timeago.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
-import StillImage from '../still-image/still-image.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -51,8 +50,7 @@ const Notification = {
     Timeago,
     Status,
     RichContent,
-    ConfirmModal,
+    ConfirmModal
-    StillImage
   },
   methods: {
     toggleUserExpanded () {

src/components/notification/notification.vue

@@ -116,13 +116,12 @@
                   scope="global"
                   keypath="notifications.reacted_with"
                 >
-                  <still-image
+                  <img
                     v-if="notification.emoji_url !== null"
                     class="notification-reaction-emoji"
                     :src="notification.emoji_url"
-                    :title="notification.emoji"
+                    :name="notification.emoji"
-                    :alt="notification.emoji"
+                  >
-                  />
                   <span
                     v-else
                     class="emoji-reaction-emoji"
@@ -152,6 +151,7 @@
             >
               <Timeago
                 :time="notification.created_at"
+                :with-direction="true"
                 :auto-update="240"
               />
             </router-link>

src/components/notifications/notifications.scss

@@ -105,12 +105,9 @@
     flex: 1;
     padding-left: 0.8em;
     min-width: 0;
-  }
 
-  .heading-right, .notification-right {
     .timeago {
-      display: inline-block;
+      min-width: 3em;
-      min-width: 6em;
       text-align: right;
     }
   }

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: {

src/components/poll/poll_form.js

@@ -103,9 +103,9 @@ export default {
     convertExpiryFromUnit (unit, amount) {
       // Note: we want seconds and not milliseconds
       switch (unit) {
-        case 'minutes': return amount * DateUtils.MINUTE / 1000
+        case 'minutes': return 0.001 * amount * DateUtils.MINUTE
-        case 'hours': return amount * DateUtils.HOUR / 1000
+        case 'hours': return 0.001 * amount * DateUtils.HOUR
-        case 'days': return amount * DateUtils.DAY / 1000
+        case 'days': return 0.001 * amount * DateUtils.DAY
       }
     },
     expiryAmountChange () {

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)
       }
     }
 

src/components/post_status_form/post_status_form.js

@@ -9,13 +9,11 @@ import StatusContent from '../status_content/status_content.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { findOffset } from '../../services/offset_finder/offset_finder.service.js'
 import { reject, map, uniqBy, debounce } from 'lodash'
-import { usePostLanguageOptions } from 'src/lib/post_language'
 import suggestor from '../emoji_input/suggestor.js'
 import { mapGetters, mapState } from 'vuex'
 import Checkbox from '../checkbox/checkbox.vue'
 import Select from '../select/select.vue'
 
-
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faSmileBeam,
@@ -55,21 +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 interfaceToISOLanguage = (ilang) => {
-    const sep = ilang.indexOf("_");
-    return sep < 0 ?
-        ilang :
-        ilang.substr(0, sep);
-}
-
 const PostStatusForm = {
   props: [
     'statusId',
@@ -80,7 +63,6 @@ const PostStatusForm = {
     'statusMediaDescriptions',
     'statusScope',
     'statusContentType',
-    'statusLanguage',
     'replyTo',
     'quoteId',
     'repliedUser',
@@ -137,13 +119,6 @@ const PostStatusForm = {
       this.$refs.textarea.focus()
     }
   },
-  setup() {
-    const {postLanguageOptions} = usePostLanguageOptions()
-
-    return {
-      postLanguageOptions,
-    }
-  },
   data () {
     const preset = this.$route.query.message
     let statusText = preset || ''
@@ -153,8 +128,7 @@ const PostStatusForm = {
       statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
     }
 
-    const { postContentType: contentType, postLanguage: defaultPostLanguage, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
+    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject } = this.$store.getters.mergedConfig
-    const postLanguage = defaultPostLanguage || interfaceToISOLanguage(interfaceLanguage)
 
     let statusParams = {
       spoilerText: this.subject || '',
@@ -165,7 +139,6 @@ const PostStatusForm = {
       poll: {},
       mediaDescriptions: {},
       visibility: this.suggestedVisibility(),
-      language: postLanguage,
       contentType
     }
 
@@ -180,45 +153,10 @@ const PostStatusForm = {
         poll: this.statusPoll || {},
         mediaDescriptions: this.statusMediaDescriptions || {},
         visibility: this.statusScope || this.suggestedVisibility(),
-        language: this.statusLanguage || postLanguage,
         contentType: statusContentType
       }
     }
 
-    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();
-        }
-      }
-    }
-
-    // When first loading the form, hide the subject (CW) field if it's disabled or doesn't have a starting value.
-    // "disableSubject" seems to take priority over "alwaysShowSubjectInput".
-    const showSubject = !this.disableSubject && (statusParams.spoilerText || alwaysShowSubjectInput)
-
     return {
       dropFiles: [],
       uploadingFiles: false,
@@ -233,10 +171,7 @@ const PostStatusForm = {
       preview: null,
       previewLoading: false,
       emojiInputShown: false,
-      idempotencyKey: '',
+      idempotencyKey: ''
-      activeEmojiInput: undefined,
-      activeTextInput: undefined,
-      subjectVisible: showSubject
     }
   },
   computed: {
@@ -324,7 +259,7 @@ const PostStatusForm = {
     ...mapGetters(['mergedConfig']),
     ...mapState({
       mobileLayout: state => state.interface.mobileLayout
-    }),
+    })
   },
   watch: {
     'newStatus': {
@@ -338,7 +273,6 @@ const PostStatusForm = {
     statusChanged () {
       this.autoPreview()
       this.updateIdempotencyKey()
-      this.saveDraft()
     },
     clearStatus () {
       const newStatus = this.newStatus
@@ -348,7 +282,6 @@ const PostStatusForm = {
         files: [],
         visibility: newStatus.visibility,
         contentType: newStatus.contentType,
-        language: newStatus.language,
         poll: {},
         mediaDescriptions: {}
       }
@@ -408,7 +341,6 @@ const PostStatusForm = {
         inReplyToStatusId: this.replyTo,
         quoteId: this.quoteId,
         contentType: newStatus.contentType,
-        language: newStatus.language,
         poll,
         idempotencyKey: this.idempotencyKey
       }
@@ -443,7 +375,6 @@ const PostStatusForm = {
         inReplyToStatusId: this.replyTo,
         quoteId: this.quoteId,
         contentType: newStatus.contentType,
-        language: newStatus.language,
         poll: {},
         preview: true
       }).then((data) => {
@@ -460,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
@@ -694,33 +595,8 @@ const PostStatusForm = {
       this.$refs['emoji-input'].resize()
     },
     showEmojiPicker () {
-      if (!this.activeEmojiInput || !this.activeTextInput)
+      this.$refs['textarea'].focus()
-        this.focusStatusInput()
+      this.$refs['emoji-input'].triggerShowPicker()
-
-      this.$refs[this.activeTextInput].focus()
-      this.$refs[this.activeEmojiInput].triggerShowPicker()
-    },
-    focusStatusInput() {
-      this.activeEmojiInput = 'emoji-input'
-      this.activeTextInput = 'textarea'
-    },
-    focusSubjectInput() {
-      this.activeEmojiInput = 'subject-emoji-input'
-      this.activeTextInput = 'subject-input'
-    },
-    toggleSubjectVisible() {
-      // If hiding CW, then we need to clear the subject and reset focus
-      if (this.subjectVisible)
-      {
-        this.focusStatusInput()
-
-        // "nsfw" property is normally set by the @change listener, but this bypasses it.
-        // We need to clear it manually instead.
-        this.newStatus.spoilerText = ''
-        this.newStatus.nsfw = false
-      }
-
-      this.subjectVisible = !this.subjectVisible
     },
     clearError () {
       this.error = null

src/components/post_status_form/post_status_form.vue

@@ -118,16 +118,13 @@
           />
         </div>
         <EmojiInput
-          ref="subject-emoji-input"
+          v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
-          v-if="subjectVisible"
           v-model="newStatus.spoilerText"
           enable-emoji-picker
-          hide-emoji-button
           :suggest="emojiSuggestor"
           class="form-control"
         >
           <input
-            ref="subject-input"
             v-model="newStatus.spoilerText"
             type="text"
             :placeholder="$t('post_status.content_warning')"
@@ -135,7 +132,6 @@
             size="1"
             class="form-post-subject"
             @input="onSubjectInput"
-            @focus="focusSubjectInput()"
           >
         </EmojiInput>
         <i18n-t
@@ -177,7 +173,6 @@
             @input="resize"
             @compositionupdate="resize"
             @paste="paste"
-            @focus="focusStatusInput()"
           />
           <p
             v-if="hasStatusLengthLimit"
@@ -199,23 +194,6 @@
             :on-scope-change="changeVis"
           />
 
-          <div
-            class="language-selector"
-            >
-            <Select
-              id="post-language"
-              v-model="newStatus.language"
-              class="form-control"
-            >
-              <option
-                v-for="language in postLanguageOptions"
-                :key="language.key"
-                :value="language.value"
-              >
-                {{ language.label }}
-              </option>
-            </Select>
-          </div>
           <div
             v-if="postFormats.length > 1"
             class="text-format"
@@ -281,15 +259,6 @@
           >
             <FAIcon icon="poll-h" />
           </button>
-          <button
-            v-if="!disableSubject"
-            class="spoiler-icon button-unstyled"
-            :class="{ selected: subjectVisible }"
-            :title="$t('post_status.toggle_content_warning')"
-            @click="toggleSubjectVisible"
-          >
-            <FAIcon icon="eye-slash" />
-          </button>
         </div>
         <button
           v-if="posting"
@@ -305,14 +274,12 @@
         >
           {{ $t('post_status.post') }}
         </button>
-        <!-- To keep the OSK at the same position after a message send, -->
+        <!-- touchstart is used 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. -->
         <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') }}
@@ -470,7 +437,7 @@
     }
   }
 
-  .media-upload-icon, .poll-icon, .emoji-icon, .spoiler-icon {
+  .media-upload-icon, .poll-icon, .emoji-icon {
     font-size: 1.85em;
     line-height: 1.1;
     flex: 1;
@@ -513,11 +480,6 @@
 
   .poll-icon {
     order: 3;
-    justify-content: center;
-  }
-
-  .spoiler-icon {
-    order: 4;
     justify-content: right;
   }
 

src/components/retweet_button/retweet_button.vue

@@ -74,9 +74,6 @@
 
   .interactive {
     .svg-inline--fa {
-      @media (prefers-reduced-motion: reduce) {
-        animation: unset;
-      }
       animation-duration: 0.6s;
     }
 

src/components/rich_content/rich_content.jsx

@@ -188,7 +188,7 @@ export default {
               break
             }
           case 'span':
-            if (this.handleLinks && attrs?.['class']?.includes?.('h-card')) {
+            if (this.handleLinks && attrs['class'] && attrs['class'].includes('h-card')) {
               return ['', children.map(processItem), '']
             }
         }

src/components/rich_content/rich_content.scss

@@ -50,6 +50,7 @@
 
   .emoji {
     display: inline-block;
+    width: var(--emoji-size, 32px);
     height: var(--emoji-size, 32px);
   }
 

src/components/scope_selector/scope_selector.vue

@@ -16,6 +16,7 @@
         class="fa-scale-110 fa-old-padding"
       />
     </button>
+    {{ ' ' }}
     <button
       v-if="showPrivate"
       class="button-unstyled scope"
@@ -29,6 +30,7 @@
         class="fa-scale-110 fa-old-padding"
       />
     </button>
+    {{ ' ' }}
     <button
       v-if="showUnlisted"
       class="button-unstyled scope"
@@ -42,6 +44,7 @@
         class="fa-scale-110 fa-old-padding"
       />
     </button>
+    {{ ' ' }}
     <button
       v-if="showPublic"
       class="button-unstyled scope"
@@ -84,7 +87,6 @@
     min-width: 1.3em;
     min-height: 1.3em;
     text-align: center;
-    margin-right: 0.4em;
 
     &.selected svg {
       color: $fallback--lightText;

src/components/search_bar/search_bar.vue

@@ -73,7 +73,6 @@
 
   .search-bar-input {
     flex: 1 0 auto;
-    margin-left: 0.5em;
   }
 
   .cancel-search {

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;

src/components/settings_modal/settings_modal.scss

@@ -76,10 +76,6 @@
       position: absolute;
       right: 20px;
       padding-right: 10px;
-
-      @media all and (max-width: 800px) {
-        display: none;
-      }
     }
   }
 }

src/components/settings_modal/settings_modal.vue

@@ -44,10 +44,6 @@
       <div class="panel-body">
         <SettingsModalContent v-if="modalOpenedOnce" />
       </div>
-      <span
-        id="unscrolled-content"
-        class="extra-content"
-      />
       <div class="panel-footer settings-footer">
         <Popover
           class="export"
@@ -57,7 +53,7 @@
           :bound-to="{ x: 'container' }"
           remove-padding
         >
-          <template #trigger>
+          <template v-slot:trigger>
             <button
               class="btn button-default"
               :title="$t('general.close')"
@@ -69,7 +65,7 @@
               />
             </button>
           </template>
-          <template #content="{close}">
+          <template v-slot:content="{close}">
             <div class="dropdown-menu">
               <button
                 class="button-default dropdown-item dropdown-item-icon"
@@ -107,11 +103,14 @@
 
         <Checkbox
           :model-value="!!expertLevel"
-          class="expertMode"
           @update:modelValue="expertLevel = Number($event)"
         >
           {{ $t("settings.expert_mode") }}
         </Checkbox>
+        <span
+          id="unscrolled-content"
+          class="extra-content"
+        />
         <button
           v-if="currentUser"
           class="button-default logout-button"

src/components/settings_modal/tabs/general_tab.js

@@ -4,7 +4,6 @@ import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
-import { usePostLanguageOptions } from 'src/lib/post_language'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import ServerSideIndicator from '../helpers/server_side_indicator.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -18,11 +17,6 @@ library.add(
 )
 
 const GeneralTab = {
-  setup() {
-    const {postLanguageOptions} = usePostLanguageOptions()
-
-    return {postLanguageOptions}
-  },
   data () {
     return {
       subjectLineOptions: ['email', 'noop', 'masto'].map(mode => ({
@@ -124,12 +118,6 @@ const GeneralTab = {
         this.$store.dispatch('setOption', { name: 'translationLanguage', value: val })
       }
     },
-    postLanguage: {
-      get: function () { return this.$store.getters.mergedConfig.postLanguage },
-      set: function (val) {
-        this.$store.dispatch('setOption', { name: 'postLanguage', value: val })
-      }
-    },
     ...SharedComputedObject()
   },
   methods: {

src/components/settings_modal/tabs/general_tab.vue

@@ -21,6 +21,7 @@
             >
               {{ $t('settings.settings_profile_force_sync') }}
             </button>
+
           </p>
           <div
             @click="toggleExpandedSettings"
@@ -146,11 +147,6 @@
             {{ $t('settings.show_wider_shortcuts') }}
           </BooleanSetting>
         </li>
-        <li>
-          <BooleanSetting path="displayPageBackgrounds">
-            {{ $t('settings.show_page_backgrounds') }}
-          </BooleanSetting>
-        </li>
         <li>
           <BooleanSetting path="stopGifs">
             {{ $t('settings.stop_gifs') }}
@@ -411,15 +407,6 @@
               {{ $t('settings.preload_images') }}
             </BooleanSetting>
           </li>
-          <li>
-            <BooleanSetting
-              path="useBlurhash"
-              expert="1"
-              :disabled="!hideNsfw"
-            >
-              {{ $t('settings.use_blurhash') }}
-            </BooleanSetting>
-          </li>
           <li>
             <BooleanSetting
               path="useOneClickNsfw"
@@ -488,6 +475,14 @@
             </BooleanSetting>
           </li>
         </ul>
+        <li>
+          <BooleanSetting
+            path="useAtIcon"
+            expert="1"
+          >
+            {{ $t('settings.use_at_icon') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting path="mentionLinkShowAvatar">
             {{ $t('settings.mention_link_show_avatar') }}
@@ -585,15 +580,6 @@
             {{ $t('settings.post_status_content_type') }}
           </ChoiceSetting>
         </li>
-        <li>
-          <ChoiceSetting
-            id="postLanguage"
-            path="postLanguage"
-            :options="postLanguageOptions"
-          >
-            {{ $t('settings.post_language') }}
-          </ChoiceSetting>
-        </li>
         <li>
           <BooleanSetting
             path="alwaysShowNewPostButton"

src/components/settings_modal/tabs/mutes_and_blocks_tab.js

@@ -10,20 +10,17 @@ import SelectableList from 'src/components/selectable_list/selectable_list.vue'
 import ProgressButton from 'src/components/progress_button/progress_button.vue'
 import withSubscription from 'src/components/../hocs/with_subscription/with_subscription'
 import Checkbox from 'src/components/checkbox/checkbox.vue'
-import withLoadMore from 'src/components/../hocs/with_load_more/with_load_more'
 
-const BlockList = withLoadMore({
+const BlockList = withSubscription({
   fetch: (props, $store) => $store.dispatch('fetchBlocks'),
   select: (props, $store) => get($store.state.users.currentUser, 'blockIds', []),
-  childPropName: 'items',
+  childPropName: 'items'
-  destroy: () => {}
 })(SelectableList)
 
-const MuteList = withLoadMore({
+const MuteList = withSubscription({
   fetch: (props, $store) => $store.dispatch('fetchMutes'),
   select: (props, $store) => get($store.state.users.currentUser, 'muteIds', []),
-  childPropName: 'items',
+  childPropName: 'items'
-  destroy: () => {}
 })(SelectableList)
 
 const DomainMuteList = withSubscription({

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 {
@@ -33,7 +32,6 @@ const ProfileTab = {
       newName: this.$store.state.users.currentUser.name_unescaped,
       newBio: unescape(this.$store.state.users.currentUser.description),
       newLocked: this.$store.state.users.currentUser.locked,
-      newPermitFollowback: this.$store.state.users.currentUser.permit_followback,
       newFields: this.$store.state.users.currentUser.fields.map(field => ({ name: field.name, value: field.value })),
       showRole: this.$store.state.users.currentUser.show_role,
       role: this.$store.state.users.currentUser.role,
@@ -45,19 +43,10 @@ const ProfileTab = {
       bannerPreview: null,
       background: null,
       backgroundPreview: null,
-      emailLanguage: this.$store.state.users.currentUser.language || '',
+      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,10 +123,7 @@ const ProfileTab = {
         display_name: this.newName,
         fields_attributes: this.newFields.filter(el => el != null),
         bot: this.bot,
-        show_role: this.showRole,
+        show_role: this.showRole
-        status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1,
-        permit_followback: this.permit_followback,
-        accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom
         /* eslint-enable camelcase */
       }
 

src/components/settings_modal/tabs/profile_tab.scss

@@ -4,10 +4,6 @@
     margin: 0;
   }
 
-  .expire-posts-days {
-    margin-left: 1em;
-  }
-
   .visibility-tray {
     padding-top: 5px;
   }

src/components/settings_modal/tabs/profile_tab.vue

@@ -88,32 +88,6 @@
         <Checkbox v-model="bot">
           {{ $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') }}
-        </Checkbox>
-        <input
-          v-model="newPostTTLDays"
-          :disabled="!expirePosts"
-          type="number"
-          min="1"
-          max="730"
-          class="expire-posts-days"
-          :placeholder="$t('settings.expire_posts_input_placeholder')"
-        />
-      </p>
-      <p>
-
       </p>
       <p>
         <interface-language-switcher
@@ -259,19 +233,6 @@
           <BooleanSetting path="serverSide_locked">
             {{ $t('settings.lock_account_description') }}
           </BooleanSetting>
-          <ul
-            class="setting-list suboptions"
-            :class="[{disabled: !serverSide_locked}]"
-          >
-            <li>
-              <BooleanSetting
-                path="serverSide_permitFollowback"
-                :disabled="!serverSide_locked"
-              >
-                {{ $t('settings.permit_followback_description') }}
-              </BooleanSetting>
-            </li>
-          </ul>
         </li>
         <li>
           <BooleanSetting path="serverSide_discoverable">

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;
@@ -288,6 +284,7 @@
     box-shadow: none;
     background: transparent;
     color: var(--faint, $fallback--faint);
+    align-self: stretch;
   }
 
   .theme-color-cl,
@@ -321,11 +318,11 @@
 
 .extra-content {
   .apply-container {
-    padding-left: 15vw;
     display: flex;
     flex-direction: row;
-    justify-content: space-evenly;
+    justify-content: space-around;
     flex-grow: 1;
+
     .btn {
       flex-grow: 1;
       min-height: 2em;

src/components/settings_modal/tabs/theme_tab/theme_tab.vue

@@ -958,22 +958,20 @@
       v-if="isActive"
       to="#unscrolled-content"
     >
-      <div class="panel-body settings-footer">
+      <div class="apply-container">
-        <div class="apply-container">
+        <button
-          <button
+          class="btn button-default submit"
-            class="btn button-default submit"
+          :disabled="!themeValid"
-            :disabled="!themeValid"
+          @click="setCustomTheme"
-            @click="setCustomTheme"
+        >
-          >
+          {{ $t('general.apply') }}
-            {{ $t('general.apply') }}
+        </button>
-          </button>
+        <button
-          <button
+          class="btn button-default"
-            class="btn button-default"
+          @click="clearAll"
-            @click="clearAll"
+        >
-          >
+          {{ $t('settings.style.switcher.reset') }}
-            {{ $t('settings.style.switcher.reset') }}
+        </button>
-          </button>
-        </div>
       </div>
     </teleport>
   </div>

src/components/side_drawer/side_drawer.vue

@@ -268,10 +268,6 @@
 .side-drawer {
   overflow-x: hidden;
   transition-timing-function: cubic-bezier(0, 1, 0.5, 1);
-  @media (prefers-reduced-motion: reduce) {
-    transition-timing-function: unset;
-    transition: unset;
-  }
   transition: 0.35s;
   transition-property: transform;
   margin: 0 0 0 -100px;

src/components/status/status.js

@@ -20,7 +20,6 @@ import generateProfileLink from 'src/services/user_profile_link_generator/user_p
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import { muteWordHits } from '../../services/status_parser/status_parser.js'
 import { unescape, uniqBy } from 'lodash'
-import StillImage from '../still-image/still-image.vue'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -118,8 +117,7 @@ const Status = {
     RichContent,
     MentionLink,
     MentionsLine,
-    QuoteButton,
+    QuoteButton
-    StillImage
   },
   props: [
     'statusoid',

src/components/status/status.scss

@@ -42,10 +42,6 @@
     display: flex;
     padding: var(--status-margin, $status-margin);
 
-    .content {
-      overflow: hidden;
-    }
-
     > * {
       min-width: 0;
     }