From 251787ed078c8a306d2e4666d805688b9cf44184 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Thu, 30 Mar 2023 09:08:23 +0000
Subject: [PATCH 01/42] Update dependency @vuelidate/core to v2.0.2

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 721400ffa..201f6e90e 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
     "@kazvmoe-infra/unicode-emoji-json": "0.4.0",
     "@ruffle-rs/ruffle": "0.1.0-nightly.2022.7.12",
-    "@vuelidate/core": "2.0.0",
+    "@vuelidate/core": "2.0.2",
     "@vuelidate/validators": "2.0.0",
     "body-scroll-lock": "3.1.5",
     "chromatism": "3.0.0",
diff --git a/yarn.lock b/yarn.lock
index 34e9664db..2c3d8b172 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2275,10 +2275,10 @@
   dependencies:
     js-beautify "1.14.6"
 
-"@vuelidate/core@2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@vuelidate/core/-/core-2.0.0.tgz#dfe73ba3f997646e07bd4da4f327fe53c29782cb"
-  integrity sha512-xIFgdQlScO0aaSZ0wTGPJh8YcTMNAj5veI8yPgiAyxOT+GV7vNQFiU1vpYWCL4cklkkhYvRRSC2OEX7YOZNmPQ==
+"@vuelidate/core@2.0.2":
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/@vuelidate/core/-/core-2.0.2.tgz#e874afc830ccc5295e83a0c0a0f0621e084348c9"
+  integrity sha512-aG1OZWv6xVws3ljyKy/pyxq1rdZZ2ryj+FEREcC9d4GP4qOvNHHZUl/NQxa0Bck3Ooc0RfXU8vwCA9piRoWy6w==
   dependencies:
     vue-demi "^0.13.11"
 

From 0bcfde4c2e916d220199b4edb8febee34948df7b Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Fri, 7 Apr 2023 09:08:13 +0000
Subject: [PATCH 02/42] Update dependency mini-css-extract-plugin to v2.7.5

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index c8f48c611..44b229a36 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "karma-spec-reporter": "0.0.36",
     "karma-webpack": "5.0.0",
     "lodash": "4.17.21",
-    "mini-css-extract-plugin": "2.7.2",
+    "mini-css-extract-plugin": "2.7.5",
     "mocha": "10.2.0",
     "nightwatch": "2.6.19",
     "opn": "5.5.0",
diff --git a/yarn.lock b/yarn.lock
index afc76ee8f..fa38a021a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6457,10 +6457,10 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-css-extract-plugin@2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz#e049d3ea7d3e4e773aad585c6cb329ce0c7b72d7"
-  integrity sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==
+mini-css-extract-plugin@2.7.5:
+  version "2.7.5"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.5.tgz#afbb344977659ec0f1f6e050c7aea456b121cfc5"
+  integrity sha512-9HaR++0mlgom81s95vvNjxkg52n2b5s//3ZTI1EtzFb98awsLSivs2LMsVqnQ3ay0PVhqWcGNyDaTE961FOcjQ==
   dependencies:
     schema-utils "^4.0.0"
 

From 034ed86312b5ddcc8de822ee938fb7c6f96cca05 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Fri, 7 Apr 2023 09:08:33 +0000
Subject: [PATCH 03/42] Update dependency sass-loader to v13.2.2

---
 package.json |  2 +-
 yarn.lock    | 17 +++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index c8f48c611..49af677cc 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,7 @@
     "postcss-loader": "7.0.2",
     "postcss-scss": "^4.0.6",
     "sass": "1.60.0",
-    "sass-loader": "13.2.0",
+    "sass-loader": "13.2.2",
     "selenium-server": "2.53.1",
     "semver": "7.3.8",
     "serviceworker-webpack5-plugin": "2.0.0",
diff --git a/yarn.lock b/yarn.lock
index afc76ee8f..5f9185c2c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5902,11 +5902,16 @@ kind-of@^6.0.3:
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klona@^2.0.4, klona@^2.0.5:
+klona@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
   integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
 
+klona@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.6.tgz#85bffbf819c03b2f53270412420a4555ef882e22"
+  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
+
 known-css-properties@^0.26.0:
   version "0.26.0"
   resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.26.0.tgz#008295115abddc045a9f4ed7e2a84dc8b3a77649"
@@ -7929,12 +7934,12 @@ safe-regex-test@^1.0.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
 
-sass-loader@13.2.0:
-  version "13.2.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.2.0.tgz#80195050f58c9aac63b792fa52acb6f5e0f6bdc3"
-  integrity sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==
+sass-loader@13.2.2:
+  version "13.2.2"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-13.2.2.tgz#f97e803993b24012c10d7ba9676548bf7a6b18b9"
+  integrity sha512-nrIdVAAte3B9icfBiGWvmMhT/D+eCDwnk+yA7VE/76dp/WkHX+i44Q/pfo71NYbwj0Ap+PGsn0ekOuU1WFJ2AA==
   dependencies:
-    klona "^2.0.4"
+    klona "^2.0.6"
     neo-async "^2.6.2"
 
 sass@1.60.0:

From 01758a28ea40e32f0bbbedfd7d83f1bf5616df16 Mon Sep 17 00:00:00 2001
From: XYenon <i@xyenon.bid>
Date: Thu, 13 Apr 2023 00:03:36 +0800
Subject: [PATCH 04/42] Fix i18n

---
 src/main.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main.js b/src/main.js
index d3e60a0fa..9ca7eb91d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -44,7 +44,7 @@ const i18n = createI18n({
   messages: messages.default
 })
 
-messages.setLanguage(i18n, currentLocale)
+messages.setLanguage(i18n.global, currentLocale)
 
 const persistedStateOptions = {
   paths: [

From e1d5add046b05c4895d3b01c2f618bf6dc681398 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Thu, 20 Apr 2023 09:07:46 +0000
Subject: [PATCH 05/42] Update dependency postcss to v8.4.23

---
 package.json |  2 +-
 yarn.lock    | 24 +++++++++++++++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index db45f210d..10d36cdc5 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "nightwatch": "2.6.19",
     "opn": "5.5.0",
     "ora": "0.4.1",
-    "postcss": "8.4.20",
+    "postcss": "8.4.23",
     "postcss-html": "^1.5.0",
     "postcss-loader": "7.0.2",
     "postcss-scss": "^4.0.6",
diff --git a/yarn.lock b/yarn.lock
index 4b407fd58..d6151a0cf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6652,6 +6652,11 @@ nanoid@^3.3.4:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
   integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
 
+nanoid@^3.3.6:
+  version "3.3.6"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.6.tgz#443380c856d6e9f9824267d960b4236ad583ea4c"
+  integrity sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -7446,12 +7451,12 @@ postcss-value-parser@^4.2.0:
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.20, postcss@^8.4.19:
-  version "8.4.20"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56"
-  integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==
+postcss@8.4.23:
+  version "8.4.23"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab"
+  integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==
   dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
@@ -7482,6 +7487,15 @@ postcss@^8.4.17:
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
+postcss@^8.4.19:
+  version "8.4.20"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.20.tgz#64c52f509644cecad8567e949f4081d98349dc56"
+  integrity sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==
+  dependencies:
+    nanoid "^3.3.4"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"

From 17e7df9da32ea345c471d07a633cfd6a5e9d20f8 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Fri, 21 Apr 2023 09:05:46 +0000
Subject: [PATCH 06/42] Update dependency html-webpack-plugin to v5.5.1

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index db45f210d..f89696ab0 100644
--- a/package.json
+++ b/package.json
@@ -83,7 +83,7 @@
     "eventsource-polyfill": "0.9.6",
     "express": "4.18.2",
     "function-bind": "1.1.1",
-    "html-webpack-plugin": "5.5.0",
+    "html-webpack-plugin": "5.5.1",
     "http-proxy-middleware": "2.0.6",
     "iso-639-1": "2.1.15",
     "json-loader": "0.5.7",
diff --git a/yarn.lock b/yarn.lock
index 4b407fd58..1ef4c66f5 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5059,10 +5059,10 @@ html-tags@^3.2.0:
   resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.2.0.tgz#dbb3518d20b726524e4dd43de397eb0a95726961"
   integrity sha512-vy7ClnArOZwCnqZgvv+ddgHgJiAFXe3Ge9ML5/mBctVJoUoYPCdxVucOywjDARn6CVoh3dRSFdPHy2sX80L0Wg==
 
-html-webpack-plugin@5.5.0:
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50"
-  integrity sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==
+html-webpack-plugin@5.5.1:
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.1.tgz#826838e31b427f5f7f30971f8d8fa2422dfa6763"
+  integrity sha512-cTUzZ1+NqjGEKjmVgZKLMdiFg3m9MdRXkZW2OEe69WYVi5ONLMmlnSZdXzGGMOq0C8jGDrL6EWyEDDUioHO/pA==
   dependencies:
     "@types/html-minifier-terser" "^6.0.0"
     html-minifier-terser "^6.0.2"

From ca7b5b7deb736429b67dfb57f1c65e1100c86db7 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 28 Apr 2023 18:12:38 -0400
Subject: [PATCH 07/42] Add changelog checker

---
 .gitlab-ci.yml        | 17 +++++++++++++++++
 tools/check-changelog | 18 ++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 tools/check-changelog

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 305155d84..d6ba7f9a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,28 @@
 image: node:16
 
 stages:
+  - check-changelog
   - lint
   - build
   - test
   - deploy
 
+check-changelog:
+  stage: check-changelog
+  image: alpine
+  rules:
+    - if: $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == 'pleroma/pleroma-fe' && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^renovate/
+      when: never
+    - if: $CI_MERGE_REQUEST_SOURCE_PROJECT_PATH == 'pleroma/pleroma-fe' && $CI_MERGE_REQUEST_SOURCE_BRANCH_NAME == 'weblate'
+      when: never
+    - if: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "develop"
+  before_script: ''
+  after_script: ''
+  cache: {}
+  script:
+    - apk add git
+    - sh ./tools/check-changelog
+
 lint:
   stage: lint
   script:
diff --git a/tools/check-changelog b/tools/check-changelog
new file mode 100644
index 000000000..86758d1d8
--- /dev/null
+++ b/tools/check-changelog
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+echo "looking for change log"
+
+git remote add upstream https://git.pleroma.social/pleroma/pleroma-fe.git
+git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+
+git diff --raw upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
+    grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\)$'
+ret=$?
+
+if [ $ret -eq 0 ]; then
+    echo "found a changelog entry"
+    exit 0
+else
+    echo "changelog entry not found"
+    exit 1
+fi

From cd5d0a8b641248c82ad2fe6b613a61f2528ef042 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 28 Apr 2023 18:15:44 -0400
Subject: [PATCH 08/42] Skip changelog

---
 changelog.d/check-changelog.skip | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 changelog.d/check-changelog.skip

diff --git a/changelog.d/check-changelog.skip b/changelog.d/check-changelog.skip
new file mode 100644
index 000000000..e69de29bb

From 5f8a34c51db50b92b2d231dccca38515f2a80cd8 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 28 Apr 2023 18:20:44 -0400
Subject: [PATCH 09/42] Run merge request pipelines instead of two different
 ones

---
 .gitlab-ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d6ba7f9a2..2b4452d53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,14 @@ stages:
   - test
   - deploy
 
+# https://git.pleroma.social/help/ci/yaml/workflow.md#switch-between-branch-pipelines-and-merge-request-pipelines
+workflow:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+    - if: $CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS
+      when: never
+    - if: $CI_COMMIT_BRANCH
+
 check-changelog:
   stage: check-changelog
   image: alpine

From 7c7385b1de240d95b04d10c2a95dd2fc3dc360df Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Tue, 2 May 2023 22:17:02 -0400
Subject: [PATCH 10/42] Do not count renames when checking changelog

---
 tools/check-changelog | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/check-changelog b/tools/check-changelog
index 86758d1d8..848a97434 100644
--- a/tools/check-changelog
+++ b/tools/check-changelog
@@ -5,7 +5,7 @@ echo "looking for change log"
 git remote add upstream https://git.pleroma.social/pleroma/pleroma-fe.git
 git fetch upstream ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}:refs/remotes/upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
 
-git diff --raw upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
+git diff --raw --no-renames upstream/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME HEAD -- changelog.d | \
     grep ' A\t' | grep '\.\(skip\|add\|remove\|fix\|security\)$'
 ret=$?
 

From 2f632b95cc373c849a4a69fc38f9f70bd5f13e82 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Wed, 3 May 2023 09:06:26 +0000
Subject: [PATCH 11/42] Update babel monorepo

---
 package.json |   8 +-
 yarn.lock    | 279 ++++++++++++++++++++++++++++++---------------------
 2 files changed, 170 insertions(+), 117 deletions(-)

