Merge branch 'develop' into fedi-absturztau-be

This patch removes Ruffle completely, significantly speeding up the
loading of the frontend, making it a little more responsive,
and reducing its compressed size.

.eslintignore

@@ -0,0 +1,2 @@
+build/*.js
+config/*.js

.eslintrc.js

@@ -0,0 +1,30 @@
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: '@babel/eslint-parser',
+    sourceType: 'module'
+  },
+  // https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
+  extends: [
+    'plugin:vue/recommended'
+  ],
+  // required to lint *.vue files
+  plugins: [
+    'vue',
+    'import'
+  ],
+  // add your custom rules here
+  rules: {
+    // allow paren-less arrow functions
+    'arrow-parens': 0,
+    // allow async-await
+    'generator-star-spacing': 0,
+    // allow debugger during development
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'vue/require-prop-types': 0,
+    'vue/no-unused-vars': 0,
+    'no-tabs': 0,
+    'vue/multi-word-component-names': 0,
+    'vue/no-reserved-component-names': 0
+  }
+}

.node-version

@@ -0,0 +1 @@
+7.2.1

.tool-versions

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

.woodpecker.yml

@@ -1,25 +1,23 @@
-labels:
+pipeline:
-  platform: linux/amd64
-
-steps:
   lint:
     when:
       event:
       - pull_request
-    image: node:20
+    image: node:18
     commands:
     - yarn
     - yarn lint
+    #- yarn stylelint
 
   test:
     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:
@@ -29,7 +27,7 @@ steps:
       branch:
       - develop
       - stable
-    image: node:20
+    image: node:18
     commands:
     - yarn
     - yarn build
@@ -41,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
@@ -71,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
@@ -80,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,4 +1,4 @@
-# Akkoma-FE
+# Akkoma-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)
 
@@ -6,9 +6,22 @@ This is a fork of Akkoma-FE from the Pleroma project, with support for new Akkom
 - MFM support via [marked-mfm](https://akkoma.dev/sfr/marked-mfm)
 - Custom emoji reactions
 
+# Changes in this Fork
+
+* script tag in index.html for [pleroma-mod-loader](https://git.pleroma.social/absturztaube/pleroma-mod-loader)
+* ability to move notifications to a seperate column
+* insert zero width space when padding of emojis is disabled
+* add custom language "English (Nyan)"
+* pointing version links to my gitlab repos
+* optional compact styles provided by craftplacer
+* tags as buttons bellow a post
+* [pinch and pan media](https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1403)
+* swap of react and favorite button in status
+* adding __vueComponent__ to DOM nodes to make new mods work
+
 # 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 Akkoma-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.
 
@@ -20,11 +33,9 @@ To use Akkoma-FE in Akkoma, use the [frontend](https://docs.akkoma.dev/stable/ad
 
 ## Build Setup
 
-Make sure you have [Node.js](https://nodejs.org/) installed. You can check `/.woodpecker.yml` for which node version the Akkoma CI currently uses.
-
 ``` bash
 # install dependencies
-corepack enable
+npm install -g yarn
 yarn
 
 # serve with hot reload at localhost:8080
@@ -39,7 +50,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.
@@ -54,4 +65,4 @@ Edit config.json for configuration.
 
 ### Login methods
 
-```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations.
+```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations. 

build/build.js

@@ -1,36 +1,36 @@
 // https://github.com/shelljs/shelljs
-require("./check-versions")();
+require('./check-versions')()
-require("shelljs/global");
+require('shelljs/global')
-env.NODE_ENV = "production";
+env.NODE_ENV = 'production'
 
-var path = require("path");
+var path = require('path')
-var config = require("../config");
+var config = require('../config')
-var webpack = require("webpack");
+var ora = require('ora')
-var webpackConfig = require("./webpack.prod.conf");
+var webpack = require('webpack')
+var webpackConfig = require('./webpack.prod.conf')
 
 console.log(
-  "  Tip:\n" +
+  '  Tip:\n' +
-    "  Built files are meant to be served over an HTTP server.\n" +
+  '  Built files are meant to be served over an HTTP server.\n' +
-    "  Opening index.html over file:// won't work.\n",
+  '  Opening index.html over file:// won\'t work.\n'
-);
+)
 
-var assetsPath = path.join(
+var spinner = ora('building for production...')
-  config.build.assetsRoot,
+spinner.start()
-  config.build.assetsSubDirectory,
+
-);
+var assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
-rm("-rf", assetsPath);
+rm('-rf', assetsPath)
-mkdir("-p", assetsPath);
+mkdir('-p', assetsPath)
-cp("-R", "static/*", assetsPath);
+cp('-R', 'static/*', assetsPath)
 
 webpack(webpackConfig, function (err, stats) {
-  if (err) throw err;
+  spinner.stop()
-  process.stdout.write(
+  if (err) throw err
-    stats.toString({
+  process.stdout.write(stats.toString({
-      colors: true,
+    colors: true,
-      modules: false,
+    modules: false,
-      children: false,
+    children: false,
-      chunks: false,
+    chunks: false,
-      chunkModules: false,
+    chunkModules: false
-    }) + "\n",
+  }) + '\n')
-  );
+})
-});

build/dev-server.js

@@ -5,7 +5,7 @@ var path = require('path')
 var express = require('express')
 var webpack = require('webpack')
 var opn = require('opn')
-const { createProxyMiddleware } = require('http-proxy-middleware');
+var proxyMiddleware = require('http-proxy-middleware')
 var webpackConfig = process.env.NODE_ENV === 'testing'
   ? require('./webpack.prod.conf')
   : require('./webpack.dev.conf')
@@ -21,7 +21,6 @@ var compiler = webpack(webpackConfig)
 
 var devMiddleware = require('webpack-dev-middleware')(compiler, {
   publicPath: webpackConfig.output.publicPath,
-  writeToDisk: true,
   stats: {
     colors: true,
     chunks: false
@@ -36,13 +35,7 @@ Object.keys(proxyTable).forEach(function (context) {
   if (typeof options === 'string') {
     options = { target: options }
   }
-  const targetUrl = new URL(options.target);
+  app.use(proxyMiddleware(context, options))
-  // add path
-  targetUrl.pathname = context;
-  options.target = targetUrl.toString();
-
-  console.log("Proxying", context, "to", options.target);
-  app.use(context, createProxyMiddleware(options))
 })
 
 // handle fallback for HTML5 history API

build/webpack.base.conf.js

@@ -3,7 +3,6 @@ var config = require('../config')
 var utils = require('./utils')
 var projectRoot = path.resolve(__dirname, '../')
 var { VueLoaderPlugin } = require('vue-loader')
-const ESLintPlugin = require('eslint-webpack-plugin');
 
 var env = process.env.NODE_ENV
 // check env & config/index.js to decide weither to enable CSS Sourcemaps for the
@@ -36,7 +35,6 @@ module.exports = {
     ],
     fallback: {
       "url": require.resolve("url/"),
-      querystring: require.resolve("querystring-es3")
     },
     alias: {
       'static': path.resolve(__dirname, '../static'),
@@ -49,6 +47,20 @@ module.exports = {
   module: {
     noParse: /node_modules\/localforage\/dist\/localforage.js/,
     rules: [
+      {
+        enforce: 'pre',
+        test: /\.(js|vue)$/,
+        include: projectRoot,
+        exclude: /node_modules/,
+        use: {
+          loader: 'eslint-loader',
+          options: {
+            formatter: require('eslint-friendly-formatter'),
+            sourceMap: config.build.productionSourceMap,
+            extract: true
+          }
+        }
+      },
       {
         enforce: 'post',
         test: /\.(json5?|ya?ml)$/, // target json, json5, yaml and yml files
@@ -106,9 +118,6 @@ module.exports = {
     ]
   },
   plugins: [
-    new VueLoaderPlugin(),
+    new VueLoaderPlugin()
-    new ESLintPlugin({
-      configType: 'flat'
-    })
   ]
 }

config/local.example.json

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

config/test.env.js

@@ -2,4 +2,5 @@ var { merge } = require('webpack-merge')
 var devEnv = require('./dev.env')
 
 module.exports = merge(devEnv, {
+  NODE_ENV: '"testing"'
 })

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

eslint.config.js

@@ -1,31 +0,0 @@
-const pluginVue = require('eslint-plugin-vue')
-const pluginImport = require('eslint-plugin-import')
-
-module.exports = [
-  ...pluginVue.configs['flat/recommended'],
-  {
-    languageOptions: {
-      parserOptions: {
-        parser: '@babel/eslint-parser',
-        sourceType: 'module'
-      }
-    },
-    rules: {
-      // allow paren-less arrow functions
-      'arrow-parens': 0,
-      // allow async-await
-      'generator-star-spacing': 0,
-      // allow debugger during development
-      'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
-      'vue/require-prop-types': 0,
-      'vue/no-unused-vars': 0,
-      'no-tabs': 0,
-      'vue/multi-word-component-names': 0,
-      'vue/no-reserved-component-names': 0
-    },
-    ignores: [
-      'build/*.js',
-      'config/*.js'
-    ]
-  }
-]

index.html

@@ -18,5 +18,6 @@
     <div id="app"></div>
     <div id="modal"></div>
     <!-- built files will be auto injected -->
+    <script type="text/javascript" src="/instance/pleroma-mod-loader.js"></script>
   </body>
 </html>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pleroma_fe",
-  "version": "3.10.0",
+  "version": "3.5.0",
   "description": "A frontend for Akkoma instances",
   "author": "Roger Braun <roger@rogerbraun.net>",
   "private": true,
@@ -12,118 +12,120 @@
     "e2e": "node test/e2e/runner.js",
     "test": "npm run unit && npm run e2e",
     "stylelint": "stylelint src/**/*.scss",
