Merge pull request '(arguably) improved layouting of user profile page' (#403) from Riedler/akkoma-fe:user-profile-changes into develop

Reviewed-on: AkkomaGang/akkoma-fe#403

.eslintignore

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

.eslintrc.js

@@ -1,30 +0,0 @@
-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

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

.tool-versions

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

.woodpecker.yml

@@ -1,20 +1,21 @@
-platform: linux/amd64
+labels:
-pipeline:
+  platform: linux/amd64
+
+steps:
   lint:
     when:
       event:
       - pull_request
-    image: node:18
+    image: node:20
     commands:
     - yarn
     - yarn lint
-    #- yarn stylelint
 
   test:
     when:
       event:
       - pull_request
-    image: node:18
+    image: node:20
     commands:
     - apt update
     - apt install firefox-esr -y --no-install-recommends
@@ -28,7 +29,7 @@ pipeline:
       branch:
       - develop
       - stable
-    image: node:18
+    image: node:20
     commands:
     - yarn
     - yarn build
@@ -40,15 +41,15 @@ pipeline:
       branch:
       - develop
       - stable
-    image: node:18
+    image: node:20
     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.5.1/scaleway-cli_2.5.1_linux_amd64
+      - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.30.0/scaleway-cli_2.30.0_linux_amd64
-      - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
+      - mv scaleway-cli_2.30.0_linux_amd64 scaleway-cli
       - chmod +x scaleway-cli
       - ./scaleway-cli object config install type=rclone
       - zip akkoma-fe.zip -r dist
@@ -70,8 +71,8 @@ pipeline:
     - 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.5.1/scaleway-cli_2.5.1_linux_amd64
+    - wget https://github.com/scaleway/scaleway-cli/releases/download/v2.30.0/scaleway-cli_2.30.0_linux_amd64
-    - mv scaleway-cli_2.5.1_linux_amd64 scaleway-cli
+    - mv scaleway-cli_2.30.0_linux_amd64 scaleway-cli
     - chmod +x scaleway-cli
     - ./scaleway-cli object config install type=rclone
     - cd docs

README.md

@@ -6,8 +6,6 @@ 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
 
-And specificly, this is a tweaked version with all the hyena.network themes and tweaks in place
-
 # For Translators
 
 The [Weblate UI](https://translate.akkoma.dev/projects/akkoma/pleroma-fe/) is recommended for adding or modifying translations for Akkoma-FE.
@@ -22,6 +20,8 @@ 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

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 ora = require('ora')
+var webpack = require("webpack");
-var webpack = require('webpack')
+var webpackConfig = require("./webpack.prod.conf");
-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 spinner = ora('building for production...')
+var assetsPath = path.join(
-spinner.start()
+  config.build.assetsRoot,
-
+  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) {
-  spinner.stop()
+  if (err) throw err;
-  if (err) throw err
+  process.stdout.write(
-  process.stdout.write(stats.toString({
+    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')
-var proxyMiddleware = require('http-proxy-middleware')
+const { createProxyMiddleware } = require('http-proxy-middleware');
 var webpackConfig = process.env.NODE_ENV === 'testing'
   ? require('./webpack.prod.conf')
   : require('./webpack.dev.conf')
@@ -36,7 +36,13 @@ Object.keys(proxyTable).forEach(function (context) {
   if (typeof options === 'string') {
     options = { target: options }
   }
-  app.use(proxyMiddleware(context, 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))
 })
 
 // handle fallback for HTML5 history API

build/webpack.base.conf.js

@@ -3,6 +3,7 @@ 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
@@ -35,6 +36,7 @@ module.exports = {
     ],
     fallback: {
       "url": require.resolve("url/"),
+      querystring: require.resolve("querystring-es3")
     },
     alias: {
       'static': path.resolve(__dirname, '../static'),
@@ -47,20 +49,6 @@ 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
@@ -118,6 +106,9 @@ module.exports = {
     ]
   },
   plugins: [
-    new VueLoaderPlugin()
+    new VueLoaderPlugin(),
+    new ESLintPlugin({
+      configType: 'flat'
+    })
   ]
 }

config/test.env.js

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

docs/docs/css/extra.css

@@ -12,13 +12,6 @@ code,
   --md-accent-fg-color:         #455a63;
 }
 
-#app { background-repeat: repeat !important; }
-@media all and (min-width: 800px) { .tab-icon { display: none !important; } }
-.tab-switcher .tab-icon { color: #fff !important; }
-.site-name {  font-family: BLACKOUT; font-size: 3rem !important; line-height: 4rem;}
-.site-name::before  { content: "%"; }
-.dropdown-item { color: #fff !important; }
-
 @font-face {
   font-family: 'Tiresias PCFont';
   font-style: normal;
@@ -33,42 +26,3 @@ code,
   src: local('Tiresias Infofont'), local('Tiresias Infofont'),
        url('./fonts/Tiresias_Infofont.ttf') format('truetype')
 } 
-
-@font-face{
-  font-family:'blockzone';
-  src:url('./fonts/blockzone-webfont.woff2') format("woff2"),
-    url('./fonts/blockzone-webfont.woff') format("woff");
-  font-style:normal;
-  font-weight:400
-}
-@font-face{
-  font-family:'PeanutMoney';
-  src:url('./fonts/PeanutMoney.ttf') format("opentype");
-  font-style:normal;
-  font-weight:400
-}
-@font-face{
-  font-family:'Heading';
-  src:url('./fonts/heading.woff');
-  font-style:normal;
-  font-weight:400
-}
-
-@font-face{
-  font-family:'MonoMMM_5';
-  src:url('./fonts/monoMMM_5.woff');
-  font-style:normal;
-  font-weight:400
-}
-@font-face{
-  font-family:'Tiny';
-  src:url('./fonts/tiny.woff');
-  font-style:normal;
-  font-weight:400
-}
-@font-face{
-  font-family:'BLACKOUT';
-  src:url('./fonts/BLACKOUT.woff');
-  font-style:normal;
-  font-weight:400
-}

eslint.config.js

@@ -0,0 +1,31 @@
+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'
+    ]
+  }
+]

package.json

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

src/boot/after_store.js

@@ -183,6 +183,12 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('renderMisskeyMarkdown')
   copyInstanceOption('sidebarRight')
 
+  if (config.backendCommitUrl)
+    copyInstanceOption('backendCommitUrl')
+
+  if (config.frontendCommitUrl)
+    copyInstanceOption('frontendCommitUrl')
+
   return store.dispatch('setTheme', config['theme'])
 }
 

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 v-slot:content>
+      <template #content>
         <div class="dropdown-menu">
           <template v-if="relationship.following">
             <button
@@ -71,7 +71,7 @@
           </button>
         </div>
       </template>
-      <template v-slot:trigger>
+      <template #trigger>
         <button class="button-unstyled ellipsis-button">
           <FAIcon
             class="icon"
@@ -93,7 +93,7 @@
           keypath="user_card.block_confirm"
           tag="span"
         >
-          <template v-slot:user>
+          <template #user>
             <span
               v-text="user.screen_name_ui"
             />

src/components/attachment/attachment.vue

@@ -246,8 +246,8 @@
           ref="flash"
           class="flash"
           :src="attachment.large_thumb_url || attachment.url"
-          @playerOpened="setFlashLoaded(true)"
+          @player-opened="setFlashLoaded(true)"
-          @playerClosed="setFlashLoaded(false)"
+          @player-closed="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/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:modelValue="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
+      @update:model-value="$emit('update:modelValue', typeof modelValue === 'undefined' ? fallback : undefined)"
     />
     <div class="input color-input-field">
       <input
@@ -46,7 +46,6 @@
     </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'
@@ -108,6 +107,7 @@ export default {
   }
 }
 </script>
+<style lang="scss" src="./color_input.scss"></style>
 
 <style lang="scss">
 .color-control {

src/components/confirm_modal/confirm_modal.vue

@@ -25,6 +25,8 @@
   </dialog-modal>
 </template>
 
+<script src="./confirm_modal.js"></script>
+
 <style lang="scss" scoped>
 @import '../../_variables';
 
@@ -35,5 +37,3 @@
   }
 }
 </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"
-              @toggleExpanded="toggleExpanded"
+              @toggle-expanded="toggleExpanded"
             />
             <div
               v-if="showOtherRepliesButtonBelowStatus && getReplies(status.id).length > 1"
@@ -184,7 +184,7 @@
           :toggle-status-content-property="toggleStatusContentProperty"
 
           @goto="setHighlight"
-          @toggleExpanded="toggleExpanded"
+          @toggle-expanded="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 v-slot:progress>
+      <template #progress>
         {{ $t('domain_mute_card.unmute_progress') }}
       </template>
     </ProgressButton>
@@ -19,7 +19,7 @@
       class="btn button-default"
     >
       {{ $t('domain_mute_card.mute') }}
-      <template v-slot:progress>
+      <template #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"
-    @backdropClicked="closeModal"
+    @backdrop-clicked="closeModal"
   >
     <div class="edit-form-modal-panel panel">
       <div class="panel-heading">
@@ -11,10 +11,10 @@
       <PostStatusForm
         class="panel-body"
         v-bind="params"
-        @posted="closeModal"
+        :disable-polls="true"
-        :disablePolls="true"
+        :disable-visibility-selector="true"
-        :disableVisibilitySelector="true"
         :post-handler="doEditStatus"
+        @posted="closeModal"
       />
     </div>
   </Modal>

src/components/emoji_input/emoji_input.vue

@@ -43,7 +43,10 @@
           :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"

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_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';
 

src/components/extra_buttons/extra_buttons.vue

@@ -7,7 +7,7 @@
     :bound-to="{ x: 'container' }"
     remove-padding
   >
-    <template v-slot:content="{close}">
+    <template #content="{close}">
       <div class="dropdown-menu">
         <button
           v-if="canMute && !status.thread_muted"
@@ -172,7 +172,7 @@
         </button>
       </div>
     </template>
-    <template v-slot:trigger>
+    <template #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';

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

@@ -1,5 +1,8 @@
 <template>
-  <basic-user-card :user="user" v-if="show">
+  <basic-user-card
+    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)"
-            @setMedia="onMedia"
+            @set-media="onMedia"
-            @naturalSizeLoad="onNaturalSizeLoad"
+            @natural-size-load="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