diff --git a/package.json b/package.json
index 169dd609c..a3eb0f774 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
     "lint-fix": "eslint --fix --ext .js,.vue src test/unit/specs test/e2e/specs"
   },
   "dependencies": {
-    "@babel/runtime": "7.21.0",
+    "@babel/runtime": "7.21.5",
     "@chenfengyuan/vue-qrcode": "2.0.0",
     "@fortawesome/fontawesome-svg-core": "6.3.0",
     "@fortawesome/free-regular-svg-icons": "6.3.0",
@@ -49,10 +49,10 @@
     "vuex": "4.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.21.4",
-    "@babel/eslint-parser": "7.21.3",
+    "@babel/core": "7.21.8",
+    "@babel/eslint-parser": "7.21.8",
     "@babel/plugin-transform-runtime": "7.21.4",
-    "@babel/preset-env": "7.21.4",
+    "@babel/preset-env": "7.21.5",
     "@babel/register": "7.21.0",
     "@intlify/vue-i18n-loader": "5.0.1",
     "@ungap/event-target": "0.2.3",
diff --git a/yarn.lock b/yarn.lock
index 1ccc9b058..e6cde1c23 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -60,26 +60,26 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.20.5.tgz#86f172690b093373a933223b4745deeb6049e733"
   integrity sha512-KZXo2t10+/jxmkhNXc7pZTqRvSOIvVv/+lJwHS+B2rErwOyjuVRh60yVpb7liQ1U5t7lLJ1bz+t8tSypUZdm0g==
 
-"@babel/compat-data@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.4.tgz#457ffe647c480dff59c2be092fc3acf71195c87f"
-  integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==
+"@babel/compat-data@^7.21.5":
+  version "7.21.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc"
+  integrity sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==
 
-"@babel/core@7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.4.tgz#c6dc73242507b8e2a27fd13a9c1814f9fa34a659"
-  integrity sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==
+"@babel/core@7.21.8":
+  version "7.21.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4"
+  integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
     "@babel/code-frame" "^7.21.4"
-    "@babel/generator" "^7.21.4"
-    "@babel/helper-compilation-targets" "^7.21.4"
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helpers" "^7.21.0"
-    "@babel/parser" "^7.21.4"
+    "@babel/generator" "^7.21.5"
+    "@babel/helper-compilation-targets" "^7.21.5"
+    "@babel/helper-module-transforms" "^7.21.5"
+    "@babel/helpers" "^7.21.5"
+    "@babel/parser" "^7.21.8"
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.4"
-    "@babel/types" "^7.21.4"
+    "@babel/traverse" "^7.21.5"
+    "@babel/types" "^7.21.5"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
@@ -107,10 +107,10 @@
     json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/eslint-parser@7.21.3":
-  version "7.21.3"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.21.3.tgz#d79e822050f2de65d7f368a076846e7184234af7"
-  integrity sha512-kfhmPimwo6k4P8zxNs8+T7yR44q1LdpsZdE1NkCsVlfiuTPRfnGgjaF8Qgug9q9Pou17u6wneYF0lDCZJATMFg==
+"@babel/eslint-parser@7.21.8":
+  version "7.21.8"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.21.8.tgz#59fb6fc4f3b017ab86987c076226ceef7b2b2ef2"
+  integrity sha512-HLhI+2q+BP3sf78mFUZNCGc10KEmoUqtUT1OCdMZsN+qr4qFeLUod62/zAnF3jNQstwyasDkZnVXwfK2Bml7MQ==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
@@ -161,16 +161,6 @@
     "@jridgewell/gen-mapping" "^0.3.2"
     jsesc "^2.5.1"
 
-"@babel/generator@^7.21.0":
-  version "7.21.1"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.1.tgz#951cc626057bc0af2c35cd23e9c64d384dea83dd"
-  integrity sha512-1lT45bAYlQhFn/BHivJs43AiW2rg3/UbLyShGfF3C0KmHvO5fSghWd5kBJy30kpRRucGzXStvnnCFniCR2kXAA==
-  dependencies:
-    "@babel/types" "^7.21.0"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
-
 "@babel/generator@^7.21.4":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.4.tgz#64a94b7448989f421f919d5239ef553b37bb26bc"
@@ -181,6 +171,16 @@
     "@jridgewell/trace-mapping" "^0.3.17"
     jsesc "^2.5.1"
 
+"@babel/generator@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f"
+  integrity sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==
+  dependencies:
+    "@babel/types" "^7.21.5"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
 "@babel/helper-annotate-as-pure@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
@@ -224,12 +224,12 @@
     lru-cache "^5.1.1"
     semver "^6.3.0"
 
-"@babel/helper-compilation-targets@^7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz#770cd1ce0889097ceacb99418ee6934ef0572656"
-  integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==
+"@babel/helper-compilation-targets@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz#631e6cc784c7b660417421349aac304c94115366"
+  integrity sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==
   dependencies:
-    "@babel/compat-data" "^7.21.4"
+    "@babel/compat-data" "^7.21.5"
     "@babel/helper-validator-option" "^7.21.0"
     browserslist "^4.21.3"
     lru-cache "^5.1.1"
@@ -315,6 +315,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.9.tgz#0c0cee9b35d2ca190478756865bb3528422f51be"
   integrity sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==
 
+"@babel/helper-environment-visitor@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba"
+  integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==
+
 "@babel/helper-explode-assignable-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz#41f8228ef0a6f1a036b8dfdfec7ce94f9a6bc096"
@@ -460,7 +465,7 @@
     "@babel/traverse" "^7.18.9"
     "@babel/types" "^7.18.9"
 
-"@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.2":
+"@babel/helper-module-transforms@^7.20.11":
   version "7.21.2"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.2.tgz#160caafa4978ac8c00ac66636cb0fa37b024e2d2"
   integrity sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==
@@ -474,6 +479,20 @@
     "@babel/traverse" "^7.21.2"
     "@babel/types" "^7.21.2"
 
+"@babel/helper-module-transforms@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz#d937c82e9af68d31ab49039136a222b17ac0b420"
+  integrity sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.21.5"
+    "@babel/helper-module-imports" "^7.21.4"
+    "@babel/helper-simple-access" "^7.21.5"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.5"
+    "@babel/types" "^7.21.5"
+
 "@babel/helper-optimise-call-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
@@ -511,6 +530,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz#d1b9000752b18d0877cff85a5c376ce5c3121629"
   integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
 
+"@babel/helper-plugin-utils@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz#345f2377d05a720a4e5ecfa39cbf4474a4daed56"
+  integrity sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==
+
 "@babel/helper-remap-async-to-generator@^7.18.9":
   version "7.18.9"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
@@ -558,6 +582,13 @@
   dependencies:
     "@babel/types" "^7.20.2"
 
+"@babel/helper-simple-access@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz#d697a7971a5c39eac32c7e63c0921c06c8a249ee"
+  integrity sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==
+  dependencies:
+    "@babel/types" "^7.21.5"
+
 "@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
   version "7.20.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
@@ -589,6 +620,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz#38d3acb654b4701a9b77fb0615a96f775c3a9e63"
   integrity sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==
 
+"@babel/helper-string-parser@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd"
+  integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==
+
 "@babel/helper-validator-identifier@^7.16.7":
   version "7.16.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
@@ -633,14 +669,14 @@
     "@babel/traverse" "^7.18.9"
     "@babel/types" "^7.18.9"
 
-"@babel/helpers@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.0.tgz#9dd184fb5599862037917cdc9eecb84577dc4e7e"
-  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
+"@babel/helpers@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.5.tgz#5bac66e084d7a4d2d9696bdf0175a93f7fb63c08"
+  integrity sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==
   dependencies:
     "@babel/template" "^7.20.7"
-    "@babel/traverse" "^7.21.0"
-    "@babel/types" "^7.21.0"
+    "@babel/traverse" "^7.21.5"
+    "@babel/types" "^7.21.5"
 
 "@babel/highlight@^7.0.0":
   version "7.0.0"
@@ -703,16 +739,16 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.20.7.tgz#66fe23b3c8569220817d5feb8b9dcdc95bb4f71b"
   integrity sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==
 
-"@babel/parser@^7.21.0":
-  version "7.21.1"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.1.tgz#a8f81ee2fe872af23faea4b17a08fcc869de7bcc"
-  integrity sha512-JzhBFpkuhBNYUY7qs+wTzNmyCWUHEaAFpQQD2YfU1rPL38/L43Wvid0fFkiOCnHvsGncRZgEPyGnltABLcVDTg==
-
 "@babel/parser@^7.21.4":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.4.tgz#94003fdfc520bbe2875d4ae557b43ddb6d880f17"
   integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
 
+"@babel/parser@^7.21.5", "@babel/parser@^7.21.8":
+  version "7.21.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8"
+  integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==
+
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
@@ -908,6 +944,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.19.0"
 
+"@babel/plugin-syntax-import-meta@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -978,12 +1021,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz#bea332b0e8b2dab3dafe55a163d8227531ab0551"
-  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
+"@babel/plugin-transform-arrow-functions@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz#9bb42a53de447936a57ba256fbf537fc312b6929"
+  integrity sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.21.5"
 
 "@babel/plugin-transform-async-to-generator@^7.20.7":
   version "7.20.7"
@@ -1023,12 +1066,12 @@
     "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.20.7":
-  version "7.20.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz#704cc2fd155d1c996551db8276d55b9d46e4d0aa"
-  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
+"@babel/plugin-transform-computed-properties@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz#3a2d8bb771cd2ef1cd736435f6552fe502e11b44"
+  integrity sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.21.5"
     "@babel/template" "^7.20.7"
 
 "@babel/plugin-transform-destructuring@^7.21.3":
@@ -1069,12 +1112,12 @@
     "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz#964108c9988de1a60b4be2354a7d7e245f36e86e"
-  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
+"@babel/plugin-transform-for-of@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz#e890032b535f5a2e237a18535f56a9fdaa7b83fc"
+  integrity sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.21.5"
 
 "@babel/plugin-transform-function-name@^7.18.9":
   version "7.18.9"
@@ -1107,14 +1150,14 @@
     "@babel/helper-module-transforms" "^7.20.11"
     "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-modules-commonjs@^7.21.2":
-  version "7.21.2"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz#6ff5070e71e3192ef2b7e39820a06fb78e3058e7"
-  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
+"@babel/plugin-transform-modules-commonjs@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz#d69fb947eed51af91de82e4708f676864e5e47bc"
+  integrity sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.21.2"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-module-transforms" "^7.21.5"
+    "@babel/helper-plugin-utils" "^7.21.5"
+    "@babel/helper-simple-access" "^7.21.5"
 
 "@babel/plugin-transform-modules-systemjs@^7.20.11":
   version "7.20.11"
@@ -1178,12 +1221,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-regenerator@^7.20.5":
-  version "7.20.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz#57cda588c7ffb7f4f8483cc83bdcea02a907f04d"
-  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
+"@babel/plugin-transform-regenerator@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz#576c62f9923f94bcb1c855adc53561fd7913724e"
+  integrity sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-plugin-utils" "^7.21.5"
     regenerator-transform "^0.15.1"
 
 "@babel/plugin-transform-reserved-words@^7.18.6":
@@ -1241,12 +1284,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-escapes@^7.18.10":
-  version "7.18.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz#1ecfb0eda83d09bbcb77c09970c2dd55832aa246"
-  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
+"@babel/plugin-transform-unicode-escapes@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz#1e55ed6195259b0e9061d81f5ef45a9b009fb7f2"
+  integrity sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.21.5"
 
 "@babel/plugin-transform-unicode-regex@^7.18.6":
   version "7.18.6"
@@ -1256,14 +1299,14 @@
     "@babel/helper-create-regexp-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/preset-env@7.21.4":
-  version "7.21.4"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.4.tgz#a952482e634a8dd8271a3fe5459a16eb10739c58"
-  integrity sha512-2W57zHs2yDLm6GD5ZpvNn71lZ0B/iypSdIeq25OurDKji6AdzV07qp4s3n1/x5BqtiGaTrPN3nerlSCaC5qNTw==
+"@babel/preset-env@7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.5.tgz#db2089d99efd2297716f018aeead815ac3decffb"
+  integrity sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==
   dependencies:
-    "@babel/compat-data" "^7.21.4"
-    "@babel/helper-compilation-targets" "^7.21.4"
-    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/compat-data" "^7.21.5"
+    "@babel/helper-compilation-targets" "^7.21.5"
+    "@babel/helper-plugin-utils" "^7.21.5"
     "@babel/helper-validator-option" "^7.21.0"
     "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7"
@@ -1288,6 +1331,7 @@
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-import-assertions" "^7.20.0"
+    "@babel/plugin-syntax-import-meta" "^7.10.4"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -1297,22 +1341,22 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.20.7"
+    "@babel/plugin-transform-arrow-functions" "^7.21.5"
     "@babel/plugin-transform-async-to-generator" "^7.20.7"
     "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
     "@babel/plugin-transform-block-scoping" "^7.21.0"
     "@babel/plugin-transform-classes" "^7.21.0"
-    "@babel/plugin-transform-computed-properties" "^7.20.7"
+    "@babel/plugin-transform-computed-properties" "^7.21.5"
     "@babel/plugin-transform-destructuring" "^7.21.3"
     "@babel/plugin-transform-dotall-regex" "^7.18.6"
     "@babel/plugin-transform-duplicate-keys" "^7.18.9"
     "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
-    "@babel/plugin-transform-for-of" "^7.21.0"
+    "@babel/plugin-transform-for-of" "^7.21.5"
     "@babel/plugin-transform-function-name" "^7.18.9"
     "@babel/plugin-transform-literals" "^7.18.9"
     "@babel/plugin-transform-member-expression-literals" "^7.18.6"
     "@babel/plugin-transform-modules-amd" "^7.20.11"
-    "@babel/plugin-transform-modules-commonjs" "^7.21.2"
+    "@babel/plugin-transform-modules-commonjs" "^7.21.5"
     "@babel/plugin-transform-modules-systemjs" "^7.20.11"
     "@babel/plugin-transform-modules-umd" "^7.18.6"
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5"
@@ -1320,17 +1364,17 @@
     "@babel/plugin-transform-object-super" "^7.18.6"
     "@babel/plugin-transform-parameters" "^7.21.3"
     "@babel/plugin-transform-property-literals" "^7.18.6"
-    "@babel/plugin-transform-regenerator" "^7.20.5"
+    "@babel/plugin-transform-regenerator" "^7.21.5"
     "@babel/plugin-transform-reserved-words" "^7.18.6"
     "@babel/plugin-transform-shorthand-properties" "^7.18.6"
     "@babel/plugin-transform-spread" "^7.20.7"
     "@babel/plugin-transform-sticky-regex" "^7.18.6"
     "@babel/plugin-transform-template-literals" "^7.18.9"
     "@babel/plugin-transform-typeof-symbol" "^7.18.9"
-    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
+    "@babel/plugin-transform-unicode-escapes" "^7.21.5"
     "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.21.4"
+    "@babel/types" "^7.21.5"
     babel-plugin-polyfill-corejs2 "^0.3.3"
     babel-plugin-polyfill-corejs3 "^0.6.0"
     babel-plugin-polyfill-regenerator "^0.4.1"
@@ -1364,10 +1408,10 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.0.tgz#5b55c9d394e5fcf304909a8b00c07dc217b56673"
-  integrity sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==
+"@babel/runtime@7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
+  integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
   dependencies:
     regenerator-runtime "^0.13.11"
 
@@ -1494,23 +1538,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/traverse@^7.21.0":
-  version "7.21.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.0.tgz#0e1807abd5db98e6a19c204b80ed1e3f5bca0edc"
-  integrity sha512-Xdt2P1H4LKTO8ApPfnO1KmzYMFpp7D/EinoXzLYN/cHcBNrVCAkAtGUcXnHXrl/VGktureU6fkQrHSBE2URfoA==
-  dependencies:
-    "@babel/code-frame" "^7.18.6"
-    "@babel/generator" "^7.21.0"
-    "@babel/helper-environment-visitor" "^7.18.9"
-    "@babel/helper-function-name" "^7.21.0"
-    "@babel/helper-hoist-variables" "^7.18.6"
-    "@babel/helper-split-export-declaration" "^7.18.6"
-    "@babel/parser" "^7.21.0"
-    "@babel/types" "^7.21.0"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.21.2", "@babel/traverse@^7.21.4":
+"@babel/traverse@^7.21.2":
   version "7.21.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.4.tgz#a836aca7b116634e97a6ed99976236b3282c9d36"
   integrity sha512-eyKrRHKdyZxqDm+fV1iqL9UAHMoIg0nDaGqfIOd8rKH17m5snv7Gn4qgjBoFfLz9APvjFU/ICT00NVCv1Epp8Q==
@@ -1526,6 +1554,22 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
+"@babel/traverse@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133"
+  integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==
+  dependencies:
+    "@babel/code-frame" "^7.21.4"
+    "@babel/generator" "^7.21.5"
+    "@babel/helper-environment-visitor" "^7.21.5"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/parser" "^7.21.5"
+    "@babel/types" "^7.21.5"
+    debug "^4.1.0"
+    globals "^11.1.0"
+
 "@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.49":
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.2.2.tgz#44e10fc24e33af524488b716cdaee5360ea8ed1e"
@@ -1603,6 +1647,15 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.21.5":
+  version "7.21.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6"
+  integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==
+  dependencies:
+    "@babel/helper-string-parser" "^7.21.5"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    to-fast-properties "^2.0.0"
+
 "@babel/types@^7.7.4":
   version "7.7.4"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.7.4.tgz#516570d539e44ddf308c07569c258ff94fde9193"

From 8531149f43a572b15463f9a3e08edbd8a1f48e7e Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Thu, 4 May 2023 09:05:33 +0000
Subject: [PATCH 12/42] Update dependency karma to v6.4.2

---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index a3eb0f774..5bf9aa900 100644
--- a/package.json
+++ b/package.json
@@ -87,7 +87,7 @@
     "http-proxy-middleware": "2.0.6",
     "iso-639-1": "2.1.15",
     "json-loader": "0.5.7",
-    "karma": "6.4.1",
+    "karma": "6.4.2",
     "karma-coverage": "2.2.0",
     "karma-firefox-launcher": "2.1.2",
     "karma-mocha": "2.0.1",
diff --git a/yarn.lock b/yarn.lock
index e6cde1c23..0e1afe5fb 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5931,10 +5931,10 @@ karma-webpack@5.0.0:
     minimatch "^3.0.4"
     webpack-merge "^4.1.5"
 
-karma@6.4.1:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.1.tgz#f2253716dd3a41aaa813fa9f54b6ee047e1127d9"
-  integrity sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==
+karma@6.4.2:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.2.tgz#a983f874cee6f35990c4b2dcc3d274653714de8e"
+  integrity sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ==
   dependencies:
     "@colors/colors" "1.5.0"
     body-parser "^1.19.0"

From 4d75a58bb92f418b159999f3c3301acd87a230b1 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Thu, 4 May 2023 09:05:44 +0000
Subject: [PATCH 13/42] Update dependency nightwatch to v2.6.20

---
 package.json |  2 +-
 yarn.lock    | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index a3eb0f774..44c2a89f8 100644
--- a/package.json
+++ b/package.json
@@ -99,7 +99,7 @@
     "lodash": "4.17.21",
     "mini-css-extract-plugin": "2.7.5",
     "mocha": "10.2.0",
-    "nightwatch": "2.6.19",
+    "nightwatch": "2.6.20",
     "opn": "5.5.0",
     "ora": "0.4.1",
     "postcss": "8.4.23",
diff --git a/yarn.lock b/yarn.lock
index e6cde1c23..460cacc8f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1955,10 +1955,10 @@
     pathval "1.1.1"
     type-detect "4.0.8"
 
-"@nightwatch/html-reporter-template@0.1.4":
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/@nightwatch/html-reporter-template/-/html-reporter-template-0.1.4.tgz#c70db1a13bb2e7e1932e6b10ac1e022e61177c94"
-  integrity sha512-fVylXypRuNJbyFAwY/5H2QM1A1XVoZWis0zhiMwA5LQN0cxHzpG2aUheb+qP1EfkxhFxwSUHOcrvphFLbPA8ow==
+"@nightwatch/html-reporter-template@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@nightwatch/html-reporter-template/-/html-reporter-template-0.2.1.tgz#9fa86e8cab6ee703d2e55b47abac92613f97a298"
+  integrity sha512-GEBeGoXVmTYPtNC4Yq34vfgxf6mlFyEagxpsfH18Qe5BvctF2rprX+wI5dKBm9p5IqHo6ZOcXHCufOeP3cjuOw==
 
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
@@ -6616,10 +6616,6 @@ mkdirp@^0.5.5:
   dependencies:
     minimist "^1.2.5"
 
-mkpath@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/mkpath/-/mkpath-1.0.0.tgz#ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"
-
 mocha@10.2.0:
   version "10.2.0"
   resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.2.0.tgz#1fd4a7c32ba5ac372e03a17eef435bd00e5c68b8"
@@ -6740,13 +6736,13 @@ nightwatch-axe-verbose@^2.1.0:
   dependencies:
     axe-core "^4.6.1"
 
-nightwatch@2.6.19:
-  version "2.6.19"
-  resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-2.6.19.tgz#2c35304eb67e06d24f982cb42cce618c617a3fcb"
-  integrity sha512-AxuPEWlf+MCfo4tZ0BFKkxqUIL0x/jZeFSvxV7Wwp/sBM8XmVA1rEEhNe/pCVsyjL+Q4G97rMKTonFYF/aXsBw==
+nightwatch@2.6.20:
+  version "2.6.20"
+  resolved "https://registry.yarnpkg.com/nightwatch/-/nightwatch-2.6.20.tgz#8c3b808f4f33699bcd67987b22e6ebeee61ddc9c"
+  integrity sha512-XEyxuSGhESdHj4LHqA5snrc/nMgH4tsB/mWrbyGt3EwW1AgjyE7DRzJUbhG7J00Np3Dv3k2nmyJs0Xq0FX/yvQ==
   dependencies:
     "@nightwatch/chai" "5.0.2"
-    "@nightwatch/html-reporter-template" "0.1.4"
+    "@nightwatch/html-reporter-template" "0.2.1"
     ansi-to-html "0.7.2"
     assertion-error "1.1.0"
     boxen "5.1.2"
@@ -6767,7 +6763,6 @@ nightwatch@2.6.19:
     lodash.pick "4.4.0"
     minimatch "3.1.2"
     minimist "1.2.6"
-    mkpath "1.0.0"
     mocha "9.2.2"
     nightwatch-axe-verbose "^2.1.0"
     open "8.4.0"

From 586cdadcec3353f0f6ca412b676c7f44a6bb0e7a Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Fri, 5 May 2023 09:04:48 +0000
Subject: [PATCH 14/42] Update dependency sinon to v15.0.4

---
 package.json |  2 +-
 yarn.lock    | 61 +++++++++++++++++++++++-----------------------------
 2 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index 5bf9aa900..cd5a33bd9 100644
--- a/package.json
+++ b/package.json
@@ -112,7 +112,7 @@
     "semver": "7.3.8",
     "serviceworker-webpack5-plugin": "2.0.0",
     "shelljs": "0.8.5",
-    "sinon": "15.0.1",
+    "sinon": "15.0.4",
     "sinon-chai": "3.7.0",
     "stylelint": "14.16.1",
     "stylelint-config-html": "^1.1.0",
diff --git a/yarn.lock b/yarn.lock
index 0e1afe5fb..6b7bcb7c0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2012,13 +2012,6 @@
   resolved "https://registry.yarnpkg.com/@sinclair/typebox/-/typebox-0.24.51.tgz#645f33fe4e02defe26f2f5c0410e1c094eac7f5f"
   integrity sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==
 
-"@sinonjs/commons@^1.7.0":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d"
-  integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==
-  dependencies:
-    type-detect "4.0.8"
-
 "@sinonjs/commons@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3"
@@ -2026,24 +2019,24 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@10.0.2":
+"@sinonjs/commons@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-3.0.0.tgz#beb434fe875d965265e04722ccfc21df7f755d72"
+  integrity sha512-jXBtWAF4vmdNmZgD5FoKsVLv3rPgDnLgPbU84LIJ3otV44vJlDRokVng5v8NFJdCf/da9legHcKaRuZs4L7faA==
+  dependencies:
+    type-detect "4.0.8"
+
+"@sinonjs/fake-timers@^10.0.2":
   version "10.0.2"
   resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-10.0.2.tgz#d10549ed1f423d80639c528b6c7f5a1017747d0c"
   integrity sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==
   dependencies:
     "@sinonjs/commons" "^2.0.0"
 
-"@sinonjs/fake-timers@^7.0.4":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz#2524eae70c4910edccf99b2f4e6efc5894aff7b5"
-  integrity sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
-"@sinonjs/samsam@^7.0.1":
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-7.0.1.tgz#5b5fa31c554636f78308439d220986b9523fc51f"
-  integrity sha512-zsAk2Jkiq89mhZovB2LLOdTCxJF4hqqTToGP0ASWlhp4I1hqOjcfmZGafXntCN7MDC6yySH0mFHrYtHceOeLmw==
+"@sinonjs/samsam@^8.0.0":
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-8.0.0.tgz#0d488c91efb3fa1442e26abea81759dfc8b5ac60"
+  integrity sha512-Bp8KUVlLp8ibJZrnvq2foVhP0IVX2CIprMJPK0vqGqgrDa0OHVKeZyBykqskkrdxV6yKBPmGasO8LVjAKR3Gew==
   dependencies:
     "@sinonjs/commons" "^2.0.0"
     lodash.get "^4.4.2"
@@ -3807,7 +3800,7 @@ diff@5.0.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
   integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
 
-diff@^5.0.0:
+diff@^5.1.0:
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.1.0.tgz#bc52d298c5ea8df9194800224445ed43ffc87e40"
   integrity sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==
@@ -6779,13 +6772,13 @@ nightwatch@2.6.19:
     untildify "^4.0.0"
     uuid "8.3.2"
 
-nise@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.2.tgz#a7b8909c216b3491fd4fc0b124efb69f3939b449"
-  integrity sha512-+gQjFi8v+tkfCuSCxfURHLhRhniE/+IaYbIphxAN2JRR9SHKhY8hgXpaXiYfHdw+gcGe4buxgbprBQFab9FkhA==
+nise@^5.1.4:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.4.tgz#491ce7e7307d4ec546f5a659b2efe94a18b4bbc0"
+  integrity sha512-8+Ib8rRJ4L0o3kfmyVCL7gzrohyDe0cMFTBa2d364yIrEGMEoetznKJx899YxjybU6bL9SQkYPSBBs1gyYs8Xg==
   dependencies:
     "@sinonjs/commons" "^2.0.0"
-    "@sinonjs/fake-timers" "^7.0.4"
+    "@sinonjs/fake-timers" "^10.0.2"
     "@sinonjs/text-encoding" "^0.7.1"
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
@@ -8219,16 +8212,16 @@ sinon-chai@3.7.0:
   resolved "https://registry.yarnpkg.com/sinon-chai/-/sinon-chai-3.7.0.tgz#cfb7dec1c50990ed18c153f1840721cf13139783"
   integrity sha512-mf5NURdUaSdnatJx3uhoBOrY9dtL19fiOtAdT1Azxg3+lNJFiuN0uzaU3xX1LeAfL17kHQhTAJgpsfhbMJMY2g==
 
-sinon@15.0.1:
-  version "15.0.1"
-  resolved "https://registry.yarnpkg.com/sinon/-/sinon-15.0.1.tgz#ce062611a0b131892e2c18f03055b8eb6e8dc234"
-  integrity sha512-PZXKc08f/wcA/BMRGBze2Wmw50CWPiAH3E21EOi4B49vJ616vW4DQh4fQrqsYox2aNR/N3kCqLuB0PwwOucQrg==
+sinon@15.0.4:
+  version "15.0.4"
+  resolved "https://registry.yarnpkg.com/sinon/-/sinon-15.0.4.tgz#bcca6fef19b14feccc96473f0d7adc81e0bc5268"
+  integrity sha512-uzmfN6zx3GQaria1kwgWGeKiXSSbShBbue6Dcj0SI8fiCNFbiUDqKl57WFlY5lyhxZVUKmXvzgG2pilRQCBwWg==
   dependencies:
-    "@sinonjs/commons" "^2.0.0"
-    "@sinonjs/fake-timers" "10.0.2"
-    "@sinonjs/samsam" "^7.0.1"
-    diff "^5.0.0"
-    nise "^5.1.2"
+    "@sinonjs/commons" "^3.0.0"
+    "@sinonjs/fake-timers" "^10.0.2"
+    "@sinonjs/samsam" "^8.0.0"
+    diff "^5.1.0"
+    nise "^5.1.4"
     supports-color "^7.2.0"
 
 slash@^3.0.0:

From ad3916027a1994cbc2a5a7b6c35576ef7a971c12 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 8 May 2023 22:14:49 +0300
Subject: [PATCH 15/42] lint

---
 src/components/settings_modal/helpers/draft_buttons.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/settings_modal/helpers/draft_buttons.vue b/src/components/settings_modal/helpers/draft_buttons.vue
index fd6d50e35..46a70e866 100644
--- a/src/components/settings_modal/helpers/draft_buttons.vue
+++ b/src/components/settings_modal/helpers/draft_buttons.vue
@@ -8,8 +8,8 @@
       v-if="$parent.isDirty"
       trigger="hover"
       normal-button
-      @click="$parent.commitDraft"
       :trigger-attrs="{ 'aria-label': $t('settings.commit_value_tooltip') }"
+      @click="$parent.commitDraft"
     >
       <template #trigger>
         {{ $t('settings.commit_value') }}
@@ -40,8 +40,8 @@
       v-if="$parent.canHardReset"
       trigger="hover"
       normal-button
-      @click="$parent.hardReset"
       :trigger-attrs="{ 'aria-label': $t('settings.hard_reset_value_tooltip') }"
+      @click="$parent.hardReset"
     >
       <template #trigger>
         {{ $t('settings.hard_reset_value') }}

From 4664d99af26bfebadf70be740abfd49acc045897 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 9 May 2023 23:29:30 +0300
Subject: [PATCH 16/42] lint

---
 src/components/settings_modal/helpers/attachment_setting.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/settings_modal/helpers/attachment_setting.vue b/src/components/settings_modal/helpers/attachment_setting.vue
index 447fa1729..bbc5172c7 100644
--- a/src/components/settings_modal/helpers/attachment_setting.vue
+++ b/src/components/settings_modal/helpers/attachment_setting.vue
@@ -87,7 +87,8 @@
   .controls {
     margin-bottom: 0.5em;
 
-    input, button {
+    input,
+    button {
       width: 100%;
     }
   }

From 4b38fc5ffcad8fe9cce81a64d418c41480d6a97f Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Fri, 12 May 2023 09:57:22 -0400
Subject: [PATCH 17/42] Fix custom emojis shown in selector if backend does not
 support it

---
 src/components/react_button/react_button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/react_button/react_button.js b/src/components/react_button/react_button.js
index 8eed4b604..0d2521556 100644
--- a/src/components/react_button/react_button.js
+++ b/src/components/react_button/react_button.js
@@ -46,7 +46,7 @@ const ReactButton = {
   },
   computed: {
     hideCustomEmoji () {
-      return !this.$store.state.instance.pleromaChatMessagesAvailable
+      return !this.$store.state.instance.pleromaCustomEmojiReactionsAvailable
     }
   }
 }

From ac21bba90cff1f954549f71ed927aad1f3db2597 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Sat, 13 May 2023 09:06:36 +0000
Subject: [PATCH 18/42] Update dependency vue-virtual-scroller to v2.0.0-beta.8

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 6b7bcb7c0..2505ff74d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9066,9 +9066,9 @@ vue-template-compiler@2.7.14:
     he "^1.2.0"
 
 vue-virtual-scroller@^2.0.0-beta.7:
-  version "2.0.0-beta.7"
-  resolved "https://registry.yarnpkg.com/vue-virtual-scroller/-/vue-virtual-scroller-2.0.0-beta.7.tgz#4ea8158638c84b2033b001a8b26c5fcb6896b271"
-  integrity sha512-OrouVj1i2939jaLjVfu8f5fsDlbzhAb4bOsYZYrAkpcVLylAmMoGtIL7eT3hJrdTiaKbwQpRdnv7DKf9Fn+tHg==
+  version "2.0.0-beta.8"
+  resolved "https://registry.yarnpkg.com/vue-virtual-scroller/-/vue-virtual-scroller-2.0.0-beta.8.tgz#eeceda57e4faa5ba1763994c873923e2a956898b"
+  integrity sha512-b8/f5NQ5nIEBRTNi6GcPItE4s7kxNHw2AIHLtDp+2QvqdTjVN0FgONwX9cr53jWRgnu+HRLPaWDOR2JPI5MTfQ==
   dependencies:
     mitt "^2.1.0"
     vue-observe-visibility "^2.0.0-alpha.1"

From 2e5412fbd8b0450d641c4762cbd3062bec81ae2a Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sat, 8 Apr 2023 20:42:21 +0000
Subject: [PATCH 19/42] Translated using Weblate (Esperanto)

Currently translated at 98.0% (969 of 988 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 88 ++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 77 insertions(+), 11 deletions(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index e013edee0..ce4e833bf 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -55,8 +55,8 @@
     "undo": "Malfari",
     "yes": "Jes",
     "no": "Ne",
-    "unpin": "Malfiksi eron",
-    "pin": "Fiksi eron",
+    "unpin": "Malfiksi",
+    "pin": "Fiksi",
     "scroll_to_top": "Rulumi supren"
   },
   "image_cropper": {
@@ -81,7 +81,11 @@
     "recovery_code": "Rehava kodo",
     "enter_two_factor_code": "Enigu kodon de duobla aŭtentikigo",
     "enter_recovery_code": "Enigu rehavan kodon",
-    "authentication_code": "Aŭtentikiga kodo"
+    "authentication_code": "Aŭtentikiga kodo",
+    "logout_confirm_title": "Konfirmo de adiaŭo",
+    "logout_confirm": "Ĉu vi certe volas adiaŭi?",
+    "logout_confirm_accept_button": "Adiaŭi",
+    "logout_confirm_cancel_button": "Ne adiaŭi"
   },
   "media_modal": {
     "previous": "Antaŭa",
@@ -115,7 +119,9 @@
     "edit_finish": "Fini redakton",
     "mobile_notifications": "Malfermi sciigojn (estas nelegitaj)",
     "mobile_notifications_close": "Fermi sciigojn",
-    "announcements": "Anoncoj"
+    "announcements": "Anoncoj",
+    "search_close": "Fermi serĉujon",
+    "mobile_sidebar": "(Mal)ŝalti flankan breton por telefonoj"
   },
   "notifications": {
     "broken_favorite": "Nekonata afiŝo, serĉante ĝin…",
@@ -189,14 +195,18 @@
       "email_required": "ne povas resti malplena",
       "password_required": "ne povas resti malplena",
       "password_confirmation_required": "ne povas resti malplena",
-      "password_confirmation_match": "samu la pasvorton"
+      "password_confirmation_match": "samu la pasvorton",
+      "birthday_min_age": "ne povas esti post {date}",
+      "birthday_required": "ne povas resti malplena"
     },
     "reason_placeholder": "Ĉi-node oni aprobas registriĝojn permane.\nSciigu la administrantojn kial vi volas registriĝi.",
     "reason": "Kialo registriĝi",
     "register": "Registriĝi",
     "bio_optional": "Prio (malnepra)",
     "email_optional": "Retpoŝtadreso (malnepra)",
-    "email_language": "En kiu lingvo vi volus ricevi retleterojn de la servilo?"
+    "email_language": "En kiu lingvo vi volus ricevi retleterojn de la servilo?",
+    "birthday": "Naskiĝtago:",
+    "birthday_optional": "Naskiĝtago (malnepra):"
   },
   "settings": {
     "app_name": "Nomo de aplikaĵo",
@@ -666,7 +676,28 @@
     "user_popover_avatar_overlay": "Aperigi ŝprucaĵon pri uzanto sur profilbildo",
     "show_yous": "Montri la markon «(Vi)»",
     "user_popover_avatar_action_zoom": "Zomi la profilbildon",
-    "third_column_mode": "Kun sufiĉo da spaco, montri trian kolumnon kun"
+    "third_column_mode": "Kun sufiĉo da spaco, montri trian kolumnon kun",
+    "birthday": {
+      "show_birthday": "Montri mian naskiĝtagon",
+      "label": "Naskiĝtago"
+    },
+    "confirm_dialogs_delete": "forigo de afiŝo",
+    "backup_running": "Ĉi tiu savkopiado progresas, traktis {number} datumon. | Ĉi tiu savkopiado progresas, traktis {number} datumojn.",
+    "backup_failed": "Ĉi tiu savkopiado malsukcesis.",
+    "autocomplete_select_first": "Memage elekti unuan kandidaton kiam rezultoj de memaga konjektado disponeblas",
+    "confirm_dialogs_logout": "adiaŭo",
+    "user_popover_avatar_action": "Post klako sur profilbildon en ŝprucaĵo",
+    "remove_language": "Forigi",
+    "primary_language": "Ĉefa lingvo:",
+    "confirm_dialogs": "Peti konfirmon je",
+    "confirm_dialogs_repeat": "ripeto de afiŝo",
+    "confirm_dialogs_unfollow": "malabono de uzanto",
+    "confirm_dialogs_block": "blokado de uzanto",
+    "confirm_dialogs_mute": "silentigo de uzanto",
+    "confirm_dialogs_approve_follow": "aprobo de abonanto",
+    "confirm_dialogs_deny_follow": "malaprobo de abonanto",
+    "confirm_dialogs_remove_follower": "forigo de abonanto",
+    "tree_fade_ancestors": "Montri responditojn de la nuna afiŝo per teksto malvigla"
   },
   "timeline": {
     "collapse": "Maletendi",
@@ -753,7 +784,33 @@
     "note_blank": "(Neniu)",
     "edit_note_apply": "Apliki",
     "edit_note_cancel": "Nuligi",
-    "edit_note": "Redakti noton"
+    "edit_note": "Redakti noton",
+    "block_confirm": "Ĉu vi certe volas bloki uzanton {user}?",
+    "block_confirm_accept_button": "Bloki",
+    "remove_follower_confirm": "Ĉu vi certe volas forigi uzanton {user} de viaj abonantoj?",
+    "approve_confirm_accept_button": "Aprobi",
+    "approve_confirm_cancel_button": "Ne aprobi",
+    "approve_confirm": "Ĉu vi certe volas aprobi abonan peton de {user}?",
+    "block_confirm_title": "Konfirmo de blokado",
+    "approve_confirm_title": "Konfirmo de aprobo",
+    "block_confirm_cancel_button": "Ne bloki",
+    "deny_confirm_accept_button": "Malaprobi",
+    "deny_confirm_cancel_button": "Ne malaprobi",
+    "mute_confirm_title": "Silentigi konfirmon",
+    "deny_confirm_title": "Konfirmo de malaprobo",
+    "mute_confirm": "Ĉu vi certe volas silentigi uzanton {user}?",
+    "mute_confirm_accept_button": "Silentigi",
+    "mute_confirm_cancel_button": "Ne silentigi",
+    "mute_duration_prompt": "Silentigi ĉi tiun uzanton por (0 signifas senliman silentigon):",
+    "remove_follower_confirm_accept_button": "Forigi",
+    "remove_follower_confirm_title": "Konfirmo de forigo de abonanto",
+    "birthday": "Naskita je {birthday}",
+    "deny_confirm": "Ĉu vi certe volas malaprobi abonan peton de {user}?",
+    "unfollow_confirm_cancel_button": "Ne malaboni",
+    "unfollow_confirm_title": "Konfirmo de malabono",
+    "unfollow_confirm": "Ĉu vi certe volas malaboni uzanton {user}?",
+    "unfollow_confirm_accept_button": "Malaboni",
+    "remove_follower_confirm_cancel_button": "Ne forigi"
   },
   "user_profile": {
     "timeline_title": "Historio de uzanto",
@@ -775,7 +832,8 @@
     "accept_follow_request": "Akcepti abonpeton",
     "add_reaction": "Aldoni reagon",
     "toggle_expand": "Etendi aŭ maletendi sciigon por montri plenan afiŝon",
-    "toggle_mute": "Etendi aŭ maletendi afiŝon por montri silentigitan enhavon"
+    "toggle_mute": "Etendi aŭ maletendi afiŝon por montri silentigitan enhavon",
+    "autocomplete_available": "{number} rezulto disponeblas. Uzu la sagajn klavojn supren kaj suben por foliumi ilin. | {number} rezulto disponeblas. Uzu la sagajn klavojn supren kaj suben por foliumi ilin."
   },
   "upload": {
     "error": {
@@ -951,7 +1009,14 @@
     "show_all_conversation_with_icon": "{icon} {text}",
     "show_only_conversation_under_this": "Montri nur respondojn al ĉi tiu afiŝo",
     "status_history": "Historio de afiŝo",
-    "open_gallery": "Malfermi galerion"
+    "open_gallery": "Malfermi galerion",
+    "delete_confirm_title": "Konfirmo de forigo",
+    "delete_confirm_accept_button": "Forigi",
+    "repeat_confirm": "Ĉu vi certe volas ripeti ĉi tiun afiŝon?",
+    "repeat_confirm_title": "Konfirmo de ripeto",
+    "repeat_confirm_accept_button": "Ripeti",
+    "repeat_confirm_cancel_button": "Ne ripeti",
+    "delete_confirm_cancel_button": "Ne forigi"
   },
   "time": {
     "years_short": "{0}j",
@@ -1119,6 +1184,7 @@
     "edit_action": "Redakti",
     "submit_edit_action": "Afiŝi",
     "cancel_edit_action": "Nuligi",
-    "inactive_message": "Ĉi tiu anonco estas neaktiva"
+    "inactive_message": "Ĉi tiu anonco estas neaktiva",
+    "post_form_header": "Afiŝi anoncon"
   }
 }

From 1dd5fa8bb756941d34e9e2c49dc79a6dd8b6c0d6 Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sun, 9 Apr 2023 22:54:42 +0000
Subject: [PATCH 20/42] Translated using Weblate (Esperanto)

Currently translated at 98.2% (971 of 988 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index ce4e833bf..252665cce 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -175,7 +175,9 @@
     "post": "Afiŝo",
     "edit_remote_warning": "Aliaj foraj nodoj eble ne subtenas redaktadon, kaj ne povos ricevi pli novan version de via afiŝo.",
     "edit_unsupported_warning": "Pleroma ne subtenas redaktadon de mencioj aŭ enketoj.",
-    "edit_status": "Redakti afiŝon"
+    "edit_status": "Redakti afiŝon",
+    "content_type_selection": "Formo de afiŝo",
+    "scope_notice_dismiss": "Fermi ĉi tiun avizon"
   },
   "registration": {
     "bio": "Priskribo",

From 811adc5b1fcd6669489c87b85ae113f2a5ce628d Mon Sep 17 00:00:00 2001
From: Xnuk Shuman <xnuk+pleroma@xnu.kr>
Date: Tue, 11 Apr 2023 03:49:33 +0000
Subject: [PATCH 21/42] Translated using Weblate (Korean)

Currently translated at 96.6% (955 of 988 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ko/
---
 src/i18n/ko.json | 64 +++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 55 insertions(+), 9 deletions(-)

diff --git a/src/i18n/ko.json b/src/i18n/ko.json
index 657bb0791..1e7e58c37 100644
--- a/src/i18n/ko.json
+++ b/src/i18n/ko.json
@@ -75,7 +75,11 @@
     "enter_two_factor_code": "2단계인증 코드를 입력하십시오",
     "enter_recovery_code": "복구 코드를 입력하십시오",
     "authentication_code": "인증 코드",
-    "hint": "로그인해서 대화에 참여"
+    "hint": "로그인해서 대화에 참여",
+    "logout_confirm_title": "로그아웃 확인",
+    "logout_confirm": "정말 로그아웃 하시겠습니까?",
+    "logout_confirm_accept_button": "로그아웃",
+    "logout_confirm_cancel_button": "로그아웃 안 함"
   },
   "nav": {
     "about": "인스턴스 소개",
@@ -104,7 +108,8 @@
     "edit_finish": "편집 종료",
     "mobile_notifications_close": "알림 닫기",
     "mobile_sidebar": "모바일 사이드바 토글",
-    "announcements": "공지사항"
+    "announcements": "공지사항",
+    "search_close": "검색 바 닫기"
   },
   "notifications": {
     "broken_favorite": "알 수 없는 게시물입니다, 검색합니다…",
@@ -158,7 +163,9 @@
     "edit_status": "수정",
     "edit_remote_warning": "수정 기능이 없는 다른 인스턴스에서는 수정한 사항이 반영되지 않을 수 있습니다.",
     "post": "게시",
-    "direct_warning_to_first_only": "맨 앞에 멘션한 사용자들에게만 보여집니다."
+    "direct_warning_to_first_only": "맨 앞에 멘션한 사용자들에게만 보여집니다.",
+    "content_type_selection": "게시물 형태",
+    "scope_notice_dismiss": "알림 닫기"
   },
   "registration": {
     "bio": "소개",
@@ -175,7 +182,9 @@
       "email_required": "공백으로 둘 수 없습니다",
       "password_required": "공백으로 둘 수 없습니다",
       "password_confirmation_required": "공백으로 둘 수 없습니다",
-      "password_confirmation_match": "패스워드와 일치해야 합니다"
+      "password_confirmation_match": "패스워드와 일치해야 합니다",
+      "birthday_required": "공백으로 둘 수 없습니다",
+      "birthday_min_age": "{date} 또는 그 이전 출생만 가능합니다"
     },
     "fullname_placeholder": "예: 김례인",
     "username_placeholder": "예: lain",
@@ -185,7 +194,9 @@
     "reason": "가입하려는 이유",
     "reason_placeholder": "이 인스턴스는 수동으로 가입을 승인하고 있습니다.\n왜 가입하고 싶은지 관리자에게 알려주세요.",
     "register": "가입",
-    "email_language": "무슨 언어로 이메일을 받길 원하시나요?"
+    "email_language": "무슨 언어로 이메일을 받길 원하시나요?",
+    "birthday": "생일:",
+    "birthday_optional": "생일 (선택):"
   },
   "settings": {
     "attachmentRadius": "첨부물",
@@ -383,7 +394,8 @@
         "highlight": "강조 요소",
         "pressed": "눌렸을 때",
         "toggled": "토글됨",
-        "tabs": "탭"
+        "tabs": "탭",
+        "underlay": "밑배경"
       },
       "radii": {
         "_tab_label": "둥글기"
@@ -652,7 +664,29 @@
     "post_status_content_type": "게시물 내용 형식",
     "list_aliases_error": "별칭을 가져오는 중 에러 발생: {error}",
     "add_alias_error": "별칭을 추가하는 중 에러 발생: {error}",
-    "mention_link_show_avatar_quick": "멘션 옆에 유저 프로필 사진을 보임"
+    "mention_link_show_avatar_quick": "멘션 옆에 유저 프로필 사진을 보임",
+    "backup_running": "백업 중입니다, {number}개 처리 완료. | 백업 중입니다, {number}개 처리 완료.",
+    "confirm_dialogs": "하기 전에 다시 물어보기",
+    "autocomplete_select_first": "자동완성이 가능하면 자동으로 첫 번째 후보를 선택",
+    "backup_failed": "백업에 실패했습니다.",
+    "emoji_reactions_scale": "리액션 크기",
+    "birthday": {
+      "label": "생일",
+      "show_birthday": "내 생일 보여주기"
+    },
+    "add_language": "보조 언어 추가",
+    "confirm_dialogs_repeat": "리핏",
+    "confirm_dialogs_unfollow": "언팔로우",
+    "confirm_dialogs_block": "차단",
+    "confirm_dialogs_mute": "뮤트",
+    "confirm_dialogs_delete": "게시물 삭제",
+    "confirm_dialogs_approve_follow": "팔로워 승인",
+    "confirm_dialogs_deny_follow": "팔로워 거절",
+    "confirm_dialogs_remove_follower": "팔로워 제거",
+    "remove_language": "삭제",
+    "primary_language": "주 언어:",
+    "fallback_language": "보조 언어 {index}:",
+    "confirm_dialogs_logout": "로그아웃"
   },
   "timeline": {
     "collapse": "접기",
@@ -735,7 +769,12 @@
       "striped": "줄무늬 배경",
       "solid": "단색 배경",
       "side": "옆트임"
-    }
+    },
+    "approve_confirm_title": "승인 확인",
+    "approve_confirm_accept_button": "승인",
+    "approve_confirm_cancel_button": "승인 안 함",
+    "approve_confirm": "{user}의 팔로우 요청을 승인할까요?",
+    "block_confirm_title": "차단 확인"
   },
   "user_profile": {
     "timeline_title": "사용자 타임라인",
@@ -1069,7 +1108,14 @@
     "ancestor_follow_with_icon": "{icon} {text}",
     "show_all_conversation_with_icon": "{icon} {text}",
     "ancestor_follow": "이 게시물 아래 {numReplies}개 답글 더 보기 | 이 게시물 아래 {numReplies}개 답글 더 보기",
-    "show_only_conversation_under_this": "이 게시물의 답글만 보기"
+    "show_only_conversation_under_this": "이 게시물의 답글만 보기",
+    "repeat_confirm": "리핏할까요?",
+    "repeat_confirm_title": "리핏 확인",
+    "repeat_confirm_accept_button": "리핏",
+    "repeat_confirm_cancel_button": "리핏 안 함",
+    "delete_confirm_title": "삭제 확인",
+    "delete_confirm_accept_button": "삭제",
+    "delete_confirm_cancel_button": "냅두기"
   },
   "errors": {
     "storage_unavailable": "Pleroma가 브라우저 저장소에 접근할 수 없습니다. 로그인이 풀리거나 로컬 설정이 초기화 되는 등 예상치 못한 문제를 겪을 수 있습니다. 쿠키를 활성화 해보세요."

From 762cdc738f17c36ec0eecf370ccd805df50e07ae Mon Sep 17 00:00:00 2001
From: Tirifto <tirifto@posteo.cz>
Date: Sun, 7 May 2023 18:04:14 +0000
Subject: [PATCH 22/42] Translated using Weblate (Esperanto)

Currently translated at 98.1% (971 of 989 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/eo/
---
 src/i18n/eo.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/eo.json b/src/i18n/eo.json
index 252665cce..249a0aaba 100644
--- a/src/i18n/eo.json
+++ b/src/i18n/eo.json
@@ -94,7 +94,7 @@
     "hide": "Fermi vidilon de vidaŭdaĵoj"
   },
   "nav": {
-    "about": "Pri",
+    "about": "Prio",
     "back": "Reen",
     "chat": "Loka babilejo",
     "friend_requests": "Petoj pri abono",

From b275c9afa68bed3454788e671985bb712a1c3c03 Mon Sep 17 00:00:00 2001
From: Pleroma Renovate Bot <contact+pleroma-renovator@hacktivis.me>
Date: Tue, 16 May 2023 09:06:29 +0000
Subject: [PATCH 23/42] Update Font Awesome to v6.4.0

---
 package.json |  6 +++---
 yarn.lock    | 38 +++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index bbe782fbc..83425b6da 100644
--- a/package.json
+++ b/package.json
@@ -18,9 +18,9 @@
   "dependencies": {
     "@babel/runtime": "7.21.5",
     "@chenfengyuan/vue-qrcode": "2.0.0",
-    "@fortawesome/fontawesome-svg-core": "6.3.0",
-    "@fortawesome/free-regular-svg-icons": "6.3.0",
-    "@fortawesome/free-solid-svg-icons": "6.3.0",
+    "@fortawesome/fontawesome-svg-core": "6.4.0",
+    "@fortawesome/free-regular-svg-icons": "6.4.0",
+    "@fortawesome/free-solid-svg-icons": "6.4.0",
     "@fortawesome/vue-fontawesome": "3.0.3",
     "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
     "@kazvmoe-infra/unicode-emoji-json": "0.4.0",
diff --git a/yarn.lock b/yarn.lock
index 08718be49..04cf0aa09 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1695,31 +1695,31 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@fortawesome/fontawesome-common-types@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.3.0.tgz#51f734e64511dbc3674cd347044d02f4dd26e86b"
-  integrity sha512-4BC1NMoacEBzSXRwKjZ/X/gmnbp/HU5Qqat7E8xqorUtBFZS+bwfGH5/wqOC2K6GV0rgEobp3OjGRMa5fK9pFg==
+"@fortawesome/fontawesome-common-types@6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.4.0.tgz#88da2b70d6ca18aaa6ed3687832e11f39e80624b"
+  integrity sha512-HNii132xfomg5QVZw0HwXXpN22s7VBHQBv9CeOu9tfJnhsWQNd2lmTNi8CSrnw5B+5YOmzu1UoPAyxaXsJ6RgQ==
 
-"@fortawesome/fontawesome-svg-core@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.3.0.tgz#b6a17d48d231ac1fad93e43fca7271676bf316cf"
-  integrity sha512-uz9YifyKlixV6AcKlOX8WNdtF7l6nakGyLYxYaCa823bEBqyj/U2ssqtctO38itNEwXb8/lMzjdoJ+aaJuOdrw==
+"@fortawesome/fontawesome-svg-core@6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.4.0.tgz#3727552eff9179506e9203d72feb5b1063c11a21"
+  integrity sha512-Bertv8xOiVELz5raB2FlXDPKt+m94MQ3JgDfsVbrqNpLU9+UE2E18GKjLKw+d3XbeYPqg1pzyQKGsrzbw+pPaw==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.3.0"
+    "@fortawesome/fontawesome-common-types" "6.4.0"
 
-"@fortawesome/free-regular-svg-icons@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.3.0.tgz#286f87f777e6c96af59151e86647c81083029ee2"
-  integrity sha512-cZnwiVHZ51SVzWHOaNCIA+u9wevZjCuAGSvSYpNlm6A4H4Vhwh8481Bf/5rwheIC3fFKlgXxLKaw8Xeroz8Ntg==
+"@fortawesome/free-regular-svg-icons@6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.4.0.tgz#cacc53bd8d832d46feead412d9ea9ce80a55e13a"
+  integrity sha512-ZfycI7D0KWPZtf7wtMFnQxs8qjBXArRzczABuMQqecA/nXohquJ5J/RCR77PmY5qGWkxAZDxpnUFVXKwtY/jPw==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.3.0"
+    "@fortawesome/fontawesome-common-types" "6.4.0"
 
-"@fortawesome/free-solid-svg-icons@6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.3.0.tgz#d3bd33ae18bb15fdfc3ca136e2fea05f32768a65"
-  integrity sha512-x5tMwzF2lTH8pyv8yeZRodItP2IVlzzmBuD1M7BjawWgg9XAvktqJJ91Qjgoaf8qJpHQ8FEU9VxRfOkLhh86QA==
+"@fortawesome/free-solid-svg-icons@6.4.0":
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.4.0.tgz#48c0e790847fa56299e2f26b82b39663b8ad7119"
+  integrity sha512-kutPeRGWm8V5dltFP1zGjQOEAzaLZj4StdQhWVZnfGFCvAPVvHh8qk5bRrU4KXnRRRNni5tKQI9PBAdI6MP8nQ==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "6.3.0"
+    "@fortawesome/fontawesome-common-types" "6.4.0"
 
 "@fortawesome/vue-fontawesome@3.0.3":
   version "3.0.3"

From b171d831f2cce2b3c7aad658c63f2dc12ddd1ce3 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Wed, 17 May 2023 11:36:14 +0000
Subject: [PATCH 24/42] Translated using Weblate (Arabic)

Currently translated at 14.2% (141 of 989 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index cd9a410a4..6a528d8ba 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -211,11 +211,19 @@
         "keyword_policies": "سياسة الكلمات الدلالية"
       },
       "simple": {
-        "simple_policies": "سياسات الخادم"
+        "simple_policies": "سياسات الخادم",
+        "instance": "مثيل",
+        "reason": "السبب",
+        "accept": "قبول",
+        "reject": "رفض"
       },
       "federation": "الاتحاد",
       "mrf_policies": "تفعيل سياسات إعادة كتابة المنشور",
       "mrf_policies_desc": "خاصية إعادة كتابة المناشير تقوم بتعديل تفاعل الاتحاد مع هذا الخادم. السياسات التالية مفعّلة:"
     }
+  },
+  "announcements": {
+    "page_header": "إعلانات",
+    "title": "إعلان"
   }
 }

