Merge pull request 'hotfix: mfm mysteries' (#215 ) from develop into stable

Reviewed-on: AkkomaGang/pleroma-fe#215
Merge pull request 'hotfix: translation' (#207 ) from develop into stable
2022-11-15 16:01:07 +00:00 · 2022-11-12 19:08:20 +00:00 · 2022-11-12 15:33:57 +00:00 · 2022-10-08 11:13:01 +00:00 · 2022-09-10 14:39:13 +00:00 · 2022-08-12 15:26:51 +00:00
35 changed files with 2180 additions and 564 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,4 +9,3 @@ selenium-debug.log
 config/local.json
 config/local.*.json
 docs/site/
-.vscode/
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@ -1,13 +1,19 @@
 {
  "extends": [
-    "stylelint-config-recommended-vue/scss",
+    "stylelint-rscss/config",
    "stylelint-config-recommended",
    "stylelint-config-standard"
  ],
-  "customSyntax": "postcss-scss",
  "rules": {
    "declaration-no-important": true,
-    "selector-class-pattern": null,
-    "custom-property-pattern": null
+    "rscss/no-descendant-combinator": false,
+    "rscss/class-format": [
+      true,
+      {
+        "component": "pascal-case",
+        "variant": "^-[a-z]\\w+",
+        "element": "^[a-z]\\w+"
+      }
+    ]
  }
 }
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@ -7,7 +7,7 @@ pipeline:
    commands:
    - yarn
    - yarn lint
-    #- yarn stylelint
+    - yarn stylelint

  test:
    when:
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@ -2,6 +2,7 @@ var path = require('path')
 var config = require('../config')
 var utils = require('./utils')
 var projectRoot = path.resolve(__dirname, '../')
+const WorkboxPlugin = require('workbox-webpack-plugin');
 var { VueLoaderPlugin } = require('vue-loader')

 var env = process.env.NODE_ENV
@ -118,6 +119,11 @@ module.exports = {
    ]
  },
  plugins: [
+    new WorkboxPlugin.InjectManifest({
+      swSrc: path.join(__dirname, '..', 'src/sw.js'),
+      swDest: 'sw-pleroma.js',
+      maximumFileSizeToCacheInBytes: 15 * 1024 * 1024,
+    }),
    new VueLoaderPlugin()
  ]
 }
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@ -2,7 +2,6 @@ var path = require('path')
 var config = require('../config')
 var utils = require('./utils')
 var webpack = require('webpack')
-const WorkboxPlugin = require('workbox-webpack-plugin');
 var { merge } = require('webpack-merge')
 var baseWebpackConfig = require('./webpack.base.conf')
 var MiniCssExtractPlugin = require('mini-css-extract-plugin')