-    "lint": "eslint src test/unit/specs test/e2e/specs",
+    "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
-    "lint-fix": "eslint --fix src test/unit/specs test/e2e/specs"
+    "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
   },
   "dependencies": {
     "@babel/runtime": "7.17.8",
-    "@chenfengyuan/vue-qrcode": "^2.0.0",
+    "@chenfengyuan/vue-qrcode": "2.0.0",
     "@floatingghost/pinch-zoom-element": "^1.3.1",
-    "@fortawesome/fontawesome-svg-core": "^6.5.2",
+    "@fortawesome/fontawesome-svg-core": "1.3.0",
-    "@fortawesome/free-regular-svg-icons": "^6.5.2",
+    "@fortawesome/free-regular-svg-icons": "^6.1.2",
-    "@fortawesome/free-solid-svg-icons": "^6.5.2",
+    "@fortawesome/free-solid-svg-icons": "^6.2.0",
-    "@fortawesome/vue-fontawesome": "^3.0.8",
+    "@fortawesome/vue-fontawesome": "3.0.1",
-    "@vuelidate/core": "^2.0.3",
+    "@vuelidate/core": "^2.0.0",
-    "@vuelidate/validators": "^2.0.4",
+    "@vuelidate/validators": "^2.0.0",
-    "blurhash": "^2.0.5",
+    "blurhash": "^2.0.4",
-    "body-scroll-lock": "^3.1.5",
+    "body-scroll-lock": "2.7.1",
-    "chromatism": "^3.0.0",
+    "chromatism": "3.0.0",
-    "click-outside-vue3": "^4.0.1",
+    "click-outside-vue3": "4.0.1",
-    "cropperjs": "^1.6.2",
+    "cropperjs": "1.5.12",
-    "diff": "^5.2.0",
+    "diff": "3.5.0",
-    "escape-html": "^1.0.3",
+    "escape-html": "1.0.3",
     "iso-639-1": "^2.1.15",
     "js-cookie": "^3.0.1",
-    "localforage": "^1.10.0",
+    "localforage": "1.10.0",
     "parse-link-header": "^2.0.0",
-    "phoenix": "^1.7.12",
+    "phoenix": "1.6.2",
-    "punycode.js": "^2.3.1",
+    "punycode.js": "2.1.0",
-    "qrcode": "^1.5.3",
+    "qrcode": "1",
-    "querystring-es3": "^0.2.1",
+    "url": "^0.11.0",
-    "url": "^0.11.3",
+    "vue": "^3.2.31",
-    "vue": "^3.4.38",
+    "vue-i18n": "^9.2.2",
-    "vue-i18n": "^9.14.0",
+    "vue-router": "4.0.14",
-    "vue-router": "^4.4.3",
+    "vue-template-compiler": "2.6.11",
-    "vue-template-compiler": "^2.7.16",
+    "vuex": "4.0.2"
-    "vuex": "^4.1.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.24.6",
+    "@babel/core": "7.17.8",
     "@babel/eslint-parser": "^7.19.1",
-    "@babel/plugin-transform-runtime": "^7.24.6",
+    "@babel/plugin-transform-runtime": "7.17.0",
-    "@babel/preset-env": "^7.24.6",
+    "@babel/preset-env": "7.16.11",
-    "@babel/register": "^7.24.6",
+    "@babel/register": "7.17.7",
     "@intlify/vue-i18n-loader": "^5.0.0",
-    "@ungap/event-target": "^0.2.4",
+    "@ungap/event-target": "0.2.3",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
+    "@vue/babel-helper-vue-jsx-merge-props": "1.2.1",
-    "@vue/babel-plugin-jsx": "^1.2.2",
+    "@vue/babel-plugin-jsx": "1.1.1",
     "@vue/compiler-sfc": "^3.1.0",
     "@vue/test-utils": "^2.0.2",
-    "autoprefixer": "^10.4.19",
+    "autoprefixer": "6.7.7",
     "babel-loader": "^9.1.0",
-    "babel-plugin-lodash": "^3.3.4",
+    "babel-plugin-lodash": "3.3.4",
     "chai": "^4.3.7",
-    "chalk": "^1.1.3",
+    "chalk": "1.1.3",
-    "chromedriver": "^119.0.1",
+    "chromedriver": "^107.0.3",
     "connect-history-api-fallback": "^2.0.0",
     "cross-spawn": "^7.0.3",
-    "css-loader": "^7.1.2",
+    "css-loader": "^6.7.2",
     "custom-event-polyfill": "^1.0.7",
-    "eslint": "^9.3.0",
+    "eslint": "^7.32.0",
-    "eslint-config-standard": "^17.1.0",
+    "eslint-config-standard": "^17.0.0",
     "eslint-friendly-formatter": "^4.0.1",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint-loader": "^4.0.2",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.2.0",
+    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-standard": "^5.0.0",
-    "eslint-plugin-vue": "^9.26.0",
+    "eslint-plugin-vue": "^9.7.0",
-    "eslint-webpack-plugin": "^4.2.0",
+    "eventsource-polyfill": "0.9.6",
-    "eventsource-polyfill": "^0.9.6",
+    "express": "4.17.3",
-    "express": "^4.19.2",
     "file-loader": "^6.2.0",
-    "function-bind": "^1.1.2",
+    "function-bind": "1.1.1",
     "html-webpack-plugin": "^5.5.0",
-    "http-proxy-middleware": "^3.0.0",
+    "http-proxy-middleware": "0.21.0",
-    "json-loader": "^0.5.7",
+    "inject-loader": "2.0.1",
-    "karma": "^6.4.3",
+    "isparta-loader": "2.0.0",
-    "karma-coverage": "^2.2.1",
+    "json-loader": "0.5.7",
-    "karma-firefox-launcher": "^2.1.3",
+    "karma": "6.3.17",
-    "karma-mocha": "^2.0.1",
+    "karma-coverage": "1.1.2",
-    "karma-mocha-reporter": "^2.2.5",
+    "karma-firefox-launcher": "1.3.0",
-    "karma-sinon-chai": "^2.0.2",
+    "karma-mocha": "2.0.1",
-    "karma-sourcemap-loader": "^0.4.0",
+    "karma-mocha-reporter": "2.2.5",
-    "karma-spec-reporter": "^0.0.36",
+    "karma-sinon-chai": "2.0.2",
+    "karma-sourcemap-loader": "0.3.8",
+    "karma-spec-reporter": "0.0.33",
     "karma-webpack": "^5.0.0",
-    "lodash": "^4.17.21",
+    "lodash": "4.17.21",
-    "lolex": "^6.0.0",
+    "lolex": "1.6.0",
-    "mini-css-extract-plugin": "^2.9.0",
+    "mini-css-extract-plugin": "0.12.0",
-    "mocha": "^10.4.0",
+    "mocha": "3.5.3",
-    "nightwatch": "^3.6.3",
+    "nightwatch": "0.9.21",
-    "opn": "^6.0.0",
+    "opn": "4.0.2",
+    "ora": "0.4.1",
     "postcss-html": "^1.5.0",
-    "postcss-loader": "^8.1.1",
+    "postcss-loader": "3.0.0",
     "postcss-sass": "^0.5.0",
-    "raw-loader": "^4.0.2",
+    "raw-loader": "0.5.1",
-    "sass": "^1.77.2",
+    "sass": "^1.56.0",
-    "sass-loader": "^14.2.1",
+    "sass-loader": "^13.2.0",
-    "selenium-server": "^3.141.59",
+    "selenium-server": "2.53.1",
-    "semver": "^7.6.2",
+    "semver": "5.7.1",
-    "shelljs": "^0.8.5",
+    "shelljs": "0.8.5",
-    "sinon": "^18.0.0",
+    "sinon": "2.4.1",
-    "sinon-chai": "^3.7.0",
+    "sinon-chai": "2.14.0",
     "stylelint": "^14.15.0",
     "stylelint-config-recommended-vue": "^1.4.0",
     "stylelint-config-standard": "^29.0.0",
     "stylelint-config-standard-scss": "^6.1.0",
     "stylelint-rscss": "^0.4.0",
     "url-loader": "^4.1.1",
-    "vue-loader": "^17.4.2",
+    "vue-loader": "^17.0.0",
-    "vue-style-loader": "^4.1.3",
+    "vue-style-loader": "^4.1.2",
-    "webpack": "^5.91.0",
+    "webpack": "^5.75.0",
-    "webpack-dev-middleware": "^7.2.1",
+    "webpack-dev-middleware": "^5.3.3",
-    "webpack-hot-middleware": "^2.26.1",
+    "webpack-hot-middleware": "^2.25.1",
-    "webpack-merge": "^5.10.0",
+    "webpack-merge": "^5.8.0",
-    "workbox-webpack-plugin": "^7.1.0"
+    "workbox-webpack-plugin": "^6.5.4"
   },
   "engines": {
     "node": ">= 16.0.0",

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

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

@@ -18,6 +18,8 @@ import { CURRENT_VERSION } from '../services/theme_data/theme_data.service.js'
 import { applyTheme } from '../services/style_setter/style_setter.js'
 import FaviconService from '../services/favicon_service/favicon_service.js'
 
+import DomNodeToComponent from '../modules/domNodeToComponent.js'
+
 let staticInitialResults = null
 
 const parsedInitialResults = () => {
@@ -422,6 +424,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
 
   app.use(vClickOutside)
   app.use(VBodyScrollLock)
+  app.use(DomNodeToComponent)
 
   app.component('FAIcon', FontAwesomeIcon)
   app.component('FALayers', FontAwesomeLayers)

src/components/about/about.vue

@@ -9,7 +9,7 @@
   </div>
 </template>
 
-<script src="./about.js"></script>
+<script src="./about.js" ></script>
 
 <style lang="scss">
 </style>

src/components/account_actions/account_actions.vue

@@ -6,7 +6,7 @@
       :bound-to="{ x: 'container' }"
       remove-padding
     >
-      <template #content>
+      <template v-slot:content>
         <div class="dropdown-menu">
           <template v-if="relationship.following">
             <button
@@ -71,7 +71,7 @@
           </button>
         </div>
       </template>
-      <template #trigger>
+      <template v-slot:trigger>
         <button class="button-unstyled ellipsis-button">
           <FAIcon
             class="icon"
@@ -93,7 +93,7 @@
           keypath="user_card.block_confirm"
           tag="span"
         >
-          <template #user>
+          <template v-slot:user>
             <span
               v-text="user.screen_name_ui"
             />

src/components/attachment/attachment.js

@@ -1,5 +1,4 @@
 import StillImage from '../still-image/still-image.vue'
-import Flash from '../flash/flash.vue'
 import VideoAttachment from '../video_attachment/video_attachment.vue'
 import nsfwImage from '../../assets/nsfw.png'
 import fileTypeService from '../../services/file_type/file_type.service.js'
@@ -62,7 +61,6 @@ const Attachment = {
     }
   },
   components: {
-    Flash,
     StillImage,
     VideoAttachment,
     Blurhash

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

@@ -246,8 +246,8 @@
           ref="flash"
           class="flash"
           :src="attachment.large_thumb_url || attachment.url"
-          @player-opened="setFlashLoaded(true)"
+          @playerOpened="setFlashLoaded(true)"
-          @player-closed="setFlashLoaded(false)"
+          @playerClosed="setFlashLoaded(false)"
         />
       </span>
     </div>

src/components/avatar_list/avatar_list.vue

@@ -14,7 +14,7 @@
   </div>
 </template>
 
-<script src="./avatar_list.js"></script>
+<script src="./avatar_list.js" ></script>
 
 <style lang="scss">
 @import '../../_variables.scss';

src/components/chat/chat_layout.js

@@ -0,0 +1,108 @@
+const ChatLayout = {
+  methods: {
+    setChatLayout () {
+      let body = document.querySelector('body')
+      if (body) {
+        body.style.overscrollBehavior = 'none'
+      }
+      if (this.isMobileLayout) {
+        this.setMobileChatLayout()
+      }
+    },
+    unsetChatLayout () {
+      this.unsetMobileChatLayout()
+      let body = document.querySelector('body')
+      if (body) {
+        body.style.overscrollBehavior = 'unset'
+      }
+    },
+    setMobileChatLayout () {
+      // This is a hacky way to adjust the global layout to the mobile chat (without modifying the rest of the app).
+      // This layout prevents empty spaces from being visible at the bottom
+      // of the chat on iOS Safari (`safe-area-inset`) when
+      // - the on-screen keyboard appears and the user starts typing
+      // - the user selects the text inside the input area
+      // - the user selects and deletes the text that is multiple lines long
+      // TODO: unify the chat layout with the global layout.
+
+      let html = document.querySelector('html')
+      if (html) {
+        html.style.overflow = 'hidden'
+        html.style.height = '100%'
+      }
+
+      let body = document.querySelector('body')
+      if (body) {
+        body.style.height = '100%'
+      }
+
+      let app = document.getElementById('app')
+      if (app) {
+        app.style.height = '100%'
+        app.style.overflow = 'hidden'
+        app.style.minHeight = 'auto'
+      }
+
+      let appBgWrapper = window.document.getElementById('app_bg_wrapper')
+      if (appBgWrapper) {
+        appBgWrapper.style.overflow = 'hidden'
+      }
+
+      let main = document.getElementsByClassName('main')[0]
+      if (main) {
+        main.style.overflow = 'hidden'
+        main.style.height = '100%'
+      }
+
+      let content = document.getElementById('content')
+      if (content) {
+        content.style.paddingTop = '0'
+        content.style.height = '100%'
+        content.style.overflow = 'visible'
+      }
+
+      this.$nextTick(() => {
+        this.updateSize()
+      })
+    },
+    unsetMobileChatLayout () {
+      let html = document.querySelector('html')
+      if (html) {
+        html.style.overflow = 'visible'
+        html.style.height = 'unset'
+      }
+
+      let body = document.querySelector('body')
+      if (body) {
+        body.style.height = 'unset'
+      }
+
+      let app = document.getElementById('app')
+      if (app) {
+        app.style.height = '100%'
+        app.style.overflow = 'visible'
+        app.style.minHeight = '100vh'
+      }
+
+      let appBgWrapper = document.getElementById('app_bg_wrapper')
+      if (appBgWrapper) {
+        appBgWrapper.style.overflow = 'visible'
+      }
+
+      let main = document.getElementsByClassName('main')[0]
+      if (main) {
+        main.style.overflow = 'visible'
+        main.style.height = 'unset'
+      }
+
+      let content = document.getElementById('content')
+      if (content) {
+        content.style.paddingTop = '60px'
+        content.style.height = 'unset'
+        content.style.overflow = 'unset'
+      }
+    }
+  }
+}
+
+export default ChatLayout

src/components/chat_avatar/chat_avatar.js

@@ -0,0 +1,34 @@
+import StillImage from '../still-image/still-image.vue'
+import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
+import { mapState } from 'vuex'
+
+const ChatAvatar = {
+  props: ['users', 'fallbackUser', 'width', 'height'],
+  components: {
+    StillImage
+  },
+  methods: {
+    getUserProfileLink (user) {
+      return generateProfileLink(user.id, user.screen_name)
+    }
+  },
+  computed: {
+    firstUser () {
+      return this.users[0] || this.fallbackUser
+    },
+    secondUser () {
+      return this.users[1]
+    },
+    thirdUser () {
+      return this.users[2]
+    },
+    fourthUser () {
+      return this.users[3]
+    },
+    ...mapState({
+      betterShadow: state => state.interface.browserSupport.cssFilter
+    })
+  }
+}
+
+export default ChatAvatar

src/components/chat_avatar/chat_avatar.vue

@@ -0,0 +1,130 @@
+<template>
+  <div
+    v-if="firstUser && secondUser"
+    class="direct-conversation-multi-user-avatar"
+    :style="{ 'width': width, 'height': height }"
+  >
+    <StillImage
+      v-if="fourthUser"
+      class="avatar avatar-fourth direct-conversation-avatar"
+      :alt="fourthUser.screen_name"
+      :title="fourthUser.screen_name"
+      :src="fourthUser.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+    />
+    <StillImage
+      v-if="thirdUser"
+      class="avatar avatar-third direct-conversation-avatar"
+      :alt="thirdUser.screen_name"
+      :title="thirdUser.screen_name"
+      :src="thirdUser.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+    />
+    <StillImage
+      class="avatar avatar-second direct-conversation-avatar"
+      :alt="secondUser.screen_name"
+      :title="secondUser.screen_name"
+      :src="secondUser.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+      :style="{ 'height': fourthUser ? '50%' : '100%' }"
+    />
+    <StillImage
+      class="avatar avatar-first direct-conversation-avatar"
+      :alt="firstUser.screen_name"
+      :title="firstUser.screen_name"
+      :src="firstUser.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+      :style="{ 'height': thirdUser ? '50%' : '100%' }"
+    />
+  </div>
+  <router-link
+    v-else
+    :to="getUserProfileLink(firstUser)"
+  >
+    <StillImage
+      :style="{ 'width': width, 'height': height }"
+      class="avatar direct-conversation-avatar single-user"
+      :alt="firstUser.screen_name"
+      :title="firstUser.screen_name"
+      :src="firstUser.profile_image_url_original"
+      error-src="/images/avi.png"
+      :class="{ 'better-shadow': betterShadow }"
+    />
+  </router-link>
+</template>
+
+<script src="./chat_avatar.js"></script>
+<style lang="scss">
+@import '../../_variables.scss';
+
+.direct-conversation-multi-user-avatar {
+  position: relative;
+  cursor: pointer;
+  width: 48px;
+  height: 48px;
+  border-radius: 50%;
+  overflow: hidden;
+
+  .avatar.still-image {
+    width: 50%;
+    height: 50%;
+    border-radius: 0;
+    img, canvas {
+      object-fit: cover;
+    }
+
+    &.avatar-first {
+      float: right;
+      position: absolute;
+      bottom: 0;
+    }
+
+    &.avatar-second {
+      float: right;
+    }
+
+    &.avatar-third {
+      float: right;
+      position: absolute;
+    }
+
+    &.avatar-fourth {
+      float: right;
+      position: absolute;
+      bottom: 0;
+      right: 0;
+    }
+  }
+}
+
+.direct-conversation-avatar {
+  display: inline-block;
+  vertical-align: middle;
+
+  &.single-user {
+    border-radius: $fallback--avatarAltRadius;
+    border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
+  }
+
+  .avatar.still-image {
+    width: 48px;
+    height: 48px;
+
+    box-shadow: var(--avatarStatusShadow);
+    border-radius: 0;
+
+    &.better-shadow {
+      box-shadow: var(--avatarStatusShadowInset);
+      filter: var(--avatarStatusShadowFilter)
+    }
+
+    &.animated::before {
+      display: none;
+    }
+  }
+}
+</style>

src/components/chat_message_date/chat_message_date.vue

@@ -18,7 +18,7 @@ export default {
       if (this.date.getTime() === today.getTime()) {
         return this.$t('display_date.today')
       } else {
-        return this.date.toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale), { day: 'numeric', month: 'long' })
+        return this.date.toLocaleDateString(localeService.internalToBrowserLocale(this.$i18n.locale.split('_')[0]), { day: 'numeric', month: 'long' })
       }
     }
   }