From 6b0d72937e19c87ea8a925b41a1475704bbd1a56 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Sun, 21 May 2023 18:31:25 +0000
Subject: [PATCH 25/42] Apply 1 suggestion(s) to 1 file(s)

---
 .../settings_modal/helpers/boolean_setting.vue         | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/components/settings_modal/helpers/boolean_setting.vue b/src/components/settings_modal/helpers/boolean_setting.vue
index 5ddf5aad5..5a9eab348 100644
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@@ -35,16 +35,6 @@
     >
       {{ backendDescriptionDescription + ' ' }}
     </p>
-    <!-- debugging -->
-    <!--
-    <p
-      v-else
-      class="setting-description"
-      :class="{ 'faint': shouldBeDisabled }"
-    >
-      MISSING DESCRIPTION FOR {{ path }}
-    </p>
-    -->
   </label>
 </template>
 

From ed23f51838477dc04fb5daedb6bf1bdf96f2ca65 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:02:22 -0400
Subject: [PATCH 26/42] Make reaction button accessible

---
 .../emoji_reactions/emoji_reactions.js        |  12 ++
 .../emoji_reactions/emoji_reactions.vue       | 104 ++++++++++++++++--
 2 files changed, 108 insertions(+), 8 deletions(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index bb11b840f..b3520a550 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -1,5 +1,17 @@
 import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserListPopover from '../user_list_popover/user_list_popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faPlus,
+  faMinus,
+  faCheck
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faPlus,
+  faMinus,
+  faCheck
+)
 
 const EMOJI_REACTION_COUNT_CUTOFF = 12
 
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index eb46018e2..3171785b3 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -1,15 +1,14 @@
 <template>
   <div class="EmojiReactions">
