Changed RichContent.blockquote to only have margin-left 2em

Changed StatusBody.text white space to normal
2023-10-03 09:01:35 +00:00 · 2023-10-03 08:33:56 +00:00
148 changed files with 5866 additions and 8269 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -0,0 +1,2 @@
+build/*.js
+config/*.js
--- a/.eslintrc.js
+++ b/.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
+  }
+}
--- a/.node-version
+++ b/.node-version
@ -0,0 +1 @@
+7.2.1
--- a/.tool-versions
+++ b/.tool-versions
@ -1 +0,0 @@
-nodejs 20.12.2
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -1,25 +1,24 @@
-labels:
-  platform: linux/amd64
-
-steps:
+platform: linux/amd64
+pipeline:
  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 +28,7 @@ steps:
      branch:
      - develop
      - stable
-    image: node:20
+    image: node:18
    commands:
    - yarn
    - yarn build
@ -41,15 +40,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
-      - mv scaleway-cli_2.30.0_linux_amd64 scaleway-cli
+      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
+      - 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 +70,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
-    - mv scaleway-cli_2.30.0_linux_amd64 scaleway-cli
+    - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.5.1/scaleway-cli_2.5.1_linux_amd64
+    - 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 +79,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/
--- a/README.md
+++ b/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)

@ -8,7 +8,7 @@ This is a fork of Akkoma-FE from the Pleroma project, with support for new Akkom

 # 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 +20,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 +37,7 @@ npm run unit

 # For Contributors:

-You can create file `/config/local.json` (see [example](https://akkoma.dev/AkkomaGang/akkoma-fe/src/branch/develop/config/local.example.json)) to enable some convenience dev options:
+You can create file `/config/local.json` (see [example](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/config/local.example.json)) to enable some convenience dev options:

 * `target`: makes local dev server redirect to some existing instance's BE instead of local BE, useful for testing things in near-production environment and searching for real-life use-cases.
 * `staticConfigPreference`: makes FE's `/static/config.json` take preference of BE-served `/api/statusnet/config.json`. Only works in dev mode.
@ -54,4 +52,4 @@ Edit config.json for configuration.

 ### Login methods

-```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations.
+```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations. 
--- a/build/build.js
+++ b/build/build.js
@ -1,36 +1,36 @@
 // https://github.com/shelljs/shelljs
-require("./check-versions")();
-require("shelljs/global");
-env.NODE_ENV = "production";
+require('./check-versions')()
+require('shelljs/global')
+env.NODE_ENV = 'production'

-var path = require("path");
-var config = require("../config");
-var webpack = require("webpack");
-var webpackConfig = require("./webpack.prod.conf");
+var path = require('path')
+var config = require('../config')
+var ora = require('ora')
+var webpack = require('webpack')
+var webpackConfig = require('./webpack.prod.conf')

 console.log(
-  "  Tip:\n" +
-    "  Built files are meant to be served over an HTTP server.\n" +
-    "  Opening index.html over file:// won't work.\n",
-);
+  '  Tip:\n' +
+  '  Built files are meant to be served over an HTTP server.\n' +
+  '  Opening index.html over file:// won\'t work.\n'
+)

-var assetsPath = path.join(
-  config.build.assetsRoot,
-  config.build.assetsSubDirectory,
-);
-rm("-rf", assetsPath);
-mkdir("-p", assetsPath);
-cp("-R", "static/*", assetsPath);
+var spinner = ora('building for production...')
+spinner.start()
+
+var assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
+rm('-rf', assetsPath)
+mkdir('-p', assetsPath)
+cp('-R', 'static/*', assetsPath)

 webpack(webpackConfig, function (err, stats) {
-  if (err) throw err;
-  process.stdout.write(
-    stats.toString({
-      colors: true,
-      modules: false,
-      children: false,
-      chunks: false,
-      chunkModules: false,
-    }) + "\n",
-  );
-});
+  spinner.stop()
+  if (err) throw err
+  process.stdout.write(stats.toString({
+    colors: true,
+    modules: false,
+    children: false,
+    chunks: false,
+    chunkModules: false
+  }) + '\n')
+})
--- a/build/dev-server.js
+++ b/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')
@ -36,13 +36,7 @@ Object.keys(proxyTable).forEach(function (context) {
  if (typeof options === 'string') {
    options = { target: options }
  }
-  const targetUrl = new URL(options.target);
-  // add path
-  targetUrl.pathname = context;
-  options.target = targetUrl.toString();
-
-  console.log("Proxying", context, "to", options.target);
-  app.use(context, createProxyMiddleware(options))
+  app.use(proxyMiddleware(context, options))
 })

 // handle fallback for HTML5 history API
--- a/build/webpack.base.conf.js
+++ b/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 ESLintPlugin({
-      configType: 'flat'
-    })
+    new VueLoaderPlugin()
  ]
 }
--- a/config/local.example.json
+++ b/config/local.example.json
@ -1,4 +1,4 @@
 {
-  "target": "https://otp.akkoma.dev/",
+  "target": "https://pleroma.soykaf.com/",
  "staticConfigPreference": false
 }
--- a/config/test.env.js
+++ b/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"'
 })
--- a/eslint.config.js
+++ b/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'
-    ]
-  }
-]
--- a/package.json
+++ b/package.json
@ -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-fix": "eslint --fix src test/unit/specs test/e2e/specs"
+    "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
+    "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
  },
  "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/free-regular-svg-icons": "^6.5.2",
-    "@fortawesome/free-solid-svg-icons": "^6.5.2",
-    "@fortawesome/vue-fontawesome": "^3.0.8",
-    "@vuelidate/core": "^2.0.3",
-    "@vuelidate/validators": "^2.0.4",
-    "blurhash": "^2.0.5",
-    "body-scroll-lock": "^3.1.5",
-    "chromatism": "^3.0.0",
-    "click-outside-vue3": "^4.0.1",
-    "cropperjs": "^1.6.2",
-    "diff": "^5.2.0",
-    "escape-html": "^1.0.3",
+    "@fortawesome/fontawesome-svg-core": "1.3.0",
+    "@fortawesome/free-regular-svg-icons": "^6.1.2",
+    "@fortawesome/free-solid-svg-icons": "^6.2.0",
+    "@fortawesome/vue-fontawesome": "3.0.1",
+    "@vuelidate/core": "^2.0.0",
+    "@vuelidate/validators": "^2.0.0",
+    "blurhash": "^2.0.4",
+    "body-scroll-lock": "2.7.1",
+    "chromatism": "3.0.0",
+    "click-outside-vue3": "4.0.1",
+    "cropperjs": "1.5.12",
+    "diff": "3.5.0",
+    "escape-html": "1.0.3",
    "iso-639-1": "^2.1.15",
    "js-cookie": "^3.0.1",
-    "localforage": "^1.10.0",
+    "localforage": "1.10.0",
    "parse-link-header": "^2.0.0",
-    "phoenix": "^1.7.12",
-    "punycode.js": "^2.3.1",
-    "qrcode": "^1.5.3",
-    "querystring-es3": "^0.2.1",
-    "url": "^0.11.3",
-    "vue": "^3.4.38",
-    "vue-i18n": "^9.14.0",
-    "vue-router": "^4.4.3",
-    "vue-template-compiler": "^2.7.16",
-    "vuex": "^4.1.0"
+    "phoenix": "1.6.2",
+    "punycode.js": "2.1.0",
+    "qrcode": "1",
+    "url": "^0.11.0",
+    "vue": "^3.2.31",
+    "vue-i18n": "^9.2.2",
+    "vue-router": "4.0.14",
+    "vue-template-compiler": "2.6.11",
+    "vuex": "4.0.2"
  },
  "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/preset-env": "^7.24.6",
-    "@babel/register": "^7.24.6",
+    "@babel/plugin-transform-runtime": "7.17.0",
+    "@babel/preset-env": "7.16.11",
+    "@babel/register": "7.17.7",
    "@intlify/vue-i18n-loader": "^5.0.0",
-    "@ungap/event-target": "^0.2.4",
-    "@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
-    "@vue/babel-plugin-jsx": "^1.2.2",
+    "@ungap/event-target": "0.2.3",
+    "@vue/babel-helper-vue-jsx-merge-props": "1.2.1",
+    "@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",
-    "chromedriver": "^119.0.1",
+    "chalk": "1.1.3",
+    "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-config-standard": "^17.1.0",
+    "eslint": "^7.32.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-webpack-plugin": "^4.2.0",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.19.2",
+    "eslint-plugin-vue": "^9.7.0",
+    "eventsource-polyfill": "0.9.6",
+    "express": "4.17.3",
    "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",
-    "json-loader": "^0.5.7",
-    "karma": "^6.4.3",
-    "karma-coverage": "^2.2.1",
-    "karma-firefox-launcher": "^2.1.3",
-    "karma-mocha": "^2.0.1",
-    "karma-mocha-reporter": "^2.2.5",
-    "karma-sinon-chai": "^2.0.2",
-    "karma-sourcemap-loader": "^0.4.0",
-    "karma-spec-reporter": "^0.0.36",
+    "http-proxy-middleware": "0.21.0",
+    "inject-loader": "2.0.1",
+    "isparta-loader": "2.0.0",
+    "json-loader": "0.5.7",
+    "karma": "6.3.17",
+    "karma-coverage": "1.1.2",
+    "karma-firefox-launcher": "1.3.0",
+    "karma-mocha": "2.0.1",
+    "karma-mocha-reporter": "2.2.5",
+    "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",
-    "lolex": "^6.0.0",
-    "mini-css-extract-plugin": "^2.9.0",
-    "mocha": "^10.4.0",
-    "nightwatch": "^3.6.3",
-    "opn": "^6.0.0",
+    "lodash": "4.17.21",
+    "lolex": "1.6.0",
+    "mini-css-extract-plugin": "0.12.0",
+    "mocha": "3.5.3",
+    "nightwatch": "0.9.21",
+    "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",
-    "sass": "^1.77.2",
-    "sass-loader": "^14.2.1",
-    "selenium-server": "^3.141.59",
-    "semver": "^7.6.2",
-    "shelljs": "^0.8.5",
-    "sinon": "^18.0.0",
-    "sinon-chai": "^3.7.0",
+    "raw-loader": "0.5.1",
+    "sass": "^1.56.0",
+    "sass-loader": "^13.2.0",
+    "selenium-server": "2.53.1",
+    "semver": "5.7.1",
+    "shelljs": "0.8.5",
+    "sinon": "2.4.1",
+    "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-style-loader": "^4.1.3",
-    "webpack": "^5.91.0",
-    "webpack-dev-middleware": "^7.2.1",
-    "webpack-hot-middleware": "^2.26.1",
-    "webpack-merge": "^5.10.0",
-    "workbox-webpack-plugin": "^7.1.0"
+    "vue-loader": "^17.0.0",
+    "vue-style-loader": "^4.1.2",
+    "webpack": "^5.75.0",
+    "webpack-dev-middleware": "^5.3.3",
+    "webpack-hot-middleware": "^2.25.1",
+    "webpack-merge": "^5.8.0",
+    "workbox-webpack-plugin": "^6.5.4"
  },
  "engines": {
    "node": ">= 16.0.0",
--- a/src/App.js
+++ b/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 {
--- a/src/App.scss
+++ b/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
 }

--- a/src/components/about/about.vue
+++ b/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>
--- a/src/components/account_actions/account_actions.vue
+++ b/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"
            />
--- a/src/components/attachment/attachment.scss
+++ b/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 {
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@ -246,8 +246,8 @@
          ref="flash"
          class="flash"
          :src="attachment.large_thumb_url || attachment.url"
-          @player-opened="setFlashLoaded(true)"
-          @player-closed="setFlashLoaded(false)"
+          @playerOpened="setFlashLoaded(true)"
+          @playerClosed="setFlashLoaded(false)"
        />
      </span>
    </div>
--- a/src/components/avatar_list/avatar_list.vue
+++ b/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';
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@ -22,12 +22,12 @@

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

--- a/src/components/color_input/color_input.vue
+++ b/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 {
--- a/src/components/confirm_modal/confirm_modal.vue
+++ b/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>
--- a/src/components/conversation/conversation.js
+++ b/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({
--- a/src/components/conversation/conversation.vue
+++ b/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>
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/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
--- a/src/components/domain_mute_card/domain_mute_card.vue
+++ b/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>
--- a/src/components/edit_status_modal/edit_status_modal.vue
+++ b/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>
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@ -43,10 +43,7 @@
          :class="{ highlighted: index === highlighted }"
          @click.stop.prevent="onClick($event, suggestion)"
        >
-          <span
-            v-if="!suggestion.mfm"
-            class="image"
-          >
+          <span v-if="!suggestion.mfm" class="image">
            <img
              v-if="suggestion.img"
              :src="suggestion.img"
--- a/src/components/emoji_input/suggestor.js
+++ b/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
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@ -42,7 +42,7 @@
  </div>
 </template>

-<script src="./emoji_reactions.js"></script>
+<script src="./emoji_reactions.js" ></script>
 <style lang="scss">
@import '../../_variables.scss';

--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/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';
--- a/src/components/favorite_button/favorite_button.vue
+++ b/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';
--- a/src/components/features_panel/features_panel.vue
+++ b/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 {
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@ -1,8 +1,5 @@
 <template>
-  <basic-user-card
-    v-if="show"
-    :user="user"
-  >
+  <basic-user-card :user="user" v-if="show">
    <div class="follow-request-card-content-container">
      <button
        class="btn button-default"
--- a/src/components/font_control/font_control.vue
+++ b/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';
--- a/src/components/gallery/gallery.vue
+++ b/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"
-            @natural-size-load="onNaturalSizeLoad"
+            @setMedia="onMedia"
+            @naturalSizeLoad="onNaturalSizeLoad"
          />
        </div>
      </div>
--- a/src/components/hashtag_link/hashtag_link.vue
+++ b/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"/>
--- a/src/components/instance_specific_panel/instance_specific_panel.vue
+++ b/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>
--- a/src/components/list/list.vue
+++ b/src/components/list/list.vue
@ -42,7 +42,6 @@ export default {
@import '../../_variables.scss';

 .list {
-  min-height: 1em;
  &-item:not(:last-child) {
    border-bottom: 1px solid;
    border-bottom-color: $fallback--border;
--- a/src/components/local_bubble_panel/local_bubble_panel.vue
+++ b/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"
--- a/src/components/login_form/login_form.vue
+++ b/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';
--- a/src/components/media_modal/media_modal.vue
+++ b/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'"
--- a/src/components/media_upload/media_upload.js
+++ b/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()
        })
--- a/src/components/media_upload/media_upload.vue
+++ b/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';
--- a/src/components/mention_link/mention_link.js
+++ b/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
    },
--- a/src/components/mention_link/mention_link.vue
+++ b/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"/>
--- a/src/components/mentions_line/mentions_line.vue
+++ b/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" />
--- a/src/components/mfa_form/recovery_form.vue
+++ b/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>
--- a/src/components/mfa_form/totp_form.vue
+++ b/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>
--- a/src/components/mod_modal/tabs/reports_tab/report_card.vue
+++ b/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
-          v-else
-          class="faint"
-        >
+        <i 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"
--- a/src/components/mod_modal/tabs/reports_tab/report_note.vue
+++ b/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
--- a/src/components/modal/modal.vue
+++ b/src/components/modal/modal.vue
@ -22,9 +22,6 @@ export default {
      default: false
    }
  },
-  emits: [
-    'backdropClicked',
-  ],
  computed: {
    classes () {
      return {
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/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)"
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@ -102,7 +102,7 @@
  </div>
 </template>

-<script src="./nav_panel.js"></script>
+<script src="./nav_panel.js" ></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@ -6,7 +6,6 @@ import UserCard from '../user_card/user_card.vue'
 import Timeago from '../timeago/timeago.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
 import ConfirmModal from '../confirm_modal/confirm_modal.vue'
-import StillImage from '../still-image/still-image.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@ -51,8 +50,7 @@ const Notification = {
    Timeago,
    Status,
    RichContent,
-    ConfirmModal,
-    StillImage
+    ConfirmModal
  },
  methods: {
    toggleUserExpanded () {
--- a/src/components/notification/notification.vue
+++ b/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"
-                    :alt="notification.emoji"
-                  />
+                    :name="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>
--- a/src/components/notifications/notification_filters.vue
+++ b/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>
--- a/src/components/notifications/notifications.scss
+++ b/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: 6em;
+      min-width: 3em;
      text-align: right;
    }
  }
--- a/src/components/opacity_input/opacity_input.vue
+++ b/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"
--- a/src/components/pinch_zoom/pinch_zoom.vue
+++ b/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>
--- a/src/components/post_status_form/post_status_form.js
+++ b/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 postLanguage = defaultPostLanguage || interfaceToISOLanguage(interfaceLanguage)
+    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage } = this.$store.getters.mergedConfig

    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: '',
-      activeEmojiInput: undefined,
-      activeTextInput: undefined,
-      subjectVisible: showSubject
+      idempotencyKey: ''
    }
  },
  computed: {
@ -325,6 +302,9 @@ const PostStatusForm = {
    ...mapState({
      mobileLayout: state => state.interface.mobileLayout
    }),
+    isoLanguages () {
+      return iso6391.getAllCodes();
+    }
  },
  watch: {
    'newStatus': {
@ -694,33 +674,8 @@ const PostStatusForm = {
      this.$refs['emoji-input'].resize()
    },
    showEmojiPicker () {
-      if (!this.activeEmojiInput || !this.activeTextInput)
-        this.focusStatusInput()
-
-      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
+      this.$refs['textarea'].focus()
+      this.$refs['emoji-input'].triggerShowPicker()
    },
    clearError () {
      this.error = null
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -118,16 +118,13 @@
          />
        </div>
        <EmojiInput
-          v-if="subjectVisible"
-          ref="subject-emoji-input"
+          v-if="!disableSubject && (newStatus.spoilerText || alwaysShowSubject)"
          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">
-            <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"
+            class="language-selector"
            >
-              <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 format-selector"
+            <Select
+              id="post-language"
+              v-model="newStatus.language"
+              class="form-control"
            >
-              <span class="only-format">
-                {{ $t(`post_status.content_type["${postFormats[0]}"]`) }}
-              </span>
-            </div>
+              <option
+                v-for="language in isoLanguages"
+                :key="language"
+                :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"
@ -464,10 +446,6 @@
    align-items: baseline;
  }

-  .visibility-tray-edit {
-    justify-content: right;
-  }
-
  .visibility-notice.edit-warning {
    > :first-child {
      margin-top: 0;
@ -478,13 +456,7 @@
    }
  }

-  .format-selector-container {
-    .format-selector {
-      display: inline-block;
-    }
-  }
-
-  .media-upload-icon, .poll-icon, .emoji-icon, .spoiler-icon {
+  .media-upload-icon, .poll-icon, .emoji-icon {
    font-size: 1.85em;
    line-height: 1.1;
    flex: 1;
@ -527,11 +499,6 @@

  .poll-icon {
    order: 3;
-    justify-content: center;
-  }
-
-  .spoiler-icon {
-    order: 4;
    justify-content: right;
  }

@ -584,11 +551,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 +563,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;
    }
--- a/src/components/post_status_modal/post_status_modal.vue
+++ b/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">
--- a/src/components/react_button/react_button.vue
+++ b/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';
--- a/src/components/remote_follow/remote_follow.js
+++ b/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`
    }
--- a/src/components/retweet_button/retweet_button.vue
+++ b/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';
--- a/src/components/rich_content/rich_content.scss
+++ b/src/components/rich_content/rich_content.scss
@ -1,6 +1,6 @@
 .RichContent {
  blockquote {
-    margin: 0.2em 0 0.2em 2em;
+    margin-left: 2em;
    font-style: italic;
  }

--- a/src/components/selectable_list/selectable_list.vue
+++ b/src/components/selectable_list/selectable_list.vue
@ -24,7 +24,7 @@
      :items="items"
      :get-key="getKey"
    >
-      <template #item="{item}">
+      <template v-slot:item="{item}">
        <div
          class="selectable-list-item-inner"
          :class="{ 'selectable-list-item-selected-inner': isSelected(item) }"
@ -41,7 +41,7 @@
          />
        </div>
      </template>
-      <template #empty>
+      <template v-slot:empty>
        <slot name="empty" />
      </template>
    </List>
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@ -6,7 +6,7 @@
    <Checkbox
      :model-value="state"
      :disabled="disabled"
-      @update:model-value="update"
+      @update:modelValue="update"
    >
      <span
        v-if="!!$slots.default"
--- a/src/components/settings_modal/helpers/choice_setting.vue
+++ b/src/components/settings_modal/helpers/choice_setting.vue
@ -8,7 +8,7 @@
    <Select
      :model-value="state"
      :disabled="disabled"
-      @update:model-value="update"
+      @update:modelValue="update"
    >
      <option
        v-for="option in options"
--- a/src/components/settings_modal/helpers/modified_indicator.vue
+++ b/src/components/settings_modal/helpers/modified_indicator.vue
@ -6,14 +6,14 @@
    <Popover
      trigger="hover"
    >
-      <template #trigger>
+      <template v-slot:trigger>
        &nbsp;
        <FAIcon
          icon="wrench"
          :aria-label="$t('settings.setting_changed')"
        />
      </template>
-      <template #content>
+      <template v-slot:content>
        <div class="modified-tooltip">
          {{ $t('settings.setting_changed') }}
        </div>
--- a/src/components/settings_modal/helpers/server_side_indicator.vue
+++ b/src/components/settings_modal/helpers/server_side_indicator.vue
@ -6,14 +6,14 @@
    <Popover
      trigger="hover"
    >
-      <template #trigger>
+      <template v-slot:trigger>
        &nbsp;
        <FAIcon
          icon="server"
          :aria-label="$t('settings.setting_server_side')"
        />
      </template>
-      <template #content>
+      <template v-slot:content>
        <div class="serverside-tooltip">
          {{ $t('settings.setting_server_side') }}
        </div>
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@ -69,7 +69,7 @@ const SettingsModal = {
      this.$store.dispatch('closeSettingsModal')
    },
    logout () {
-      this.$router.replace(this.$store.state.instance.redirectRootNoLogin || '/main/all')
+      this.$router.replace('/main/public')
      this.$store.dispatch('closeSettingsModal')
      this.$store.dispatch('logout')
    },
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@ -108,7 +108,7 @@
        <Checkbox
          :model-value="!!expertLevel"
          class="expertMode"
-          @update:model-value="expertLevel = Number($event)"
+          @update:modelValue="expertLevel = Number($event)"
        >
          {{ $t("settings.expert_mode") }}
        </Checkbox>
--- a/src/components/settings_modal/tabs/data_import_export_tab.js
+++ b/src/components/settings_modal/tabs/data_import_export_tab.js
@ -72,7 +72,7 @@ const DataImportExportTab = {
        // check is it's a local user
        if (user && user.is_local) {
          // append the instance address
-           
+          // eslint-disable-next-line no-undef
          return user.screen_name + '@' + location.hostname
        }
        return user.screen_name
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@ -4,7 +4,6 @@ import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import IntegerSetting from '../helpers/integer_setting.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'

-import { usePostLanguageOptions } from 'src/lib/post_language'
 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import ServerSideIndicator from '../helpers/server_side_indicator.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
@ -18,11 +17,6 @@ library.add(
 )

 const GeneralTab = {
-  setup() {
-    const {postLanguageOptions} = usePostLanguageOptions()
-
-    return {postLanguageOptions}
-  },
  data () {
    return {
      subjectLineOptions: ['email', 'noop', 'masto'].map(mode => ({
@ -124,12 +118,6 @@ const GeneralTab = {
        this.$store.dispatch('setOption', { name: 'translationLanguage', value: val })
      }
    },
-    postLanguage: {
-      get: function () { return this.$store.getters.mergedConfig.postLanguage },
-      set: function (val) {
-        this.$store.dispatch('setOption', { name: 'postLanguage', value: val })
-      }
-    },
    ...SharedComputedObject()
  },
  methods: {
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@ -44,6 +44,7 @@
          <template
            v-if="profilesExpanded"
          >
+
            <div
              v-for="profile in settingsProfiles"
              :key="profile.id"
@ -72,24 +73,15 @@
                </button>
              </template>
            </div>
-            <button
-              class="btn button-default"
-              @click="refreshProfiles()"
-            >
+            <button class="btn button-default" @click="refreshProfiles()">
              {{ $t('settings.settings_profiles_refresh') }}
-              <FAIcon
-                icon="sync"
-                @click="refreshProfiles()"
-              />
+              <FAIcon icon="sync" @click="refreshProfiles()" />
            </button>
            <h3>{{ $t('settings.settings_profile_creation') }}</h3>
            <label for="settings-profile-new-name">
              {{ $t('settings.settings_profile_creation_new_name_label') }}
            </label>
-            <input
-              id="settings-profile-new-name"
-              v-model="newProfileName"
-            >
+            <input v-model="newProfileName" id="settings-profile-new-name">
            <button
              class="btn button-default"
              @click="createSettingsProfile"
@ -154,11 +146,6 @@
            {{ $t('settings.show_wider_shortcuts') }}
          </BooleanSetting>
        </li>
-        <li>
-          <BooleanSetting path="displayPageBackgrounds">
-            {{ $t('settings.show_page_backgrounds') }}
-          </BooleanSetting>
-        </li>
        <li>
          <BooleanSetting path="stopGifs">
            {{ $t('settings.stop_gifs') }}
@ -496,6 +483,14 @@
            </BooleanSetting>
          </li>
        </ul>
+        <li>
+          <BooleanSetting
+            path="useAtIcon"
+            expert="1"
+          >
+            {{ $t('settings.use_at_icon') }}
+          </BooleanSetting>
+        </li>
        <li>
          <BooleanSetting path="mentionLinkShowAvatar">
            {{ $t('settings.mention_link_show_avatar') }}
@ -593,15 +588,6 @@
            {{ $t('settings.post_status_content_type') }}
          </ChoiceSetting>
        </li>
-        <li>
-          <ChoiceSetting
-            id="postLanguage"
-            path="postLanguage"
-            :options="postLanguageOptions"
-          >
-            {{ $t('settings.post_language') }}
-          </ChoiceSetting>
-        </li>
        <li>
          <BooleanSetting
            path="alwaysShowNewPostButton"
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.js
@ -85,7 +85,7 @@ const MutesAndBlocks = {
        // check is it's a local user
        if (user && user.is_local) {
          // append the instance address
-           
+          // eslint-disable-next-line no-undef
          return user.screen_name + '@' + location.hostname
        }
        return user.screen_name
--- a/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
+++ b/src/components/settings_modal/tabs/mutes_and_blocks_tab.vue
@ -10,7 +10,7 @@
          :query="queryUserIds"
          :placeholder="$t('settings.search_user_to_block')"
        >
-          <template #default="row">
+          <template v-slot="row">
            <BlockCard
              :user-id="row.item"
            />
@ -21,7 +21,7 @@
        :refresh="true"
        :get-key="i => i"
      >
-        <template #header="{selected}">
+        <template v-slot:header="{selected}">
          <div class="bulk-actions">
            <ProgressButton
              v-if="selected.length > 0"
@ -29,7 +29,7 @@
              :click="() => blockUsers(selected)"
            >
              {{ $t('user_card.block') }}
-              <template #progress>
+              <template v-slot:progress>
                {{ $t('user_card.block_progress') }}
              </template>
            </ProgressButton>
@ -39,16 +39,16 @@
              :click="() => unblockUsers(selected)"
            >
              {{ $t('user_card.unblock') }}
-              <template #progress>
+              <template v-slot:progress>
                {{ $t('user_card.unblock_progress') }}
              </template>
            </ProgressButton>
          </div>
        </template>
-        <template #item="{item}">
+        <template v-slot:item="{item}">
          <BlockCard :user-id="item" />
        </template>
-        <template #empty>
+        <template v-slot:empty>
          {{ $t('settings.no_blocks') }}
        </template>
      </BlockList>
@ -63,7 +63,7 @@
              :query="queryUserIds"
              :placeholder="$t('settings.search_user_to_mute')"
            >
-              <template #default="row">
+              <template v-slot="row">
                <MuteCard
                  :user-id="row.item"
                />
@ -74,7 +74,7 @@
            :refresh="true"
            :get-key="i => i"
          >
-            <template #header="{selected}">
+            <template v-slot:header="{selected}">
              <div class="bulk-actions">
                <ProgressButton
                  v-if="selected.length > 0"
@ -82,7 +82,7 @@
                  :click="() => muteUsers(selected)"
                >
                  {{ $t('user_card.mute') }}
-                  <template #progress>
+                  <template v-slot:progress>
                    {{ $t('user_card.mute_progress') }}
                  </template>
                </ProgressButton>
@ -92,16 +92,16 @@
                  :click="() => unmuteUsers(selected)"
                >
                  {{ $t('user_card.unmute') }}
-                  <template #progress>
+                  <template v-slot:progress>
                    {{ $t('user_card.unmute_progress') }}
                  </template>
                </ProgressButton>
              </div>
            </template>
-            <template #item="{item}">
+            <template v-slot:item="{item}">
              <MuteCard :user-id="item" />
            </template>
-            <template #empty>
+            <template v-slot:empty>
              {{ $t('settings.no_mutes') }}
            </template>
          </MuteList>
@ -114,7 +114,7 @@
              :query="queryKnownDomains"
              :placeholder="$t('settings.type_domains_to_mute')"
            >
-              <template #default="row">
+              <template v-slot="row">
                <DomainMuteCard
                  :domain="row.item"
                />
@ -125,7 +125,7 @@
            :refresh="true"
            :get-key="i => i"
          >
-            <template #header="{selected}">
+            <template v-slot:header="{selected}">
              <div class="bulk-actions">
                <ProgressButton
                  v-if="selected.length > 0"
@ -133,16 +133,16 @@
                  :click="() => unmuteDomains(selected)"
                >
                  {{ $t('domain_mute_card.unmute') }}
-                  <template #progress>
+                  <template v-slot:progress>
                    {{ $t('domain_mute_card.unmute_progress') }}
                  </template>
                </ProgressButton>
              </div>
            </template>
-            <template #item="{item}">
+            <template v-slot:item="{item}">
              <DomainMuteCard :domain="item" />
            </template>
-            <template #empty>
+            <template v-slot:empty>
              {{ $t('settings.no_mutes') }}
            </template>
          </DomainMuteList>
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@ -33,7 +33,6 @@ const ProfileTab = {
      newName: this.$store.state.users.currentUser.name_unescaped,
      newBio: unescape(this.$store.state.users.currentUser.description),
      newLocked: this.$store.state.users.currentUser.locked,
-      newPermitFollowback: this.$store.state.users.currentUser.permit_followback,
      newFields: this.$store.state.users.currentUser.fields.map(field => ({ name: field.name, value: field.value })),
      showRole: this.$store.state.users.currentUser.show_role,
      role: this.$store.state.users.currentUser.role,
@ -130,15 +129,14 @@ const ProfileTab = {
        note: this.newBio,
        locked: this.newLocked,
        // Backend notation.
-         
+        /* eslint-disable camelcase */
        display_name: this.newName,
        fields_attributes: this.newFields.filter(el => el != null),
        bot: this.bot,
        show_role: this.showRole,
        status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1,