src/components/checkbox/checkbox.vue

@@ -22,12 +22,12 @@
 
 <script>
 export default {
+  emits: ['update:modelValue'],
   props: [
     'modelValue',
     'indeterminate',
     'disabled'
-  ],
+  ]
-  emits: ['update:modelValue']
 }
 </script>
 

src/components/color_input/color_input.vue

@@ -14,7 +14,7 @@
       :model-value="present"
       :disabled="disabled"
       class="opt"
-      @update:model-value="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
+      @update:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
     />
     <div class="input color-input-field">
       <input
@@ -46,6 +46,7 @@
     </div>
   </div>
 </template>
+<style lang="scss" src="./color_input.scss"></style>
 <script>
 import Checkbox from '../checkbox/checkbox.vue'
 import { hex2rgb } from '../../services/color_convert/color_convert.js'
@@ -107,7 +108,6 @@ export default {
   }
 }
 </script>
-<style lang="scss" src="./color_input.scss"></style>
 
 <style lang="scss">
 .color-control {

src/components/confirm_modal/confirm_modal.vue

@@ -25,8 +25,6 @@
   </dialog-modal>
 </template>
 
-<script src="./confirm_modal.js"></script>
-
 <style lang="scss" scoped>
 @import '../../_variables';
 
@@ -37,3 +35,5 @@
   }
 }
 </style>