-    <UserListPopover
+    <span
       v-for="(reaction) in emojiReactions"
       :key="reaction.url || reaction.name"
-      :users="accountsForEmoji[reaction.name]"
+      class="emoji-reaction-container btn-group"
     >
       <button
         class="emoji-reaction btn button-default"
         :class="{ '-picked-reaction': reactedWith(reaction.name), 'not-clickable': !loggedIn }"
         @click="emojiOnClick(reaction.name, $event)"
-        @mouseenter="fetchEmojiReactionsByIfMissing()"
       >
         <span
           class="reaction-emoji"
@@ -26,9 +25,36 @@
             class="reaction-emoji reaction-emoji-content"
           >{{ reaction.name }}</span>
         </span>
-        <span>{{ reaction.count }}</span>
+        <FALayers>
+        <FAIcon
+          v-if="reactedWith(reaction.name)"
+          class="active-marker"
+          transform="shrink-6 up-9"
+          icon="check"
+        />
+        <FAIcon
+          v-if="!reactedWith(reaction.name)"
+          class="focus-marker"
+          transform="shrink-6 up-9"
+          icon="plus"
+        />
+        <FAIcon
+          v-else
+          class="focus-marker"
+          transform="shrink-6 up-9"
+          icon="minus"
+        />
+        </FALayers>
       </button>