@@ -42,6 +42,7 @@ 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.vue

@@ -2,7 +2,7 @@
   <Modal
     v-if="showing"
     class="media-modal-view"
-    @backdropClicked="hideIfNotSwiped"
+    @backdrop-clicked="hideIfNotSwiped"
   >
     <SwipeClick
       v-if="type === 'image'"

src/components/media_upload/media_upload.js

@@ -42,7 +42,7 @@ const mediaUpload = {
         .then((fileData) => {
           self.$emit('uploaded', fileData)
           self.decreaseUploadCount()
-        }, (error) => { // eslint-disable-line handle-callback-err
+        }, (error) => {  
           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.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,6 +18,7 @@
           <input
             id="code"
             v-model="code"
+            autocomplete="one-time-code"
             class="form-control"
           >
         </div>

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

@@ -4,7 +4,7 @@
       class="panel-heading"
       @click="toggleHidden"
     >
-      <h4>{{ $t('moderation.reports.report') + ' ' + this.account.screen_name }}</h4>
+      <h4>{{ $t('moderation.reports.report') + ' ' + 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,7 +35,10 @@
         <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">
@@ -43,12 +46,12 @@
             class="small-avatar"
             :user="actor"
           />
-          {{ this.actor.screen_name }}
+          {{ 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"
@@ -74,8 +77,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"
@@ -99,9 +102,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
@@ -134,7 +137,7 @@
         :offset="{ y: 5 }"
         remove-padding
       >
-        <template v-slot:trigger>
+        <template #trigger>
           <button
             class="btn button-default"
             :disabled="!tagPolicyEnabled"
@@ -147,7 +150,7 @@
             />
           </button>
         </template>
-        <template v-slot:content="{close}">
+        <template #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"
         />
-        {{ this.user.screen_name }}
+        {{ user.screen_name }}
       </div>
       <div class="header-right">
         <Timeago

src/components/modal/modal.vue

@@ -22,6 +22,9 @@ 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 v-slot:content>
+      <template #content>
         <div class="dropdown-menu">
           <span v-if="user.is_local">
             <button
@@ -122,7 +122,7 @@
           </span>
         </div>
       </template>
-      <template v-slot:trigger>
+      <template #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 v-slot:header>
+        <template #header>
           {{ $t('user_card.admin_menu.delete_user') }}
         </template>
         <p>{{ $t('user_card.admin_menu.delete_user_confirmation') }}</p>
-        <template v-slot:footer>
+        <template #footer>
           <button
             class="btn button-default"
             @click="deleteUserDialog(false)"

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';

src/components/notification/notification.js

@@ -6,6 +6,7 @@ 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'
@@ -50,7 +51,8 @@ const Notification = {
     Timeago,
     Status,
     RichContent,
-    ConfirmModal
+    ConfirmModal,
+    StillImage
   },
   methods: {
     toggleUserExpanded () {

src/components/notification/notification.vue

@@ -116,12 +116,13 @@
                   scope="global"
                   keypath="notifications.reacted_with"
                 >
-                  <img
+                  <still-image
                     v-if="notification.emoji_url !== null"
                     class="notification-reaction-emoji"
                     :src="notification.emoji_url"
-                    :name="notification.emoji"
+                    :title="notification.emoji"
-                  >
+                    :alt="notification.emoji"
+                  />
                   <span
                     v-else
                     class="emoji-reaction-emoji"

src/components/notifications/notification_filters.vue

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

src/components/opacity_input/opacity_input.vue

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

src/components/pinch_zoom/pinch_zoom.vue

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

src/components/post_status_form/post_status_form.js

@@ -9,11 +9,12 @@ 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 {
@@ -62,6 +63,13 @@ 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',
@@ -129,6 +137,13 @@ const PostStatusForm = {
       this.$refs.textarea.focus()
     }
   },
+  setup() {
+    const {postLanguageOptions} = usePostLanguageOptions()
+
+    return {
+      postLanguageOptions,
+    }
+  },
   data () {
     const preset = this.$route.query.message
     let statusText = preset || ''
@@ -138,7 +153,8 @@ const PostStatusForm = {
       statusText = buildMentionsString({ user: this.repliedUser, attentions: this.attentions }, currentUser)
     }
 
-    const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
+    const { postContentType: contentType, postLanguage: defaultPostLanguage, sensitiveByDefault, sensitiveIfSubject, interfaceLanguage, alwaysShowSubjectInput } = this.$store.getters.mergedConfig
+    const postLanguage = defaultPostLanguage || interfaceToISOLanguage(interfaceLanguage)
 
     let statusParams = {
       spoilerText: this.subject || '',
@@ -149,7 +165,7 @@ const PostStatusForm = {
       poll: {},
       mediaDescriptions: {},
       visibility: this.suggestedVisibility(),
-      language: interfaceLanguage,
+      language: postLanguage,
       contentType
     }
 
@@ -164,7 +180,7 @@ const PostStatusForm = {
         poll: this.statusPoll || {},
         mediaDescriptions: this.statusMediaDescriptions || {},
         visibility: this.statusScope || this.suggestedVisibility(),
-        language: this.statusLanguage || interfaceLanguage,
+        language: this.statusLanguage || postLanguage,
         contentType: statusContentType
       }
     }
@@ -309,13 +325,11 @@ const PostStatusForm = {
     ...mapState({
       mobileLayout: state => state.interface.mobileLayout
     }),
-    isoLanguages () {
-      return iso6391.getAllCodes();
-    }
   },
   watch: {
     'newStatus': {
       deep: true,
+      flush: 'sync',
       handler () {
         this.statusChanged()
       }

src/components/post_status_form/post_status_form.vue

@@ -118,8 +118,8 @@
           />
         </div>
         <EmojiInput
-          ref="subject-emoji-input"
           v-if="subjectVisible"
+          ref="subject-emoji-input"
           v-model="newStatus.spoilerText"
           enable-emoji-picker
           hide-emoji-button
@@ -170,7 +170,7 @@
             cols="1"
             :disabled="posting && !optimisticPosting"
             class="form-post-body"
-            :class="{ 'scrollable-form': !!maxHeight }"
+            :class="{ 'scrollable-form': !!maxHeight, '-has-subject': subjectVisible }"
             @keydown.exact.enter="submitOnEnter && postStatus($event, newStatus)"
             @keydown.meta.enter="postStatus($event, newStatus)"
             @keydown.ctrl.enter="!submitOnEnter && postStatus($event, newStatus)"
@@ -190,6 +190,7 @@
         <div
           v-if="!disableScopeSelector"
           class="visibility-tray"
+          :class="{ 'visibility-tray-edit': isEdit }"
         >
           <scope-selector
             v-if="!disableVisibilitySelector"
@@ -200,47 +201,50 @@
           />
 
           <div
-            class="language-selector"
+            class="format-selector-container">
-            >
+            <div
-            <Select
+              class="format-selector"
-              id="post-language"
-              v-model="newStatus.language"
-              class="form-control"
-            >
-              <option
-                v-for="language in isoLanguages"
-                :key="language"
-                :value="language"
               >
-                {{ language }}
+              <Select
-              </option>
+                id="post-language"
-            </Select>
+                v-model="newStatus.language"
-          </div>
+                class="form-control"
-          <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
-              </option>
+                  v-for="language in postLanguageOptions"
-            </Select>
+                  :key="language.key"
-          </div>
+                  :value="language.value"
-          <div
+                >
-            v-if="postFormats.length === 1 && postFormats[0] !== 'text/plain'"
+                  {{ language.label }}
-            class="text-format"
+                </option>
-          >
+              </Select>
-            <span class="only-format">
+            </div>
-              {{ $t(`post_status.content_type["${postFormats[0]}"]`) }}
+            <div
-            </span>
+              v-if="postFormats.length > 1"
+              class="text-format format-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"
+            >
+              <span class="only-format">
+                {{ $t(`post_status.content_type["${postFormats[0]}"]`) }}
+              </span>
+            </div>
           </div>
         </div>
       </div>
@@ -460,6 +464,10 @@
     align-items: baseline;
   }
 
+  .visibility-tray-edit {
+    justify-content: right;
+  }
+
   .visibility-notice.edit-warning {
     > :first-child {
       margin-top: 0;
@@ -470,6 +478,12 @@
     }
   }
 
+  .format-selector-container {
+    .format-selector {
+      display: inline-block;
+    }
+  }
+
   .media-upload-icon, .poll-icon, .emoji-icon, .spoiler-icon {
     font-size: 1.85em;
     line-height: 1.1;
@@ -570,6 +584,11 @@
     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
@@ -582,6 +601,11 @@
     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;
     }

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"
-    @backdropClicked="closeModal"
+    @backdrop-clicked="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 v-slot:content="{close}">
+    <template #content="{close}">
       <EmojiPicker
         :enable-sticker-picker="false"
         @emoji="addReaction($event, close)"
       />
     </template>
-    <template v-slot:trigger>
+    <template #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';

src/components/selectable_list/selectable_list.vue

@@ -24,7 +24,7 @@
       :items="items"
       :get-key="getKey"
     >
-      <template v-slot:item="{item}">
+      <template #item="{item}">
         <div
           class="selectable-list-item-inner"
           :class="{ 'selectable-list-item-selected-inner': isSelected(item) }"
@@ -41,7 +41,7 @@
           />
         </div>
       </template>
-      <template v-slot:empty>
+      <template #empty>
         <slot name="empty" />
       </template>
     </List>

src/components/settings_modal/helpers/boolean_setting.vue

@@ -6,7 +6,7 @@
     <Checkbox
       :model-value="state"
       :disabled="disabled"
-      @update:modelValue="update"
+      @update:model-value="update"
     >
       <span
         v-if="!!$slots.default"

src/components/settings_modal/helpers/choice_setting.vue

@@ -8,7 +8,7 @@
     <Select
       :model-value="state"
       :disabled="disabled"
-      @update:modelValue="update"
+      @update:model-value="update"
     >
       <option
         v-for="option in options"

src/components/settings_modal/helpers/modified_indicator.vue

@@ -6,14 +6,14 @@
     <Popover
       trigger="hover"
     >
-      <template v-slot:trigger>
+      <template #trigger>
         &nbsp;
         <FAIcon
           icon="wrench"
           :aria-label="$t('settings.setting_changed')"
         />
       </template>
-      <template v-slot:content>
+      <template #content>
         <div class="modified-tooltip">
           {{ $t('settings.setting_changed') }}
         </div>

src/components/settings_modal/helpers/server_side_indicator.vue

@@ -6,14 +6,14 @@
     <Popover
       trigger="hover"
     >
-      <template v-slot:trigger>
+      <template #trigger>
         &nbsp;
         <FAIcon
           icon="server"
           :aria-label="$t('settings.setting_server_side')"
         />
       </template>
-      <template v-slot:content>
+      <template #content>
         <div class="serverside-tooltip">
           {{ $t('settings.setting_server_side') }}
         </div>

src/components/settings_modal/settings_modal.js

@@ -69,7 +69,7 @@ const SettingsModal = {
       this.$store.dispatch('closeSettingsModal')
     },
     logout () {
-      this.$router.replace('/main/public')
+      this.$router.replace(this.$store.state.instance.redirectRootNoLogin || '/main/all')
       this.$store.dispatch('closeSettingsModal')
       this.$store.dispatch('logout')
     },

src/components/settings_modal/settings_modal.vue

@@ -108,7 +108,7 @@
         <Checkbox
           :model-value="!!expertLevel"
           class="expertMode"
-          @update:modelValue="expertLevel = Number($event)"
+          @update:model-value="expertLevel = Number($event)"
         >
           {{ $t("settings.expert_mode") }}
         </Checkbox>

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

src/components/settings_modal/tabs/general_tab.js

@@ -4,6 +4,7 @@ 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'
@@ -17,6 +18,11 @@ library.add(
 )
 
 const GeneralTab = {
+  setup() {
+    const {postLanguageOptions} = usePostLanguageOptions()
+
+    return {postLanguageOptions}
+  },
   data () {
     return {
       subjectLineOptions: ['email', 'noop', 'masto'].map(mode => ({
@@ -118,6 +124,12 @@ const GeneralTab = {
         this.$store.dispatch('setOption', { name: 'translationLanguage', value: val })
       }
     },
+    postLanguage: {
+      get: function () { return this.$store.getters.mergedConfig.postLanguage },
+      set: function (val) {
+        this.$store.dispatch('setOption', { name: 'postLanguage', value: val })
+      }
+    },
     ...SharedComputedObject()
   },
   methods: {

src/components/settings_modal/tabs/general_tab.vue

@@ -44,7 +44,6 @@
           <template
             v-if="profilesExpanded"
           >
-
             <div
               v-for="profile in settingsProfiles"
               :key="profile.id"
@@ -73,15 +72,24 @@
                 </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 v-model="newProfileName" id="settings-profile-new-name">
+            <input
+              id="settings-profile-new-name"
+              v-model="newProfileName"
+            >
             <button
               class="btn button-default"
               @click="createSettingsProfile"
@@ -151,6 +159,16 @@
             {{ $t('settings.show_page_backgrounds') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting path="centerAlignBio">
+            {{ $t('settings.center_align_bio') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="compactUserInfo">
+            {{ $t('settings.compact_user_info') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting path="stopGifs">
             {{ $t('settings.stop_gifs') }}
@@ -585,6 +603,15 @@
             {{ $t('settings.post_status_content_type') }}
           </ChoiceSetting>
         </li>
+        <li>
+          <ChoiceSetting
+            id="postLanguage"
+            path="postLanguage"
+            :options="postLanguageOptions"
+          >
+            {{ $t('settings.post_language') }}
+          </ChoiceSetting>
+        </li>
         <li>
           <BooleanSetting
             path="alwaysShowNewPostButton"

src/components/settings_modal/tabs/mutes_and_blocks_tab.js

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

src/components/settings_modal/tabs/mutes_and_blocks_tab.vue

@@ -10,7 +10,7 @@
           :query="queryUserIds"
           :placeholder="$t('settings.search_user_to_block')"
         >
-          <template v-slot="row">
+          <template #default="row">
             <BlockCard
               :user-id="row.item"
             />
@@ -21,7 +21,7 @@
         :refresh="true"
         :get-key="i => i"
       >
-        <template v-slot:header="{selected}">
+        <template #header="{selected}">
           <div class="bulk-actions">
             <ProgressButton
               v-if="selected.length > 0"
@@ -29,7 +29,7 @@
               :click="() => blockUsers(selected)"
             >
               {{ $t('user_card.block') }}
-              <template v-slot:progress>
+              <template #progress>
                 {{ $t('user_card.block_progress') }}
               </template>
             </ProgressButton>
@@ -39,16 +39,16 @@
               :click="() => unblockUsers(selected)"
             >
               {{ $t('user_card.unblock') }}
-              <template v-slot:progress>
+              <template #progress>
                 {{ $t('user_card.unblock_progress') }}
               </template>
             </ProgressButton>
           </div>
         </template>
-        <template v-slot:item="{item}">
+        <template #item="{item}">
           <BlockCard :user-id="item" />
         </template>
-        <template v-slot:empty>
+        <template #empty>
           {{ $t('settings.no_blocks') }}
         </template>
       </BlockList>
@@ -63,7 +63,7 @@
               :query="queryUserIds"
               :placeholder="$t('settings.search_user_to_mute')"
             >
-              <template v-slot="row">
+              <template #default="row">
                 <MuteCard
                   :user-id="row.item"
                 />
@@ -74,7 +74,7 @@
             :refresh="true"
             :get-key="i => i"
           >
-            <template v-slot:header="{selected}">
+            <template #header="{selected}">
               <div class="bulk-actions">
                 <ProgressButton
                   v-if="selected.length > 0"
@@ -82,7 +82,7 @@
                   :click="() => muteUsers(selected)"
                 >
                   {{ $t('user_card.mute') }}
-                  <template v-slot:progress>
+                  <template #progress>
                     {{ $t('user_card.mute_progress') }}
                   </template>
                 </ProgressButton>
@@ -92,16 +92,16 @@
                   :click="() => unmuteUsers(selected)"
                 >
                   {{ $t('user_card.unmute') }}
-                  <template v-slot:progress>
+                  <template #progress>
                     {{ $t('user_card.unmute_progress') }}
                   </template>
                 </ProgressButton>
               </div>
             </template>
-            <template v-slot:item="{item}">
+            <template #item="{item}">
               <MuteCard :user-id="item" />
             </template>
-            <template v-slot:empty>
+            <template #empty>
               {{ $t('settings.no_mutes') }}
             </template>
           </MuteList>
@@ -114,7 +114,7 @@
               :query="queryKnownDomains"
               :placeholder="$t('settings.type_domains_to_mute')"
             >
-              <template v-slot="row">
+              <template #default="row">
                 <DomainMuteCard
                   :domain="row.item"
                 />
@@ -125,7 +125,7 @@
             :refresh="true"
             :get-key="i => i"
           >
-            <template v-slot:header="{selected}">
+            <template #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 v-slot:progress>
+                  <template #progress>
                     {{ $t('domain_mute_card.unmute_progress') }}
                   </template>
                 </ProgressButton>
               </div>
             </template>
-            <template v-slot:item="{item}">
+            <template #item="{item}">
               <DomainMuteCard :domain="item" />
             </template>
-            <template v-slot:empty>
+            <template #empty>
               {{ $t('settings.no_mutes') }}
             </template>
           </DomainMuteList>

src/components/settings_modal/tabs/profile_tab.js

@@ -130,7 +130,7 @@ 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,
@@ -138,7 +138,7 @@ const ProfileTab = {
         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 +187,7 @@ const ProfileTab = {
         })
         return
       }
-      // eslint-disable-next-line no-undef
+       
       const reader = new FileReader()
       reader.onload = ({ target }) => {
         const img = target.result

src/components/settings_modal/tabs/profile_tab.vue

@@ -110,11 +110,9 @@
           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')"

src/components/settings_modal/tabs/version_tab.js

@@ -1,22 +1,25 @@
 import { extractCommit } from 'src/services/version/version.service'
 
-const pleromaFeCommitUrl = 'https://akkoma.dev/AkkomaGang/pleroma-fe/commit/'
+function joinURL(base, subpath) {
-const pleromaBeCommitUrl = 'https://akkoma.dev/AkkomaGang/akkoma/commit/'
+  return URL.parse(subpath, base)?.href || "invalid base URL"
+}
 
 const VersionTab = {
   data () {
     const instance = this.$store.state.instance
     return {
+      backendCommitUrl: instance.backendCommitUrl,
       backendVersion: instance.backendVersion,
+      frontendCommitUrl: instance.frontendCommitUrl,
       frontendVersion: instance.frontendVersion
     }
   },
   computed: {
     frontendVersionLink () {
-      return pleromaFeCommitUrl + this.frontendVersion
+      return joinURL(this.frontendCommitUrl, this.frontendVersion)
     },
     backendVersionLink () {
-      return pleromaBeCommitUrl + extractCommit(this.backendVersion)
+      return joinURL(this.backendCommitUrl, extractCommit(this.backendVersion))
     }
   }
 }

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';

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';

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

src/components/status/status.scss

@@ -266,6 +266,16 @@
       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 {

src/components/status/status.vue

@@ -83,7 +83,7 @@
           :user="statusoid.user"
         />
         <div class="right-side faint">
-          <span
+          <div
             class="status-username repeater-name"
             :title="retweeter"
           >
@@ -100,14 +100,19 @@
               v-else
               :to="retweeterProfileLink"
             >{{ retweeter }}</router-link>
-          </span>
+          </div>
           {{ ' ' }}
-          <FAIcon
+
-            icon="retweet"
+          <div
-            class="repeat-icon"
+            class="repeat-tooltip"
-            :title="$t('tool_tip.repeat')"
+          >
-          />
+             <FAIcon
-          {{ $t('timeline.repeated') }}
+               icon="retweet"
+               class="repeat-icon"
+               :title="$t('tool_tip.repeat')"
+             />
+             {{ $t('timeline.repeated') }}
+          </div>
         </div>
       </div>
 
@@ -368,7 +373,7 @@
               :controlled-toggle-showing-long-subject="controlledToggleShowingLongSubject"
               @mediaplay="addMediaPlaying($event)"
               @mediapause="removeMediaPlaying($event)"
-              @parseReady="setHeadTailLinks"
+              @parse-ready="setHeadTailLinks"
             />
           </div>
 
@@ -476,8 +481,8 @@
             />
             <extra-buttons
               :status="status"
-              @onError="showError"
+              @on-error="showError"
-              @onSuccess="clearError"
+              @on-success="clearError"
             />
           </div>
         </div>

src/components/status_body/status_body.js

@@ -41,7 +41,8 @@ const StatusContent = {
       postLength: this.status.text.length,
       parseReadyDone: false,
       renderMisskeyMarkdown,
-      translateFrom: null
+      translateFrom: null,
+      translating: false
     }
   },
   computed: {
@@ -135,7 +136,10 @@ const StatusContent = {
     },
     translateStatus () {
       const translateTo = this.$store.getters.mergedConfig.translationLanguage || this.$store.state.instance.interfaceLanguage
-      this.$store.dispatch('translateStatus', { id: this.status.id, language: translateTo, from: this.translateFrom })
+      this.translating = true
+      this.$store.dispatch(
+        'translateStatus', { id: this.status.id, language: translateTo, from: this.translateFrom }
+      ).finally(() => { this.translating = false })
     }
   }
 }

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"
-            @parseReady="onParseReady"
+            @parse-ready="onParseReady"
           />
           <div
             v-if="status.translation"
@@ -70,7 +70,7 @@
               :mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
               :greentext="mergedConfig.greentext"
               :attentions="status.attentions"
-              @parseReady="onParseReady"
+              @parse-ready="onParseReady"
             />
             <div>
               <label class="label">{{ $t('status.override_translation_source_language') }}</label>
@@ -89,7 +89,11 @@
                 </option>
               </Select>
               {{ ' ' }}
-              <button @click="translateStatus" class="btn button-default">
+              <button
+                class="btn button-default"
+                :disabled="translating"
+                @click="translateStatus"
+              >
                 {{ $t('status.translate') }}
               </button>
             </div>
@@ -138,5 +142,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" />

src/components/status_content/status_content.vue

@@ -14,7 +14,7 @@
       :toggle-showing-tall="toggleShowingTall"
       :toggle-expanding-subject="toggleExpandingSubject"
       :toggle-showing-long-subject="toggleShowingLongSubject"
-      @parseReady="$emit('parseReady', $event)"
+      @parse-ready="$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;

src/components/status_history_modal/status_history_modal.vue

@@ -2,7 +2,7 @@
   <Modal
     v-if="modalActivated"
     class="status-history-modal-view"
-    @backdropClicked="closeModal"
+    @backdrop-clicked="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"
-            :isPreview="true"
+            :is-preview="true"
             class="conversation-status status-fadein panel-body"
-        />
+          />
         </div>
       </div>
     </div>

src/components/status_popover/status_popover.vue

@@ -5,10 +5,10 @@
     :bound-to="{ x: 'container' }"
     @show="enter"
   >
-    <template v-slot:trigger>
+    <template #trigger>
       <slot />
     </template>
-    <template v-slot:content>
+    <template #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';

src/components/still-image/still-image.vue

@@ -7,8 +7,9 @@
   >
     <div
       v-if="animated && imageTypeLabel"
-      class="image-type-label">
+      class="image-type-label"
-        {{ imageTypeLabel }}
+    >
+      {{ imageTypeLabel }}
     </div>
     <canvas
       v-if="animated"

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 {

src/components/thread_tree/thread_tree.vue

@@ -32,7 +32,7 @@
       :dive="dive ? () => dive(status.id) : undefined"
 
       @goto="setHighlight"
-      @toggleExpanded="toggleExpanded"
+      @toggle-expanded="toggleExpanded"
     />
     <div
       v-if="currentReplies.length && threadShowing"

src/components/timeline/timeline.scss

@@ -28,4 +28,7 @@
       }
     }
   }
+  .timeline {
+    min-height: 1em;
+  }
 }

src/components/timeline/timeline_quick_settings.vue

@@ -4,7 +4,7 @@
     class="TimelineQuickSettings"
     :bound-to="{ x: 'container' }"
   >
-    <template v-slot:content>
+    <template #content>
       <div class="dropdown-menu">
         <div v-if="loggedIn">
           <button
@@ -80,7 +80,7 @@
         </button>
       </div>
     </template>
-    <template v-slot:trigger>
+    <template #trigger>
       <button class="button-unstyled">
         <FAIcon icon="filter" />
       </button>

src/components/timeline_menu/timeline_menu.vue

@@ -9,12 +9,12 @@
     @show="openMenu"
     @close="() => isOpen = false"
   >
-    <template v-slot:content>
+    <template #content>
       <div class="timeline-menu-popover popover-default">
         <TimelineMenuContent />
       </div>
     </template>
-    <template v-slot:trigger>
+    <template #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';

src/components/timeline_menu/timeline_menu_content.vue

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

src/components/timeline_menu_tabs/timeline_menu_content.vue

@@ -99,7 +99,7 @@
   </ul>
 </template>
 
-<script src="./timeline_menu_content.js" ></script>
+<script src="./timeline_menu_content.js"></script>
 
 <style lang="scss">
 @import "../../_variables.scss";

src/components/timeline_menu_tabs/timeline_menu_tabs.vue

@@ -16,9 +16,9 @@
       />
     </router-link>
     <router-link
+      v-if="publicTimelineVisible"
       :to="{ name: 'public-timeline' }"
       class="nav-icon"
-      v-if="publicTimelineVisible"
     >
       <FAIcon
         fixed-width
@@ -40,9 +40,9 @@
       />
     </router-link>
     <router-link
+      v-if="federatedTimelineVisible"
       :to="{ name: 'public-external-timeline' }"
       class="nav-icon"
-      v-if="federatedTimelineVisible"
     >
       <FAIcon
         fixed-width
@@ -55,7 +55,7 @@
   </div>
 </template>
 
-<script src="./timeline_menu_tabs.js" ></script>
+<script src="./timeline_menu_tabs.js"></script>
 
 <style lang="scss">
 @import '../../_variables.scss';

src/components/user_card/user_card.js

@@ -66,7 +66,7 @@ export default {
       return this.user.id !== this.$store.state.users.currentUser.id
     },
     subscribeUrl () {
-      // eslint-disable-next-line no-undef
+       
       const serverUrl = new URL(this.user.statusnet_profile_url)
       return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
     },
@@ -117,6 +117,11 @@ export default {
     shouldConfirmMute () {
       return this.mergedConfig.modalOnMute
     },
+    compactUserInfo () {
+      return this.$store.getters.mergedConfig.compactUserInfo
+        && (this.$store.state.interface.layoutType !== 'mobile')
+        && this.switcher
+    },
     ...mapGetters(['mergedConfig'])
   },
   components: {

src/components/user_card/user_card.scss

@@ -21,6 +21,13 @@
     position: relative;
   }
 
+  .user-buttons {
+    grid-area: edit;
+    display: flex;
+    padding: .5em 0 .5em 0;
+    justify-self: end;
+  }
+
   .panel-body {
     word-wrap: break-word;
     border-bottom-right-radius: inherit;
@@ -53,7 +60,6 @@
   }
 
   &-bio {
-    text-align: center;
     display: block;
     line-height: 1.3;
     padding: 1em;
@@ -100,15 +106,14 @@
   padding: 0 26px;
 
   .container {
-    min-width: 0;
     padding: 16px 0 6px;
-    display: flex;
+    display: grid;
-    align-items: flex-start;
+    grid-template-areas:
-    max-height: 56px;
+      "pfp name edit"
-
+      "pfp summary summary"
-    > * {
+      "stats stats stats";
-      min-width: 0;
+    grid-template-columns: auto 1fr auto;
-    }
+    align-items: start;
 
     .Avatar {
       --_avatarShadowBox: var(--avatarShadow);
@@ -123,6 +128,7 @@
   }
 
   &-avatar-link {
+    grid-area: pfp;
     position: relative;
     cursor: pointer;
 
@@ -153,8 +159,8 @@
 
   .external-link-button, .edit-profile-button {
     cursor: pointer;
-    width: 2.5em;
+    width: 2.3em;
-    text-align: center;
+    text-align: right;
     margin: -0.5em 0;
     padding: 0.5em 0;
 
@@ -165,12 +171,16 @@
   }
 
   .user-summary {
-    display: block;
+    grid-area: summary;
+    display: grid;
+    grid-template-areas:
+      "name name name name name"
+      "hand role lock avg _";
+    grid-template-columns:
+       auto auto auto auto 1fr;
+    justify-items: start;
     margin-left: 0.6em;
-    text-align: left;
     text-overflow: ellipsis;
-    white-space: nowrap;
-    flex: 1 1 0;
     // This is so that text doesn't get overlapped by avatar's shadow if it has
     // big one
     z-index: 1;
@@ -178,56 +188,82 @@
 
     --emoji-size: 1.7em;
 
-    .top-line,
+    .user-locked {
-    .bottom-line {
-      display: flex;
-    }
-  }
-
-  .user-name {
-    text-overflow: ellipsis;
-    overflow: hidden;
-    flex: 1 1 auto;
-    margin-right: 1em;
-    font-size: 1.1em;
-  }
-
-  .bottom-line {
-    font-weight: light;
-    font-size: 1.1em;
-    align-items: baseline;
-
-    .lock-icon {
       margin-left: 0.5em;
+      grid-area: lock;
     }
 
     .user-screen-name {
       min-width: 1px;
-      flex: 0 1 auto;
+      max-width: 100%;
       text-overflow: ellipsis;
       overflow: hidden;
       color: $fallback--lightText;
       color: var(--lightText, $fallback--lightText);
+      grid-area: hand;
     }
 
     .dailyAvg {
       min-width: 1px;
-      flex: 0 0 auto;
       margin-left: 1em;
       font-size: 0.7em;
       color: $fallback--text;
       color: var(--text, $fallback--text);
+      grid-area: avg;
     }
 
-    .user-role {
+    .user-roles {
-      flex: none;
+      display: flex;
-      color: $fallback--text;
+      grid-area: role;
-      color: var(--alertNeutralText, $fallback--text);
+
-      background-color: $fallback--fg;
+      .user-role {
-      background-color: var(--alertNeutral, $fallback--fg);
+        color: $fallback--text;
+        color: var(--alertNeutralText, $fallback--text);
+        background-color: $fallback--fg;
+        background-color: var(--alertNeutral, $fallback--fg);
+      }
     }
   }
 
+  .user-counts {
+    grid-area: stats;
+    display: flex;
+    line-height:16px;
+    padding-top: 0.5em;
+    text-align: center;
+    justify-content: space-around;
+    color: $fallback--lightText;
+    color: var(--lightText, $fallback--lightText);
+    align-self: center;
+
+    .user-count {
+      padding: .5em 0 .5em 0;
+      margin: 0 .5em;
+
+      h5 {
+        font-size:1em;
+        font-weight: bolder;
+        margin: 0 0 0.25em;
+      }
+      a {
+        text-decoration: none;
+      }
+    }
+  }
+
+  .user-name {
+    text-align: start;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    margin-left: 0.6em;
+    font-size: 1.1em;
+    grid-area: name;
+    align-self: center;
+    white-space: nowrap;
+    max-width: 100%;
+    z-index: 1; // so shadow from user avatar doesn't overlap it
+  }
+
   .user-meta {
     margin-bottom: .15em;
     display: flex;
@@ -290,34 +326,21 @@
       margin: 0;
     }
   }
+
+  &.-compact {
+    .container {
+      grid-template-areas:
+        "pfp name stats edit"
+        "pfp summary stats edit";
+      grid-template-columns: auto auto 1fr auto;
+    }
+    .user-counts {
+      padding-top: 0;
+      justify-content: space-evenly;
+    }
+  }
 }
 
 .sidebar .edit-profile-button {
   display: none;
 }
-
-.user-counts {
-  display: flex;
-  line-height:16px;
-  padding: .5em 1.5em 0em 1.5em;
-  text-align: center;
-  justify-content: space-between;
-  color: $fallback--lightText;
-  color: var(--lightText, $fallback--lightText);
-  flex-wrap: wrap;
-}
-
-.user-count {
-  flex: 1 0 auto;
-  padding: .5em 0 .5em 0;
-  margin: 0 .5em;
-
-  h5 {
-    font-size:1em;
-    font-weight: bolder;
-    margin: 0 0 0.25em;
-  }
-  a {
-    text-decoration: none;
-  }
-}