+
+<script src="./confirm_modal.js"></script>

src/components/conversation/conversation.js

@@ -267,11 +267,11 @@ const conversation = {
     },
     replies () {
       let i = 1
-       
+      // eslint-disable-next-line camelcase
       return reduce(this.conversation, (result, { id, in_reply_to_status_id }) => {
-         
+        /* eslint-disable camelcase */
         const irid = in_reply_to_status_id
-         
+        /* eslint-enable camelcase */
         if (irid) {
           result[irid] = result[irid] || []
           result[irid].push({

src/components/conversation/conversation.vue

@@ -91,7 +91,7 @@
               :controlled-set-media-playing="(newVal) => toggleStatusContentProperty(status.id, 'mediaPlaying', newVal)"
 
               @goto="setHighlight"
-              @toggle-expanded="toggleExpanded"
+              @toggleExpanded="toggleExpanded"
             />
             <div
               v-if="showOtherRepliesButtonBelowStatus && getReplies(status.id).length > 1"
@@ -184,7 +184,7 @@
           :toggle-status-content-property="toggleStatusContentProperty"
 
           @goto="setHighlight"
-          @toggle-expanded="toggleExpanded"
+          @toggleExpanded="toggleExpanded"
         />
       </div>
     </div>

src/components/desktop_nav/desktop_nav.vue

@@ -44,9 +44,9 @@
             />
           </router-link>
           <router-link
-            v-if="publicTimelineVisible"
             :to="{ name: 'public-timeline' }"
             class="nav-icon"
+            v-if="publicTimelineVisible"
           >
             <FAIcon
               fixed-width
@@ -68,9 +68,9 @@
             />
           </router-link>
           <router-link
-            v-if="federatedTimelineVisible"
             :to="{ name: 'public-external-timeline' }"
             class="nav-icon"
+            v-if="federatedTimelineVisible"
           >
             <FAIcon
               fixed-width

src/components/domain_mute_card/domain_mute_card.vue

@@ -9,7 +9,7 @@
       class="btn button-default"
     >
       {{ $t('domain_mute_card.unmute') }}
-      <template #progress>
+      <template v-slot:progress>
         {{ $t('domain_mute_card.unmute_progress') }}
       </template>
     </ProgressButton>
@@ -19,7 +19,7 @@
       class="btn button-default"
     >
       {{ $t('domain_mute_card.mute') }}
-      <template #progress>
+      <template v-slot:progress>
         {{ $t('domain_mute_card.mute_progress') }}
       </template>
     </ProgressButton>

src/components/edit_status_modal/edit_status_modal.vue

@@ -2,7 +2,7 @@
   <Modal
     v-if="isFormVisible"
     class="edit-form-modal-view"
-    @backdrop-clicked="closeModal"
+    @backdropClicked="closeModal"
   >
     <div class="edit-form-modal-panel panel">
       <div class="panel-heading">
@@ -11,10 +11,10 @@
       <PostStatusForm
         class="panel-body"
         v-bind="params"
-        :disable-polls="true"
-        :disable-visibility-selector="true"
-        :post-handler="doEditStatus"
         @posted="closeModal"
+        :disablePolls="true"
+        :disableVisibilitySelector="true"
+        :post-handler="doEditStatus"
       />
     </div>
   </Modal>

src/components/emoji_input/emoji_input.js

@@ -249,8 +249,8 @@ const EmojiInput = {
        * them, masto seem to be rendering :emoji::emoji: correctly now so why not
        */
       const isSpaceRegex = /\s/
-      const spaceBefore = (surroundingSpace && !isSpaceRegex.exec(before.slice(-1)) && before.length && this.padEmoji > 0) ? ' ' : ''
+      const spaceBefore = (surroundingSpace && !isSpaceRegex.exec(before.slice(-1)) && before.length && this.padEmoji > 0) ? ' ' : '​'
-      const spaceAfter = (surroundingSpace && !isSpaceRegex.exec(after[0]) && this.padEmoji) ? ' ' : ''
+      const spaceAfter = (surroundingSpace && !isSpaceRegex.exec(after[0]) && this.padEmoji) ? ' ' : '​'
 
       const newValue = [
         before,

src/components/emoji_input/emoji_input.vue

@@ -43,10 +43,7 @@
           :class="{ highlighted: index === highlighted }"
           @click.stop.prevent="onClick($event, suggestion)"
         >
-          <span
+          <span v-if="!suggestion.mfm" class="image">
-            v-if="!suggestion.mfm"
-            class="image"
-          >
             <img
               v-if="suggestion.img"
               :src="suggestion.img"

src/components/emoji_input/suggestor.js

@@ -122,14 +122,14 @@ export const suggestUsers = ({ dispatch, state }) => {
       const screenNameAlphabetically = a.screen_name > b.screen_name ? 1 : -1
 
       return diff + nameAlphabetically + screenNameAlphabetically
-       
+      /* eslint-disable camelcase */
     }).map(({ screen_name, screen_name_ui, name, profile_image_url_original }) => ({
       displayText: screen_name_ui,
       detailText: name,
       imageUrl: profile_image_url_original,
       replacement: '@' + screen_name + ' '
     }))
-     
+    /* eslint-enable camelcase */
 
     suggestions = newSuggestions || []
     return suggestions

src/components/emoji_picker/emoji_picker.js

@@ -7,7 +7,7 @@ import {
   faStickyNote,
   faSmileBeam
 } from '@fortawesome/free-solid-svg-icons'
-import { trim, escapeRegExp, startCase, debounce } from 'lodash'
+import { trim, escapeRegExp, startCase } from 'lodash'
 
 library.add(
   faBoxOpen,
@@ -42,9 +42,6 @@ const EmojiPicker = {
     EmojiGrid
   },
   methods: {
-    debouncedSearch: debounce(function (e) {
-      this.keyword = e.target.value
-    }, 500),
     onStickerUploaded (e) {
       this.$emit('sticker-uploaded', e)
     },
@@ -88,6 +85,17 @@ const EmojiPicker = {
     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 || []
+      )
+    },
     emojis () {
       const recentEmojis = this.$store.getters.recentEmojis
       const standardEmojis = this.$store.state.instance.emoji || []

src/components/emoji_picker/emoji_picker.vue

@@ -44,10 +44,11 @@
       >
         <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

src/components/emoji_reactions/emoji_reactions.js

@@ -1,6 +1,5 @@
 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
 
@@ -13,8 +12,7 @@ const EmojiReactions = {
   name: 'EmojiReactions',
   components: {
     UserAvatar,
-    UserListPopover,
+    UserListPopover
-    StillImage
   },
   props: ['status'],
   data: () => ({

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"
-          />
+          >
           {{ reaction.count }}
         </span>
         <span v-else>
@@ -42,7 +41,7 @@
   </div>
 </template>
 
-<script src="./emoji_reactions.js"></script>
+<script src="./emoji_reactions.js" ></script>
 <style lang="scss">
 @import '../../_variables.scss';
 

src/components/extra_buttons/extra_buttons.js

@@ -136,26 +136,18 @@ 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,
+          statusLanguage: this.status.language,
-            statusIsSensitive: this.status.nsfw,
+          statusContentType: data.content_type
-            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 () {

src/components/extra_buttons/extra_buttons.vue

@@ -7,7 +7,7 @@
     :bound-to="{ x: 'container' }"
     remove-padding
   >
-    <template #content="{close}">
+    <template v-slot:content="{close}">
       <div class="dropdown-menu">
         <button
           v-if="canMute && !status.thread_muted"
@@ -172,7 +172,7 @@
         </button>
       </div>
     </template>
-    <template #trigger>
+    <template v-slot:trigger>
       <button class="button-unstyled popover-trigger">
         <FAIcon
           class="fa-scale-110 fa-old-padding"
@@ -205,7 +205,7 @@
   </Popover>
 </template>
 
-<script src="./extra_buttons.js"></script>
+<script src="./extra_buttons.js" ></script>
 
 <style lang="scss">
 @import '../../_variables.scss';

src/components/favorite_button/favorite_button.vue

@@ -35,7 +35,7 @@
   </div>
 </template>
 
-<script src="./favorite_button.js"></script>
+<script src="./favorite_button.js" ></script>
 
 <style lang="scss">
 @import '../../_variables.scss';
@@ -55,9 +55,6 @@
 
   .interactive {
     .svg-inline--fa {
-      @media (prefers-reduced-motion: reduce) {
-        animation: unset;
-      }
       animation-duration: 0.6s;
     }
 

src/components/features_panel/features_panel.vue

@@ -23,7 +23,7 @@
   </div>
 </template>
 
-<script src="./features_panel.js"></script>
+<script src="./features_panel.js" ></script>
 
 <style lang="scss">
   .features-panel li {

src/components/flash/flash.js

@@ -1,53 +0,0 @@
-import RuffleService from '../../services/ruffle_service/ruffle_service.js'
-import { library } from '@fortawesome/fontawesome-svg-core'
-import {
-  faStop,
-  faExclamationTriangle
-} from '@fortawesome/free-solid-svg-icons'
-
-library.add(
-  faStop,
-  faExclamationTriangle
-)
-
-const Flash = {
-  props: [ 'src' ],
-  data () {
-    return {
-      player: false, // can be true, "hidden", false. hidden = element exists
-      loaded: false,
-      ruffleInstance: null
-    }
-  },
-  methods: {
-    openPlayer () {
-      if (this.player) return // prevent double-loading, or re-loading on failure
-      this.player = 'hidden'
-      RuffleService.getRuffle().then((ruffle) => {
-        const player = ruffle.newest().createPlayer()
-        player.config = {
-          letterbox: 'on'
-        }
-        const container = this.$refs.container
-        container.appendChild(player)
-        player.style.width = '100%'
-        player.style.height = '100%'
-        player.load(this.src).then(() => {
-          this.player = true
-        }).catch((e) => {
-          console.error('Error loading ruffle', e)
-          this.player = 'error'
-        })
-        this.ruffleInstance = player
-        this.$emit('playerOpened')
-      })
-    },
-    closePlayer () {
-      this.ruffleInstance && this.ruffleInstance.remove()
-      this.player = false
-      this.$emit('playerClosed')
-    }
-  }
-}
-
-export default Flash

src/components/flash/flash.vue

@@ -1,84 +0,0 @@
-<template>
-  <div class="Flash">
-    <div
-      v-if="player === true || player === 'hidden'"
-      ref="container"
-      class="player"
-      :class="{ hidden: player === 'hidden' }"
-    />
-    <button
-      v-if="player !== true"
-      class="button-unstyled placeholder"
-      @click="openPlayer"
-    >
-      <span
-        v-if="player === 'hidden'"
-        class="label"
-      >
-        {{ $t('general.loading') }}
-      </span>
-      <span
-        v-if="player === 'error'"
-        class="label"
-      >
-        {{ $t('general.flash_fail') }}
-      </span>
-      <span
-        v-else
-        class="label"
-      >
-        <p>
-          {{ $t('general.flash_content') }}
-        </p>
-        <p>
-          <FAIcon icon="exclamation-triangle" />
-          {{ $t('general.flash_security') }}
-        </p>
-      </span>
-    </button>
-  </div>
-</template>
-
-<script src="./flash.js"></script>
-
-<style lang="scss">
-@import '../../_variables.scss';
-.Flash {
-  display: inline-block;
-  width: 100%;
-  height: 100%;
-  position: relative;
-
-  .player {
-    height: 100%;
-    width: 100%;
-  }
-
-  .placeholder {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    background: var(--bg);
-    color: var(--link);
-  }
-
-  .hider {
-    top: 0;
-  }
-
-  .label {
-    text-align: center;
-    flex: 1 1 0;
-    line-height: 1.2;
-    white-space: normal;
-    word-wrap: normal;
-  }
-
-  .hidden {
-    display: none;
-    visibility: 'hidden';
-  }
-}
-</style>

src/components/follow_request_card/follow_request_card.vue

@@ -1,8 +1,5 @@
 <template>
-  <basic-user-card
+  <basic-user-card :user="user" v-if="show">
-    v-if="show"
-    :user="user"
-  >
     <div class="follow-request-card-content-container">
       <button
         class="btn button-default"

src/components/font_control/font_control.vue

@@ -47,7 +47,7 @@
   </div>
 </template>
 
-<script src="./font_control.js"></script>
+<script src="./font_control.js" ></script>
 
 <style lang="scss">
 @import '../../_variables.scss';

src/components/gallery/gallery.vue

@@ -31,8 +31,8 @@
             :description="descriptions && descriptions[attachment.id]"
             :hide-description="size === 'small' || tooManyAttachments && hidingLong"
             :style="itemStyle(attachment.id, row.items)"
-            @set-media="onMedia"
+            @setMedia="onMedia"
-            @natural-size-load="onNaturalSizeLoad"
+            @naturalSizeLoad="onNaturalSizeLoad"
           />
         </div>
       </div>

src/components/hashtag_link/hashtag_link.vue

@@ -14,6 +14,6 @@
   </span>
 </template>
 
-<script src="./hashtag_link.js" />
+<script src="./hashtag_link.js"/>
 
-<style lang="scss" src="./hashtag_link.scss" />
+<style lang="scss" src="./hashtag_link.scss"/>

src/components/instance_specific_panel/instance_specific_panel.vue

@@ -10,4 +10,4 @@
   </div>
 </template>
 
-<script src="./instance_specific_panel.js"></script>
+<script src="./instance_specific_panel.js" ></script>

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"
@@ -42,7 +38,6 @@ export default {
 @import '../../_variables.scss';
 
 .list {
-  min-height: 1em;
   &-item:not(:last-child) {
     border-bottom: 1px solid;
     border-bottom-color: $fallback--border;

src/components/local_bubble_panel/local_bubble_panel.vue

@@ -10,7 +10,7 @@
         </div>
       </div>
       <div class="panel-body">
-        <p>{{ $t("about.bubble_instances_description") }}:</p>
+        <p>{{ $t("about.bubble_instances_description")}}:</p>
         <ul>
           <li
             v-for="instance in bubbleInstances"

src/components/login_form/login_form.vue

@@ -90,7 +90,7 @@
   </div>
 </template>
 
-<script src="./login_form.js"></script>
+<script src="./login_form.js" ></script>
 
 <style lang="scss">
 @import '../../_variables.scss';

src/components/media_modal/media_modal.js

@@ -4,7 +4,6 @@ import Modal from '../modal/modal.vue'
 import PinchZoom from '../pinch_zoom/pinch_zoom.vue'
 import SwipeClick from '../swipe_click/swipe_click.vue'
 import GestureService from '../../services/gesture_service/gesture_service'
-import Flash from 'src/components/flash/flash.vue'
 import fileTypeService from '../../services/file_type/file_type.service.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -27,8 +26,7 @@ const MediaModal = {
     VideoAttachment,
     PinchZoom,
     SwipeClick,
-    Modal,
+    Modal
-    Flash
   },
   data () {
     return {

src/components/media_modal/media_modal.vue

@@ -2,7 +2,7 @@
   <Modal
     v-if="showing"
     class="media-modal-view"
-    @backdrop-clicked="hideIfNotSwiped"
+    @backdropClicked="hideIfNotSwiped"
   >
     <SwipeClick
       v-if="type === 'image'"
@@ -48,13 +48,6 @@
       :title="currentMedia.description"
       controls
     />
-    <Flash
-      v-if="type === 'flash'"
-      class="modal-image"
-      :src="currentMedia.url"
-      :alt="currentMedia.description"
-      :title="currentMedia.description"
-    />
     <button
       v-if="canNavigate"
       :title="$t('media_modal.previous')"

src/components/media_upload/media_upload.js

@@ -42,7 +42,7 @@ const mediaUpload = {
         .then((fileData) => {
           self.$emit('uploaded', fileData)
           self.decreaseUploadCount()
-        }, (error) => {  
+        }, (error) => { // eslint-disable-line handle-callback-err
           self.$emit('upload-failed', 'default')
           self.decreaseUploadCount()
         })

src/components/media_upload/media_upload.vue

@@ -26,7 +26,7 @@
   </label>
 </template>
 
-<script src="./media_upload.js"></script>
+<script src="./media_upload.js" ></script>
 
 <style lang="scss">
 @import '../../_variables.scss';

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/mention_link/mention_link.vue

@@ -66,6 +66,6 @@
   </span>
 </template>
 
-<script src="./mention_link.js" />
+<script src="./mention_link.js"/>
 
-<style lang="scss" src="./mention_link.scss" />
+<style lang="scss" src="./mention_link.scss"/>

src/components/mentions_line/mentions_line.vue

@@ -37,5 +37,5 @@
     </span>
   </span>
 </template>
-<script src="./mentions_line.js"></script>
+<script src="./mentions_line.js" ></script>
 <style lang="scss" src="./mentions_line.scss" />

src/components/mfa_form/recovery_form.vue

@@ -69,4 +69,4 @@
     </div>
   </div>
 </template>
-<script src="./recovery_form.js"></script>
+<script src="./recovery_form.js" ></script>

src/components/mfa_form/totp_form.vue

@@ -18,7 +18,6 @@
           <input
             id="code"
             v-model="code"
-            autocomplete="one-time-code"
             class="form-control"
           >
         </div>

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/mod_modal/tabs/reports_tab/report_card.vue

@@ -4,7 +4,7 @@
       class="panel-heading"
       @click="toggleHidden"
     >
-      <h4>{{ $t('moderation.reports.report') + ' ' + account.screen_name }}</h4>
+      <h4>{{ $t('moderation.reports.report') + ' ' + this.account.screen_name }}</h4>
       <button
         v-if="isOpen"
         class="button-default"
@@ -24,7 +24,7 @@
         class="button-default"
         @click.stop="updateReportState('open')"
       >
-        {{ $t('moderation.reports.reopen') }}
+          {{ $t('moderation.reports.reopen') }}
       </button>
     </div>
     <div
@@ -35,10 +35,7 @@
         <div v-if="content">
           {{ decode(content) }}
         </div>
-        <i
+        <i v-else class="faint">
-          v-else
-          class="faint"
-        >
           {{ $t('moderation.reports.no_content') }}
         </i>
         <div class="report-author">
@@ -46,12 +43,12 @@
             class="small-avatar"
             :user="actor"
           />
-          {{ actor.screen_name }}
+          {{ this.actor.screen_name }}
         </div>
       </div>
       <div
-        v-if="!hidden && statuses.length > 0"
         class="dropdown"
+        v-if="!hidden && this.statuses.length > 0"
       >
         <button
           class="button button-unstyled dropdown-header"
@@ -77,8 +74,8 @@
         </div>
       </div>
       <div
-        v-if="!hidden && notes.length > 0"
         class="dropdown"
+        v-if="!hidden && this.notes.length > 0"
       >
         <button
           class="button button-unstyled dropdown-header"
@@ -102,9 +99,9 @@
       </div>
       <div class="report-add-note">
         <textarea
-          v-model.trim="note"
           rows="1"
           cols="1"
+          v-model.trim="note"
           :placeholder="$t('moderation.reports.note_placeholder')"
         />
         <button
@@ -137,7 +134,7 @@
         :offset="{ y: 5 }"
         remove-padding
       >
-        <template #trigger>
+        <template v-slot:trigger>
           <button
             class="btn button-default"
             :disabled="!tagPolicyEnabled"
@@ -150,7 +147,7 @@
             />
           </button>
         </template>
-        <template #content="{close}">
+        <template v-slot:content="{close}">
           <div
             class="dropdown-menu"
             :disabled="!tagPolicyEnabled"

src/components/mod_modal/tabs/reports_tab/report_note.vue

@@ -6,7 +6,7 @@
           class="small-avatar"
           :user="user"
         />
-        {{ user.screen_name }}
+        {{ this.user.screen_name }}
       </div>
       <div class="header-right">
         <Timeago

src/components/modal/modal.vue

@@ -22,9 +22,6 @@ export default {
       default: false
     }
   },
-  emits: [
-    'backdropClicked',
-  ],
   computed: {
     classes () {
       return {

src/components/moderation_tools/moderation_tools.vue

@@ -8,7 +8,7 @@
       @show="setToggled(true)"
       @close="setToggled(false)"
     >
-      <template #content>
+      <template v-slot:content>
         <div class="dropdown-menu">
           <span v-if="user.is_local">
             <button
@@ -122,7 +122,7 @@
           </span>
         </div>
       </template>
-      <template #trigger>
+      <template v-slot:trigger>
         <button
           class="btn button-default btn-block moderation-tools-button"
           :class="{ toggled }"
@@ -137,11 +137,11 @@
         v-if="showDeleteUserDialog"
         :on-cancel="deleteUserDialog.bind(this, false)"
       >
-        <template #header>
+        <template v-slot:header>
           {{ $t('user_card.admin_menu.delete_user') }}
         </template>
         <p>{{ $t('user_card.admin_menu.delete_user_confirmation') }}</p>
-        <template #footer>
+        <template v-slot:footer>
           <button
             class="btn button-default"
             @click="deleteUserDialog(false)"

src/components/nav_panel/nav_panel.js

@@ -47,6 +47,9 @@ const NavPanel = {
     }
   },
   computed: {
+    compactNavPanel () {
+      return this.$store.getters.mergedConfig.compactNavPanel || false
+    },
     ...mapState({
       currentUser: state => state.users.currentUser,
       privateMode: state => state.instance.private,

src/components/nav_panel/nav_panel.vue

@@ -1,5 +1,8 @@
 <template>
-  <div class="NavPanel">
+  <div
+    class="NavPanel"
+    :class="{ compact: compactNavPanel }"
+  >
     <div class="panel panel-default">
       <ul>
         <li v-if="currentUser || !privateMode">
@@ -102,7 +105,7 @@
   </div>
 </template>
 
-<script src="./nav_panel.js"></script>
+<script src="./nav_panel.js" ></script>
 
 <style lang="scss">
 @import '../../_variables.scss';
@@ -211,5 +214,83 @@
     right: 0.6rem;
     top: 1.25em;
   }
+
+  &.compact {
+    .panel {
+      overflow: visible;
+
+      ul > li:hover > a:not(.router-link-active) > .button-icon {
+        color: var(--selectedMenuText,#b9b9ba);
+      }
+
+      ul > li > .router-link-active > .button-icon {
+        color: var(--selectedMenuLightText);
+      }
+
+      ul {
+        display: flex;
+        height: 100%;
+        padding: 0;
+      }
+
+      li {
+        width: -moz-available;
+        width: -webkit-fill-available;
+        border-bottom: none;
+
+        a {
+          border-radius: 0 !important;
+        }
+      }
+
+      .timelines-chevron {
+        display: none;
+      }
+
+      .timelines-background {
+        position: absolute;
+        z-index: 10000;
+      }
+
+      a, button {
+        font-size: 0;
+        height: 100%;
+        display: flex;
+        position: relative;
+        padding-top: 7px;
+        padding-bottom: 7px;
+      }
+
+      .button-icon, svg.svg-inline--fa {
+        margin: auto;
+        font-size: 20px;
+        color: var(--link,#d8a070);
+      }
+
+      .badge {
+        position: absolute;
+        right: 0;
+        background-color: red;
+        background-color: var(--badgeNotification,red);
+        color: #fff;
+        color: var(--badgeNotificationText,#fff);
+
+        // remove layout
+        padding: 0;
+        margin: 0;
+        box-shadow: black 0 1px 5px;
+        display: inline-block;
+        border-radius: 99px;
+        min-width: 22px;
+        line-height: 22px;
+        min-height: 22px;
+        max-height: 22px;
+        font-size: 14px;
+        font-weight: normal;
+        font-style: normal;
+        font-family: inherit;
+      }
+    }
+  }
 }
 </style>

src/components/notification/notification.js

@@ -1,12 +1,11 @@
-import StatusContent from '../status_content/status_content.vue'
 import { mapState } from 'vuex'
 import Status from '../status/status.vue'
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserCard from '../user_card/user_card.vue'
 import Timeago from '../timeago/timeago.vue'
+import StatusContent from '../status_content/status_content.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/notification_filters.vue

@@ -5,7 +5,7 @@
     placement="bottom"
     :bound-to="{ x: 'container' }"
   >
-    <template #content>
+    <template v-slot:content>
       <div class="dropdown-menu">
         <button
           class="button-default dropdown-item"
@@ -72,7 +72,7 @@
         </button>
       </div>
     </template>
-    <template #trigger>
+    <template v-slot:trigger>
       <button class="filter-trigger-button button-unstyled">
         <FAIcon icon="filter" />
       </button>

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/opacity_input/opacity_input.vue

@@ -14,7 +14,7 @@
       :model-value="present"
       :disabled="disabled"
       class="opt"
-      @update:model-value="$emit('update:modelValue', !present ? fallback : undefined)"
+      @update:modelValue="$emit('update:modelValue', !present ? fallback : undefined)"
     />
     <input
       :id="name"

src/components/pinch_zoom/pinch_zoom.vue

@@ -2,6 +2,7 @@
   <pinch-zoom
     class="pinch-zoom-parent"
     v-bind="$attrs"
+    v-on="$listeners"
   >
     <slot />
   </pinch-zoom>

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,12 +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 iso6391 from 'iso-639-1'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -63,13 +62,6 @@ const deleteDraft = (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',
@@ -137,13 +129,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 +138,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, interfaceLanguage } = this.$store.getters.mergedConfig
-    const postLanguage = defaultPostLanguage || interfaceToISOLanguage(interfaceLanguage)
 
     let statusParams = {
       spoilerText: this.subject || '',
@@ -165,7 +149,7 @@ const PostStatusForm = {
       poll: {},
       mediaDescriptions: {},
       visibility: this.suggestedVisibility(),
-      language: postLanguage,
+      language: interfaceLanguage,
       contentType
     }
 
@@ -180,7 +164,7 @@ const PostStatusForm = {
         poll: this.statusPoll || {},
         mediaDescriptions: this.statusMediaDescriptions || {},
         visibility: this.statusScope || this.suggestedVisibility(),
-        language: this.statusLanguage || postLanguage,
+        language: this.statusLanguage || interfaceLanguage,
         contentType: statusContentType
       }
     }
@@ -215,10 +199,6 @@ const PostStatusForm = {
       }
     }
 
-    // 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 +213,7 @@ const PostStatusForm = {
       preview: null,
       previewLoading: false,
       emojiInputShown: false,
-      idempotencyKey: '',
+      idempotencyKey: ''
-      activeEmojiInput: undefined,
-      activeTextInput: undefined,
-      subjectVisible: showSubject
     }
   },
   computed: {
@@ -325,6 +302,9 @@ const PostStatusForm = {
     ...mapState({
       mobileLayout: state => state.interface.mobileLayout
     }),
+    isoLanguages () {
+      return iso6391.getAllCodes();
+    }
   },
   watch: {
     'newStatus': {
@@ -509,6 +489,7 @@ const PostStatusForm = {
       }
     },
     addMediaFile (fileInfo) {
+      this.$emit('resize')
       this.newStatus.files.push(fileInfo)
 
       if (this.$store.getters.mergedConfig.sensitiveIfSubject && this.newStatus.spoilerText !== '') {
@@ -517,6 +498,7 @@ const PostStatusForm = {
       this.$emit('resize', { delayed: true })
     },
     removeMediaFile (fileInfo) {
+      this.$emit('resize')
       let index = this.newStatus.files.indexOf(fileInfo)
       this.newStatus.files.splice(index, 1)
       this.$emit('resize')
@@ -694,33 +676,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
-          v-if="subjectVisible"
+          v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
-          ref="subject-emoji-input"
           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
@@ -170,14 +166,13 @@
             cols="1"
             :disabled="posting && !optimisticPosting"
             class="form-post-body"
-            :class="{ 'scrollable-form': !!maxHeight, '-has-subject': subjectVisible }"
+            :class="{ 'scrollable-form': !!maxHeight }"
             @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
             @keydown.meta.enter="postStatus($event, newStatus)"
             @keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
             @input="resize"
             @compositionupdate="resize"
             @paste="paste"
-            @focus="focusStatusInput()"
           />
           <p
             v-if="hasStatusLengthLimit"
@@ -190,7 +185,6 @@
         <div
           v-if="!disableScopeSelector"
           class="visibility-tray"
-          :class="{ 'visibility-tray-edit': isEdit }"
         >
           <scope-selector
             v-if="!disableVisibilitySelector"
@@ -201,50 +195,47 @@
           />
 
           <div
-            class="format-selector-container">
+            class="language-selector"
-            <div
-              class="format-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 format-selector"
             >
-              <Select
+            <Select
-                id="post-content-type"
+              id="post-language"
-                v-model="newStatus.contentType"
+              v-model="newStatus.language"
-                class="form-control"
+              class="form-control"
-              >
-                <option
-                  v-for="postFormat in postFormats"
-                  :key="postFormat"
-                  :value="postFormat"
-                >
-                  {{ $t(`post_status.content_type["${postFormat}"]`) }}
-                </option>
-              </Select>
-            </div>
-            <div
-              v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'"
-              class="text-format format-selector"
             >
-              <span class="only-format">
+              <option
-                {{ $t(`post_status.content_type["${postFormats[0]}"]`) }}
+                v-for="language in isoLanguages"
-              </span>
+                :key="language"
-            </div>
+                :value="language"
+              >
+                {{ language }}
+              </option>
+            </Select>
+          </div>
+          <div
+            v-if="postFormats.length > 1"
+            class="text-format"
+          >
+            <Select
+              id="post-content-type"
+              v-model="newStatus.contentType"
+              class="form-control"
+            >
+              <option
+                v-for="postFormat in postFormats"
+                :key="postFormat"
+                :value="postFormat"
+              >
+                {{ $t(`post_status.content_type["${postFormat}"]`) }}
+              </option>
+            </Select>
+          </div>
+          <div
+            v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'"
+            class="text-format"
+          >
+            <span class="only-format">
+              {{ $t(`post_status.content_type["${postFormats[0]}"]`) }}
+            </span>
           </div>
         </div>
       </div>
@@ -285,15 +276,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"
@@ -309,14 +291,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') }}
@@ -464,10 +444,6 @@
     align-items: baseline;
   }
 
-  .visibility-tray-edit {
-    justify-content: right;
-  }
-
   .visibility-notice.edit-warning {
     > :first-child {
       margin-top: 0;
@@ -478,13 +454,7 @@
     }
   }
 
-  .format-selector-container {
+  .media-upload-icon, .poll-icon, .emoji-icon {
-    .format-selector {
-      display: inline-block;
-    }
-  }
-
-  .media-upload-icon, .poll-icon, .emoji-icon, .spoiler-icon {
     font-size: 1.85em;
     line-height: 1.1;
     flex: 1;
@@ -527,11 +497,6 @@
 
   .poll-icon {
     order: 3;
-    justify-content: center;
-  }
-
-  .spoiler-icon {
-    order: 4;
     justify-content: right;
   }
 
@@ -584,11 +549,6 @@
     line-height: 1.85;
   }
 
-  .form-post-subject {
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-
   .form-post-body {
     // TODO: make a resizable textarea component?
     box-sizing: content-box; // needed for easier computation of dynamic size
@@ -601,11 +561,6 @@
     min-height: calc(var(--post-line-height) * 1em);
     resize: none;
 
-    &.-has-subject {
-      border-top-left-radius: 0;
-      border-top-right-radius: 0;
-    }
-
     &.scrollable-form {
       overflow-y: auto;
     }
@@ -661,4 +616,5 @@
     border: 2px dashed var(--text, $fallback--text);
   }
 }
+
 </style>

src/components/post_status_modal/post_status_modal.vue

@@ -3,7 +3,7 @@
     v-if="isLoggedIn && !resettingForm"
     :is-open="modalActivated"
     class="post-form-modal-view"
-    @backdrop-clicked="closeModal"
+    @backdropClicked="closeModal"
   >
     <div class="post-form-modal-panel panel">
       <div class="panel-heading">

src/components/react_button/react_button.vue

@@ -8,13 +8,13 @@
     remove-padding
     @show="focusInput"
   >
-    <template #content="{close}">
+    <template v-slot:content="{close}">
       <EmojiPicker
         :enable-sticker-picker="false"
         @emoji="addReaction($event, close)"
       />
     </template>
-    <template #trigger>
+    <template v-slot:trigger>
       <button
         class="button-unstyled popover-trigger"
         :title="$t('tool_tip.add_reaction')"
@@ -28,7 +28,7 @@
   </Popover>
 </template>
 
-<script src="./react_button.js"></script>
+<script src="./react_button.js" ></script>
 
 <style lang="scss">
 @import '../../_variables.scss';

src/components/remote_follow/remote_follow.js

@@ -2,7 +2,7 @@ export default {
   props: [ 'user' ],
   computed: {
     subscribeUrl () {
-       
+      // eslint-disable-next-line no-undef
       const serverUrl = new URL(this.user.statusnet_profile_url)
       return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
     }

src/components/retweet_button/retweet_button.vue

@@ -54,7 +54,7 @@
   </div>
 </template>
 
-<script src="./retweet_button.js"></script>
+<script src="./retweet_button.js" ></script>
 
 <style lang="scss">
 @import '../../_variables.scss';
@@ -74,9 +74,6 @@
 
   .interactive {
     .svg-inline--fa {
-      @media (prefers-reduced-motion: reduce) {
-        animation: unset;
-      }
       animation-duration: 0.6s;
     }