+    <UserListPopover
+      :users="accountsForEmoji[reaction.name]"
+      class="emoji-reaction-popover"
+      @show="fetchEmojiReactionsByIfMissing()"
+      :trigger-attrs="{ class: ['btn', 'button-default', 'emoji-reaction-count-button', { '-picked-reaction': reactedWith(reaction.name) }] }"
+    >
+      <span class="emoji-reaction-counts">{{ reaction.count }}</span>
     </UserListPopover>
+    </span>
     <a
       v-if="tooManyReactions"
       class="emoji-reaction-expand faint"
@@ -43,6 +69,7 @@
 <script src="./emoji_reactions.js"></script>
 <style lang="scss">
 @import "../../variables";
+@import "../../mixins";
 
 .EmojiReactions {
   display: flex;
@@ -51,10 +78,36 @@
 
   --emoji-size: calc(1.25em * var(--emojiReactionsScale, 1));
 
-  .emoji-reaction {
-    padding: 0 0.5em;
-    margin-right: 0.5em;
+  .emoji-reaction-container {
+    display: flex;
+    align-items: stretch;
     margin-top: 0.5em;
+    margin-right: 0.5em;
+
+    .emoji-reaction-popover {
+      padding: 0;
+
+      .emoji-reaction-count-button {
+        background-color: var(--btn);
+        height: 100%;
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        box-sizing: border-box;
+        min-width: 2em;
+        display: inline-flex;
+        justify-content: center;
+        align-items: center;
+
+        &.-picked-reaction {
+          border: 1px solid var(--accent, $fallback--link);
+          margin-right: -1px;
+        }
+      }
+    }
+  }
+
+  .emoji-reaction {
+    padding-left: 0.5em;
     display: flex;
     align-items: center;
     justify-content: center;
@@ -97,7 +150,42 @@
     &.-picked-reaction {
       border: 1px solid var(--accent, $fallback--link);
       margin-left: -1px; // offset the border, can't use inset shadows either
-      margin-right: calc(0.5em - 1px);
+      margin-right: -1px;
+
+      .svg-inline--fa {
+        color: $fallback--link;
+        color: var(--accent, $fallback--link);
+      }
+    }
+
+    @include unfocused-style {
+      .svg-inline--fa {
+        color: $fallback--text;
+        color: var(--btnText, $fallback--text);
+      }
+
+      .focus-marker {
+        visibility: hidden;
+      }
+
+      .active-marker {
+        visibility: visible;
+      }
+    }
+
+    @include focused-style {
+      .svg-inline--fa {
+        color: $fallback--link;
+        color: var(--accent, $fallback--link);
+      }
+
+      .focus-marker {
+        visibility: visible;
+      }
+
+      .active-marker {
+        visibility: hidden;
+      }
     }
   }
 

From 8a1074336c3cce8111a23281bbe71301b93c3420 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:09:04 -0400
Subject: [PATCH 27/42] Make emoji reactions clickable when not logged in

---
 .../emoji_reactions/emoji_reactions.js        |  3 +++
 .../emoji_reactions/emoji_reactions.vue       | 20 ++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index b3520a550..74cb844cc 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -45,6 +45,9 @@ const EmojiReactions = {
     },
     loggedIn () {
       return !!this.$store.state.users.currentUser
+    },
+    remoteInteractionLink () {
+      return this.$store.getters.remoteInteractionLink({ statusId: this.status.id })
     }
   },
   methods: {
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 3171785b3..f30afcb2a 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -5,9 +5,12 @@
       :key="reaction.url || reaction.name"
       class="emoji-reaction-container btn-group"
     >
-      <button
+      <component
+        :is="loggedIn ? 'button' : 'a'"
+        v-bind="!loggedIn ? { href: remoteInteractionLink } : {}"
+        role="button"
         class="emoji-reaction btn button-default"
-        :class="{ '-picked-reaction': reactedWith(reaction.name), 'not-clickable': !loggedIn }"
+        :class="{ '-picked-reaction': reactedWith(reaction.name) }"
         @click="emojiOnClick(reaction.name, $event)"
       >
         <span
@@ -45,7 +48,7 @@
           icon="minus"
         />
         </FALayers>
-      </button>
+      </component>
     <UserListPopover
       :users="accountsForEmoji[reaction.name]"
       class="emoji-reaction-popover"
@@ -112,6 +115,8 @@
     align-items: center;
     justify-content: center;
     box-sizing: border-box;
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
 
     .reaction-emoji {
       width: var(--emoji-size);
@@ -138,15 +143,6 @@
       outline: none;
     }
 
-    &.not-clickable {
-      cursor: default;
-
-      &:hover {
-        box-shadow: $fallback--buttonShadow;
-        box-shadow: var(--buttonShadow);
-      }
-    }
-
     &.-picked-reaction {
       border: 1px solid var(--accent, $fallback--link);
       margin-left: -1px; // offset the border, can't use inset shadows either

From 0b2f676e50c5fb8da1d5e673ee6a2723ee7c9e1e Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:14:44 -0400
Subject: [PATCH 28/42] Fix focus (unvisible) style

---
 src/components/emoji_reactions/emoji_reactions.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index f30afcb2a..3f76cdc66 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -143,6 +143,11 @@
       outline: none;
     }
 
+    .svg-inline--fa {
+      color: $fallback--text;
+      color: var(--btnText, $fallback--text);
+    }
+
     &.-picked-reaction {
       border: 1px solid var(--accent, $fallback--link);
       margin-left: -1px; // offset the border, can't use inset shadows either
@@ -155,11 +160,6 @@
     }
 
     @include unfocused-style {
-      .svg-inline--fa {
-        color: $fallback--text;
-        color: var(--btnText, $fallback--text);
-      }
-
       .focus-marker {
         visibility: hidden;
       }

From 48ee11fea35123090762d98f5249168679f05e3a Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:18:42 -0400
Subject: [PATCH 29/42] Add aria for react button

---
 src/components/emoji_reactions/emoji_reactions.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 3f76cdc66..1fdfb87be 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -11,6 +11,8 @@
         role="button"
         class="emoji-reaction btn button-default"
         :class="{ '-picked-reaction': reactedWith(reaction.name) }"
+        :title="reaction.url ? reaction.name : undefined"
+        :aria-pressed="reactedWith(reaction.name)"
         @click="emojiOnClick(reaction.name, $event)"
       >
         <span
@@ -19,7 +21,6 @@
           <img
             v-if="reaction.url"
             :src="reaction.url"
-            :title="reaction.name"
             class="reaction-emoji-content"
             width="1em"
           >

From d3e251665f50c7d289066b0be0fdfa5b227c3b65 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:20:09 -0400
Subject: [PATCH 30/42] Lint

---
 .../emoji_reactions/emoji_reactions.vue       | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 1fdfb87be..d475d5dc0 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -30,34 +30,34 @@
           >{{ reaction.name }}</span>
         </span>
         <FALayers>
-        <FAIcon
-          v-if="reactedWith(reaction.name)"
-          class="active-marker"
-          transform="shrink-6 up-9"
-          icon="check"
-        />
-        <FAIcon
-          v-if="!reactedWith(reaction.name)"
-          class="focus-marker"
-          transform="shrink-6 up-9"
-          icon="plus"
-        />
-        <FAIcon
-          v-else
-          class="focus-marker"
-          transform="shrink-6 up-9"
-          icon="minus"
-        />
+          <FAIcon
+            v-if="reactedWith(reaction.name)"
+            class="active-marker"
+            transform="shrink-6 up-9"
+            icon="check"
+          />
+          <FAIcon
+            v-if="!reactedWith(reaction.name)"
+            class="focus-marker"
+            transform="shrink-6 up-9"
+            icon="plus"
+          />
+          <FAIcon
+            v-else
+            class="focus-marker"
+            transform="shrink-6 up-9"
+            icon="minus"
+          />
         </FALayers>
       </component>
-    <UserListPopover
-      :users="accountsForEmoji[reaction.name]"
-      class="emoji-reaction-popover"
-      @show="fetchEmojiReactionsByIfMissing()"
-      :trigger-attrs="{ class: ['btn', 'button-default', 'emoji-reaction-count-button', { '-picked-reaction': reactedWith(reaction.name) }] }"
-    >
-      <span class="emoji-reaction-counts">{{ reaction.count }}</span>
-    </UserListPopover>
+      <UserListPopover
+        :users="accountsForEmoji[reaction.name]"
+        class="emoji-reaction-popover"
+        :trigger-attrs="{ class: ['btn', 'button-default', 'emoji-reaction-count-button', { '-picked-reaction': reactedWith(reaction.name) }] }"
+        @show="fetchEmojiReactionsByIfMissing()"
+      >
+        <span class="emoji-reaction-counts">{{ reaction.count }}</span>
+      </UserListPopover>
     </span>
     <a
       v-if="tooManyReactions"

From c67513002460f56901246c81a9e7b6dbad89be27 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:30:54 -0400
Subject: [PATCH 31/42] Make reaction counter accessible

---
 src/components/emoji_reactions/emoji_reactions.js  | 11 +++++++++++
 src/components/emoji_reactions/emoji_reactions.vue |  2 +-
 src/i18n/en.json                                   |  3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index 74cb844cc..b4936424b 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -77,6 +77,17 @@ const EmojiReactions = {
       } else {
         this.reactWith(emoji)
       }
+    },
+    counterTriggerAttrs (reaction) {
+      return {
+        class: [
+          'btn',
+          'button-default',
+          'emoji-reaction-count-button',
+          { '-picked-reaction': this.reactedWith(reaction.name) }
+        ],
+        'aria-label': this.$tc('status.reaction_count_label', reaction.count, { num: reaction.count })
+      }
     }
   }
 }
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index d475d5dc0..20a1f4a13 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -53,7 +53,7 @@
       <UserListPopover
         :users="accountsForEmoji[reaction.name]"
         class="emoji-reaction-popover"