-        permit_followback: this.permit_followback,
        accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom
-         
+        /* eslint-enable camelcase */
      }

      if (this.emailLanguage) {
@ -187,7 +185,7 @@ const ProfileTab = {
        })
        return
      }
-       
+      // eslint-disable-next-line no-undef
      const reader = new FileReader()
      reader.onload = ({ target }) => {
        const img = target.result
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@ -110,9 +110,11 @@
          max="730"
          class="expire-posts-days"
          :placeholder="$t('settings.expire_posts_input_placeholder')"
-        >
+        />
+      </p>
+      <p>
+
      </p>
-      <p />
      <p>
        <interface-language-switcher
          :prompt-text="$t('settings.email_language')"
@ -257,19 +259,6 @@
          <BooleanSetting path="serverSide_locked">
            {{ $t('settings.lock_account_description') }}
          </BooleanSetting>
-          <ul
-            class="setting-list suboptions"
-            :class="[{disabled: !serverSide_locked}]"
-          >
-            <li>
-              <BooleanSetting
-                path="serverSide_permitFollowback"
-                :disabled="!serverSide_locked"
-              >
-                {{ $t('settings.permit_followback_description') }}
-              </BooleanSetting>
-            </li>
-          </ul>
        </li>
        <li>
          <BooleanSetting path="serverSide_discoverable">
--- a/src/components/shadow_control/shadow_control.vue
+++ b/src/components/shadow_control/shadow_control.vue
@ -215,7 +215,7 @@
  </div>
 </template>

-<script src="./shadow_control.js"></script>
+<script src="./shadow_control.js" ></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@ -218,7 +218,7 @@
  </div>
 </template>

-<script src="./side_drawer.js"></script>
+<script src="./side_drawer.js" ></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/staff_panel/staff_panel.vue
+++ b/src/components/staff_panel/staff_panel.vue
@ -24,7 +24,7 @@
  </div>
 </template>

-<script src="./staff_panel.js"></script>
+<script src="./staff_panel.js" ></script>

 <style lang="scss">

--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@ -266,16 +266,6 @@
      color: $fallback--cGreen;
      color: var(--cGreen, $fallback--cGreen);
    }