@ -33,11 +32,6 @@ var webpackConfig = merge(baseWebpackConfig, {
    chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
  },
  plugins: [
-    new WorkboxPlugin.InjectManifest({
-      swSrc: path.join(__dirname, '..', 'src/sw.js'),
-      swDest: 'sw-pleroma.js',
-      maximumFileSizeToCacheInBytes: 15 * 1024 * 1024,
-    }),
    // http://vuejs.github.io/vue-loader/workflow/production.html
    new webpack.DefinePlugin({
      'process.env': env,
--- a/index.html
+++ b/index.html
@ -11,7 +11,6 @@
    <link rel="stylesheet" href="/static/mfm.css">
    <!--server-generated-meta-->
    <link rel="icon" type="image/png" href="/favicon.png">
-    <link rel="manifest" href="/manifest.json">
  </head>
  <body class="hidden">
    <noscript>To use Akkoma, please enable JavaScript.</noscript>
--- a/package.json
+++ b/package.json
@ -11,7 +11,7 @@
    "unit:watch": "karma start test/unit/karma.conf.js --single-run=false",
    "e2e": "node test/e2e/runner.js",
    "test": "npm run unit && npm run e2e",
-    "stylelint": "stylelint src/**/*.scss",
+    "stylelint": "npx stylelint src/components/status/status.scss",
    "lint": "eslint --ext .js,.vue src test/unit/specs test/e2e/specs",
    "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
  },
@ -23,8 +23,8 @@
    "@fortawesome/free-solid-svg-icons": "^6.2.0",
    "@fortawesome/vue-fontawesome": "3.0.1",
    "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
-    "@vuelidate/core": "^2.0.0",
-    "@vuelidate/validators": "^2.0.0",
+    "@vuelidate/core": "2.0.0-alpha.42",
+    "@vuelidate/validators": "2.0.0-alpha.30",
    "body-scroll-lock": "2.7.1",
    "chromatism": "3.0.0",
    "click-outside-vue3": "4.0.1",
@ -33,6 +33,8 @@
    "escape-html": "1.0.3",
    "js-cookie": "^3.0.1",
    "localforage": "1.10.0",
+    "marked": "^4.2.2",
+    "marked-mfm": "^0.5.0",
    "parse-link-header": "^2.0.0",
    "phoenix": "1.6.2",
    "punycode.js": "2.1.0",
@ -101,9 +103,7 @@
    "nightwatch": "0.9.21",
    "opn": "4.0.2",
    "ora": "0.4.1",
-    "postcss-html": "^1.5.0",
    "postcss-loader": "3.0.0",
-    "postcss-sass": "^0.5.0",
    "raw-loader": "0.5.1",
    "sass": "^1.56.0",
    "sass-loader": "^13.2.0",
@ -112,11 +112,9 @@
    "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",
+    "stylelint": "13.6.1",
+    "stylelint-config-standard": "20.0.0",
+    "stylelint-rscss": "0.4.0",
    "url-loader": "^4.1.1",
    "vue-loader": "^17.0.0",
    "vue-style-loader": "^4.1.2",
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -150,7 +150,6 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
  copyInstanceOption('showPanelNavShortcuts')
  copyInstanceOption('stopGifs')
  copyInstanceOption('logo')
-  copyInstanceOption('conversationDisplay')

  store.dispatch('setInstanceOption', {
    name: 'logoMask',
--- a/src/boot/routes.js
+++ b/src/boot/routes.js
@ -22,8 +22,6 @@ import Lists from 'components/lists/lists.vue'
 import ListTimeline from 'components/list_timeline/list_timeline.vue'
 import ListEdit from 'components/list_edit/list_edit.vue'
 import AnnouncementsPage from 'components/announcements_page/announcements_page.vue'
-import RegistrationRequestSent from 'components/registration_request_sent/registration_request_sent.vue'
-import AwaitingEmailConfirmation from 'components/awaiting_email_confirmation/awaiting_email_confirmation.vue'

 export default (store) => {
  const validateAuthenticatedRoute = (to, from, next) => {
@ -64,8 +62,6 @@ export default (store) => {
    { name: 'interactions', path: '/users/:username/interactions', component: Interactions, beforeEnter: validateAuthenticatedRoute },
    { name: 'dms', path: '/users/:username/dms', component: DMs, beforeEnter: validateAuthenticatedRoute },
    { name: 'registration', path: '/registration', component: Registration },
-    { name: 'registration-request-sent', path: '/registration-request-sent', component: RegistrationRequestSent },
-    { name: 'awaiting-email-confirmation', path: '/awaiting-email-confirmation', component: AwaitingEmailConfirmation },
    { name: 'password-reset', path: '/password-reset', component: PasswordReset, props: true },
    { name: 'registration-token', path: '/registration/:token', component: Registration },
    { name: 'friend-requests', path: '/friend-requests', component: FollowRequests, beforeEnter: validateAuthenticatedRoute },
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@ -26,9 +26,6 @@ const AccountActions = {
    ConfirmModal
  },
  methods: {
-    refetchRelationship () {
-      return this.$store.dispatch('fetchUserRelationship', this.user.id)
-    },
    showConfirmBlock () {
      this.showingConfirmBlock = true
    },
@ -60,14 +57,6 @@ const AccountActions = {
    },
    reportUser () {
      this.$store.dispatch('openUserReportingModal', { userId: this.user.id })
-    },
-    muteDomain () {
-      this.$store.dispatch('muteDomain', this.user.screen_name.split('@')[1])
-        .then(() => this.refetchRelationship())
-    },
-    unmuteDomain () {
-      this.$store.dispatch('unmuteDomain', this.user.screen_name.split('@')[1])
-        .then(() => this.refetchRelationship())
    }
  },
  computed: {
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@ -55,20 +55,6 @@
          >
            {{ $t('user_card.report') }}
          </button>
-          <button
-            v-if="relationship.domain_blocking"
-            class="btn button-default btn-block dropdown-item"
-            @click="unmuteDomain"
-          >
-            {{ $t('user_card.domain_muted') }}
-          </button>
-          <button
-            v-else-if="!user.is_local"
-            class="btn button-default btn-block dropdown-item"
-            @click="muteDomain"
-          >
-            {{ $t('user_card.mute_domain') }}
-          </button>
        </div>
      </template>
      <template v-slot:trigger>
--- a/src/components/awaiting_email_confirmation/awaiting_email_confirmation.js
+++ b/src/components/awaiting_email_confirmation/awaiting_email_confirmation.js
@ -1,4 +0,0 @@
-export default {
-  computed: {
-  }
-}
--- a/src/components/awaiting_email_confirmation/awaiting_email_confirmation.vue
+++ b/src/components/awaiting_email_confirmation/awaiting_email_confirmation.vue
@ -1,12 +0,0 @@
-<template>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4>{{ $t('registration.awaiting_email_confirmation_title') }}</h4>
-    </div>
-    <div class="panel-body">
-      <p>{{ $t('registration.awaiting_email_confirmation') }}</p>
-    </div>
-  </div>
-</template>
-
-<script src="./awaiting_email_confirmation.js"></script>
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@ -62,10 +62,6 @@ const EmojiPicker = {
      this.scrolledGroup(target)
      this.triggerLoadMore(target)
    },
-    onWheel (e) {
-      e.preventDefault()
-      this.$refs['emoji-tabs'].scrollBy(e.deltaY, 0)
-    },
    highlight (key) {
      this.setShowStickers(false)
      this.activeGroup = key
@ -142,7 +138,7 @@ const EmojiPicker = {
      if (this.keyword === '') return list
      const regex = new RegExp(escapeRegExp(trim(this.keyword)), 'i')
      return list.filter(emoji => {
-        return (regex.test(emoji.displayText) || (!emoji.imageUrl && emoji.replacement === this.keyword))
+        return regex.test(emoji.displayText)
      })
    }
  },
--- a/src/components/emoji_picker/emoji_picker.vue
+++ b/src/components/emoji_picker/emoji_picker.vue
@ -1,11 +1,7 @@
 <template>
  <div class="emoji-picker panel panel-default panel-body">
    <div class="heading">
-      <span
-        class="emoji-tabs"
-        @wheel="onWheel"
-        ref="emoji-tabs"
-      >
+      <span class="emoji-tabs">
        <span
          v-for="group in emojis"
          :key="group.id"
--- a/src/components/registration/registration.js
+++ b/src/components/registration/registration.js
@ -79,16 +79,8 @@ const registration = {

      if (!this.v$.$invalid) {
        try {
-          const data = await this.signUp(this.user)
-          if (data.me) {
-            this.$router.push({ name: 'friends' })
-          } else if (data.identifier === 'awaiting_approval') {
-            this.$router.push({ name: 'registration-request-sent' })
-          } else if (data.identifier === 'missing_confirmed_email') {
-            this.$router.push({ name: 'awaiting-email-confirmation' })
-          } else {
-            console.warn('Unknown response from sign up', data)
-          }
+          await this.signUp(this.user)
+          this.$router.push({ name: 'friends' })
        } catch (error) {
          console.warn('Registration failed: ', error)
          this.setCaptcha()
--- a/src/components/registration/registration.vue
+++ b/src/components/registration/registration.vue
@ -177,7 +177,6 @@
            <div
              v-if="accountApprovalRequired"
              class="form-group"
-              :class="{ 'form-group--error': v$.user.reason.$error }"
            >
              <label
                class="form--label"
--- a/src/components/registration_request_sent/registration_request_sent.js
+++ b/src/components/registration_request_sent/registration_request_sent.js
@ -1,4 +0,0 @@
-export default {
-  computed: {
-  }
-}
--- a/src/components/registration_request_sent/registration_request_sent.vue
+++ b/src/components/registration_request_sent/registration_request_sent.vue
@ -1,12 +0,0 @@
-<template>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4>{{ $t('registration.request_sent_title') }}</h4>
-    </div>
-    <div class="panel-body">
-      <p>{{ $t('registration.request_sent') }}</p>
-    </div>
-  </div>
-</template>
-
-<script src="./registration_request_sent.js"></script>
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@ -2,6 +2,8 @@ import { unescape, flattenDeep } from 'lodash'
 import { getTagName, processTextForEmoji, getAttrs } from 'src/services/html_converter/utility.service.js'
 import { convertHtmlToTree } from 'src/services/html_converter/html_tree_converter.service.js'
 import { convertHtmlToLines } from 'src/services/html_converter/html_line_converter.service.js'
+import { marked } from 'marked'
+import markedMfm from 'marked-mfm'
 import StillImage from 'src/components/still-image/still-image.vue'
 import MentionsLine, { MENTIONS_LIMIT } from 'src/components/mentions_line/mentions_line.vue'
 import HashtagLink from 'src/components/hashtag_link/hashtag_link.vue'
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@ -43,9 +43,7 @@ const ProfileTab = {
      bannerPreview: null,
      background: null,
      backgroundPreview: null,
-      emailLanguage: this.$store.state.users.currentUser.language || '',
-      newPostTTLDays: this.$store.state.users.currentUser.status_ttl_days,
-      expirePosts: this.$store.state.users.currentUser.status_ttl_days !== null,
+      emailLanguage: this.$store.state.users.currentUser.language || ''
    }
  },
  components: {
@ -125,8 +123,7 @@ const ProfileTab = {
        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
+        show_role: this.showRole
        /* eslint-enable camelcase */
      }

--- a/src/components/settings_modal/tabs/profile_tab.scss
+++ b/src/components/settings_modal/tabs/profile_tab.scss
@ -4,10 +4,6 @@
    margin: 0;
  }

-  .expire-posts-days {
-    margin-left: 1em;
-  }
-
  .visibility-tray {
    padding-top: 5px;
  }
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@ -89,20 +89,6 @@
          {{ $t('settings.bot') }}
        </Checkbox>
      </p>
-      <p>
-        <Checkbox v-model="expirePosts">
-          {{ $t('settings.expire_posts_enabled') }}
-        </Checkbox>
-        <input
-          v-model="newPostTTLDays"
-          :disabled="!expirePosts"
-          type="number"
-          min="1"
-          max="730"
-          class="expire-posts-days"
-          :placeholder="$t('settings.expire_posts_input_placeholder')"
-        />
-      </p>
      <p>
        <interface-language-switcher
          :prompt-text="$t('settings.email_language')"
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@ -1,4 +1,4 @@
-@import "../../_variables.scss";
+@import '../../_variables.scss';

 .Status {
  min-width: 0;
@ -130,15 +130,6 @@
  .heading-left {
    display: flex;
    min-width: 0;
-    flex-wrap: wrap;
-
-    img {
-      aspect-ratio: 1 / 1;
-    }
-
-    .nowrap {
-      white-space: nowrap;
-    }
  }

  .heading-right {
@ -148,7 +139,6 @@
    .button-unstyled {
      padding: 5px;
      margin: -5px;
-      height: min-content;

      &:hover svg {
        color: $fallback--lightText;
@ -195,7 +185,7 @@

  .reply-to-popover {
    .reply-to:hover::before {
-      content: "";
+      content: '';
      display: block;
      position: absolute;
      bottom: 0;
@ -205,12 +195,13 @@
    }

    .faint-link:hover {
+      // override default
      text-decoration: none;
    }

    &.-strikethrough {
      .reply-to::after {
-        content: "";
+        content: '';
        display: block;
        position: absolute;
        top: 50%;
@ -302,12 +293,10 @@
    position: relative;
    width: 100%;
    display: flex;
-    flex-wrap: wrap;
-    justify-content: left;
    margin-top: var(--status-margin, $status-margin);

    > * {
-      min-width: fit-content;
+      max-width: 4em;
      flex: 1;
    }
  }
@ -351,7 +340,7 @@
      margin-left: 0.2em;

      &::before {
-        content: " ";
+        content: ' ';
      }
    }

@ -398,7 +387,7 @@
    align-items: center;

    &::before {
-      content: "";
+      content: '';
      position: absolute;
      height: 100%;
      width: 1px;
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@ -166,21 +166,19 @@
                >
                  {{ status.user.name }}
                </h4>
-                <span class="nowrap">
-                  <router-link
-                    class="account-name"
-                    :title="status.user.screen_name_ui"
-                    :to="userProfileLink"
-                  >
-                    @{{ status.user.screen_name_ui }}
-                  </router-link>
-                  <img
-                    v-if="!!(status.user && status.user.favicon)"
-                    class="status-favicon"
-                    :src="status.user.favicon"
-                    :title="faviconAlt(status)"
-                  >
-                </span>
+                <router-link
+                  class="account-name"
+                  :title="status.user.screen_name_ui"
+                  :to="userProfileLink"
+                >
+                  {{ status.user.screen_name_ui }}
+                </router-link>
+                <img
+                  v-if="!!(status.user && status.user.favicon)"
+                  class="status-favicon"
+                  :src="status.user.favicon"
+                  :title="faviconAlt(status)"
+                >
              </div>

              <span class="heading-right">
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@ -68,7 +68,6 @@
 .StatusContent {
  flex: 1;
  min-width: 0;
-  overflow: hidden;

  img, video {
    &.emoji {
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@ -154,6 +154,14 @@ export default {
    unmuteUser () {
      this.$store.dispatch('unmuteUser', this.user.id)
    },
+    muteDomain () {
+      this.$store.dispatch('muteDomain', this.user.screen_name.split('@')[1])
+        .then(() => this.refetchRelationship())
+    },
+    unmuteDomain () {
+      this.$store.dispatch('unmuteDomain', this.user.screen_name.split('@')[1])
+        .then(() => this.refetchRelationship())
+    },
    subscribeUser () {
      return this.$store.dispatch('subscribeUser', this.user.id)
    },
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@ -67,17 +67,6 @@
                  icon="external-link-alt"
                />
              </a>
-              <a
-                v-if="isOtherUser"
-                :href="user.statusnet_profile_url + '.rss'"
-                target="_blank"
-                class="button-unstyled external-link-button"
-              >
-                <FAIcon
-                  class="icon"
-                  icon="rss"
-                />
-              </a>
              <AccountActions
                v-if="isOtherUser && loggedIn"
                :user="user"
@ -236,6 +225,22 @@
              {{ $t('user_card.mute') }}
            </button>
          </div>
+          <div>
+            <button
+              v-if="relationship.domain_blocking"
+              class="btn button-default btn-block toggled"
+              @click="unmuteDomain"
+            >
+              {{ $t('user_card.domain_muted') }}
+            </button>
+            <button
+              v-else
+              class="btn button-default btn-block"
+              @click="muteDomain"
+            >
+              {{ $t('user_card.mute_domain') }}
+            </button>
+          </div>
          <div>
            <button
              class="btn button-default btn-block"
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@ -33,8 +33,6 @@ const FriendList = withLoadMore({
  additionalPropNames: ['userId']
 })(List)

-const isUserPage = ({ name }) => name === 'user-profile' || name === 'external-user-profile'
-
 const UserProfile = {
  data () {
    return {
@ -184,12 +182,12 @@ const UserProfile = {
  },
  watch: {
    '$route.params.id': function (newVal) {
-      if (isUserPage(this.$route) && newVal) {
+      if (newVal) {
        this.switchUser(newVal)
      }
    },
    '$route.params.name': function (newVal) {
-      if (isUserPage(this.$route) && newVal) {
+      if (newVal) {
        this.switchUser(newVal)
      }
    },
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -409,8 +409,6 @@
        }
    },
    "registration": {
-        "awaiting_email_confirmation_title": "Awaiting email confirmation",
-        "awaiting_email_confirmation": "Your account has been registered and an email has been sent to your address. Please check the email to complete registration.",
        "bio": "Bio",
        "bio_placeholder": "e.g.\nHi! Welcome to my bio.\nI love watching anime and playing games. I hope we can be friends!",
        "captcha": "CAPTCHA",
@ -424,8 +422,6 @@
        "reason_placeholder": "This instance approves registrations manually.\nLet the administration know why you want to register.",
        "register": "Register",
        "registration": "Registration",
-        "request_sent": "Your registration request has been sent for approval. You will receive an email when your account is approved.",
-        "request_sent_title": "Registration request sent",
        "token": "Invite token",
        "username_placeholder": "e.g. akko",
        "validations": {
@ -536,8 +532,6 @@
        "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
        "expert_mode": "Show advanced",
        "export_theme": "Save preset",
-        "expire_posts_enabled": "Delete posts after a set amount of days",
-        "expire_posts_input_placeholder": "Number of days",
        "file_export_import": {
            "backup_restore": "Settings backup",
            "backup_settings": "Backup settings to file",
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@ -254,10 +254,6 @@
        "hint": "Inicia sesión para unirte a la discusión",
        "login": "Identificarse",
        "logout": "Cerrar sesión",
-        "logout_confirm": "¿Estás seguro que quieres cerrar la sesión?",
-        "logout_confirm_accept_button": "Cerrar sesión",
-        "logout_confirm_cancel_button": "Cancelar",
-        "logout_confirm_title": "Cerrar sesión",
        "password": "Contraseña",
        "placeholder": "miusuario",
        "recovery_code": "Código de recuperación",
@ -281,15 +277,14 @@
            "delete_note_confirm": "¿Estás seguro que quieres eliminar esta nota?",
            "delete_note_title": "Confirma la eliminación",
            "no_content": "Sin descripción dada",
-            "no_reports": "No hay informes que mostrar",
            "note_placeholder": "Dejar una nota...",
-            "notes": "{ count } nota | { count } notas",
+            "notes": "notas",
            "reopen": "Reabrir",
            "report": "Reportar",
            "reports": "Reportes",
            "resolve": "Resolver",
            "show_closed": "Mostrar cerrados",
-            "statuses": "{ count } estado | { count } estados",
+            "statuses": "estados",
            "tag_policy_notice": "Habilitar TagPolicy MRF para establecer restricciones de publicación",
            "tags": "Establecer restricciones de publicación"
        },
@ -450,7 +445,6 @@
    },
    "settings": {
        "accent": "Acento",
-        "account_alias": "Alias de cuenta",
        "account_alias_table_head": "Alias",
        "account_backup": "Copia de seguridad de la cuenta",
        "account_backup_description": "Esto le permite descargar un archivo con la información de su cuenta y sus publicaciones, pero aún no se pueden importar a una cuenta de Pleroma.",
@ -498,16 +492,7 @@
        "columns": "Columnas",
        "composing": "Redactando",
        "confirm_dialogs": "Requiere confirmación de:",
-        "confirm_dialogs_approve_follow": "Aceptar una solicitud de seguimiento",
-        "confirm_dialogs_block": "Bloqueando a alguien",
-        "confirm_dialogs_delete": "Eliminar una publicación",
-        "confirm_dialogs_deny_follow": "Rechazar una solicitud de seguimiento",
-        "confirm_dialogs_mute": "Silenciar a alguien",
-        "confirm_dialogs_repeat": "Repitiendo una publicación",
-        "confirm_dialogs_unfollow": "Dejar de seguir a alguien",
        "confirm_new_password": "Confirmar la nueva contraseña",
-        "confirmation_dialogs": "Opciones de confirmación",
-        "conversation_display": "Estilo de visualización de la conversación",
        "conversation_display_linear": "Lineal",
        "conversation_display_tree": "Ramificado",
        "conversation_other_replies_button": "Mostrar el botón \"otras respuestas\"",
@ -558,7 +543,6 @@
        "hide_all_muted_posts": "Ocultar las publicaciones silenciadas",
        "hide_attachments_in_convo": "Ocultar adjuntos en las conversaciones",
        "hide_attachments_in_tl": "Ocultar adjuntos en la línea temporal",
-        "hide_bot_indication": "Ocultar indicación de bot en publicaciones",
        "hide_favorites_description": "No mostrar la lista de mis favoritos (las personas aún serán notificadas)",
        "hide_filtered_statuses": "Ocultar estados filtrados",
        "hide_followers_count_description": "No mostrar el número de cuentas que me siguen",
@ -603,10 +587,8 @@
        "mention_link_display_full": "siempre como nombre completo (p. ej. {'@'}foo{'@'}example.org)",
        "mention_link_display_full_for_remote": "como nombre completo solo para usuarios remotos (p. ej. {'@'}foo{'@'}example.org)",
        "mention_link_display_short": "siempre como nombres cortos (p. ej. {'@'}foo)",
-        "mention_link_fade_domain": "Renombrar dominios (p. ej. {'@'}ejemplo.org en {'@'}algo{'@'}ejemplo.org)",
        "mention_link_show_avatar": "Mostrar el avatar del usuario detrás del enlace",
        "mention_link_show_tooltip": "Mostrar el nombre completo de los usuarios remotos como información emergente",
-        "mention_links": "Mencionar enlaces",
        "mfa": {
            "authentication_methods": "Métodos de autentificación",
            "confirm_and_enable": "Confirmar y habilitar OTP",
@ -655,7 +637,6 @@
        "notification_mutes": "Para dejar de recibir notificaciones de un usuario específico, siléncialo.",
        "notification_setting_block_from_strangers": "Bloquea las notificaciones de los usuarios que no sigues",
        "notification_setting_filters": "Filtros",
-        "notification_setting_hide_if_cw": "Ocultar las notificaciones \"push\", si la publicación está marcada como \"contenido sensible\"",
        "notification_setting_hide_notification_contents": "Ocultar el remitente y el contenido de las notificaciones push",
        "notification_setting_privacy": "Privacidad",
        "notification_visibility": "Tipos de notificaciones a mostrar",
--- a/src/modules/users.js
+++ b/src/modules/users.js
@ -489,17 +489,9 @@ const users = {
        let data = await rootState.api.backendInteractor.register(
          { params: { ...userInfo } }
        )
-        if (data.identifier === 'awaiting_approval' || data.identifier === 'missing_confirmed_email') {
-          store.commit('signUpSuccess')
-          return data
-        } else if (data.me !== undefined) {
-          store.commit('signUpSuccess')
-          store.commit('setToken', data.access_token)
-          store.dispatch('loginUser', data.access_token)
-          return data
-        } else {
-          store.commit('signUpFailure', data)
-        }
+        store.commit('signUpSuccess')
+        store.commit('setToken', data.access_token)
+        store.dispatch('loginUser', data.access_token)
      } catch (e) {
        let errors = e.message
        store.commit('signUpFailure', errors)
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@ -650,7 +650,7 @@ const getReports = ({ state, limit, page, pageSize, credentials }) => {
  url = url + (args ? '?' + args : '')
  return fetch(url, { headers: authHeaders(credentials) })
    .then((data) => data.json())
-    .then((data) => data?.reports?.map(parseReport) ?? [])
+    .then((data) => data.reports.map(parseReport))
 }

 const updateReportStates = ({ credentials, reports }) => {
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@ -90,7 +90,6 @@ export const parseUser = (data) => {
    output.bot = data.bot
    if (data.akkoma) {
      output.instance = data.akkoma.instance
-      output.status_ttl_days = data.akkoma.status_ttl_days
    }

    if (data.pleroma) {
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
floatingghost	2c9b73646c	Merge pull request 'hotfix: mfm mysteries' (#215 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#215	2022-11-15 16:01:07 +00:00
floatingghost	80a519d7e4	Merge pull request 'hotfix: translation' (#207 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#207	2022-11-12 19:08:20 +00:00
floatingghost	975f04bf5a	Merge pull request '2022.11 stable release' (#202 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#202	2022-11-12 15:33:57 +00:00
floatingghost	c8c8d40827	Merge pull request '2022.10 stable' (#177 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#177	2022-10-08 11:13:01 +00:00
floatingghost	d7499a1f91	Merge pull request '2022.09 stable' (#160 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#160	2022-09-10 14:39:13 +00:00
floatingghost	5972d89117	Merge pull request 'stable release' (#130 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#130	2022-08-12 15:26:51 +00:00
floatingghost	d03872d598	Merge pull request 'port MFM link into stable docs' (#38 ) from develop into stable Reviewed-on: AkkomaGang/pleroma-fe#38	2022-07-15 13:02:06 +00:00