-        :trigger-attrs="{ class: ['btn', 'button-default', 'emoji-reaction-count-button', { '-picked-reaction': reactedWith(reaction.name) }] }"
+        :trigger-attrs="counterTriggerAttrs(reaction)"
         @show="fetchEmojiReactionsByIfMissing()"
       >
         <span class="emoji-reaction-counts">{{ reaction.count }}</span>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index b051f088c..01309d0ef 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -933,7 +933,8 @@
     "show_all_conversation_with_icon": "{icon} {text}",
     "show_all_conversation": "Show full conversation ({numStatus} other status) | Show full conversation ({numStatus} other statuses)",
     "show_only_conversation_under_this": "Only show replies to this status",
-    "status_history": "Status history"
+    "status_history": "Status history",
+    "reaction_count_label": "{num} person reacted | {num} people reacted"
   },
   "user_card": {
     "approve": "Approve",

From dc2ff9b2d293a444d4af261692a307f96f27a60f Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 22:37:18 -0400
Subject: [PATCH 32/42] Add text label for custom emoji reactions

---
 src/components/notification/notification.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 4d801c5e9..5a32fc701 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -125,7 +125,8 @@
                     v-if="notification.emoji_url"
                     class="emoji-reaction-emoji emoji-reaction-emoji-image"
                     :src="notification.emoji_url"
-                    :name="notification.emoji"
+                    :alt="notification.emoji"
+                    :title="notification.emoji"
                   >
                   <span
                     v-else

From b82f2a3543b733eda9ce52d60d6b7aba60f787d0 Mon Sep 17 00:00:00 2001
From: tusooa <tusooa@kazv.moe>
Date: Mon, 22 May 2023 23:09:05 -0400
Subject: [PATCH 33/42] Use button text in reaction counter

---
 src/components/emoji_reactions/emoji_reactions.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index 20a1f4a13..92fc58ca4 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -101,6 +101,8 @@
         display: inline-flex;
         justify-content: center;
         align-items: center;
+        color: $fallback--text;
+        color: var(--btnText, $fallback--text);
 
         &.-picked-reaction {
           border: 1px solid var(--accent, $fallback--link);

From f4d3575804667a6b5eeeebb81600d0bcde09e113 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Fri, 19 May 2023 20:23:52 +0000
Subject: [PATCH 34/42] Translated using Weblate (Arabic)

Currently translated at 37.4% (370 of 989 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 317 +++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 295 insertions(+), 22 deletions(-)

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 6a528d8ba..7915e7794 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -9,7 +9,8 @@
     "scope_options": "",
     "text_limit": "الحد الأقصى للنص",
     "title": "الميّزات",
-    "who_to_follow": "للمتابعة"
+    "who_to_follow": "للمتابعة",
+    "upload_limit": "حد الرفع"
   },
   "finder": {
     "error_fetching_user": "خطأ أثناء جلب صفحة المستخدم",
@@ -17,7 +18,35 @@
   },
   "general": {
     "apply": "تطبيق",
-    "submit": "إرسال"
+    "submit": "إرسال",
+    "error_retry": "حاول مجددًا",
+    "retry": "حاول مجدداً",
+    "optional": "اختياري",
+    "show_more": "اعرض المزيد",
+    "show_less": "اعرض أقل",
+    "cancel": "ألغ",
+    "disable": "عطّل",
+    "enable": "فعّل",
+    "confirm": "تأكيد",
+    "close": "أغلق",
+    "role": {
+      "admin": "مدير",
+      "moderator": "مشرف"
+    },
+    "generic_error_message": "حدث خطأ: {0}",
+    "never_show_again": "لا تظهره مجددًا",
+    "yes": "نعم",
+    "no": "لا",
+    "unpin": "ألغ تثبيت العنصر",
+    "undo": "تراجع",
+    "more": "المزيد",
+    "loading": "يحمل…",
+    "generic_error": "حدث خطأ",
+    "scope_in_timeline": {
+      "private": "المتابِعون فقط"
+    },
+    "scroll_to_top": "مرر لأعلى",
+    "pin": "ثبت العنصر"
   },
   "login": {
     "login": "تسجيل الدخول",
@@ -25,7 +54,19 @@
     "password": "الكلمة السرية",
     "placeholder": "مثال lain",
     "register": "انشاء حساب",
-    "username": "إسم المستخدم"
+    "username": "إسم المستخدم",
+    "logout_confirm_title": "تأكيد الخروج",
+    "logout_confirm": "أتريد الخروج؟",
+    "logout_confirm_accept_button": "خروج",
+    "logout_confirm_cancel_button": "لا تخرج",
+    "hint": "لِج للانضمام للمناقشة",
+    "authentication_code": "رمز الاستيثاق",
+    "enter_recovery_code": "أدخل رمز التأكيد",
+    "enter_two_factor_code": "أدخل رمز الاستيثاق بعاملين",
+    "recovery_code": "رمز الاستعادة",
+    "heading": {
+      "totp": "الاستيثاق بعاملين"
+    }
   },
   "nav": {
     "chat": "الدردشة المحلية",
@@ -33,23 +74,48 @@
     "mentions": "الإشارات",
     "public_tl": "الخيط الزمني العام",
     "timeline": "الخيط الزمني",
-    "twkn": "كافة الشبكة المعروفة"
+    "twkn": "كافة الشبكة المعروفة",
+    "search_close": "أغلق شربط البحث",
+    "back": "للخلف",
+    "administration": "الإدارة",
+    "preferences": "التفضيلات",
+    "chats": "المحادثات",
+    "lists": "القوائم",
+    "edit_nav_mobile": "خصص شريط التنقل",
+    "edit_pinned": "حرر العناصر المثبتة",
+    "mobile_notifications_close": "أغلق الاشعارات",
+    "announcements": "إعلانات",
+    "home_timeline": "الخط الزمني الرئيس",
+    "search": "بحث",
+    "who_to_follow": "للمتابعة",
+    "dms": "رسالة شخصية",
+    "edit_finish": "تم التحرير",
+    "timelines": "الخيوط الزمنية",
+    "mobile_notifications": "افتح الإشعارات (تتواجد اشعارات غير مقروءة)"
   },
   "notifications": {
     "broken_favorite": "منشور مجهول، جارٍ البحث عنه…",
     "favorited_you": "أعجِب بمنشورك",
     "followed_you": "يُتابعك",
     "load_older": "تحميل الإشعارات الأقدم",
-    "notifications": "الإخطارات",
+    "notifications": "الاشعارات",
     "read": "مقروء!",
-    "repeated_you": "شارَك منشورك"
+    "repeated_you": "شارَك منشورك",
+    "error": "خطأ أثناء جلب الاشعارات: {0}",
+    "follow_request": "يريد متابعتك",
+    "poll_ended": "انتهى الاستطلاع",
+    "no_more_notifications": "لا مزيد من الإشعارات",
+    "reacted_with": "تفاعل بـ{0}",
+    "submitted_report": "أرسل بلاغًا"
   },
   "post_status": {
     "account_not_locked_warning": "",
     "account_not_locked_warning_link": "مقفل",
     "attachments_sensitive": "اعتبر المرفقات كلها كمحتوى حساس",
     "content_type": {
-      "text/plain": "نص صافٍ"
+      "text/plain": "نص صِرف",
+      "text/html": "HTML",
+      "text/markdown": "ماركداون"
     },
     "content_warning": "الموضوع (اختياري)",
     "default": "وصلت للتوّ إلى لوس أنجلس.",
@@ -60,15 +126,47 @@
       "private": "",
       "public": "علني - يُنشر على الخيوط الزمنية العمومية",
       "unlisted": "غير مُدرَج - لا يُنشَر على الخيوط الزمنية العمومية"
-    }
+    },
+    "media_description": "وصف الوسائط",
+    "direct_warning_to_all": "سيكون عذا المنشور مرئيًا لكل المستخدمين المذكورين.",
+    "post": "انشر",
+    "preview": "معاينة",
+    "preview_empty": "فارغ",
+    "scope_notice": {
+      "public": "سيكون هذا المنشور مرئيًا للجميع",
+      "private": "سيكون هذا المنشور مرئيا لمتابِعيك فقط"
+    },
+    "direct_warning_to_first_only": "سيكون عذا المنشور مرئيًا للمستخدمين المذكورين في أول الرسالة.",
+    "edit_unsupported_warning": "بليروما لا يدعم تعديل الذكر والاستطلاع.",
+    "empty_status_error": "يتعذر نشر منشور فارغ دون ملفات"
   },
   "registration": {
     "bio": "السيرة الذاتية",
     "email": "عنوان البريد الإلكتروني",
-    "fullname": "الإسم المعروض",
+    "fullname": "الاسم العلني",
     "password_confirm": "تأكيد الكلمة السرية",
     "registration": "التسجيل",
-    "token": "رمز الدعوة"
+    "token": "رمز الدعوة",
+    "bio_optional": "سيرة (اختيارية)",
+    "email_optional": "بيرد إلكتروني (اختياري)",
+    "username_placeholder": "مثل lain",
+    "reason": "سبب التسجيل",
+    "register": "سجل",
+    "validations": {
+      "username_required": "لايمكن تركه فارغًا",
+      "email_required": "لايمكن تركه فارغًا",
+      "password_required": "لايمكن تركه فارغًا",
+      "password_confirmation_required": "لايمكن تركه فارغًا",
+      "fullname_required": "لايمكن تركه فارغًا",
+      "password_confirmation_match": "يلزم أن يطابق كلمة السر",
+      "birthday_required": "لايمكن تركه فارغًا",
+      "birthday_min_age": "يلزم أن يكون في {date} أو قبله"
+    },
+    "fullname_placeholder": "مثل Lain Iwakura",
+    "reason_placeholder": "قبول التسجيل في هذا المثيل يستلزم موافقة المدير\nلهذا يجب عليك إعلامه بسبب التسجيل.",
+    "birthday_optional": "تاريخ الميلاد (اختياري):",
+    "email_language": "بأي لغة تريد استلام رسائل البريد الإلكتروني؟",
+    "birthday": "تاريخ الميلاد:"
   },
   "settings": {
     "attachmentRadius": "المُرفَقات",
@@ -83,9 +181,9 @@
     "cGreen": "أخضر (إعادة النشر)",
     "cOrange": "برتقالي (مفضلة)",
     "cRed": "أحمر (إلغاء)",
-    "change_password": "تغيير كلمة السر",
-    "change_password_error": "وقع هناك خلل أثناء تعديل كلمتك السرية.",
-    "changed_password": "تم تغيير كلمة المرور بنجاح!",
+    "change_password": "غيّر كلمة السر",
+    "change_password_error": "حدث خلل أثناء تعديل كلمتك السرية.",
+    "changed_password": "نجح تغيير كلمة السر!",
     "collapse_subject": "",
     "confirm_new_password": "تأكيد كلمة السر الجديدة",
     "current_avatar": "صورتك الرمزية الحالية",
@@ -94,11 +192,11 @@
     "data_import_export_tab": "تصدير واستيراد البيانات",
     "default_vis": "أسلوب العرض الافتراضي",
     "delete_account": "حذف الحساب",
-    "delete_account_description": "حذف حسابك و كافة منشوراتك نهائيًا.",
-    "delete_account_error": "",
+    "delete_account_description": "حذف حسابك و كافة بياناتك نهائيًا.",
+    "delete_account_error": "حدثة مشكلة اثناء حذف حسابك، إذا استمرت تواصل مع مدير المثيل.",
     "delete_account_instructions": "يُرجى إدخال كلمتك السرية أدناه لتأكيد عملية حذف الحساب.",
     "export_theme": "حفظ النموذج",
-    "filtering": "التصفية",
+    "filtering": "الترشيح",
     "filtering_explanation": "سيتم إخفاء كافة المنشورات التي تحتوي على هذه الكلمات، كلمة واحدة في كل سطر",
     "follow_export": "تصدير الاشتراكات",
     "follow_export_button": "تصدير الاشتراكات كملف csv",
@@ -108,10 +206,10 @@
     "follows_imported": "",
     "foreground": "الأمامية",
     "general": "الإعدادات العامة",
-    "hide_attachments_in_convo": "إخفاء المرفقات على المحادثات",
-    "hide_attachments_in_tl": "إخفاء المرفقات على الخيط الزمني",
-    "hide_post_stats": "",
-    "hide_user_stats": "",
+    "hide_attachments_in_convo": "اخف المرفقات من المحادثات",
+    "hide_attachments_in_tl": "اخف المرفقات من الخيط الزمني",
+    "hide_post_stats": "اخف احصائيات المنشور (مثل عدد التفضيلات)",
+    "hide_user_stats": "اخف احصائيات المستخدم (مثل عدد المتابِعين)",
     "import_followers_from_a_csv_file": "",
     "import_theme": "تحميل نموذج",
     "inputRadius": "",
@@ -166,7 +264,92 @@
     "values": {
       "false": "لا",
       "true": "نعم"
-    }
+    },
+    "emoji_reactions_scale": "معامل تحجيم التفاعلات",
+    "app_name": "اسم تطبيق",
+    "security": "الأمن",
+    "enter_current_password_to_confirm": "أدخل كلمة السر الحالية لتيقن من هويتك",
+    "mfa": {
+      "title": "الاستيثاق بعاملين",
+      "generate_new_recovery_codes": "ولّد رموز استعادة جديدة",
+      "warning_of_generate_new_codes": "عند توليد رموز استعادة جديدة ستزال القديمة.",
+      "recovery_codes": "رموز الاستعادة.",
+      "recovery_codes_warning": "خزن هذه الرموز في مكان آمن. إذا فقدت هذه الرموز وتعذر عليك الوصول إلى تطبيق الاستيثاق بعاملين، لن تتمكن من الوصول لحسابك.",
+      "authentication_methods": "طرق الاستيثاق",
+      "scan": {
+        "title": "مسح",
+        "desc": "امسح رمز الاستجابة السريعة QR من تطبيق الاستيثاق أو أدخل المفتاح:",
+        "secret_code": "مفتاح"
+      },
+      "verify": {
+        "desc": "لتفعيل الاستيثاق بعاملين أدخل الرمز من تطبيق الاستيثاق:"
+      }
+    },
+    "block_import": "استيراد المحجوبين",
+    "import_mutes_from_a_csv_file": "استورد قائمة المكتومين من ملف csv",
+    "account_backup": "نسخ احتياطي للحساب",
+    "download_backup": "نزّل",
+    "account_backup_table_head": "نسخ احتياطي",
+    "backup_not_ready": "هذا النسخ الاحتياطي ليس جاهزًا.",
+    "backup_failed": "فشل النسخ الاحتياطي.",
+    "remove_backup": "أزل",
+    "list_backups_error": "خطأ أثناء حلب قائمة النُسخ الاحتياطية: {error}",
+    "added_backup": "أُضيفت نسخة احتياطية جديدة.",
+    "blocks_tab": "المحجوبون",
+    "confirm_dialogs_block": "حجب مستخدم",
+    "confirm_dialogs_mute": "كتم مستخدم",
+    "confirm_dialogs_delete": "حذف حالة",
+    "confirm_dialogs_logout": "خروج",
+    "confirm_dialogs_approve_follow": "قبول متابِع",
+    "confirm_dialogs_deny_follow": "رفض متابِع",
+    "list_aliases_error": "خطأ أثناء جلب الكنيات: {error}",
+    "hide_list_aliases_error_action": "أغلق",
+    "remove_alias": "أزل هذه الكنية",
+    "add_alias_error": "حدث خطأ أثناء إضافة الكنية: {error}",
+    "confirm_dialogs": "أطلب تأكيدًا عند",
+    "confirm_dialogs_repeat": "مشاركة حالة",
+    "mutes_and_blocks": "المكتومون والمحجوبون",
+    "move_account_target": "الحساب المستهدف (مثل {example})",
+    "wordfilter": "ترشيح الكلمات",
+    "always_show_post_button": "أظهر الزر العائم لإنشاء منشور جديد دائمًا",
+    "hide_wallpaper": "اخف خلفية المثيل",
+    "save": "احفظ التعديلات",
+    "lists_navigation": "أظهر القوائم في شريط التنقل",
+    "mute_export_button": "صدّر قائمة المكتومين إلى ملف csv",
+    "blocks_imported": "اُستورد المحجوبون! معالجة القائمة ستستغرق وقتًا.",
+    "mute_export": "تصدير المكتومين",
+    "mute_import": "استيراد المكتومين",
+    "mute_import_error": "خطأ أثناء استيراد المكتومين",
+    "change_email_error": "حدثت خلل أثناء تغيير بريدك الإلكتروني.",
+    "change_email": "غيّر البريد الإلكتروني",
+    "changed_email": "نجح تغيير البريد الإلكتروني!",
+    "account_alias_table_head": "الكنية",
+    "account_alias": "كنيات الحساب",
+    "move_account": "أنقل الحساب",
+    "moved_account": "نُقل الحساب.",
+    "hide_media_previews": "اخف معاينات الوسائط",
+    "hide_muted_posts": "اخف منشورات المستخدمين المكتومين",
+    "confirm_dialogs_unfollow": "الغاء متابعة مستخدم",
+    "confirm_dialogs_remove_follower": "إزالة متابع",
+    "new_alias_target": "أضف كنية جديدة (مثل {example})",
+    "added_alias": "أُضيفت الكنية.",
+    "move_account_error": "خطأ أثناء نقل الحساب: {error}",
+    "emoji_reactions_on_timeline": "أظهر التفاعلات في الخط الزمني",
+    "mutes_imported": "اُستورد المكتومون! معالجة القئمة ستستغرق وقتًا.",
+    "remove_language": "أزل",
+    "primary_language": "اللغة الرئيسية:",
+    "expert_mode": "أظهر الإعدادات المتقدمة",
+    "block_import_error": "خطأ أثناء استيراد قائمة المحجوبين",
+    "add_backup": "أنشئ نسخة احتياطية جديدة",
+    "add_backup_error": "خطأ أثناء إضافة نسخ احتياطي جديد: {error}",
+    "move_account_notes": "إذا أردت نقل حسابك عليك إضافة كنية تشير إلى هنا في الحساب المستهدف.",
+    "avatar_size_instruction": "أدنى حجم مستحسن للصورة الرمزية هو 150x150 بيكسل.",
+    "word_filter_and_more": "مرشح الكلمات والمزيد...",
+    "hide_all_muted_posts": "اخف المنشورات المكتومة",
+    "max_thumbnails": "أقصى عدد للصور المصغرة لكل منشور (فارغ = غير محدود)",
+    "block_export_button": "صدّر قائمة المحجوبين إلى ملف csv",
+    "block_export": "تصدير المحجوبين",
+    "use_one_click_nsfw": "افتح المرفقات ذات المحتوى الحساس NSFW بنقرة واحدة"
   },
   "timeline": {
     "collapse": "",
@@ -224,6 +407,96 @@
   },
   "announcements": {
     "page_header": "إعلانات",
-    "title": "إعلان"
+    "title": "إعلان",
+    "mark_as_read_action": "علّمه كمقروء",
+    "post_form_header": "انشر إعلانًا",
+    "post_placeholder": "اكتب محتوى الاعلان هنا...",
+    "post_action": "انشر",
+    "post_error": "خطأ: {error}",
+    "close_error": "أغلاق",
+    "delete_action": "احذف",
+    "start_time_prompt": "وقت البدأ: ",
+    "end_time_prompt": "وقت النهاية: ",
+    "all_day_prompt": "هذا حدث يوم كامل",
+    "start_time_display": "يبدأ في {time}",
+    "end_time_display": "ينتهي في {time}",
+    "edit_action": "حرر",
+    "submit_edit_action": "أرسل",
+    "cancel_edit_action": "ألغِ",
+    "inactive_message": "هذا الاعلان غير نشط",
+    "published_time_display": "نُشر في {time}"
+  },
+  "polls": {
+    "votes": "أصوات",
+    "vote": "صوّت",
+    "type": "نوع الاستطلاع",
+    "single_choice": "خيار واحد",
+    "multiple_choices": "متعدد الخيارات",
+    "expiry": "عمر الاستطلاع",
+    "expires_in": "ينتهي الاستطلاع في {0}",
+    "expired": "انتهى الاستطلاع منذ {0}",
+    "add_poll": "أضف استطلاعًا",
+    "add_option": "أضف خيارًا",
+    "option": "خيار"
+  },
+  "emoji": {
+    "stickers": "ملصقات",
+    "emoji": "إيموجي",
+    "search_emoji": "ابحث عن إيموجي",
+    "unicode_groups": {
+      "animals-and-nature": "حيوانات وطبيعة",
+      "food-and-drink": "أطعمة ومشروبات",
+      "symbols": "رموز",
+      "activities": "نشاطات",
+      "flags": "أعلام"
+    },
+    "add_emoji": "أدخل إيموجي",
+    "custom": "إيموجي مخصص"
+  },
+  "interactions": {
+    "emoji_reactions": "تفاعلات بالإيموجي",
+    "reports": "البلاغات",
+    "follows": "المتابعات الجديدة"
+  },
+  "report": {
+    "state_closed": "مغلق",
+    "state_resolved": "عولج",
+    "reported_statuses": "الحالة المبلغة عنها:",
+    "state_open": "مفتوح",
+    "notes": "ملاحظة:",
+    "state": "الحالة:",
+    "reporter": "المبلِّغ:",
+    "reported_user": "المُبلغ عنه:"
+  },
+  "selectable_list": {
+    "select_all": "اختر الكل"
+  },
+  "image_cropper": {
+    "save": "احفظ",
+    "cancel": "ألغ"
+  },
+  "importer": {
+    "submit": "أرسل",
+    "success": "نجح الاستيراد.",
+    "error": "حدث خطأ أثناء الاستيراد."
+  },
+  "domain_mute_card": {
+    "mute": "اكتم",
+    "mute_progress": "يكتم…",
+    "unmute": "ارفع الكتم",
+    "unmute_progress": "يرفع الكتم…"
+  },
+  "exporter": {
+    "export": "صدر",
+    "processing": "يُعالج. سيُطلب منك تنزيل الملف قريباً"
+  },
+  "media_modal": {
+    "previous": "السابق",
+    "next": "التالي",
+    "hide": "أغلق عارض الوسائط"
+  },
+  "remote_user_resolver": {
+    "searching_for": "يبحث عن",
+    "error": "لم يُعثر عليه."
   }
 }