-
-    .right-side {
-      display: flex;
-      align-items: center;
-      gap: 0.3em;
-    }
-
-    .repeat-tooltip {
-      flex-shrink: 0;
-    }
  }

  .repeater-avatar {
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@ -83,7 +83,7 @@
          :user="statusoid.user"
        />
        <div class="right-side faint">
-          <div
+          <span
            class="status-username repeater-name"
            :title="retweeter"
          >
@ -100,19 +100,14 @@
              v-else
              :to="retweeterProfileLink"
            >{{ retweeter }}</router-link>
-          </div>
+          </span>
          {{ ' ' }}
-
-          <div
-            class="repeat-tooltip"
-          >
-             <FAIcon
-               icon="retweet"
-               class="repeat-icon"
-               :title="$t('tool_tip.repeat')"
-             />
-             {{ $t('timeline.repeated') }}
-          </div>
+          <FAIcon
+            icon="retweet"
+            class="repeat-icon"
+            :title="$t('tool_tip.repeat')"
+          />
+          {{ $t('timeline.repeated') }}
        </div>
      </div>

@ -195,7 +190,7 @@
                >
                  <Timeago
                    :time="status.created_at"
-                    :with-direction="!compact"
+                    :with-direction="true"
                    :auto-update="60"
                  />
                </router-link>
@ -373,7 +368,7 @@
              :controlled-toggle-showing-long-subject="controlledToggleShowingLongSubject"
              @mediaplay="addMediaPlaying($event)"
              @mediapause="removeMediaPlaying($event)"
-              @parse-ready="setHeadTailLinks"
+              @parseReady="setHeadTailLinks"
            />
          </div>

@ -481,8 +476,8 @@
            />
            <extra-buttons
              :status="status"
-              @on-error="showError"
-              @on-success="clearError"
+              @onError="showError"
+              @onSuccess="clearError"
            />
          </div>
        </div>
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@ -62,7 +62,7 @@

  .text {
    & > * {
-      white-space: pre-wrap;
+      white-space: normal;
    }
    &.-single-line {
      white-space: nowrap;
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@ -54,7 +54,7 @@
            :mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
            :greentext="mergedConfig.greentext"
            :attentions="status.attentions"
-            @parse-ready="onParseReady"
+            @parseReady="onParseReady"
          />
          <div
            v-if="status.translation"
@ -70,7 +70,7 @@
              :mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
              :greentext="mergedConfig.greentext"
              :attentions="status.attentions"
-              @parse-ready="onParseReady"
+              @parseReady="onParseReady"
            />
            <div>
              <label class="label">{{ $t('status.override_translation_source_language') }}</label>
@ -89,10 +89,7 @@
                </option>
              </Select>
              {{ ' ' }}
-              <button
-                class="btn button-default"
-                @click="translateStatus"
-              >
+              <button @click="translateStatus" class="btn button-default">
                {{ $t('status.translate') }}
              </button>
            </div>
@ -141,5 +138,5 @@
    <slot v-if="!hideSubjectStatus" />
  </div>
 </template>
-<script src="./status_body.js"></script>
+<script src="./status_body.js" ></script>
 <style lang="scss" src="./status_body.scss" />
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@ -14,7 +14,7 @@
      :toggle-showing-tall="toggleShowingTall"
      :toggle-expanding-subject="toggleExpandingSubject"
      :toggle-showing-long-subject="toggleShowingLongSubject"
-      @parse-ready="$emit('parseReady', $event)"
+      @parseReady="$emit('parseReady', $event)"
    >
      <div v-if="status.poll && status.poll.options && !compact">
        <Poll
@ -63,7 +63,7 @@
  </div>
 </template>

-<script src="./status_content.js"></script>
+<script src="./status_content.js" ></script>
 <style lang="scss">
 .StatusContent {
  flex: 1;
--- a/src/components/status_history_modal/status_history_modal.vue
+++ b/src/components/status_history_modal/status_history_modal.vue
@ -2,7 +2,7 @@
  <Modal
    v-if="modalActivated"
    class="status-history-modal-view"
-    @backdrop-clicked="closeModal"
+    @backdropClicked="closeModal"
  >
    <div class="status-history-modal-panel panel">
      <div class="panel-heading">
@ -17,9 +17,9 @@
            v-for="status in history"
            :key="status.id"
            :statusoid="status"
-            :is-preview="true"
+            :isPreview="true"
            class="conversation-status status-fadein panel-body"
-          />
+        />
        </div>
      </div>
    </div>
--- a/src/components/status_popover/status_popover.vue
+++ b/src/components/status_popover/status_popover.vue
@ -5,10 +5,10 @@
    :bound-to="{ x: 'container' }"
    @show="enter"
  >
-    <template #trigger>
+    <template v-slot:trigger>
      <slot />
    </template>
-    <template #content>
+    <template v-slot:content>
      <Status
        v-if="status"
        :is-preview="true"
@ -35,7 +35,7 @@
  </Popover>
 </template>

-<script src="./status_popover.js"></script>
+<script src="./status_popover.js" ></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/still-image/still-image.js
+++ b/src/components/still-image/still-image.js
@ -42,22 +42,20 @@ const StillImage = {
    detectAnimation (image) {
      const mediaProxyAvailable = this.$store.state.instance.mediaProxyAvailable

+      // harmless CORS errors without-- clean console with
      if (!mediaProxyAvailable) {
        // It's a bit aggressive to assume all images we can't find the mimetype of is animated, but necessary for
        // people in need of reduced motion accessibility. As such, we'll consider those images animated if the user
        // agent is set to prefer reduced motion. Otherwise, it'll just be used as an early exit.
        if (window.matchMedia('(prefers-reduced-motion: reduce)').matches) {
+          // Only for no media-proxy for now, since we're capturing gif, webp, and apng (are there others?)
          // Since the canvas and images are not pixel-perfect matching (due to scaling),
          // It makes the images jiggle on hover, which is not ideal for accessibility, methinks
          this.isAnimated = true
-          return
        }
-        this.detectWithoutMediaProxy(image)
-      } else {
-        this.detectWithMediaProxy(image)
+        return
      }
-    },
-    detectAnimationWithFetch (image) {
+      
      // Browser Cache should ensure image doesn't get loaded twice if cache exists
      fetch(image.src, {
        referrerPolicy: 'same-origin'
@ -87,36 +85,6 @@ const StillImage = {
          // this.imageLoadError && this.imageLoadError()
        })
    },
-    detectWithMediaProxy (image) {
-      this.detectAnimationWithFetch(image)
-    },
-    detectWithoutMediaProxy (image) {
-      // We'll just assume that gifs and webp are animated
-      const extension = image.src.split('.').pop().toLowerCase()
-
-      if (extension === 'gif') {
-        this.isAnimated = true
-        this.setLabel('GIF')
-        return
-      }
-      if (extension === 'webp') {
-        this.isAnimated = true
-        this.setLabel('WEBP')
-        return
-      }
-      // Beware the apng! use this if ye dare
-      // if (extension === 'png') {
-      //  this.isAnimated = true
-      //  this.setLabel('PNG')
-      //  return
-      // }
-      
-      // Hail mary for extensionless
-      if (extension.includes('/')) {
-        // Don't mind the CORS error barrage
-        this.detectAnimationWithFetch(image)
-      }
-    },
    setLabel (name) {
      this.imageTypeLabel = name;
    },
--- a/src/components/still-image/still-image.vue
+++ b/src/components/still-image/still-image.vue
@ -7,9 +7,8 @@
  >
    <div
      v-if="animated && imageTypeLabel"
-      class="image-type-label"
-    >
-      {{ imageTypeLabel }}
+      class="image-type-label">
+        {{ imageTypeLabel }}
    </div>
    <canvas
      v-if="animated"
--- a/src/components/terms_of_service_panel/terms_of_service_panel.vue
+++ b/src/components/terms_of_service_panel/terms_of_service_panel.vue
@ -13,7 +13,7 @@
  </div>
 </template>

-<script src="./terms_of_service_panel.js"></script>
+<script src="./terms_of_service_panel.js" ></script>

 <style lang="scss">
 .tos-content {
--- a/src/components/thread_tree/thread_tree.vue
+++ b/src/components/thread_tree/thread_tree.vue
@ -32,7 +32,7 @@
      :dive="dive ? () => dive(status.id) : undefined"

      @goto="setHighlight"
-      @toggle-expanded="toggleExpanded"
+      @toggleExpanded="toggleExpanded"
    />
    <div
      v-if="currentReplies.length && threadShowing"
--- a/src/components/timeline/timeline.scss
+++ b/src/components/timeline/timeline.scss
@ -28,7 +28,4 @@
      }
    }
  }
-  .timeline {
-    min-height: 1em;
-  }
 }
--- a/src/components/timeline/timeline_quick_settings.vue
+++ b/src/components/timeline/timeline_quick_settings.vue
@ -4,7 +4,7 @@
    class="TimelineQuickSettings"
    :bound-to="{ x: 'container' }"
  >
-    <template #content>
+    <template v-slot:content>
      <div class="dropdown-menu">
        <div v-if="loggedIn">
          <button
@ -80,7 +80,7 @@
        </button>
      </div>
    </template>
-    <template #trigger>
+    <template v-slot:trigger>
      <button class="button-unstyled">
        <FAIcon icon="filter" />
      </button>
--- a/src/components/timeline_menu/timeline_menu.vue
+++ b/src/components/timeline_menu/timeline_menu.vue
@ -9,12 +9,12 @@
    @show="openMenu"
    @close="() => isOpen = false"
  >
-    <template #content>
+    <template v-slot:content>
      <div class="timeline-menu-popover popover-default">
        <TimelineMenuContent />
      </div>
    </template>
-    <template #trigger>
+    <template v-slot:trigger>
      <button class="button-unstyled title timeline-menu-title">
        <span class="timeline-title">{{ timelineName() }}</span>
        <span>
@ -32,7 +32,7 @@
  </Popover>
 </template>

-<script src="./timeline_menu.js"></script>
+<script src="./timeline_menu.js" ></script>

 <style lang="scss">
@import '../../_variables.scss';
--- a/src/components/timeline_menu/timeline_menu_content.vue
+++ b/src/components/timeline_menu/timeline_menu_content.vue
@ -62,6 +62,7 @@
          :title="$t('nav.twkn_timeline_description')"
          :aria-label="$t('nav.twkn_timeline_description')"
        >{{ $t("nav.twkn") }}</span>
+
      </router-link>
    </li>
    <li v-if="currentUser">
@ -99,7 +100,7 @@
  </ul>
 </template>

-<script src="./timeline_menu_content.js"></script>
+<script src="./timeline_menu_content.js" ></script>

 <style lang="scss">
@import "../../_variables.scss";
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
subtype	fb909e2126	Changed RichContent.blockquote to only have margin-left 2em All checks were successful ci/woodpecker/pr/woodpecker Pipeline was successful Details	2023-10-03 09:01:35 +00:00
subtype	16467d2e19	Changed StatusBody.text white space to normal	2023-10-03 08:33:56 +00:00