From 99f85069b8a3bc44c3c0a5c6cac35dbfbd740dd5 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 23 May 2023 18:52:10 +0300
Subject: [PATCH 35/42] fix indeterminate state animation

---
 src/components/checkbox/checkbox.vue | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 42f89be9a..274e8d0be 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -1,7 +1,7 @@
 <template>
   <label
     class="checkbox"
-    :class="{ disabled, indeterminate }"
+    :class="{ disabled, indeterminate, 'indeterminate-fix': indeterminateTransitionFix }"
   >
     <input
       type="checkbox"
@@ -14,6 +14,7 @@
     <i
       class="checkbox-indicator"
       :aria-hidden="true"
+      @transitionend.capture="onTransitionEnd"
     />
     <span
       v-if="!!$slots.default"
@@ -31,7 +32,22 @@ export default {
     'indeterminate',
     'disabled'
   ],
-  emits: ['update:modelValue']
+  emits: ['update:modelValue'],
+  data: () => ({
+    indeterminateTransitionFix: false
+  }),
+  watch: {
+    indeterminate (e) {
+      if (e) {
+        this.indeterminateTransitionFix = true
+      }
+    }
+  },
+  methods: {
+    onTransitionEnd (e) {
+      this.indeterminateTransitionFix = false
+    }
+  }
 }
 </script>
 
@@ -98,6 +114,12 @@ export default {
     }
   }
 
+  &.indeterminate-fix {
+    input[type="checkbox"] + .checkbox-indicator::before {
+      content: "–";
+    }
+  }
+
   & > span {
     margin-left: 0.5em;
   }

From 3ead21bcc640dfd2fb0f4080e532ba637cc2fdb3 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 23 May 2023 22:30:24 +0300
Subject: [PATCH 36/42] changelog

---
 changelog.d/adminfe.add | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog.d/adminfe.add

diff --git a/changelog.d/adminfe.add b/changelog.d/adminfe.add
new file mode 100644
index 000000000..188c45550
--- /dev/null
+++ b/changelog.d/adminfe.add
@@ -0,0 +1 @@
+Implemented a very basic instance administration screen

From 9f77f910b86ada3ef9f7e537003ef62ec193c741 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 24 May 2023 11:29:59 +0300
Subject: [PATCH 37/42] fix animation when ideterminate is the initial state

---
 src/components/checkbox/checkbox.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 274e8d0be..7d4e0e955 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -33,8 +33,8 @@ export default {
     'disabled'
   ],
   emits: ['update:modelValue'],
-  data: () => ({
-    indeterminateTransitionFix: false
+  data: (vm) => ({
+    indeterminateTransitionFix: vm.indeterminate
   }),
   watch: {
     indeterminate (e) {

From d223683b2e1d7f3fc4c2dfc4e4a532cc6c3d67a1 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 24 May 2023 11:32:16 +0300
Subject: [PATCH 38/42] make detailed access restriction an expert section

---
 src/components/settings_modal/admin_tabs/instance_tab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/settings_modal/admin_tabs/instance_tab.vue b/src/components/settings_modal/admin_tabs/instance_tab.vue
index cbc578f15..a6be776b0 100644
--- a/src/components/settings_modal/admin_tabs/instance_tab.vue
+++ b/src/components/settings_modal/admin_tabs/instance_tab.vue
@@ -108,7 +108,7 @@
             path=":pleroma.:instance.:limit_to_local_content"
           />
         </li>
-        <li>
+        <li v-if="expertLevel">
           <h3>{{ $t('admin_dash.instance.restrict.header') }}</h3>
           <p>
             {{ $t('admin_dash.instance.restrict.description') }}

From ed34b07b3f5e902a59638e3c1fd138a5d90d2d03 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 24 May 2023 11:44:26 +0300
Subject: [PATCH 39/42] fix transition when resetting to indeterminate state

---
 src/components/checkbox/checkbox.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/checkbox/checkbox.vue b/src/components/checkbox/checkbox.vue
index 7d4e0e955..b8b77e7cd 100644
--- a/src/components/checkbox/checkbox.vue
+++ b/src/components/checkbox/checkbox.vue
@@ -45,7 +45,9 @@ export default {
   },
   methods: {
     onTransitionEnd (e) {
-      this.indeterminateTransitionFix = false
+      if (!this.indeterminate) {
+        this.indeterminateTransitionFix = false
+      }
     }
   }
 }

From b3d0360699d2c4a05f92cdbc58493afc2aa55f7a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 24 May 2023 11:44:41 +0300
Subject: [PATCH 40/42] fix and cleanup reset button

---
 src/components/settings_modal/helpers/setting.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js
index fec1b947b..b3add3466 100644
--- a/src/components/settings_modal/helpers/setting.js
+++ b/src/components/settings_modal/helpers/setting.js
@@ -1,7 +1,7 @@
 import ModifiedIndicator from './modified_indicator.vue'
 import ProfileSettingIndicator from './profile_setting_indicator.vue'
 import DraftButtons from './draft_buttons.vue'
-import { get, set } from 'lodash'
+import { get, set, cloneDeep } from 'lodash'
 
 export default {
   components: {
@@ -218,13 +218,10 @@ export default {
       }
     },
     reset () {
-      console.log('reset')
       if (this.realDraftMode) {
-        console.log(this.draft)
-        console.log(this.state)
-        this.draft = this.state
+        this.draft = cloneDeep(this.state)
       } else {
-        set(this.$store.getters.mergedConfig, this.path, this.defaultState)
+        set(this.$store.getters.mergedConfig, this.path, cloneDeep(this.defaultState))
       }
     },
     hardReset () {

From cbd22d52b8d0cacf01f71edcb799294b93754f60 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 24 May 2023 12:00:16 +0300
Subject: [PATCH 41/42] make admin settings modal available on mobile

---
 src/components/side_drawer/side_drawer.js  | 5 ++++-
 src/components/side_drawer/side_drawer.vue | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index 270195775..81c5a6121 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -115,7 +115,10 @@ const SideDrawer = {
       GestureService.updateSwipe(e, this.closeGesture)
     },
     openSettingsModal () {
-      this.$store.dispatch('openSettingsModal')
+      this.$store.dispatch('openSettingsModal', 'user')
+    },
+    openAdminModal () {
+      this.$store.dispatch('openSettingsModal', 'admin')
     }
   }
 }
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 994ac953d..095887679 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -180,16 +180,16 @@
           v-if="currentUser && currentUser.role === 'admin'"
           @click="toggleDrawer"
         >
-          <a
-            href="/pleroma/admin/#/login-pleroma"
-            target="_blank"
+          <button
+            class="button-unstyled -link -fullwidth"
+            @click.stop="openAdminModal"
           >
             <FAIcon
               fixed-width
               class="fa-scale-110 fa-old-padding"
               icon="tachometer-alt"
             /> {{ $t("nav.administration") }}
-          </a>
+          </button>
         </li>
         <li
           v-if="currentUser && supportsAnnouncements"

From 8e9f0aabbad60049f013a5cfe4c54659f349f3a8 Mon Sep 17 00:00:00 2001
From: baloo toumi <abidin24@disroot.org>
Date: Tue, 23 May 2023 11:24:44 +0000
Subject: [PATCH 42/42] Translated using Weblate (Arabic)

Currently translated at 39.7% (394 of 990 strings)

Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ar/
---
 src/i18n/ar.json | 57 ++++++++++++++++++++++++++++++++++++------------
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/src/i18n/ar.json b/src/i18n/ar.json
index 7915e7794..93367865e 100644
--- a/src/i18n/ar.json
+++ b/src/i18n/ar.json
@@ -210,26 +210,26 @@
     "hide_attachments_in_tl": "اخف المرفقات من الخيط الزمني",
     "hide_post_stats": "اخف احصائيات المنشور (مثل عدد التفضيلات)",
     "hide_user_stats": "اخف احصائيات المستخدم (مثل عدد المتابِعين)",
-    "import_followers_from_a_csv_file": "",
+    "import_followers_from_a_csv_file": "استورد المتابِعين من ملف csv",
     "import_theme": "تحميل نموذج",
     "inputRadius": "",
-    "instance_default": "",
+    "instance_default": "(الافتراضي: {value})",
     "interfaceLanguage": "لغة الواجهة",
-    "invalid_theme_imported": "",
+    "invalid_theme_imported": "الملف المختار ليس سمة تدعمها بليروما.لن تطرأ تغييرات على سمتك.",
     "limited_availability": "غير متوفر على متصفحك",
     "links": "الروابط",
     "lock_account_description": "",
-    "loop_video": "",
-    "loop_video_silent_only": "",
+    "loop_video": "كرر الفيديوهات",
+    "loop_video_silent_only": "كرر فيديوهات بدون صوت (مثل gif في ماستودون)",
     "name": "الاسم",
     "name_bio": "الاسم والسيرة الذاتية",
     "new_password": "كلمة السر الجديدة",
     "no_rich_text_description": "",
     "notification_visibility": "نوع الإشعارات التي تريد عرضها",
     "notification_visibility_follows": "يتابع",
-    "notification_visibility_likes": "الإعجابات",
-    "notification_visibility_mentions": "الإشارات",
-    "notification_visibility_repeats": "",
+    "notification_visibility_likes": "المفضلة",
+    "notification_visibility_mentions": "ذِكر",
+    "notification_visibility_repeats": "مشاركات",
     "nsfw_clickthrough": "",
     "oauth_tokens": "رموز OAuth",
     "token": "رمز",
@@ -239,16 +239,16 @@
     "panelRadius": "",
     "pause_on_unfocused": "",
     "presets": "النماذج",
-    "profile_background": "خلفية الصفحة الشخصية",
+    "profile_background": "خلفية الملف التعريفي",
     "profile_banner": "رأسية الصفحة الشخصية",
-    "profile_tab": "الملف الشخصي",
+    "profile_tab": "الملف التعريفي",
     "radii_help": "",
-    "replies_in_timeline": "الردود على الخيط الزمني",
-    "reply_visibility_all": "عرض كافة الردود",
+    "replies_in_timeline": "المشاركات في الخيط الزمني",
+    "reply_visibility_all": "أظهر كل المشاركات",
     "reply_visibility_following": "",
     "reply_visibility_self": "",
     "saving_err": "خطأ أثناء حفظ الإعدادات",
-    "saving_ok": "تم حفظ الإعدادات",
+    "saving_ok": "حُفظت الإعدادات",
     "security_tab": "الأمان",
     "set_new_avatar": "اختيار صورة رمزية جديدة",
     "set_new_profile_background": "اختيار خلفية جديدة للملف الشخصي",
@@ -349,7 +349,36 @@
     "max_thumbnails": "أقصى عدد للصور المصغرة لكل منشور (فارغ = غير محدود)",
     "block_export_button": "صدّر قائمة المحجوبين إلى ملف csv",
     "block_export": "تصدير المحجوبين",
-    "use_one_click_nsfw": "افتح المرفقات ذات المحتوى الحساس NSFW بنقرة واحدة"
+    "use_one_click_nsfw": "افتح المرفقات ذات المحتوى الحساس NSFW بنقرة واحدة",
+    "account_privacy": "خصوصية",
+    "use_contain_fit": "لا تقتص الصور المصغرة للمرفقات",
+    "import_blocks_from_a_csv_file": "استورد المحجوبين من ملف csv",
+    "instance_default_simple": "(افتراضي)",
+    "interface": "واجهة",
+    "birthday": {
+      "label": "تاريخ الميلاد",
+      "show_birthday": "اظهر تاريخ ميلادي"
+    },
+    "profile_fields": {
+      "add_field": "أضف حقل",
+      "value": "محتوى"
+    },
+    "posts": "منشورات",
+    "user_profiles": "ملفات تعريفية للمستخدمين",
+    "notification_visibility_emoji_reactions": "تفاعلات",
+    "notification_visibility_polls": "انتهاء استطلاعات اشتركت بها",
+    "file_export_import": {
+      "restore_settings": "استرجع الإعدادات من ملف",
+      "backup_restore": "نسخ احتياطي للإعدادات"
+    },
+    "mutes_tab": "مكتومون",
+    "no_mutes": "لا يوجد مكتومون",
+    "hide_followers_count_description": "لا تظهر عدد المتابِعين",
+    "show_moderator_badge": "أظهر شارة \"مشرف\" في ملفي التعريفي",
+    "hide_follows_count_description": "لا تظهر عدد المتابَعين",
+    "hide_muted_threads": "اخف النقاشات المكتومة",
+    "no_blocks": "لا يوجد محجوبون",
+    "show_admin_badge": "أظهر شارة \"مدير\" في ملفي التعريفي"
   },
   "timeline": {
     "collapse": "",