From ca0b73060556367b5a7ec0d771b9ca14ba958870 Mon Sep 17 00:00:00 2001
From: eris <femmediscord@gmail.com>
Date: Sun, 14 Aug 2022 23:24:59 +0000
Subject: [PATCH 01/50] Redo desktop nav, add options for site name and favicon
 (#83)

Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/83
Co-authored-by: eris <femmediscord@gmail.com>
Co-committed-by: eris <femmediscord@gmail.com>
---
 src/components/desktop_nav/desktop_nav.js     |  31 ++++-
 src/components/desktop_nav/desktop_nav.scss   |  42 ++++--
 src/components/desktop_nav/desktop_nav.vue    | 125 +++++++++++++++---
 src/components/mobile_nav/mobile_nav.js       |   7 +-
 src/components/mobile_nav/mobile_nav.vue      |   2 +-
 src/components/nav_panel/nav_panel.js         |   4 +-
 src/components/nav_panel/nav_panel.vue        |   2 +-
 .../settings_modal/settings_modal.js          |   8 ++
 .../settings_modal/settings_modal.scss        |   6 +
 .../settings_modal/settings_modal.vue         |  14 ++
 .../settings_modal/tabs/general_tab.vue       |  32 +++++
 src/components/side_drawer/side_drawer.js     |   4 +-
 src/components/side_drawer/side_drawer.vue    |   2 +-
 src/i18n/en.json                              |   4 +
 src/modules/config.js                         |   4 +
 src/modules/instance.js                       |   5 +-
 16 files changed, 251 insertions(+), 41 deletions(-)

diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index e048f53d..3307b5d5 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -5,12 +5,16 @@ import {
   faSignOutAlt,
   faHome,
   faComments,
-  faBell,
   faUserPlus,
   faBullhorn,
   faSearch,
   faTachometerAlt,
   faCog,
+  faGlobe,
+  faBolt,
+  faUsers,
+  faCommentMedical,
+  faBookmark,
   faInfoCircle
 } from '@fortawesome/free-solid-svg-icons'
 
@@ -19,12 +23,16 @@ library.add(
   faSignOutAlt,
   faHome,
   faComments,
-  faBell,
   faUserPlus,
   faBullhorn,
   faSearch,
   faTachometerAlt,
   faCog,
+  faGlobe,
+  faBolt,
+  faUsers,
+  faCommentMedical,
+  faBookmark,
   faInfoCircle
 )
 
@@ -65,7 +73,22 @@ export default {
       })
     },
     logo () { return this.$store.state.instance.logo },
+    mergedConfig () {
+      return this.$store.getters.mergedConfig
+    },
     sitename () { return this.$store.state.instance.name },
+    showNavShortcuts () {
+      return this.mergedConfig.showNavShortcuts
+    },
+    showWiderShortcuts () {
+      return this.mergedConfig.showWiderShortcuts
+    },
+    hideSiteFavicon () {
+      return this.mergedConfig.hideSiteFavicon
+    },
+    hideSiteName () {
+      return this.mergedConfig.hideSiteName
+    },
     hideSitename () { return this.$store.state.instance.hideSitename },
     logoLeft () { return this.$store.state.instance.logoLeft },
     currentUser () { return this.$store.state.users.currentUser },
@@ -75,10 +98,6 @@ export default {
     scrollToTop () {
       window.scrollTo(0, 0)
     },
-    logout () {
-      this.$router.replace('/main/public')
-      this.$store.dispatch('logout')
-    },
     onSearchBarToggled (hidden) {
       this.searchBarHidden = hidden
     },
diff --git a/src/components/desktop_nav/desktop_nav.scss b/src/components/desktop_nav/desktop_nav.scss
index 7fd2b26f..4d8c40e3 100644
--- a/src/components/desktop_nav/desktop_nav.scss
+++ b/src/components/desktop_nav/desktop_nav.scss
@@ -15,16 +15,16 @@
     display: grid;
     grid-template-rows: var(--navbar-height);
     grid-template-columns: 2fr auto 2fr;
-    grid-template-areas: "sitename logo actions";
+    grid-template-areas: "nav-left logo actions";
     box-sizing: border-box;
     padding: 0 1.2em;
     margin: auto;
-    max-width: 980px;
+    max-width: 1110px;
   }
 
   &.-logoLeft .inner-nav {
     grid-template-columns: auto 2fr 2fr;
-    grid-template-areas: "logo sitename actions";
+    grid-template-areas: "logo nav-left actions";
   }
 
   .button-default {
@@ -84,14 +84,21 @@
   }
 
   .nav-icon {
-    margin-left: 1em;
+    margin-left: 0.2em;
     width: 2em;
     height: 100%;
-    font-size: 130%;
     text-align: center;
 
-    &-logout {
-      margin-left: 2em;
+    &.router-link-active {
+      font-size: 1.2em;
+      margin-top: 0.05em;
+
+      .svg-inline--fa {
+        font-weight: bolder;
+        color: $fallback--text;
+        color: var(--selectedMenuText, $fallback--text);
+        --lightText: var(--selectedMenuLightText, $fallback--lightText);
+      }
     }
 
     .svg-inline--fa {
@@ -100,8 +107,25 @@
     }
   }
 
-  .sitename {
-    grid-area: sitename;
+  .-wide {
+    .nav-icon {
+      margin-left: 0.7em;
+    }
+  }
+
+  .left {
+    padding-left: 5px;
+    display: flex;
+  }
+
+  .nav-left-wrapper {
+    grid-area: nav-left;
+
+    .favicon {
+      height: 28px;
+      vertical-align: middle;
+      padding-right: 5px;
+    }
   }
 
   .actions {
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index fe9af544..32b90749 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -5,16 +5,79 @@
     :class="{ '-logoLeft': logoLeft }"
     @click="scrollToTop()"
   >
-    <div class="inner-nav">
-      <div class="item sitename">
+    <div
+      class="inner-nav"
+      :class="{ '-wide': showWiderShortcuts }"
+    >
+      <div class="item nav-left-wrapper">
         <router-link
-          v-if="!hideSitename"
-          class="site-name"
+          class="site-brand"
           :to="{ name: 'root' }"
           active-class="home"
         >
-          {{ sitename }}
+          <img
+            v-if="!hideSiteFavicon"
+            class="favicon"
+            src="/favicon.png"
+          >
+          <span
+            v-if="!hideSiteName"
+            class="site-name"
+          >
+            {{ sitename }}
+          </span>
         </router-link>
+        <div
+          v-if="(currentUser || !privateMode) && showNavShortcuts"
+          class="nav-items left"
+        >
+          <router-link
+            v-if="currentUser"
+            :to="{ name: 'friends' }"
+            class="nav-icon"
+          >
+            <FAIcon
+              fixed-width
+              class="fa-scale-110 fa-old-padding"
+              icon="home"
+              :title="$t('nav.home_timeline')"
+            />
+          </router-link>
+          <router-link
+            :to="{ name: 'public-timeline' }"
+            class="nav-icon"
+          >
+            <FAIcon
+              fixed-width
+              class="fa-scale-110 fa-old-padding"
+              icon="users"
+              :title="$t('nav.public_tl')"
+            />
+          </router-link>
+          <router-link
+            :to="{ name: 'public-external-timeline' }"
+            class="nav-icon"
+          >
+            <FAIcon
+              fixed-width
+              class="fa-scale-110 fa-old-padding"
+              icon="globe"
+              :title="$t('nav.twkn')"
+            />
+          </router-link>
+          <router-link
+            v-if="currentUser"
+            :to="{ name: 'bubble-timeline' }"
+            class="nav-icon"
+          >
+            <FAIcon
+              fixed-width
+              class="fa-scale-110 fa-old-padding"
+              icon="circle"
+              :title="$t('nav.bubble_timeline')"
+            />
+          </router-link>
+        </div>
       </div>
       <router-link
         class="logo"
@@ -36,6 +99,46 @@
           @toggled="onSearchBarToggled"
           @click.stop
         />
+        <div
+          v-if="(currentUser || !privateMode) && showNavShortcuts"
+          class="nav-items right"
+        >
+          <router-link
+            class="nav-icon"
+            :to="{ name: 'interactions', params: { username: currentUser.screen_name } }"
+          >
+            <FAIcon
+              fixed-width
+              class="fa-scale-110 fa-old-padding"
+              icon="bolt"
+              :title="$t('nav.interactions')"
+            />
+          </router-link>
+          <router-link
+            v-if="currentUser"
+            :to="{ name: 'lists' }"
+            class="nav-icon"
+          >
+            <FAIcon
+              fixed-width
+              class="fa-scale-110 fa-old-padding"
+              icon="list"
+              :title="$t('nav.lists')"
+            />
+          </router-link>
+          <router-link
+            v-if="currentUser"
+            :to="{ name: 'bookmarks' }"
+            class="nav-icon"
+          >
+            <FAIcon
+              fixed-width
+              class="fa-scale-110 fa-old-padding"
+              icon="bookmark"
+              :title="$t('nav.bookmarks')"
+            />
+          </router-link>
+        </div>
         <button
           class="button-unstyled nav-icon"
           @click.stop="openSettingsModal"
@@ -61,18 +164,6 @@
             :title="$t('nav.administration')"
           />
         </a>
-        <button
-          v-if="currentUser"
-          class="button-unstyled nav-icon nav-icon-logout"
-          @click.prevent="logout"
-        >
-          <FAIcon
-            fixed-width
-            class="fa-scale-110 fa-old-padding"
-            icon="sign-out-alt"
-            :title="$t('login.logout')"
-          />
-        </button>
       </div>
     </div>
   </nav>
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 713fd37b..7a356921 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -41,7 +41,12 @@ const MobileNav = {
     unseenNotificationsCount () {
       return this.unseenNotifications.length
     },
-    hideSitename () { return this.$store.state.instance.hideSitename },
+    mergedConfig () {
+      return this.$store.getters.mergedConfig
+    },
+    hideSiteName () {
+      return this.mergedConfig.hideSiteName
+    },
     sitename () { return this.$store.state.instance.name }
   },
   methods: {
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 3583ab3c..308c8d57 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -22,7 +22,7 @@
           />
         </button>
         <router-link
-          v-if="!hideSitename"
+          v-if="!hideSiteName"
           class="site-name"
           :to="{ name: 'root' }"
           active-class="home"
diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
index 18c7cded..af165d47 100644
--- a/src/components/nav_panel/nav_panel.js
+++ b/src/components/nav_panel/nav_panel.js
@@ -10,7 +10,7 @@ import {
   faChevronDown,
   faChevronUp,
   faComments,
-  faBell,
+  faBolt,
   faInfoCircle,
   faStream,
   faList,
@@ -25,7 +25,7 @@ library.add(
   faChevronDown,
   faChevronUp,
   faComments,
-  faBell,
+  faBolt,
   faInfoCircle,
   faStream,
   faList,
diff --git a/src/components/nav_panel/nav_panel.vue b/src/components/nav_panel/nav_panel.vue
index 1a893348..66dae37a 100644
--- a/src/components/nav_panel/nav_panel.vue
+++ b/src/components/nav_panel/nav_panel.vue
@@ -45,7 +45,7 @@
             <FAIcon
               fixed-width
               class="fa-scale-110"
-              icon="bell"
+              icon="bolt"
             />{{ $t("nav.interactions") }}
           </router-link>
         </li>
diff --git a/src/components/settings_modal/settings_modal.js b/src/components/settings_modal/settings_modal.js
index 0a72dca1..b1bb4eab 100644
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@@ -14,6 +14,7 @@ import {
   faTimes,
   faFileUpload,
   faFileDownload,
+  faSignOutAlt,
   faChevronDown
 } from '@fortawesome/free-solid-svg-icons'
 import {
@@ -28,6 +29,7 @@ library.add(
   faWindowMinimize,
   faFileUpload,
   faFileDownload,
+  faSignOutAlt,
   faChevronDown
 )
 
@@ -66,6 +68,11 @@ const SettingsModal = {
     closeModal () {
       this.$store.dispatch('closeSettingsModal')
     },
+    logout () {
+      this.$router.replace('/main/public')
+      this.$store.dispatch('closeSettingsModal')
+      this.$store.dispatch('logout')
+    },
     peekModal () {
       this.$store.dispatch('togglePeekSettingsModal')
     },
@@ -150,6 +157,7 @@ const SettingsModal = {
     }
   },
   computed: {
+    currentUser () { return this.$store.state.users.currentUser },
     currentSaveStateNotice () {
       return this.$store.state.interface.settings.currentSaveStateNotice
     },
diff --git a/src/components/settings_modal/settings_modal.scss b/src/components/settings_modal/settings_modal.scss
index 13cb0e65..70b63360 100644
--- a/src/components/settings_modal/settings_modal.scss
+++ b/src/components/settings_modal/settings_modal.scss
@@ -71,5 +71,11 @@
       display: flex;
       flex-grow: 1;
     }
+
+    .logout-button {
+      position: absolute;
+      right: 20px;
+      padding-right: 10px;
+    }
   }
 }
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index d3bed061..03c9978e 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -111,6 +111,20 @@
           id="unscrolled-content"
           class="extra-content"
         />
+        <button
+          v-if="currentUser"
+          class="button-default logout-button"
+          :title="$t('login.logout')"
+          :aria-label="$t('login.logout')"
+          @click.prevent="logout"
+        >
+          <FAIcon
+            fixed-width
+            class="fa-scale-110 fa-old-padding"
+            icon="sign-out-alt"
+          />
+          <span>{{ $t('login.logout') }}</span>
+        </button>
       </div>
     </div>
   </Modal>
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index b2d06eef..2c6ff5cd 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -25,6 +25,38 @@
             {{ $t('settings.hide_wallpaper') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting
+            path="hideSiteFavicon"
+            expert="1"
+          >
+            {{ $t('settings.hide_site_favicon') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting
+            path="hideSiteName"
+            expert="1"
+          >
+            {{ $t('settings.hide_site_name') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting
+            path="showNavShortcuts"
+            expert="1"
+          >
+            {{ $t('settings.show_nav_shortcuts') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting
+            path="showWiderShortcuts"
+            expert="1"
+          >
+            {{ $t('settings.show_wider_shortcuts') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting path="stopGifs">
             {{ $t('settings.stop_gifs') }}
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index 9bfee6bd..1c8d5865 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -8,7 +8,7 @@ import {
   faSignOutAlt,
   faHome,
   faComments,
-  faBell,
+  faBolt,
   faUserPlus,
   faBullhorn,
   faSearch,
@@ -23,7 +23,7 @@ library.add(
   faSignOutAlt,
   faHome,
   faComments,
-  faBell,
+  faBolt,
   faUserPlus,
   faBullhorn,
   faSearch,
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 4bbc43bb..6d78fa85 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -74,7 +74,7 @@
             <FAIcon
               fixed-width
               class="fa-scale-110 fa-old-padding"
-              icon="bell"
+              icon="bolt"
             /> {{ $t("nav.interactions") }}
           </router-link>
         </li>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 308575f4..853f5917 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -461,6 +461,8 @@
         "hide_muted_threads": "Hide muted threads",
         "hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
         "hide_shoutbox": "Hide instance shoutbox",
+        "hide_site_favicon": "Hide instance favicon in top panel",
+        "hide_site_name": "Hide instance name in top panel",
         "hide_threads_with_blocked_users": "Hide threads mentioning blocked users",
         "hide_user_stats": "Hide user statistics (e.g. the number of followers)",
         "hide_wallpaper": "Hide instance wallpaper",
@@ -613,7 +615,9 @@
         "settings": "Settings",
         "show_admin_badge": "Show \"Admin\" badge in my profile",
         "show_moderator_badge": "Show \"Moderator\" badge in my profile",
+        "show_nav_shortcuts": "Show extra navigation shortcuts in top panel",
         "show_scrollbars": "Show side column's scrollbars",
+        "show_wider_shortcuts": "Show wider gap between top panel shortcuts",
         "show_yous": "Show (You)s",
         "stop_gifs": "Pause animated images until you hover on them",
         "streaming": "Automatically show new posts when scrolled to the top",
diff --git a/src/modules/config.js b/src/modules/config.js
index 2f12e153..501d5dfe 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -36,6 +36,10 @@ export const defaultState = {
   muteBotStatuses: undefined, // instance default
   collapseMessageWithSubject: undefined, // instance default
   padEmoji: true,
+  showNavShortcuts: undefined, // instance default
+  showWiderShortcuts: undefined, // instance default
+  hideSiteFavicon: undefined, // instance default
+  hideSiteName: undefined, // instance default
   hideAttachments: false,
   hideAttachmentsInConv: false,
   maxThumbnails: 16,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index cb6250ef..faa8692a 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -34,7 +34,8 @@ const defaultState = {
   hideWordFilteredPosts: false,
   hidePostStats: false,
   hideBotIndication: false,
-  hideSitename: false,
+  hideSiteFavicon: false,
+  hideSiteName: false,
   hideUserStats: false,
   muteBotStatuses: false,
   loginMethod: 'password',
@@ -50,6 +51,8 @@ const defaultState = {
   scopeCopy: true,
   showFeaturesPanel: true,
   showInstanceSpecificPanel: false,
+  showNavShortcuts: true,
+  showWiderShortcuts: true,
   sidebarRight: false,
   subjectLineBehavior: 'email',
   theme: 'pleroma-dark',
-- 
2.34.1


From 64fdde52f6d20f5615a34b114b638851a84ae918 Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Wed, 17 Aug 2022 08:41:36 +0000
Subject: [PATCH 02/50] timeline panel nav (#131)

Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/131
---
 package.json                                  |   2 +-
 src/components/desktop_nav/desktop_nav.vue    |  23 ++--
 .../moderation_tools/moderation_tools.vue     |   5 +-
 .../settings_modal/tabs/general_tab.vue       |   8 ++
 src/components/timeline/timeline.js           |   5 +
 src/components/timeline/timeline.vue          |   6 +-
 .../timeline_menu_content.js                  |  30 +++++
 .../timeline_menu_content.vue                 | 114 ++++++++++++++++++
 .../timeline_menu_tabs/timeline_menu_tabs.js  |  61 ++++++++++
 .../timeline_menu_tabs/timeline_menu_tabs.vue |  96 +++++++++++++++
 src/components/user_card/user_card.js         |   1 +
 src/components/user_card/user_card.vue        |   2 +-
 src/i18n/en.json                              |   1 +
 src/modules/config.js                         |   1 +
 yarn.lock                                     |  15 ++-
 15 files changed, 349 insertions(+), 21 deletions(-)
 create mode 100644 src/components/timeline_menu_tabs/timeline_menu_content.js
 create mode 100644 src/components/timeline_menu_tabs/timeline_menu_content.vue
 create mode 100644 src/components/timeline_menu_tabs/timeline_menu_tabs.js
 create mode 100644 src/components/timeline_menu_tabs/timeline_menu_tabs.vue

diff --git a/package.json b/package.json
index 1445f12c..dcde025a 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
     "@babel/runtime": "7.17.8",
     "@chenfengyuan/vue-qrcode": "2.0.0",
     "@fortawesome/fontawesome-svg-core": "1.3.0",
-    "@fortawesome/free-regular-svg-icons": "5.15.4",
+    "@fortawesome/free-regular-svg-icons": "^6.1.2",
     "@fortawesome/free-solid-svg-icons": "5.15.4",
     "@fortawesome/vue-fontawesome": "3.0.1",
     "@kazvmoe-infra/pinch-zoom-element": "1.2.0",
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 32b90749..25b4fe8e 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -54,17 +54,6 @@
               :title="$t('nav.public_tl')"
             />
           </router-link>
-          <router-link
-            :to="{ name: 'public-external-timeline' }"
-            class="nav-icon"
-          >
-            <FAIcon
-              fixed-width
-              class="fa-scale-110 fa-old-padding"
-              icon="globe"
-              :title="$t('nav.twkn')"
-            />
-          </router-link>
           <router-link
             v-if="currentUser"
             :to="{ name: 'bubble-timeline' }"
@@ -77,6 +66,17 @@
               :title="$t('nav.bubble_timeline')"
             />
           </router-link>
+          <router-link
+            :to="{ name: 'public-external-timeline' }"
+            class="nav-icon"
+          >
+            <FAIcon
+              fixed-width
+              class="fa-scale-110 fa-old-padding"
+              icon="globe"
+              :title="$t('nav.twkn')"
+            />
+          </router-link>
         </div>
       </div>
       <router-link
@@ -105,6 +105,7 @@
         >
           <router-link
             class="nav-icon"
+            v-if="currentUser"
             :to="{ name: 'interactions', params: { username: currentUser.screen_name } }"
           >
             <FAIcon
diff --git a/src/components/moderation_tools/moderation_tools.vue b/src/components/moderation_tools/moderation_tools.vue
index 96b8c3a3..75ea08cc 100644
--- a/src/components/moderation_tools/moderation_tools.vue
+++ b/src/components/moderation_tools/moderation_tools.vue
@@ -13,13 +13,13 @@
           <span v-if="user.is_local">
             <button
               class="button-default dropdown-item"
-              @click="toggleRight(&quot;admin&quot;)"
+              @click="toggleRight('admin')"
             >
               {{ $t(!!user.rights.admin ? 'user_card.admin_menu.revoke_admin' : 'user_card.admin_menu.grant_admin') }}
             </button>
             <button
               class="button-default dropdown-item"
-              @click="toggleRight(&quot;moderator&quot;)"
+              @click="toggleRight('moderator')"
             >
               {{ $t(!!user.rights.moderator ? 'user_card.admin_menu.revoke_moderator' : 'user_card.admin_menu.grant_moderator') }}
             </button>
@@ -167,6 +167,7 @@
 
 .moderation-tools-popover {
   height: 100%;
+  z-index: 999;
   .trigger {
     display: flex !important;
     height: 100%;
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 2c6ff5cd..4f5a5bc7 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -49,6 +49,14 @@
             {{ $t('settings.show_nav_shortcuts') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting
+            path="showPanelNavShortcuts"
+            expert="1"
+          >
+            {{ $t('settings.show_panel_nav_shortcuts') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="showWiderShortcuts"
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index 5b6c5089..f44fabb1 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -2,6 +2,7 @@ import Status from '../status/status.vue'
 import timelineFetcher from '../../services/timeline_fetcher/timeline_fetcher.service.js'
 import Conversation from '../conversation/conversation.vue'
 import TimelineMenu from '../timeline_menu/timeline_menu.vue'
+import TimelineMenuTabs from '../timeline_menu_tabs/timeline_menu_tabs.vue'
 import TimelineQuickSettings from './timeline_quick_settings.vue'
 import { debounce, throttle, keyBy } from 'lodash'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -39,6 +40,7 @@ const Timeline = {
     Status,
     Conversation,
     TimelineMenu,
+    TimelineMenuTabs,
     TimelineQuickSettings
   },
   computed: {
@@ -85,6 +87,9 @@ const Timeline = {
     },
     virtualScrollingEnabled () {
       return this.$store.getters.mergedConfig.virtualScrolling
+    },
+    showPanelNavShortcuts () {
+      return this.$store.getters.mergedConfig.showPanelNavShortcuts
     }
   },
   created () {
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index 266c1d9a..d75114df 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,7 +1,11 @@
 <template>
   <div :class="['Timeline', classes.root]">
     <div :class="classes.header">
-      <TimelineMenu v-if="!embedded" />
+      <template v-if="!embedded">
+        <TimelineMenuTabs v-if="showPanelNavShortcuts" />
+        <TimelineMenu v-else />
+      </template>
+
       <button
         v-if="showLoadButton"
         class="button-default loadmore-button"
diff --git a/src/components/timeline_menu_tabs/timeline_menu_content.js b/src/components/timeline_menu_tabs/timeline_menu_content.js
new file mode 100644
index 00000000..9c2ef0c9
--- /dev/null
+++ b/src/components/timeline_menu_tabs/timeline_menu_content.js
@@ -0,0 +1,30 @@
+import { mapState } from 'vuex'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faUsers,
+  faGlobe,
+  faBookmark,
+  faEnvelope,
+  faHome
+} from '@fortawesome/free-solid-svg-icons'
+import { faCircle } from '@fortawesome/free-regular-svg-icons'
+library.add(
+  faUsers,
+  faGlobe,
+  faBookmark,
+  faEnvelope,
+  faHome,
+  faCircle
+)
+
+const TimelineMenuContent = {
+  computed: {
+    ...mapState({
+      currentUser: state => state.users.currentUser,
+      privateMode: state => state.instance.private,
+      federating: state => state.instance.federating
+    })
+  }
+}
+
+export default TimelineMenuContent
diff --git a/src/components/timeline_menu_tabs/timeline_menu_content.vue b/src/components/timeline_menu_tabs/timeline_menu_content.vue
new file mode 100644
index 00000000..32548c49
--- /dev/null
+++ b/src/components/timeline_menu_tabs/timeline_menu_content.vue
@@ -0,0 +1,114 @@
+<template>
+  <ul>
+    <li v-if="currentUser">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'friends' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="home"
+        />
+        <span
+          :title="$t('nav.home_timeline_description')"
+          :aria-label="$t('nav.home_timeline_description')"
+        >{{ $t("nav.home_timeline") }}</span>
+      </router-link>
+    </li>
+    <li v-if="currentUser">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'bubble-timeline' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          :icon="['far', 'circle']"
+        />
+        <span
+          :title="$t('nav.bubble_timeline_description')"
+          :aria-label="$t('nav.bubble_timeline_description')"
+        >{{ $t("nav.bubble_timeline") }}</span>
+      </router-link>
+    </li>
+    <li v-if="currentUser || !privateMode">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'public-timeline' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="users"
+        />
+        <span
+          :title="$t('nav.public_timeline_description')"
+          :aria-label="$t('nav.public_timeline_description')"
+        >{{ $t("nav.public_tl") }}</span>
+      </router-link>
+    </li>
+    <li v-if="federating && (currentUser || !privateMode)">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'public-external-timeline' }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="globe"
+        />
+        <span
+          :title="$t('nav.twkn_timeline_description')"
+          :aria-label="$t('nav.twkn_timeline_description')"
+        >{{ $t("nav.twkn") }}</span>
+      </router-link>
+    </li>
+    <li v-if="currentUser">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'bookmarks'}"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="bookmark"
+        />
+        <span
+          :title="$t('nav.bookmarks')"
+          :aria-label="$t('nav.bookmarks')"
+        >{{ $t("nav.bookmarks") }}</span>
+      </router-link>
+    </li>
+    <li v-if="currentUser">
+      <router-link
+        class="menu-item"
+        :to="{ name: 'dms', params: { username: currentUser.screen_name } }"
+      >
+        <FAIcon
+          fixed-width
+          class="fa-scale-110 fa-old-padding "
+          icon="envelope"
+        />
+        <span
+          :title="$t('nav.dms')"
+          :aria-label="$t('nav.dms')"
+        >{{ $t("nav.dms") }}</span>
+      </router-link>
+    </li>
+  </ul>
+</template>
+
+<script src="./timeline_menu_content.js" ></script>
+
+<style lang="scss">
+@import "../../_variables.scss";
+.timeline-desc {
+  text-decoration: none;
+  color: var(--text, $fallback--text);
+  padding-left: 1em;
+  display: block;
+  background-color: scale(var(--bg, $fallback--bg), 0.1);
+  padding-bottom: 0.4em;
+}
+</style>
diff --git a/src/components/timeline_menu_tabs/timeline_menu_tabs.js b/src/components/timeline_menu_tabs/timeline_menu_tabs.js
new file mode 100644
index 00000000..40192b39
--- /dev/null
+++ b/src/components/timeline_menu_tabs/timeline_menu_tabs.js
@@ -0,0 +1,61 @@
+import Popover from '../popover/popover.vue'
+import TimelineMenuContent from './timeline_menu_content.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import {
+  faChevronDown
+} from '@fortawesome/free-solid-svg-icons'
+
+library.add(faChevronDown)
+
+// Route -> i18n key mapping, exported and not in the computed
+// because nav panel benefits from the same information.
+export const timelineNames = () => {
+  return {
+    'friends': 'nav.home_timeline',
+    'bookmarks': 'nav.bookmarks',
+    'dms': 'nav.dms',
+    'public-timeline': 'nav.public_tl',
+    'public-external-timeline': 'nav.twkn',
+    'bubble-timeline': 'nav.bubble_timeline'
+  }
+}
+
+const TimelineMenuTabs = {
+  components: {
+    Popover,
+    TimelineMenuContent
+  },
+  data () {
+    return {
+      isOpen: false
+    }
+  },
+  created () {
+    if (timelineNames()[this.$route.name]) {
+      this.$store.dispatch('setLastTimeline', this.$route.name)
+    }
+  },
+  computed: {
+    currentUser () {
+      return this.$store.state.users.currentUser
+    },
+    privateMode () {
+      return this.$store.state.instance.private
+    }
+  },
+  methods: {
+    timelineName () {
+      const route = this.$route.name
+      if (route === 'tag-timeline') {
+        return '#' + this.$route.params.tag
+      }
+      if (route === 'list-timeline') {
+        return this.$store.getters.findListTitle(this.$route.params.id)
+      }
+      const i18nkey = timelineNames()[this.$route.name]
+      return i18nkey ? this.$t(i18nkey) : route
+    }
+  }
+}
+
+export default TimelineMenuTabs
diff --git a/src/components/timeline_menu_tabs/timeline_menu_tabs.vue b/src/components/timeline_menu_tabs/timeline_menu_tabs.vue
new file mode 100644
index 00000000..f017fa1f
--- /dev/null
+++ b/src/components/timeline_menu_tabs/timeline_menu_tabs.vue
@@ -0,0 +1,96 @@
+<template>
+  <div
+    v-if="currentUser || !privateMode"
+    class="nav-items timeline-menu-tabs"
+  >
+    <router-link
+      v-if="currentUser"
+      :to="{ name: 'friends' }"
+      class="nav-icon"
+    >
+      <FAIcon
+        fixed-width
+        class="fa-scale-110 fa-old-padding"
+        icon="home"
+        :title="$t('nav.home_timeline_description')"
+      />
+    </router-link>
+    <router-link
+      :to="{ name: 'public-timeline' }"
+      class="nav-icon"
+    >
+      <FAIcon
+        fixed-width
+        class="fa-scale-110 fa-old-padding"
+        icon="users"
+        :title="$t('nav.public_timeline_description')"
+      />
+    </router-link>
+    <router-link
+      v-if="currentUser"
+      :to="{ name: 'bubble-timeline' }"
+      class="nav-icon"
+    >
+      <FAIcon
+        fixed-width
+        class="fa-scale-110 fa-old-padding"
+        :icon="['far', 'circle']"
+        :title="$t('nav.bubble_timeline_description')"
+      />
+    </router-link>
+    <router-link
+      :to="{ name: 'public-external-timeline' }"
+      class="nav-icon"
+    >
+      <FAIcon
+        fixed-width
+        class="fa-scale-110 fa-old-padding"
+        icon="globe"
+        :title="$t('nav.twkn_timeline_description')"
+      />
+    </router-link>
+    <span class="timeline-title">{{ timelineName() }}</span>
+  </div>
+</template>
+
+<script src="./timeline_menu_tabs.js" ></script>
+
+<style lang="scss">
+@import '../../_variables.scss';
+
+.timeline-menu-tabs {
+  .nav-icon {
+    margin-left: 0.7em;
+    width: 2em;
+    height: 100%;
+    text-align: center;
+
+    &.router-link-active {
+      border-bottom: 2px solid var(--selectedMenuText, $fallback--text);
+      padding-bottom: 0.8em;
+
+      .svg-inline--fa {
+        font-weight: bolder;
+        color: $fallback--text;
+        color: var(--selectedMenuText, $fallback--text);
+        --lightText: var(--selectedMenuLightText, $fallback--lightText);
+      }
+    }
+  }
+
+  .timeline-title {
+    margin-left: 1em;
+    font-size: 1.2em;
+    font-weight: bold;
+    color: var(--selectedMenuText, $fallback--text);
+    color: var(--selectedMenuText, $fallback--text);
+    --lightText: var(--selectedMenuLightText, $fallback--lightText);
+  }
+
+  @media all and (max-width: 900px) {
+    .timeline-title {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index db8931cf..ef898f96 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -69,6 +69,7 @@ export default {
       return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
     },
     loggedIn () {
+      console.log({ ...this.$store.state.users.currentUser })
       return this.$store.state.users.currentUser
     },
     dailyAvg () {
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 8e63e1a3..0f776e55 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -245,7 +245,7 @@
             </button>
           </div>
           <ModerationTools
-            v-if="loggedIn.role === &quot;admin&quot;"
+            v-if="loggedIn.role === 'admin'"
             :user="user"
           />
         </div>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 853f5917..84e4a185 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -616,6 +616,7 @@
         "show_admin_badge": "Show \"Admin\" badge in my profile",
         "show_moderator_badge": "Show \"Moderator\" badge in my profile",
         "show_nav_shortcuts": "Show extra navigation shortcuts in top panel",
+        "show_panel_nav_shortcuts": "Show timeline navigation shortcuts at the top of the panel",
         "show_scrollbars": "Show side column's scrollbars",
         "show_wider_shortcuts": "Show wider gap between top panel shortcuts",
         "show_yous": "Show (You)s",
diff --git a/src/modules/config.js b/src/modules/config.js
index 501d5dfe..5b60520b 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -37,6 +37,7 @@ export const defaultState = {
   collapseMessageWithSubject: undefined, // instance default
   padEmoji: true,
   showNavShortcuts: undefined, // instance default
+  showPanelNavShortcuts: undefined, // instance default
   showWiderShortcuts: undefined, // instance default
   hideSiteFavicon: undefined, // instance default
   hideSiteName: undefined, // instance default
diff --git a/yarn.lock b/yarn.lock
index a761ad0d..5961b770 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1085,6 +1085,11 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
+"@fortawesome/fontawesome-common-types@6.1.2":
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.2.tgz#c1095b1bbabf19f37f9ff0719db38d92a410bcfe"
+  integrity sha512-wBaAPGz1Awxg05e0PBRkDRuTsy4B3dpBm+zreTTyd9TH4uUM27cAL4xWyWR0rLJCrRwzVsQ4hF3FvM6rqydKPA==
+
 "@fortawesome/fontawesome-common-types@^0.2.36":
   version "0.2.36"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz#b44e52db3b6b20523e0c57ef8c42d315532cb903"
@@ -1102,12 +1107,12 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "^0.3.0"
 
-"@fortawesome/free-regular-svg-icons@5.15.4":
-  version "5.15.4"
-  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-5.15.4.tgz#b97edab436954333bbeac09cfc40c6a951081a02"
-  integrity sha512-9VNNnU3CXHy9XednJ3wzQp6SwNwT3XaM26oS4Rp391GsxVYA+0oDR2J194YCIWf7jNRCYKjUCOduxdceLrx+xw==
+"@fortawesome/free-regular-svg-icons@^6.1.2":
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/@fortawesome/free-regular-svg-icons/-/free-regular-svg-icons-6.1.2.tgz#9f04009098addcc11d0d185126f058ed042c3099"
+  integrity sha512-xR4hA+tAwsaTHGfb+25H1gVU/aJ0Rzu+xIUfnyrhaL13yNQ7TWiI2RvzniAaB+VGHDU2a+Pk96Ve+pkN3/+TTQ==
   dependencies:
-    "@fortawesome/fontawesome-common-types" "^0.2.36"
+    "@fortawesome/fontawesome-common-types" "6.1.2"
 
 "@fortawesome/free-solid-svg-icons@5.15.4":
   version "5.15.4"
-- 
2.34.1


From e61228b0310c46e641cd3429ccb5348e954dbf6e Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Wed, 17 Aug 2022 09:34:50 +0000
Subject: [PATCH 03/50] use akkoma-specific source for MFM unless asked not to
 (#132)

Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/132
---
 src/boot/after_store.js                           |  6 ++++++
 src/components/rich_content/rich_content.jsx      | 15 +++++++++++++--
 src/components/status_body/status_body.vue        |  1 +
 src/modules/users.js                              |  2 +-
 .../entity_normalizer.service.js                  |  1 +
 5 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index c0a4cff9..b1f1ee02 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -124,6 +124,11 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('hideBotIndication')
   copyInstanceOption('hideUserStats')
   copyInstanceOption('hideFilteredStatuses')
+  copyInstanceOption('hideSiteName')
+  copyInstanceOption('hideSiteFavicon')
+  copyInstanceOption('showWiderShortcuts')
+  copyInstanceOption('showNavShortcuts')
+  copyInstanceOption('showPanelNavShortcuts')
   copyInstanceOption('logo')
 
   store.dispatch('setInstanceOption', {
@@ -154,6 +159,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('alwaysShowSubjectInput')
   copyInstanceOption('showFeaturesPanel')
   copyInstanceOption('hideSitename')
+  copyInstanceOption('renderMisskeyMarkdown')
   copyInstanceOption('sidebarRight')
 
   return store.dispatch('setTheme', config['theme'])
diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index 0d4127b6..e384b745 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -10,6 +10,11 @@ import HashtagLink from 'src/components/hashtag_link/hashtag_link.vue'
 
 import './rich_content.scss'
 
+const selectContent = (html, sourceContent, mfm) => {
+  if (!mfm) return html
+  return sourceContent === '' ? html : sourceContent
+}
+
 /**
  * RichContent, The Über-powered component for rendering Post HTML.
  *
@@ -66,6 +71,11 @@ export default {
       required: false,
       type: Boolean,
       default: false
+    },
+    sourceContent: {
+      required: false,
+      type: String,
+      default: ''
     }
   },
   // NEVER EVER TOUCH DATA INSIDE RENDER
@@ -74,7 +84,8 @@ export default {
     const greentext = this.mfm ? false : this.greentext
 
     // Pre-process HTML
-    const { newHtml: html } = preProcessPerLine(this.html, greentext)
+    const useContent = selectContent(this.html, this.sourceContent, this.mfm)
+    const { newHtml: html } = preProcessPerLine(useContent, greentext)
     let currentMentions = null // Current chain of mentions, we group all mentions together
     // This is used to recover spacing removed when parsing mentions
     let lastSpacing = ''
@@ -169,7 +180,7 @@ export default {
     }
 
     // Processor to use with html_tree_converter
-    const processItem = (item, index, array, what) => {
+    const processItem = (item, index, array) => {
       // Handle text nodes - just add emoji
       if (typeof item === 'string') {
         const emptyText = item.trim() === ''
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue
index 321f3c4b..5a5f3e5e 100644
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@@ -52,6 +52,7 @@
             :emoji="status.emojis"
             :handle-links="true"
             :mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
+            :sourceContent="status.source_content"
             :greentext="mergedConfig.greentext"
             :attentions="status.attentions"
             @parseReady="onParseReady"
diff --git a/src/modules/users.js b/src/modules/users.js
index 02a9e361..5daf3862 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -589,7 +589,7 @@ const users = {
               const response = data.error
               // Authentication failed
               commit('endLogin')
-              if (response.status === 401) {
+              if (response.status === 401 || response.status === 403) {
                 reject(new Error('Wrong username or password'))
               } else {
                 reject(new Error('An error occurred, please try again'))
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index b66191bf..29032a65 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -282,6 +282,7 @@ export const parseStatus = (data) => {
       const { akkoma } = data
       if (akkoma && akkoma.source) {
         output.media_type = akkoma.source.mediaType
+        output.source_content = akkoma.source.content
       }
     }
 
-- 
2.34.1


From 2d85ee6a0831ed1c3d5f1a0e2934718f4ef4a111 Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Thu, 18 Aug 2022 03:14:38 +0000
Subject: [PATCH 04/50] use-server-side-mfm (#133)

Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/133
---
 src/components/rich_content/rich_content.jsx      | 15 ++-------------
 src/components/status_body/status_body.vue        |  1 -
 src/components/status_content/status_content.js   |  3 +++
 src/components/status_content/status_content.vue  |  9 +++++++--
 src/modules/users.js                              |  2 +-
 .../entity_normalizer.service.js                  |  1 -
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
index e384b745..0d4127b6 100644
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@@ -10,11 +10,6 @@ import HashtagLink from 'src/components/hashtag_link/hashtag_link.vue'
 
 import './rich_content.scss'
 
-const selectContent = (html, sourceContent, mfm) => {
-  if (!mfm) return html
-  return sourceContent === '' ? html : sourceContent
-}
-
 /**
  * RichContent, The Über-powered component for rendering Post HTML.
  *
@@ -71,11 +66,6 @@ export default {
       required: false,
       type: Boolean,
       default: false
-    },
-    sourceContent: {
-      required: false,
-      type: String,
-      default: ''
     }
   },
   // NEVER EVER TOUCH DATA INSIDE RENDER
@@ -84,8 +74,7 @@ export default {
     const greentext = this.mfm ? false : this.greentext
 
     // Pre-process HTML
-    const useContent = selectContent(this.html, this.sourceContent, this.mfm)
-    const { newHtml: html } = preProcessPerLine(useContent, greentext)
+    const { newHtml: html } = preProcessPerLine(this.html, greentext)
     let currentMentions = null // Current chain of mentions, we group all mentions together
     // This is used to recover spacing removed when parsing mentions
     let lastSpacing = ''
@@ -180,7 +169,7 @@ export default {
     }
 
     // Processor to use with html_tree_converter
-    const processItem = (item, index, array) => {
+    const processItem = (item, index, array, what) => {
       // Handle text nodes - just add emoji
       if (typeof item === 'string') {
         const emptyText = item.trim() === ''
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue
index 5a5f3e5e..321f3c4b 100644
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@@ -52,7 +52,6 @@
             :emoji="status.emojis"
             :handle-links="true"
             :mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
-            :sourceContent="status.source_content"
             :greentext="mergedConfig.greentext"
             :attentions="status.attentions"
             @parseReady="onParseReady"
diff --git a/src/components/status_content/status_content.js b/src/components/status_content/status_content.js
index 96fb99b2..81e40b0b 100644
--- a/src/components/status_content/status_content.js
+++ b/src/components/status_content/status_content.js
@@ -103,6 +103,9 @@ const StatusContent = {
     renderMfmOnHover () {
       return this.mergedConfig.renderMfmOnHover
     },
+    renderMisskeyMarkdown () {
+      return this.mergedConfig.renderMisskeyMarkdown
+    },
     ...mapGetters(['mergedConfig']),
     ...mapState({
       currentUser: state => state.users.currentUser
diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue
index 3a99c779..b8735f2c 100644
--- a/src/components/status_content/status_content.vue
+++ b/src/components/status_content/status_content.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     class="StatusContent"
-    :class="{ '-compact': compact, 'mfm-hover': renderMfmOnHover }"
+    :class="{ '-compact': compact, 'mfm-hover': renderMfmOnHover, 'mfm-disabled': !renderMisskeyMarkdown }"
   >
     <slot name="header" />
     <StatusBody
@@ -78,7 +78,12 @@
 
   &.mfm-hover:not(:hover) {
     .mfm {
-      animation: none;
+      animation: none !important;
+    }
+  }
+  &.mfm-disabled {
+    .mfm {
+      animation: none !important;
     }
   }
 }
diff --git a/src/modules/users.js b/src/modules/users.js
index 5daf3862..02a9e361 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -589,7 +589,7 @@ const users = {
               const response = data.error
               // Authentication failed
               commit('endLogin')
-              if (response.status === 401 || response.status === 403) {
+              if (response.status === 401) {
                 reject(new Error('Wrong username or password'))
               } else {
                 reject(new Error('An error occurred, please try again'))
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 29032a65..b66191bf 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -282,7 +282,6 @@ export const parseStatus = (data) => {
       const { akkoma } = data
       if (akkoma && akkoma.source) {
         output.media_type = akkoma.source.mediaType
-        output.source_content = akkoma.source.content
       }
     }
 
-- 
2.34.1


From 1f2b059320a4ba697e399e5bdd07aff5b9b9d967 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 23 Aug 2022 16:12:06 +0100
Subject: [PATCH 05/50] add language tags

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 06b1dfb7..9be1c3bd 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Pleroma-FE 
 
+![English OK](https://img.shields.io/badge/English-OK-blueviolet) ![日本語OK](https://img.shields.io/badge/%E6%97%A5%E6%9C%AC%E8%AA%9E-OK-blueviolet)
+
 This is a fork of Pleroma-FE from the Pleroma project, with support for new Akkoma features such as:
 - MFM support via [marked-mfm](https://akkoma.dev/sfr/marked-mfm)
 - Custom emoji reactions
-- 
2.34.1


From e1e3b9beffbcc6ba669a99e6d803e7f2d6dc358a Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 23 Aug 2022 15:12:18 +0000
Subject: [PATCH 06/50] Translated using Weblate (Spanish)

Currently translated at 84.1% (724 of 860 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: mint <they@mint.lgbt>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/es/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/es.json | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/i18n/es.json b/src/i18n/es.json
index 7b1a2179..007aca8d 100644
--- a/src/i18n/es.json
+++ b/src/i18n/es.json
@@ -1,5 +1,7 @@
 {
     "about": {
+        "bubble_instances": "Instancias de burbuja local",
+        "bubble_instances_description": "Instancias elegidas por los/las adminstradores/as para representar el área local de esta instancia",
         "mrf": {
             "federation": "Federación",
             "keyword": {
@@ -137,7 +139,8 @@
             "direct": "Directo",
             "local": "Local - sólo tu instancia puede ver esta publicación",
             "private": "Sólo para seguidores",
-            "public": "Público"
+            "public": "Público",
+            "unlisted": "No listado"
         },
         "show_less": "Mostrar menos",
         "show_more": "Mostrar más",
@@ -164,6 +167,8 @@
     "lists": {
         "create": "Crear",
         "delete": "Eliminar lista",
+        "lists": "Listas",
+        "new": "Nueva Lista",
         "save": "Guardar cambios",
         "search": "Buscar cuentas",
         "title": "Título de la lista"
@@ -193,6 +198,7 @@
     "nav": {
         "about": "Acerca de",
         "administration": "Administración",
+        "announcements": "Anuncios",
         "back": "Volver",
         "bookmarks": "Marcadores",
         "chats": "Chats",
@@ -200,13 +206,16 @@
         "friend_requests": "Solicitudes de seguimiento",
         "home_timeline": "Línea temporal personal",
         "interactions": "Interacciones",
+        "lists": "Listas",
         "mentions": "Menciones",
         "preferences": "Preferencias",
+        "public_timeline_description": "Publicaciones públicas de esta instancia",
         "public_tl": "Línea temporal pública",
         "search": "Buscar",
         "timeline": "Línea Temporal",
         "timelines": "Líneas de Tiempo",
         "twkn": "Red Conocida",
+        "twkn_timeline_description": "Publicaciones de la red conocida",
         "user_search": "Búsqueda de Usuarios",
         "who_to_follow": "A quién seguir"
     },
-- 
2.34.1


From e6783275262a0087f2b9a136b4ef0832c7bccdce Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 23 Aug 2022 15:12:18 +0000
Subject: [PATCH 07/50] Translated using Weblate (Japanese (ja_PEDANTIC))

Currently translated at 86.0% (740 of 860 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ja_pedantic.json | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 40fed513..f9149743 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -25,6 +25,7 @@
                 "media_removal_desc": "このインスタンスでは、以下のインスタンスからの投稿に対して、メディアを除去します:",
                 "quarantine": "検疫",
                 "quarantine_desc": "このインスタンスでは、以下のインスタンスに対して公開投稿のみを送信します:",
+                "reason": "理由",
                 "reject": "拒否",
                 "reject_desc": "このインスタンスでは、以下のインスタンスからのメッセージを受け付けません:",
                 "simple_policies": "インスタンス固有のポリシー"
@@ -33,7 +34,19 @@
         "staff": "スタッフ"
     },
     "announcements": {
-        "page_header": "お知らせ"
+        "all_day_prompt": "一日中",
+        "cancel_edit_action": "キャンセル",
+        "delete_action": "削除",
+        "edit_action": "更新",
+        "end_time_display": "{time}に終わる",
+        "end_time_prompt": "終了時間 ",
+        "mark_as_read_action": "読んだ",
+        "page_header": "お知らせ",
+        "post_error": "エラーが発生しました： {error}",
+        "post_placeholder": "コンテンツ",
+        "published_time_display": "{time}に告知されました",
+        "start_time_prompt": "開始時間 ",
+        "title": "お知らせ"
     },
     "chats": {
         "chats": "チャット一覧",
@@ -115,6 +128,13 @@
             "admin": "管理者",
             "moderator": "モデレーター"
         },
+        "scope_in_timeline": {
+            "direct": "ダイレクト",
+            "local": "ローカル：このインスタンスのユーザーしか見えません",
+            "private": "フォロワー限定",
+            "public": "公開",
+            "unlisted": "アンリステッド"
+        },
         "show_less": "たたむ",
         "show_more": "もっと見る",
         "submit": "送信",
@@ -137,6 +157,14 @@
         "load_older": "古いインタラクションを見る",
         "moves": "ユーザーの引っ越し"
     },
+    "lists": {
+        "delete": "削除",
+        "lists": "リスト",
+        "new": "リスト作成",
+        "save": "OK",
+        "search": "ユーザー探索",
+        "title": "リスト名"
+    },
     "login": {
         "authentication_code": "認証コード",
         "description": "OAuthでログイン",
@@ -258,6 +286,7 @@
             "unlisted": "アンリステッド: 公開タイムラインに届きません"
         },
         "scope_notice": {
+            "local": "このインスタンスのユーザーしか見えません",
             "private": "この投稿は、あなたのフォロワーだけが、見ることができます",
             "public": "この投稿は、誰でも見ることができます",
             "unlisted": "この投稿は、パブリックタイムラインと、接続しているすべてのネットワークには、表示されません"
@@ -268,6 +297,7 @@
         "bio_placeholder": "例:\nこんにちは。私は玲音。\n私はアニメのキャラクターで、日本の郊外に住んでいます。私をWiredで見たことがあるかもしれません。",
         "captcha": "CAPTCHA",
         "email": "Eメール",
+        "email_language": "サーバーからのメールの言語",
         "fullname": "スクリーンネーム",
         "fullname_placeholder": "例: 岩倉玲音",
         "new_captcha": "文字が読めないときは、画像をクリックすると、新しい画像になります",
@@ -304,6 +334,11 @@
     },
     "settings": {
         "accent": "アクセント",
+        "account_backup": "アカウントのバックアップ",
+        "account_backup_description": "投稿やアカウント情報をダウンロードできますが、インポートすることがまだできません",
+        "account_backup_table_head": "バックアップ",
+        "account_privacy": "プライバシー",
+        "add_backup": "バックアップ作成",
         "allow_following_move": "フォロー中のアカウントが引っ越したとき、自動フォローを許可する",
         "always_show_post_button": "投稿ボタンを常に表示",
         "app_name": "アプリの名称",
-- 
2.34.1


From f67868b9ad6c2a89a7f660dc85443058675a31da Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 23 Aug 2022 15:12:19 +0000
Subject: [PATCH 08/50] Translated using Weblate (Dutch)

Currently translated at 100.0% (860 of 860 strings)

Translated using Weblate (Dutch)

Currently translated at 100.0% (859 of 859 strings)

Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/nl/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/nl.json | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index b82dd23e..e6761de9 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -461,6 +461,8 @@
         "hide_muted_threads": "Genegeerde gesprekken verbergen",
         "hide_post_stats": "Bericht-statistieken verbergen (bijv. het aantal favorieten)",
         "hide_shoutbox": "Shoutbox verbergen",
+        "hide_site_favicon": "Favicon verbergen in top-paneel",
+        "hide_site_name": "Instantienaam verbergen in top paneel",
         "hide_threads_with_blocked_users": "Gesprekken met geblokkeerde gebruikers verbergen",
         "hide_user_stats": "Gebruikers-statistieken verbergen (bijv. het aantal volgers)",
         "hide_wallpaper": "Achtergrond-afbeelding verbergen",
@@ -613,7 +615,10 @@
         "settings": "Instellingen",
         "show_admin_badge": "\"Beheerder\" badge in mijn profiel tonen",
         "show_moderator_badge": "\"Moderator\" badge in mijn profiel tonen",
+        "show_nav_shortcuts": "Extra navigatie snelkoppelingen tonen in top paneel",
+        "show_panel_nav_shortcuts": "Tijdlijn navigatie-snelkoppelingen tonen bovenop het paneel",
         "show_scrollbars": "Scrollbalk tonen in zijkolommen",
+        "show_wider_shortcuts": "Extra ruimte tonen tussen snelkoppelingen in top paneel",
         "show_yous": "(Jij)'s tonen",
         "stop_gifs": "Geanimeerde afbeeldingen afspelen bij zweven",
         "streaming": "Automatisch streamen van nieuwe berichten inschakelen wanneer tot boven gescrold is",
-- 
2.34.1


From 9a37c42f06742618c774f5768550355c49ff7756 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 23 Aug 2022 15:12:20 +0000
Subject: [PATCH 09/50] Translated using Weblate (French)

Currently translated at 100.0% (860 of 860 strings)

Co-authored-by: Thomate <thomas@burdick.fr>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/fr/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/fr.json | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 73d8c1c7..5fc83c69 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -1,5 +1,7 @@
 {
     "about": {
+        "bubble_instances": "Les instances de la bulle locale",
+        "bubble_instances_description": "Des instances choisies par l'administration pour representer la région de cette instance",
         "mrf": {
             "federation": "Fédération",
             "keyword": {
@@ -136,6 +138,7 @@
         },
         "scope_in_timeline": {
             "direct": "Direct",
+            "local": "Local - visible seulement sur cette instance",
             "private": "Abonné·e·s uniquement",
             "public": "Public",
             "unlisted": "Non-listé"
@@ -281,11 +284,11 @@
         "default": "Je viens d'arriver au QG de la NERV",
         "direct_warning_to_all": "Ce message sera visible pour toutes les personnes mentionnées.",
         "direct_warning_to_first_only": "Ce message sera visible uniquement pour personnes mentionnées au début du message.",
-        "empty_status_error": "Impossible de poster un statut vide sans pièces-jointes",
+        "empty_status_error": "Impossible de publier un statut vide sans pièces-jointes",
         "media_description": "Description de la pièce-jointe",
         "media_description_error": "Échec de téléversement du media, essayez encore",
         "media_not_sensitive_warning": "Il y a un avertissment, mais les pièces jointes ne sont pas marquées comme sensibles !",
-        "new_status": "Poster un nouveau statut",
+        "new_status": "Nouveau statut",
         "post": "Post",
         "posting": "Envoi en cours",
         "preview": "Prévisualisation",
@@ -306,7 +309,7 @@
     },
     "registration": {
         "bio": "Biographie",
-        "bio_placeholder": "ex.\nSalut, je suis Lain\nJe suis une héroïne d'animation qui vit dans une banlieue japonaise. Vous me connaissez peut-être du Wired.",
+        "bio_placeholder": "ex :\nSalut, je me présente ici !\nJ’adore les animés et les jeux vidéos. J’espère qu'on peut être amis⋅ies !",
         "captcha": "CAPTCHA",
         "email": "Courriel",
         "email_language": "Dans quelle langue souhaitez-vous recevoir des courriels ?",
@@ -458,6 +461,8 @@
         "hide_muted_threads": "Masquer les fils de discussion silenciés",
         "hide_post_stats": "Masquer les statistiques des messages (ex. le nombre de favoris)",
         "hide_shoutbox": "Cacher la shoutbox de l'instance",
+        "hide_site_favicon": "Ne pas afficher le favicon de l’instance dans le panneau supérieur",
+        "hide_site_name": "Ne pas afficher le nom de l'instance dans le panneau supérieur",
         "hide_threads_with_blocked_users": "Masquer les fils qui mentionnent les personnes bloquées",
         "hide_user_stats": "Masquer les statistiques de compte (ex. le nombre de suivis)",
         "hide_wallpaper": "Cacher le fond d'écran",
@@ -576,6 +581,7 @@
         "remove_alias": "Supprimer ce pseudo",
         "remove_backup": "Supprimer",
         "render_mfm": "Afficher le contenu Misskey Markdown",
+        "render_mfm_on_hover": "Rester sur du contenu MFM pour déclencher les animations",
         "replies_in_timeline": "Réponses dans le flux",
         "reply_visibility_all": "Montrer toutes les réponses",
         "reply_visibility_following": "Afficher uniquement les réponses adressées à moi ou aux personnes que je suis",
@@ -609,7 +615,10 @@
         "settings": "Paramètres",
         "show_admin_badge": "Afficher le badge d'Admin sur mon profil",
         "show_moderator_badge": "Afficher le badge de Modo' sur mon profil",
+        "show_nav_shortcuts": "Afficher plus de raccourcis de navigations dans le panneau supérieur",
+        "show_panel_nav_shortcuts": "Afficher les raccourcis de navigation du flux dans le panneau supérieur",
         "show_scrollbars": "Afficher la barre de défilement",
+        "show_wider_shortcuts": "Plus d'espace entre les raccourcis dans le panneau supérieur",
         "show_yous": "Afficher « Vous : »",
         "stop_gifs": "N'animer les GIFS que lors du survol du curseur de la souris",
         "streaming": "Charger automatiquement les nouveaux statuts lorsque vous êtes au haut de la page",
@@ -1004,4 +1013,4 @@
         "more": "Plus",
         "who_to_follow": "À qui s'abonner"
     }
-}
\ No newline at end of file
+}
-- 
2.34.1


From bf501e36a1041721809d87430aae8008936fc9c8 Mon Sep 17 00:00:00 2001
From: David <dmgf2008@hotmail.com>
Date: Wed, 24 Aug 2022 23:53:16 -0700
Subject: [PATCH 10/50] Potential Fix for (#113) on show new

---
 src/components/timeline/timeline.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index f44fabb1..c91c8d57 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -150,7 +150,6 @@ const Timeline = {
         this.$store.commit('showNewStatuses', { timeline: this.timelineName })
         this.paused = false
       }
-      window.scrollTo({ top: 0 })
     },
     fetchOlderStatuses: throttle(function () {
       const store = this.$store
-- 
2.34.1


From d4e91ef61ec5e2d2661d02c70426b3abcd8a55e8 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Thu, 25 Aug 2022 17:02:55 +0100
Subject: [PATCH 11/50] allow instance language to take precedence over EN

---
 src/boot/after_store.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index b1f1ee02..2a90ceee 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -1,3 +1,4 @@
+import Cookies from 'js-cookie'
 import { createApp } from 'vue'
 import { createRouter, createWebHistory } from 'vue-router'
 import vClickOutside from 'click-outside-vue3'
@@ -58,6 +59,10 @@ const getInstanceConfig = async ({ store }) => {
 
       store.dispatch('setInstanceOption', { name: 'textlimit', value: textlimit })
       store.dispatch('setInstanceOption', { name: 'accountApprovalRequired', value: data.approval_required })
+      // don't override cookie if set
+      if (!Cookies.get('userLanguage')) {
+        store.dispatch('setOption', { name: 'interfaceLanguage', value: data.languages[0] })
+      }
 
       if (vapidPublicKey) {
         store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
-- 
2.34.1


From c1c40d72da9f242ef175b00ce7491feb2d09797b Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Fri, 26 Aug 2022 09:31:25 +0000
Subject: [PATCH 12/50] resolve language from navigator langs (#139)

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/139
---
 src/boot/after_store.js                          | 16 +++++++++++++++-
 .../interface_language_switcher.vue              |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 2a90ceee..ce93436f 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -49,6 +49,20 @@ const preloadFetch = async (request) => {
   }
 }
 
+const resolveLanguage = (instanceLanguages) => {
+  // First language in navigator.languages that is listed as an instance language
+  // falls back to first instance language
+  const navigatorLanguages = navigator.languages.map((x) => x.split('-')[0])
+
+  for (const navLanguage of navigatorLanguages) {
+    if (instanceLanguages.includes(navLanguage)) {
+      return navLanguage
+    }
+  }
+
+  return instanceLanguages[0]
+}
+
 const getInstanceConfig = async ({ store }) => {
   try {
     const res = await preloadFetch('/api/v1/instance')
@@ -61,7 +75,7 @@ const getInstanceConfig = async ({ store }) => {
       store.dispatch('setInstanceOption', { name: 'accountApprovalRequired', value: data.approval_required })
       // don't override cookie if set
       if (!Cookies.get('userLanguage')) {
-        store.dispatch('setOption', { name: 'interfaceLanguage', value: data.languages[0] })
+        store.dispatch('setOption', { name: 'interfaceLanguage', value: resolveLanguage(data.languages) })
       }
 
       if (vapidPublicKey) {
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index 7ad1fe2e..51c4a9e3 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -1,5 +1,6 @@
 <template>
   <div>
+    <FAIcon icon="globe" style="color: white;" /> {{ ' ' }}
     <label for="interface-language-switcher">
       {{ promptText }}
     </label>
-- 
2.34.1


From f925fa6265f52d6a2f69342bacaa0535adebe3de Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Fri, 26 Aug 2022 10:36:21 +0100
Subject: [PATCH 13/50] don't force white globe

---
 .../interface_language_switcher/interface_language_switcher.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index 51c4a9e3..e46bcf71 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <FAIcon icon="globe" style="color: white;" /> {{ ' ' }}
+    <FAIcon icon="globe" /> {{ ' ' }}
     <label for="interface-language-switcher">
       {{ promptText }}
     </label>
-- 
2.34.1


From 776bee889e8b4490fa840e88fc4573f5f220cac5 Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Fri, 26 Aug 2022 11:58:33 +0000
Subject: [PATCH 14/50] Confirmation dialogs (#140)

supercedes #135

adapted from https://git.pleroma.social/pleroma/pleroma-fe/-/merge_requests/1431

Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/140
---
 index.html                                    |  1 +
 src/App.vue                                   |  2 +-
 .../account_actions/account_actions.js        | 31 +++++++-
 .../account_actions/account_actions.vue       | 21 ++++++
 src/components/confirm_modal/confirm_modal.js | 37 ++++++++++
 .../confirm_modal/confirm_modal.vue           | 39 ++++++++++
 src/components/desktop_nav/desktop_nav.js     | 12 +++-
 src/components/desktop_nav/desktop_nav.vue    | 12 ++++
 src/components/dialog_modal/dialog_modal.vue  |  4 +-
 src/components/extra_buttons/extra_buttons.js | 34 +++++++--
 .../extra_buttons/extra_buttons.vue           | 12 ++++
 src/components/follow_button/follow_button.js | 25 ++++++-
 .../follow_button/follow_button.vue           | 21 ++++++
 .../follow_request_card.js                    | 49 ++++++++++++-
 .../follow_request_card.vue                   | 22 ++++++
 src/components/mobile_nav/mobile_nav.js       | 28 +++++++-
 src/components/mobile_nav/mobile_nav.vue      | 20 ++++++
 src/components/notification/notification.js   | 45 +++++++++++-
 src/components/notification/notification.vue  | 22 ++++++
 .../retweet_button/retweet_button.js          | 24 ++++++-
 .../retweet_button/retweet_button.vue         | 12 ++++
 .../settings_modal/tabs/general_tab.vue       | 71 +++++++++++++++++++
 src/components/user_card/user_card.js         | 24 ++++++-
 src/components/user_card/user_card.vue        | 21 ++++++
 src/i18n/en.json                              | 37 ++++++++++
 src/modules/config.js                         |  8 +++
 src/modules/instance.js                       |  8 +++
 27 files changed, 619 insertions(+), 23 deletions(-)
 create mode 100644 src/components/confirm_modal/confirm_modal.js
 create mode 100644 src/components/confirm_modal/confirm_modal.vue

diff --git a/index.html b/index.html
index 40db0bbe..1b1385de 100644
--- a/index.html
+++ b/index.html
@@ -15,6 +15,7 @@
   <body class="hidden">
     <noscript>To use Pleroma, please enable JavaScript.</noscript>
     <div id="app"></div>
+    <div id="modal"></div>
     <!-- built files will be auto injected -->
   </body>
 </html>
diff --git a/src/App.vue b/src/App.vue
index c3cf33f8..ed4f318e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -59,7 +59,7 @@
     <UserReportingModal />
     <PostStatusModal />
     <SettingsModal />
-    <div id="modal" />
+    <UpdateNotification />
     <GlobalNoticeList />
   </div>
 </template>
diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js
index 8fe0fe5e..c227c409 100644
--- a/src/components/account_actions/account_actions.js
+++ b/src/components/account_actions/account_actions.js
@@ -1,6 +1,8 @@
 import ProgressButton from '../progress_button/progress_button.vue'
 import Popover from '../popover/popover.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
+import { mapState } from 'vuex'
 import {
   faEllipsisV
 } from '@fortawesome/free-solid-svg-icons'
@@ -14,13 +16,22 @@ const AccountActions = {
     'user', 'relationship'
   ],
   data () {
-    return { }
+    return {
+      showingConfirmBlock: false
+    }
   },
   components: {
     ProgressButton,
-    Popover
+    Popover,
+    ConfirmModal
   },
   methods: {
+    showConfirmBlock () {
+      this.showingConfirmBlock = true
+    },
+    hideConfirmBlock () {
+      this.showingConfirmBlock = false
+    },
     showRepeats () {
       this.$store.dispatch('showReblogs', this.user.id)
     },
@@ -28,7 +39,15 @@ const AccountActions = {
       this.$store.dispatch('hideReblogs', this.user.id)
     },
     blockUser () {
+      if (!this.shouldConfirmBlock) {
+        this.doBlockUser()
+      } else {
+        this.showConfirmBlock()
+      }
+    },
+    doBlockUser () {
       this.$store.dispatch('blockUser', this.user.id)
+      this.hideConfirmBlock()
     },
     unblockUser () {
       this.$store.dispatch('unblockUser', this.user.id)
@@ -36,6 +55,14 @@ const AccountActions = {
     reportUser () {
       this.$store.dispatch('openUserReportingModal', { userId: this.user.id })
     }
+  },
+  computed: {
+    shouldConfirmBlock () {
+      return this.$store.getters.mergedConfig.modalOnBlock
+    },
+    ...mapState({
+      pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
+    })
   }
 }
 
diff --git a/src/components/account_actions/account_actions.vue b/src/components/account_actions/account_actions.vue
index afd8bb1b..3e65aa62 100644
--- a/src/components/account_actions/account_actions.vue
+++ b/src/components/account_actions/account_actions.vue
@@ -59,6 +59,27 @@
         </button>
       </template>
     </Popover>
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingConfirmBlock"
+        :title="$t('user_card.block_confirm_title')"
+        :confirm-text="$t('user_card.block_confirm_accept_button')"
+        :cancel-text="$t('user_card.block_confirm_cancel_button')"
+        @accepted="doBlockUser"
+        @cancelled="hideConfirmBlock"
+      >
+        <i18n-t
+          keypath="user_card.block_confirm"
+          tag="span"
+        >
+          <template v-slot:user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
+      </confirm-modal>
+    </teleport>
   </div>
 </template>
 
diff --git a/src/components/confirm_modal/confirm_modal.js b/src/components/confirm_modal/confirm_modal.js
new file mode 100644
index 00000000..96ddc118
--- /dev/null
+++ b/src/components/confirm_modal/confirm_modal.js
@@ -0,0 +1,37 @@
+import DialogModal from '../dialog_modal/dialog_modal.vue'
+
+/**
+ * This component emits the following events:
+ * cancelled, emitted when the action should not be performed;
+ * accepted, emitted when the action should be performed;
+ *
+ * The caller should close this dialog after receiving any of the two events.
+ */
+const ConfirmModal = {
+  components: {
+    DialogModal
+  },
+  props: {
+    title: {
+      type: String
+    },
+    cancelText: {
+      type: String
+    },
+    confirmText: {
+      type: String
+    }
+  },
+  computed: {
+  },
+  methods: {
+    onCancel () {
+      this.$emit('cancelled')
+    },
+    onAccept () {
+      this.$emit('accepted')
+    }
+  }
+}
+
+export default ConfirmModal
diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue
new file mode 100644
index 00000000..5783c794
--- /dev/null
+++ b/src/components/confirm_modal/confirm_modal.vue
@@ -0,0 +1,39 @@
+<template>
+  <dialog-modal
+    v-body-scroll-lock="true"
+    class="confirm-modal"
+    :on-cancel="onCancel"
+  >
+    <template #header>
+      <span v-text="title" />
+    </template>
+
+    <slot />
+
+    <template #footer>
+      <button
+        class="btn button-default"
+        @click.prevent="onCancel"
+        v-text="cancelText"
+      />
+      <button
+        class="btn button-default button-positive"
+        @click.prevent="onAccept"
+        v-text="confirmText"
+      />
+    </template>
+  </dialog-modal>
+</template>
+
+<style lang="scss" scoped>
+@import '../../_variables';
+
+.confirm-modal {
+  .button-positive {
+    border: 3px solid var(--accent, $fallback--link);
+    border-radius: var(--btnRadius, $fallback--btnRadius);
+  }
+}
+</style>
+
+<script src="./confirm_modal.js"></script>
diff --git a/src/components/desktop_nav/desktop_nav.js b/src/components/desktop_nav/desktop_nav.js
index 3307b5d5..9ba5abc4 100644
--- a/src/components/desktop_nav/desktop_nav.js
+++ b/src/components/desktop_nav/desktop_nav.js
@@ -1,4 +1,5 @@
 import SearchBar from 'components/search_bar/search_bar.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faSignInAlt,
@@ -38,7 +39,8 @@ library.add(
 
 export default {
   components: {
-    SearchBar
+    SearchBar,
+    ConfirmModal
   },
   data: () => ({
     searchBarHidden: true,
@@ -48,7 +50,8 @@ export default {
         window.CSS.supports('-moz-mask-size', 'contain') ||
         window.CSS.supports('-ms-mask-size', 'contain') ||
         window.CSS.supports('-o-mask-size', 'contain')
-    )
+    ),
+    showingConfirmLogout: false
   }),
   computed: {
     enableMask () { return this.supportsMask && this.$store.state.instance.logoMask },
@@ -92,7 +95,10 @@ export default {
     hideSitename () { return this.$store.state.instance.hideSitename },
     logoLeft () { return this.$store.state.instance.logoLeft },
     currentUser () { return this.$store.state.users.currentUser },
-    privateMode () { return this.$store.state.instance.private }
+    privateMode () { return this.$store.state.instance.private },
+    shouldConfirmLogout () {
+      return this.$store.getters.mergedConfig.modalOnLogout
+    }
   },
   methods: {
     scrollToTop () {
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 25b4fe8e..32e3c73f 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -167,6 +167,18 @@
         </a>
       </div>
     </div>
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingConfirmLogout"
+        :title="$t('login.logout_confirm_title')"
+        :confirm-text="$t('login.logout_confirm_accept_button')"
+        :cancel-text="$t('login.logout_confirm_cancel_button')"
+        @accepted="doLogout"
+        @cancelled="hideConfirmLogout"
+      >
+        {{ $t('login.logout_confirm') }}
+      </confirm-modal>
+    </teleport>
   </nav>
 </template>
 <script src="./desktop_nav.js"></script>
diff --git a/src/components/dialog_modal/dialog_modal.vue b/src/components/dialog_modal/dialog_modal.vue
index 06b270c3..1a42b0e5 100644
--- a/src/components/dialog_modal/dialog_modal.vue
+++ b/src/components/dialog_modal/dialog_modal.vue
@@ -39,7 +39,7 @@
     right: 0;
     top: 0;
     background: rgba(27,31,35,.5);
-    z-index: 99;
+    z-index: 2000;
   }
 }
 
@@ -51,7 +51,7 @@
   margin: 15vh auto;
   position: fixed;
   transform: translateX(-50%);
-  z-index: 999;
+  z-index: 2001;
   cursor: default;
   display: block;
   background-color: $fallback--bg;
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index dd45b6b9..f7045110 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -1,4 +1,5 @@
 import Popover from '../popover/popover.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faEllipsisH,
@@ -25,15 +26,35 @@ library.add(
 )
 
 const ExtraButtons = {
-  props: [ 'status' ],
-  components: { Popover },
+  props: ['status'],
+  components: {
+    Popover,
+    ConfirmModal
+  },
+  data () {
+    return {
+      expanded: false,
+      showingDeleteDialog: false
+    }
+  },
   methods: {
     deleteStatus () {
-      const confirmed = window.confirm(this.$t('status.delete_confirm'))
-      if (confirmed) {
-        this.$store.dispatch('deleteStatus', { id: this.status.id })
+      if (this.shouldConfirmDelete) {
+        this.showDeleteStatusConfirmDialog()
+      } else {
+        this.doDeleteStatus()
       }
     },
+    doDeleteStatus () {
+      this.$store.dispatch('deleteStatus', { id: this.status.id })
+      this.hideDeleteStatusConfirmDialog()
+    },
+    showDeleteStatusConfirmDialog () {
+      this.showingDeleteDialog = true
+    },
+    hideDeleteStatusConfirmDialog () {
+      this.showingDeleteDialog = false
+    },
     pinStatus () {
       this.$store.dispatch('pinStatus', this.status.id)
         .then(() => this.$emit('onSuccess'))
@@ -91,6 +112,9 @@ const ExtraButtons = {
     },
     statusLink () {
       return `${this.$store.state.instance.server}${this.$router.resolve({ name: 'conversation', params: { id: this.status.id } }).href}`
+    },
+    shouldConfirmDelete () {
+      return this.$store.getters.mergedConfig.modalOnDelete
     }
   }
 }
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index a3c3c767..2b574bbd 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -125,6 +125,18 @@
           icon="ellipsis-h"
         />
       </button>
+      <teleport to="#modal">
+        <ConfirmModal
+          v-if="showingDeleteDialog"
+          :title="$t('status.delete_confirm_title')"
+          :cancel-text="$t('status.delete_confirm_cancel_button')"
+          :confirm-text="$t('status.delete_confirm_accept_button')"
+          @cancelled="hideDeleteStatusConfirmDialog"
+          @accepted="doDeleteStatus"
+        >
+          {{ $t('status.delete_confirm') }}
+        </ConfirmModal>
+      </teleport>
     </template>
   </Popover>
 </template>
diff --git a/src/components/follow_button/follow_button.js b/src/components/follow_button/follow_button.js
index 3edbcb86..443aa9bc 100644
--- a/src/components/follow_button/follow_button.js
+++ b/src/components/follow_button/follow_button.js
@@ -1,12 +1,20 @@
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
 export default {
   props: ['relationship', 'user', 'labelFollowing', 'buttonClass'],
+  components: {
+    ConfirmModal
+  },
   data () {
     return {
-      inProgress: false
+      inProgress: false,
+      showingConfirmUnfollow: false
     }
   },
   computed: {
+    shouldConfirmUnfollow () {
+      return this.$store.getters.mergedConfig.modalOnUnfollow
+    },
     isPressed () {
       return this.inProgress || this.relationship.following
     },
@@ -35,6 +43,12 @@ export default {
     }
   },
   methods: {
+    showConfirmUnfollow () {
+      this.showingConfirmUnfollow = true
+    },
+    hideConfirmUnfollow () {
+      this.showingConfirmUnfollow = false
+    },
     onClick () {
       this.relationship.following || this.relationship.requested ? this.unfollow() : this.follow()
     },
@@ -45,12 +59,21 @@ export default {
       })
     },
     unfollow () {
+      if (this.shouldConfirmUnfollow) {
+        this.showConfirmUnfollow()
+      } else {
+        this.doUnfollow()
+      }
+    },
+    doUnfollow () {
       const store = this.$store
       this.inProgress = true
       requestUnfollow(this.relationship.id, store).then(() => {
         this.inProgress = false
         store.commit('removeStatus', { timeline: 'friends', userId: this.relationship.id })
       })
+
+      this.hideConfirmUnfollow()
     }
   }
 }
diff --git a/src/components/follow_button/follow_button.vue b/src/components/follow_button/follow_button.vue
index 965d5256..e421c15b 100644
--- a/src/components/follow_button/follow_button.vue
+++ b/src/components/follow_button/follow_button.vue
@@ -7,6 +7,27 @@
     @click="onClick"
   >
     {{ label }}
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingConfirmUnfollow"
+        :title="$t('user_card.unfollow_confirm_title')"
+        :confirm-text="$t('user_card.unfollow_confirm_accept_button')"
+        :cancel-text="$t('user_card.unfollow_confirm_cancel_button')"
+        @accepted="doUnfollow"
+        @cancelled="hideConfirmUnfollow"
+      >
+        <i18n-t
+          keypath="user_card.unfollow_confirm"
+          tag="span"
+        >
+          <template #user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
+      </confirm-modal>
+    </teleport>
   </button>
 </template>
 
diff --git a/src/components/follow_request_card/follow_request_card.js b/src/components/follow_request_card/follow_request_card.js
index cbd75311..b0873bb1 100644
--- a/src/components/follow_request_card/follow_request_card.js
+++ b/src/components/follow_request_card/follow_request_card.js
@@ -1,10 +1,18 @@
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { notificationsFromStore } from '../../services/notification_utils/notification_utils.js'
 
 const FollowRequestCard = {
   props: ['user'],
   components: {
-    BasicUserCard
+    BasicUserCard,
+    ConfirmModal
+  },
+  data () {
+    return {
+      showingApproveConfirmDialog: false,
+      showingDenyConfirmDialog: false
+    }
   },
   methods: {
     findFollowRequestNotificationId () {
@@ -13,7 +21,26 @@ const FollowRequestCard = {
       )
       return notif && notif.id
     },
+    showApproveConfirmDialog () {
+      this.showingApproveConfirmDialog = true
+    },
+    hideApproveConfirmDialog () {
+      this.showingApproveConfirmDialog = false
+    },
+    showDenyConfirmDialog () {
+      this.showingDenyConfirmDialog = true
+    },
+    hideDenyConfirmDialog () {
+      this.showingDenyConfirmDialog = false
+    },
     approveUser () {
+      if (this.shouldConfirmApprove) {
+        this.showApproveConfirmDialog()
+      } else {
+        this.doApprove()
+      }
+    },
+    doApprove () {
       this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
       this.$store.dispatch('removeFollowRequest', this.user)
 
@@ -25,14 +52,34 @@ const FollowRequestCard = {
           notification.type = 'follow'
         }
       })
+      this.hideApproveConfirmDialog()
     },
     denyUser () {
+      if (this.shouldConfirmDeny) {
+        this.showDenyConfirmDialog()
+      } else {
+        this.doDeny()
+      }
+    },
+    doDeny () {
       const notifId = this.findFollowRequestNotificationId()
       this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
         .then(() => {
           this.$store.dispatch('dismissNotificationLocal', { id: notifId })
           this.$store.dispatch('removeFollowRequest', this.user)
         })
+      this.hideDenyConfirmDialog()
+    }
+  },
+  computed: {
+    mergedConfig () {
+      return this.$store.getters.mergedConfig
+    },
+    shouldConfirmApprove () {
+      return this.mergedConfig.modalOnApproveFollow
+    },
+    shouldConfirmDeny () {
+      return this.mergedConfig.modalOnDenyFollow
     }
   }
 }
diff --git a/src/components/follow_request_card/follow_request_card.vue b/src/components/follow_request_card/follow_request_card.vue
index 1b12ba4b..835471e7 100644
--- a/src/components/follow_request_card/follow_request_card.vue
+++ b/src/components/follow_request_card/follow_request_card.vue
@@ -14,6 +14,28 @@
         {{ $t('user_card.deny') }}
       </button>
     </div>
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingApproveConfirmDialog"
+        :title="$t('user_card.approve_confirm_title')"
+        :confirm-text="$t('user_card.approve_confirm_accept_button')"
+        :cancel-text="$t('user_card.approve_confirm_cancel_button')"
+        @accepted="doApprove"
+        @cancelled="hideApproveConfirmDialog"
+      >
+        {{ $t('user_card.approve_confirm', { user: user.screen_name_ui }) }}
+      </confirm-modal>
+      <confirm-modal
+        v-if="showingDenyConfirmDialog"
+        :title="$t('user_card.deny_confirm_title')"
+        :confirm-text="$t('user_card.deny_confirm_accept_button')"
+        :cancel-text="$t('user_card.deny_confirm_cancel_button')"
+        @accepted="doDeny"
+        @cancelled="hideDenyConfirmDialog"
+      >
+        {{ $t('user_card.deny_confirm', { user: user.screen_name_ui }) }}
+      </confirm-modal>
+    </teleport>
   </basic-user-card>
 </template>
 
diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js
index 7a356921..bba520d4 100644
--- a/src/components/mobile_nav/mobile_nav.js
+++ b/src/components/mobile_nav/mobile_nav.js
@@ -1,7 +1,9 @@
 import SideDrawer from '../side_drawer/side_drawer.vue'
 import Notifications from '../notifications/notifications.vue'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
 import GestureService from '../../services/gesture_service/gesture_service'
+import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faTimes,
@@ -18,11 +20,13 @@ library.add(
 const MobileNav = {
   components: {
     SideDrawer,
-    Notifications
+    Notifications,
+    ConfirmModal
   },
   data: () => ({
     notificationsCloseGesture: undefined,
-    notificationsOpen: false
+    notificationsOpen: false,
+    showingConfirmLogout: false
   }),
   created () {
     this.notificationsCloseGesture = GestureService.swipeGesture(
@@ -47,7 +51,11 @@ const MobileNav = {
     hideSiteName () {
       return this.mergedConfig.hideSiteName
     },
-    sitename () { return this.$store.state.instance.name }
+    sitename () { return this.$store.state.instance.name },
+    shouldConfirmLogout () {
+      return this.$store.getters.mergedConfig.modalOnLogout
+    },
+    ...mapGetters(['unreadChatCount'])
   },
   methods: {
     toggleMobileSidebar () {
@@ -73,9 +81,23 @@ const MobileNav = {
     scrollToTop () {
       window.scrollTo(0, 0)
     },
+    showConfirmLogout () {
+      this.showingConfirmLogout = true
+    },
+    hideConfirmLogout () {
+      this.showingConfirmLogout = false
+    },
     logout () {
+      if (!this.shouldConfirmLogout) {
+        this.doLogout()
+      } else {
+        this.showConfirmLogout()
+      }
+    },
+    doLogout () {
       this.$router.replace('/main/public')
       this.$store.dispatch('logout')
+      this.hideConfirmLogout()
     },
     markNotificationsAsSeen () {
       // this.$refs.notifications.markAsSeen()
diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue
index 308c8d57..e6a8e694 100644
--- a/src/components/mobile_nav/mobile_nav.vue
+++ b/src/components/mobile_nav/mobile_nav.vue
@@ -76,6 +76,18 @@
       ref="sideDrawer"
       :logout="logout"
     />
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingConfirmLogout"
+        :title="$t('login.logout_confirm_title')"
+        :confirm-text="$t('login.logout_confirm_accept_button')"
+        :cancel-text="$t('login.logout_confirm_cancel_button')"
+        @accepted="doLogout"
+        @cancelled="hideConfirmLogout"
+      >
+        {{ $t('login.logout_confirm') }}
+      </confirm-modal>
+    </teleport>
   </div>
 </template>
 
@@ -206,6 +218,14 @@
       }
     }
   }
+  .confirm-modal.dark-overlay {
+    &::before {
+      z-index: 3000;
+    }
+    .dialog-modal.panel {
+      z-index: 3001;
+    }
+  }
 }
 
 </style>
diff --git a/src/components/notification/notification.js b/src/components/notification/notification.js
index 398bb7a9..af612ccb 100644
--- a/src/components/notification/notification.js
+++ b/src/components/notification/notification.js
@@ -5,6 +5,7 @@ import UserAvatar from '../user_avatar/user_avatar.vue'
 import UserCard from '../user_card/user_card.vue'
 import Timeago from '../timeago/timeago.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { isStatusNotification } from '../../services/notification_utils/notification_utils.js'
 import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -36,7 +37,9 @@ const Notification = {
     return {
       userExpanded: false,
       betterShadow: this.$store.state.interface.browserSupport.cssFilter,
-      unmuted: false
+      unmuted: false,
+      showingApproveConfirmDialog: false,
+      showingDenyConfirmDialog: false
     }
   },
   props: [ 'notification' ],
@@ -46,7 +49,8 @@ const Notification = {
     UserCard,
     Timeago,
     Status,
-    RichContent
+    RichContent,
+    ConfirmModal
   },
   methods: {
     toggleUserExpanded () {
@@ -61,7 +65,26 @@ const Notification = {
     toggleMute () {
       this.unmuted = !this.unmuted
     },
+    showApproveConfirmDialog () {
+      this.showingApproveConfirmDialog = true
+    },
+    hideApproveConfirmDialog () {
+      this.showingApproveConfirmDialog = false
+    },
+    showDenyConfirmDialog () {
+      this.showingDenyConfirmDialog = true
+    },
+    hideDenyConfirmDialog () {
+      this.showingDenyConfirmDialog = false
+    },
     approveUser () {
+      if (this.shouldConfirmApprove) {
+        this.showApproveConfirmDialog()
+      } else {
+        this.doApprove()
+      }
+    },
+    doApprove () {
       this.$store.state.api.backendInteractor.approveUser({ id: this.user.id })
       this.$store.dispatch('removeFollowRequest', this.user)
       this.$store.dispatch('markSingleNotificationAsSeen', { id: this.notification.id })
@@ -71,13 +94,22 @@ const Notification = {
           notification.type = 'follow'
         }
       })
+      this.hideApproveConfirmDialog()
     },
     denyUser () {
+      if (this.shouldConfirmDeny) {
+        this.showDenyConfirmDialog()
+      } else {
+        this.doDeny()
+      }
+    },
+    doDeny () {
       this.$store.state.api.backendInteractor.denyUser({ id: this.user.id })
         .then(() => {
           this.$store.dispatch('dismissNotificationLocal', { id: this.notification.id })
           this.$store.dispatch('removeFollowRequest', this.user)
         })
+      this.hideDenyConfirmDialog()
     }
   },
   computed: {
@@ -107,6 +139,15 @@ const Notification = {
     isStatusNotification () {
       return isStatusNotification(this.notification.type)
     },
+    mergedConfig () {
+      return this.$store.getters.mergedConfig
+    },
+    shouldConfirmApprove () {
+      return this.mergedConfig.modalOnApproveFollow
+    },
+    shouldConfirmDeny () {
+      return this.mergedConfig.modalOnDenyFollow
+    },
     ...mapState({
       currentUser: state => state.users.currentUser
     })
diff --git a/src/components/notification/notification.vue b/src/components/notification/notification.vue
index 72e31a0c..76101865 100644
--- a/src/components/notification/notification.vue
+++ b/src/components/notification/notification.vue
@@ -231,6 +231,28 @@
         </template>
       </div>
     </div>
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingApproveConfirmDialog"
+        :title="$t('user_card.approve_confirm_title')"
+        :confirm-text="$t('user_card.approve_confirm_accept_button')"
+        :cancel-text="$t('user_card.approve_confirm_cancel_button')"
+        @accepted="doApprove"
+        @cancelled="hideApproveConfirmDialog"
+      >
+        {{ $t('user_card.approve_confirm', { user: user.screen_name_ui }) }}
+      </confirm-modal>
+      <confirm-modal
+        v-if="showingDenyConfirmDialog"
+        :title="$t('user_card.deny_confirm_title')"
+        :confirm-text="$t('user_card.deny_confirm_accept_button')"
+        :cancel-text="$t('user_card.deny_confirm_cancel_button')"
+        @accepted="doDeny"
+        @cancelled="hideDenyConfirmDialog"
+      >
+        {{ $t('user_card.deny_confirm', { user: user.screen_name_ui }) }}
+      </confirm-modal>
+    </teleport>
   </div>
 </template>
 
diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js
index 4f71af0a..9dc4d091 100644
--- a/src/components/retweet_button/retweet_button.js
+++ b/src/components/retweet_button/retweet_button.js
@@ -1,3 +1,4 @@
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import { faRetweet } from '@fortawesome/free-solid-svg-icons'
 
@@ -5,13 +6,24 @@ library.add(faRetweet)
 
 const RetweetButton = {
   props: ['status', 'loggedIn', 'visibility'],
+  components: {
+    ConfirmModal
+  },
   data () {
     return {
-      animated: false
+      animated: false,
+      showingConfirmDialog: false
     }
   },
   methods: {
     retweet () {
+      if (!this.status.repeated && this.shouldConfirmRepeat) {
+        this.showConfirmDialog()
+      } else {
+        this.doRetweet()
+      }
+    },
+    doRetweet () {
       if (!this.status.repeated) {
         this.$store.dispatch('retweet', { id: this.status.id })
       } else {
@@ -21,6 +33,13 @@ const RetweetButton = {
       setTimeout(() => {
         this.animated = false
       }, 500)
+      this.hideConfirmDialog()
+    },
+    showConfirmDialog () {
+      this.showingConfirmDialog = true
+    },
+    hideConfirmDialog () {
+      this.showingConfirmDialog = false
     }
   },
   computed: {
@@ -29,6 +48,9 @@ const RetweetButton = {
     },
     mergedConfig () {
       return this.$store.getters.mergedConfig
+    },
+    shouldConfirmRepeat () {
+      return this.mergedConfig.modalOnRepeat
     }
   }
 }
diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue
index e8a77e10..6bb7a283 100644
--- a/src/components/retweet_button/retweet_button.vue
+++ b/src/components/retweet_button/retweet_button.vue
@@ -33,6 +33,18 @@
     >
       {{ status.repeat_num }}
     </span>
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingConfirmDialog"
+        :title="$t('status.repeat_confirm_title')"
+        :confirm-text="$t('status.repeat_confirm_accept_button')"
+        :cancel-text="$t('status.repeat_confirm_cancel_button')"
+        @accepted="doRetweet"
+        @cancelled="hideConfirmDialog"
+      >
+        {{ $t('status.repeat_confirm') }}
+      </confirm-modal>
+    </teleport>
   </div>
 </template>
 
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 4f5a5bc7..1e696d1a 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -172,6 +172,77 @@
             {{ $t('settings.autohide_floating_post_button') }}
           </BooleanSetting>
         </li>
+        <li>
+          <h3>{{ $t('settings.columns') }}</h3>
+        </li>
+        <li>
+          <BooleanSetting path="disableStickyHeaders">
+            {{ $t('settings.disable_sticky_headers') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="showScrollbars">
+            {{ $t('settings.show_scrollbars') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <BooleanSetting path="sidebarRight">
+            {{ $t('settings.right_sidebar') }}
+          </BooleanSetting>
+        </li>
+        <li>
+          <ChoiceSetting
+            v-if="user"
+            id="thirdColumnMode"
+            path="thirdColumnMode"
+            :options="thirdColumnModeOptions"
+          >
+            {{ $t('settings.third_column_mode') }}
+          </ChoiceSetting>
+        </li>
+        <li>
+          <h3>{{ $t('settings.confirmation_dialogs') }}</h3>
+        </li>
+        <li class="select-multiple">
+          <span class="label">{{ $t('settings.confirm_dialogs') }}</span>
+          <ul class="option-list">
+            <li>
+              <BooleanSetting path="modalOnRepeat">
+                {{ $t('settings.confirm_dialogs_repeat') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnUnfollow">
+                {{ $t('settings.confirm_dialogs_unfollow') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnBlock">
+                {{ $t('settings.confirm_dialogs_block') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnMute">
+                {{ $t('settings.confirm_dialogs_mute') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnDelete">
+                {{ $t('settings.confirm_dialogs_delete') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnApproveFollow">
+                {{ $t('settings.confirm_dialogs_approve_follow') }}
+              </BooleanSetting>
+            </li>
+            <li>
+              <BooleanSetting path="modalOnDenyFollow">
+                {{ $t('settings.confirm_dialogs_deny_follow') }}
+              </BooleanSetting>
+            </li>
+          </ul>
+        </li>
       </ul>
     </div>
     <div class="setting-item">
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index ef898f96..97e619a2 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -6,6 +6,7 @@ import ModerationTools from '../moderation_tools/moderation_tools.vue'
 import AccountActions from '../account_actions/account_actions.vue'
 import Select from '../select/select.vue'
 import RichContent from 'src/components/rich_content/rich_content.jsx'
+import ConfirmModal from '../confirm_modal/confirm_modal.vue'
 import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
 import { mapGetters } from 'vuex'
 import { library } from '@fortawesome/fontawesome-svg-core'
@@ -32,7 +33,8 @@ export default {
   data () {
     return {
       followRequestInProgress: false,
-      betterShadow: this.$store.state.interface.browserSupport.cssFilter
+      betterShadow: this.$store.state.interface.browserSupport.cssFilter,
+      showingConfirmMute: false
     }
   },
   created () {
@@ -113,6 +115,9 @@ export default {
     hideFollowersCount () {
       return this.isOtherUser && this.user.hide_followers_count
     },
+    shouldConfirmMute () {
+      return this.mergedConfig.modalOnMute
+    },
     ...mapGetters(['mergedConfig'])
   },
   components: {
@@ -123,14 +128,29 @@ export default {
     ProgressButton,
     FollowButton,
     Select,
-    RichContent
+    RichContent,
+    ConfirmModal
   },
   methods: {
     refetchRelationship () {
       return this.$store.dispatch('fetchUserRelationship', this.user.id)
     },
+    showConfirmMute () {
+      this.showingConfirmMute = true
+    },
+    hideConfirmMute () {
+      this.showingConfirmMute = false
+    },
     muteUser () {
+      if (!this.shouldConfirmMute) {
+        this.doMuteUser()
+      } else {
+        this.showConfirmMute()
+      }
+    },
+    doMuteUser () {
       this.$store.dispatch('muteUser', this.user.id)
+      this.hideConfirmMute()
     },
     unmuteUser () {
       this.$store.dispatch('unmuteUser', this.user.id)
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 0f776e55..c04250aa 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -295,6 +295,27 @@
         :handle-links="true"
       />
     </div>
+    <teleport to="#modal">
+      <confirm-modal
+        v-if="showingConfirmMute"
+        :title="$t('user_card.mute_confirm_title')"
+        :confirm-text="$t('user_card.mute_confirm_accept_button')"
+        :cancel-text="$t('user_card.mute_confirm_cancel_button')"
+        @accepted="doMuteUser"
+        @cancelled="hideConfirmMute"
+      >
+        <i18n-t
+          keypath="user_card.mute_confirm"
+          tag="span"
+        >
+          <template #user>
+            <span
+              v-text="user.screen_name_ui"
+            />
+          </template>
+        </i18n-t>
+      </confirm-modal>
+    </teleport>
   </div>
 </template>
 
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 84e4a185..7d845ca4 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -394,7 +394,17 @@
         "chatMessageRadius": "Chat message",
         "checkboxRadius": "Checkboxes",
         "collapse_subject": "Collapse posts with subjects",
+        "columns": "Columns",
         "composing": "Composing",
+        "confirmation_dialogs": "Confirmation options",
+        "confirm_dialogs": "Require confirmation for:",
+        "confirm_dialogs_repeat": "Repeating a post",
+        "confirm_dialogs_unfollow": "Unfollowing someone",
+        "confirm_dialogs_block": "Blocking someone",
+        "confirm_dialogs_mute": "Muting someone",
+        "confirm_dialogs_delete": "Deleting a post",
+        "confirm_dialogs_approve_follow": "Accepting a follow request",
+        "confirm_dialogs_deny_follow": "Rejecting a follow request",
         "confirm_new_password": "Confirm new password",
         "conversation_display": "Conversation display style",
         "conversation_display_linear": "Linear-style",
@@ -819,6 +829,9 @@
         "copy_link": "Copy link to post",
         "delete": "Delete post",
         "delete_confirm": "Do you really want to delete this post?",
+        "delete_confirm_title": "Confirm deletion",
+        "delete_confirm_accept_button": "Yes, delete it",
+        "delete_confirm_cancel_button": "No, keep it",
         "expand": "Expand",
         "external_source": "External source",
         "favorites": "Favorites",
@@ -840,6 +853,10 @@
         "replies_list": "Replies:",
         "replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",
         "reply_to": "Reply to",
+        "repeat_confirm": "Do you really want to repeat this post?",
+        "repeat_confirm_title": "Confirm repeat",
+        "repeat_confirm_accept_button": "Yes, repeat it",
+        "repeat_confirm_cancel_button": "No, don't repeat",
         "show_all_attachments": "Show all attachments",
         "show_all_conversation": "Show full conversation ({numStatus} other post) | Show full conversation ({numStatus} other posts)",
         "show_all_conversation_with_icon": "{icon} {text}",
@@ -948,12 +965,24 @@
             "strip_media": "Remove media from posts"
         },
         "approve": "Approve",
+        "approve_confirm_title": "Approve follow request",
+        "approve_confirm": "Are you sure you want to let this user follow you?",
+        "approve_confirm_accept_button": "Yes, accept",
+        "approve_confirm_cancel_button": "No, cancel",
         "block": "Block",
+        "block_confirm": "Are you sure you want to block {user}?",
+        "block_confirm_title": "Block user",
+        "block_confirm_cancel_button": "No, don't block",
+        "block_confirm_accept_button": "Yes, block",
         "block_progress": "Blocking…",
         "blocked": "Blocked!",
         "bot": "Bot",
         "deactivated": "Deactivated",
         "deny": "Deny",
+        "deny_confirm_title": "Deny follow request",
+        "deny_confirm": "Are you sure you want to deny this user's follow request?",
+        "deny_confirm_accept_button": "Yes, deny",
+        "deny_confirm_cancel_button": "No, cancel",
         "domain_muted": "Unblock domain",
         "edit_profile": "Edit profile",
         "favorites": "Favorites",
@@ -979,6 +1008,10 @@
         "mention": "Mention",
         "message": "Message",
         "mute": "Mute",
+        "mute_confirm": "Are you sure you want to mute {user}?",
+        "mute_confirm_title": "Mute user",
+        "mute_confirm_cancel_button": "No, don't mute",
+        "mute_confirm_accept_button": "Yes, mute",
         "mute_domain": "Block domain",
         "mute_progress": "Muting…",
         "muted": "Muted",
@@ -991,6 +1024,10 @@
         "subscribe": "Subscribe",
         "unblock": "Unblock",
         "unblock_progress": "Unblocking…",
+        "unfollow_confirm": "Are you sure you want to unfollow {user}?",
+        "unfollow_confirm_title": "Unfollow user",
+        "unfollow_confirm_cancel_button": "No, don't unfollow",
+        "unfollow_confirm_accept_button": "Yes, unfollow",
         "unmute": "Unmute",
         "unmute_progress": "Unmuting…",
         "unsubscribe": "Unsubscribe"
diff --git a/src/modules/config.js b/src/modules/config.js
index 5b60520b..f97e5a8f 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -81,6 +81,14 @@ export const defaultState = {
   minimalScopesMode: undefined, // instance default
   // This hides statuses filtered via a word filter
   hideFilteredStatuses: undefined, // instance default
+  modalOnRepeat: undefined, // instance default
+  modalOnUnfollow: undefined, // instance default
+  modalOnBlock: undefined, // instance default
+  modalOnMute: undefined, // instance default
+  modalOnDelete: undefined, // instance default
+  modalOnLogout: undefined, // instance default
+  modalOnApproveFollow: undefined, // instance default
+  modalOnDenyFollow: undefined, // instance default
   playVideosInModal: false,
   useOneClickNsfw: false,
   useContainFit: true,
diff --git a/src/modules/instance.js b/src/modules/instance.js
index faa8692a..f9118e16 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -38,6 +38,14 @@ const defaultState = {
   hideSiteName: false,
   hideUserStats: false,
   muteBotStatuses: false,
+  modalOnRepeat: false,
+  modalOnUnfollow: false,
+  modalOnBlock: true,
+  modalOnMute: false,
+  modalOnDelete: true,
+  modalOnLogout: true,
+  modalOnApproveFollow: false,
+  modalOnDenyFollow: false,
   loginMethod: 'password',
   logo: '/static/logo.svg',
   logoMargin: '.2em',
-- 
2.34.1


From b1460a990944c2f2588b038024576225e97c196c Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 26 Aug 2022 12:44:30 +0000
Subject: [PATCH 15/50] Translated using Weblate (Japanese (ja_PEDANTIC))

Currently translated at 86.1% (773 of 897 strings)

Translated using Weblate (Japanese (ja_PEDANTIC))

Currently translated at 86.0% (740 of 860 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ja_pedantic.json | 41 ++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index f9149743..1858ed92 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -23,8 +23,9 @@
                 "media_nsfw_desc": "このインスタンスでは、以下のインスタンスからの投稿に対して、メディアを閲覧注意に設定します:",
                 "media_removal": "メディア除去",
                 "media_removal_desc": "このインスタンスでは、以下のインスタンスからの投稿に対して、メディアを除去します:",
+                "not_applicable": "なし",
                 "quarantine": "検疫",
-                "quarantine_desc": "このインスタンスでは、以下のインスタンスに対して公開投稿のみを送信します:",
+                "quarantine_desc": "このインスタンスでは、以下のインスタンスに投稿を送信しません",
                 "reason": "理由",
                 "reject": "拒否",
                 "reject_desc": "このインスタンスでは、以下のインスタンスからのメッセージを受け付けません:",
@@ -36,15 +37,19 @@
     "announcements": {
         "all_day_prompt": "一日中",
         "cancel_edit_action": "キャンセル",
+        "close_error": "閉じる",
         "delete_action": "削除",
         "edit_action": "更新",
         "end_time_display": "{time}に終わる",
         "end_time_prompt": "終了時間 ",
         "mark_as_read_action": "読んだ",
         "page_header": "お知らせ",
+        "post_action": "投稿",
         "post_error": "エラーが発生しました： {error}",
+        "post_form_header": "お知らせ作成",
         "post_placeholder": "コンテンツ",
         "published_time_display": "{time}に告知されました",
+        "start_time_display": "{time}で始まる",
         "start_time_prompt": "開始時間 ",
         "title": "お知らせ"
     },
@@ -158,7 +163,9 @@
         "moves": "ユーザーの引っ越し"
     },
     "lists": {
+        "create": "作成",
         "delete": "削除",
+        "following_only": "フォローしているユーザーのみ",
         "lists": "リスト",
         "new": "リスト作成",
         "save": "OK",
@@ -178,12 +185,14 @@
         "login": "ログイン",
         "logout": "ログアウト",
         "password": "パスワード",
-        "placeholder": "例: lain",
+        "placeholder": "例: user",
         "recovery_code": "リカバリーコード",
         "register": "登録",
         "username": "ユーザー名"
     },
     "media_modal": {
+        "counter": "{current} / {total}",
+        "hide": "閉じる",
         "next": "次",
         "previous": "前"
     },
@@ -215,18 +224,19 @@
         "who_to_follow": "おすすめユーザー"
     },
     "notifications": {
-        "broken_favorite": "ステータスが見つかりません。探しています…",
+        "broken_favorite": "投稿が見つかりません。探しています…",
         "error": "通知の取得に失敗しました: {0}",
-        "favorited_you": "あなたのステータスがお気に入りされました",
+        "favorited_you": "あなたの投稿がいいねされました",
         "follow_request": "あなたをフォローしたいです",
         "followed_you": "フォローされました",
         "load_older": "古い通知をみる",
         "migrated_to": "インスタンスを引っ越しました",
         "no_more_notifications": "通知はありません",
         "notifications": "通知",
+        "poll_ended": "投票終了",
         "reacted_with": "{0} でリアクションしました",
         "read": "読んだ！",
-        "repeated_you": "あなたのステータスがリピートされました"
+        "repeated_you": "あなたの投稿がリピートされました"
     },
     "password_reset": {
         "check_email": "パスワードをリセットするためのリンクが記載されたメールが届いているか確認してください。",
@@ -264,7 +274,8 @@
             "text/bbcode": "BBCode",
             "text/html": "HTML",
             "text/markdown": "Markdown",
-            "text/plain": "プレーンテキスト"
+            "text/plain": "プレーンテキスト",
+            "text/x.misskeymarkdown": "MFM"
         },
         "content_warning": "説明 (省略可)",
         "default": "羽田空港に着きました。",
@@ -273,6 +284,7 @@
         "empty_status_error": "投稿内容を入力してください",
         "media_description": "メディアの説明",
         "media_description_error": "メディアのアップロードに失敗しました。もう一度お試しください",
+        "media_not_sensitive_warning": "注意： 説明が付けていますがNSFW警告が付けていません",
         "new_status": "投稿する",
         "post": "投稿",
         "posting": "投稿",
@@ -372,8 +384,21 @@
         "chatMessageRadius": "チャットメッセージ",
         "checkboxRadius": "チェックボックス",
         "collapse_subject": "説明のある投稿をたたむ",
+        "columns": "カラム",
         "composing": "投稿",
+        "confirm_dialogs": "選択しているアクションは確認必要があります",
+        "confirm_dialogs_approve_follow": "フォローリクエストを受け入れること",
+        "confirm_dialogs_block": "ユーザーをブロックすること",
+        "confirm_dialogs_delete": "投稿を削除すること",
+        "confirm_dialogs_deny_follow": "フォローリクエストを断ること",
+        "confirm_dialogs_mute": "ユーザーをミュートすること",
+        "confirm_dialogs_repeat": "投稿をリピートすること",
+        "confirm_dialogs_unfollow": "フォローをやめること",
         "confirm_new_password": "新しいパスワードの確認",
+        "confirmation_dialogs": "確認設定",
+        "conversation_display": "スレッドの表示モード",
+        "conversation_display_linear": "リニアー",
+        "conversation_display_tree": "ツリー",
         "current_avatar": "現在のアバター",
         "current_password": "現在のパスワード",
         "data_import_export_tab": "インポートとエクスポート",
@@ -385,6 +410,8 @@
         "disable_sticky_headers": "ヘッダーを追従させない",
         "discoverable": "検索などのサービスでこのアカウントを見つけることを許可する",
         "domain_mutes": "ドメイン",
+        "download_backup": "ダウンロード",
+        "email_language": "メールの表示言語",
         "emoji_reactions_on_timeline": "絵文字リアクションをタイムラインに表示",
         "enable_web_push_notifications": "ウェブプッシュ通知を許可する",
         "enter_current_password_to_confirm": "あなたのアイデンティティを証明するため、現在のパスワードを入力してください",
@@ -436,7 +463,7 @@
         "instance_default": "(デフォルト: {value})",
         "instance_default_simple": "(デフォルト)",
         "interface": "インターフェース",
-        "interfaceLanguage": "インターフェースの言語",
+        "interfaceLanguage": "表示言語",
         "invalid_theme_imported": "このファイルはPleromaのテーマではありません。テーマは変更されませんでした。",
         "limited_availability": "あなたのブラウザではできません",
         "links": "リンク",
-- 
2.34.1


From b39143413c8515a19b44225025412a919b205a10 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 26 Aug 2022 12:44:30 +0000
Subject: [PATCH 16/50] Translated using Weblate (Catalan)

Currently translated at 100.0% (860 of 860 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: sola <spla@mastodont.cat>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ca/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ca.json | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/i18n/ca.json b/src/i18n/ca.json
index af4a5b2d..8fb864c8 100644
--- a/src/i18n/ca.json
+++ b/src/i18n/ca.json
@@ -400,7 +400,7 @@
         "conversation_display_linear": "Estil linear",
         "conversation_display_tree": "Estil d'arbre",
         "conversation_other_replies_button": "Mostra el botó \"altres respostes\"",
-        "conversation_other_replies_button_below": "Apunts a sota",
+        "conversation_other_replies_button_below": "Apunts de sota",
         "conversation_other_replies_button_inside": "Apunts interiors",
         "current_avatar": "El teu avatar actual",
         "current_mascot": "La teva mascota actual",
@@ -461,6 +461,8 @@
         "hide_muted_threads": "Amaga fils silenciats",
         "hide_post_stats": "Amaga les estadístiques dels apunts (p. ex. el número de favorits)",
         "hide_shoutbox": "Amaga la casella de gàbia de grills",
+        "hide_site_favicon": "Amaga el favicon de l'instància en el panell superior",
+        "hide_site_name": "Amaga el nom de l'instància en el panell superior",
         "hide_threads_with_blocked_users": "Amaga els fils mencionant usuaris bloquejats",
         "hide_user_stats": "Amaga les estadístiques de l'usuari (p. ex. el número de seguidors)",
         "hide_wallpaper": "Amagar el fons de l'instància",
@@ -546,13 +548,13 @@
         "notification_setting_hide_notification_contents": "Amagar el remitent i els continguts de les notificacions push",
         "notification_setting_privacy": "Privacitat",
         "notification_visibility": "Tipus de notificacions a mostrar",
-        "notification_visibility_emoji_reactions": "reacciona",
-        "notification_visibility_follows": "em segueix",
-        "notification_visibility_likes": "m'afavoreix",
-        "notification_visibility_mentions": "em menciona",
-        "notification_visibility_moves": "es mou",
+        "notification_visibility_emoji_reactions": "reaccionen",
+        "notification_visibility_follows": "em segueixen",
+        "notification_visibility_likes": "m'afavoreixen",
+        "notification_visibility_mentions": "em mencionen",
+        "notification_visibility_moves": "usuari es mou",
         "notification_visibility_polls": "finalitza una enquesta que he votat",
-        "notification_visibility_repeats": "em repeteix",
+        "notification_visibility_repeats": "em repeteixen",
         "notifications": "Notificacions",
         "nsfw_clickthrough": "Amaga els Mèdia sensibles/NSFW",
         "oauth_tokens": "Codis OAuth",
@@ -613,7 +615,10 @@
         "settings": "Configuració",
         "show_admin_badge": "Mostra l'insígnia \"Administrador\" en el meu perfil",
         "show_moderator_badge": "Mostra l'insígnia \"Moderador\" en el meu perfil",
+        "show_nav_shortcuts": "Mostra els accessos directes addicionals en el panell superior",
+        "show_panel_nav_shortcuts": "Mostra els accessos directes de navegació de la línia de temps en el panell superior",
         "show_scrollbars": "Mostra les barres de desplaçament de la columna lateral",
+        "show_wider_shortcuts": "Mostra més separats els accessos directes del panell superior",
         "show_yous": "Mostra (Tu)s",
         "stop_gifs": "Pausa les imatges animades fins que hi passis el cursor per sobre",
         "streaming": "Mostra automàticament els nous apunts quan et desplacis a la part superior",
-- 
2.34.1


From e67d94f73d273a6584635514fd368f87971ac254 Mon Sep 17 00:00:00 2001
From: eris <femmediscord@gmail.com>
Date: Sun, 28 Aug 2022 09:27:48 +0000
Subject: [PATCH 17/50] Fix MRF transparency panel showing without transparency

---
 .../mrf_transparency_panel/mrf_transparency_panel.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
index 1787fa07..b05bd298 100644
--- a/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
+++ b/src/components/mrf_transparency_panel/mrf_transparency_panel.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="federationPolicy"
+    v-if="hasInstanceSpecificPolicies"
     class="mrf-transparency-panel"
   >
     <div class="panel panel-default base01-background">
-- 
2.34.1


From 48a11cb9d187cf8631e53141ce34c607e4f38816 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Mon, 29 Aug 2022 20:02:34 +0100
Subject: [PATCH 18/50] add translation options

---
 src/boot/after_store.js                         |  1 +
 .../emoji_reactions/emoji_reactions.vue         |  1 -
 src/components/extra_buttons/extra_buttons.js   |  9 +++++++++
 src/components/extra_buttons/extra_buttons.vue  | 11 +++++++++++
 src/components/status_body/status_body.scss     |  6 ++++++
 src/components/status_body/status_body.vue      | 17 +++++++++++++++++
 src/i18n/en.json                                |  2 ++
 src/i18n/ja_pedantic.json                       |  2 ++
 src/modules/config.js                           |  1 +
 src/modules/statuses.js                         |  8 ++++++++
 src/services/api/api.service.js                 | 11 ++++++++++-
 11 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index ce93436f..aab74f2a 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -275,6 +275,7 @@ const getNodeInfo = async ({ store }) => {
       store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: features.includes('polls') })
       store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits })
       store.dispatch('setInstanceOption', { name: 'mailerEnabled', value: metadata.mailerEnabled })
+      store.dispatch('setInstanceOption', { name: 'translationEnabled', value: features.includes('akkoma:machine_translation') })
 
       const uploadLimits = metadata.uploadLimits
       store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadLimits.general) })
diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue
index edc57d89..6d9713ff 100644
--- a/src/components/emoji_reactions/emoji_reactions.vue
+++ b/src/components/emoji_reactions/emoji_reactions.vue
@@ -8,7 +8,6 @@
       <button
         class="emoji-reaction btn button-default"
         :class="{ 'picked-reaction': reactedWith(reaction.name), 'not-clickable': !loggedIn }"
-        :disabled="!isLocalReaction(reaction.url)"
         @click="emojiOnClick(reaction.name, $event)"
         @mouseenter="fetchEmojiReactionsByIfMissing()"
       >
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index f7045110..97fb7d6e 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -55,6 +55,12 @@ const ExtraButtons = {
     hideDeleteStatusConfirmDialog () {
       this.showingDeleteDialog = false
     },
+
+    translateStatus () {
+      this.$store.dispatch('translateStatus', { id: this.status.id, language: this.$store.state.instance.interfaceLanguage })
+        .then(() => this.$emit('onSuccess'))
+        .catch(err => this.$emit('onError', err.error.error))
+    },
     pinStatus () {
       this.$store.dispatch('pinStatus', this.status.id)
         .then(() => this.$emit('onSuccess'))
@@ -110,6 +116,9 @@ const ExtraButtons = {
     canMute () {
       return !!this.currentUser
     },
+    canTranslate () {
+      return this.$store.state.instance.translationEnabled === true
+    },
     statusLink () {
       return `${this.$store.state.instance.server}${this.$router.resolve({ name: 'conversation', params: { id: this.status.id } }).href}`
     },
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index 2b574bbd..bbb140e4 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -116,6 +116,17 @@
             :icon="['far', 'flag']"
           /><span>{{ $t("user_card.report") }}</span>
         </button>
+        <button
+          v-if="canTranslate"
+          class="button-default dropdown-item dropdown-item-icon"
+          @click.prevent="translateStatus"
+          @click="close"
+        >
+          <FAIcon
+            fixed-width
+            icon="globe"
+          /><span>{{ $t("status.translate") }}</span>
+        </button>
       </div>
     </template>
     <template v-slot:trigger>
diff --git a/src/components/status_body/status_body.scss b/src/components/status_body/status_body.scss
index 0f946f79..230a27ac 100644
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@@ -4,6 +4,12 @@
   display: flex;
   flex-direction: column;
 
+  .translation {
+    border: 1px solid var(--accent, $fallback--link);
+    border-radius: var(--panelRadius, $fallback--panelRadius);
+    margin-top: 1em;
+    padding: 0.5em;
+  }
   .emoji {
     --_still_image-label-scale: 0.5;
     --emoji-size: 38px;
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue
index 321f3c4b..c1a3d9e7 100644
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@@ -56,6 +56,23 @@
             :attentions="status.attentions"
             @parseReady="onParseReady"
           />
+          <div
+            v-if="status.translation"
+            class="translation"
+          >
+            <h4>{{ $t('status.translated_from', { language: status.translation.detected_language }) }}</h4>
+            <RichContent
+              :class="{ '-single-line': singleLine }"
+              class="text media-body"
+              :html="status.translation.text"
+              :emoji="status.emojis"
+              :handle-links="true"
+              :mfm="renderMisskeyMarkdown && (status.media_type === 'text/x.misskeymarkdown')"
+              :greentext="mergedConfig.greentext"
+              :attentions="status.attentions"
+              @parseReady="onParseReady"
+            />
+          </div>
         </div>
         <button
           v-show="hideSubjectStatus"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 7d845ca4..3671a2a2 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -875,6 +875,8 @@
         "thread_show": "Show this thread",
         "thread_show_full": "Show everything under this thread ({numStatus} post in total, max depth {depth}) | Show everything under this thread ({numStatus} posts in total, max depth {depth})",
         "thread_show_full_with_icon": "{icon} {text}",
+        "translate": "Translate",
+        "translated_from": "Translated from {language}",
         "unbookmark": "Unbookmark",
         "unmute_conversation": "Unmute conversation",
         "unpin": "Unpin from profile",
diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 1858ed92..888afe29 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -791,6 +791,8 @@
         "status_unavailable": "利用できません",
         "thread_muted": "ミュートされたスレッド",
         "thread_muted_and_words": "以下の単語を含むため:",
+        "translate": "翻訳",
+        "translated_from": "{language}から翻訳されました",
         "unbookmark": "ブックマーク解除",
         "unmute_conversation": "スレッドのミュートを解除",
         "unpin": "プロフィールのピン留めを外す",
diff --git a/src/modules/config.js b/src/modules/config.js
index f97e5a8f..789c0640 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -187,6 +187,7 @@ const config = {
         case 'interfaceLanguage':
           messages.setLanguage(this.getters.i18n, value)
           Cookies.set(BACKEND_LANGUAGE_COOKIE_NAME, localeService.internalToBackendLocale(value))
+          dispatch('setInstanceOption', { name: 'interfaceLanguage', value })
           break
         case 'thirdColumnMode':
           dispatch('setLayoutWidth', undefined)
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 56e48759..8bb8abb9 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -425,6 +425,10 @@ export const mutations = {
       state.conversationsObject[newStatus.statusnet_conversation_id].forEach(status => { status.thread_muted = newStatus.thread_muted })
     }
   },
+  setTranslatedStatus (state, { id, translation }) {
+    const newStatus = state.allStatusesObject[id]
+    newStatus.translation = translation
+  },
   setRetweeted (state, { status, value }) {
     const newStatus = state.allStatusesObject[status.id]
 
@@ -637,6 +641,10 @@ const statuses = {
       rootState.api.backendInteractor.unpinOwnStatus({ id: statusId })
         .then((status) => dispatch('addNewStatuses', { statuses: [status] }))
     },
+    translateStatus ({ rootState, commit }, { id, translation, language }) {
+      return rootState.api.backendInteractor.translateStatus({ id: id, translation, language })
+        .then((translation) => commit('setTranslatedStatus', { id, translation }))
+    },
     muteConversation ({ rootState, commit }, statusId) {
       return rootState.api.backendInteractor.muteConversation({ id: statusId })
         .then((status) => commit('setMutedStatus', status))
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 686689cd..cc2da9c5 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -31,6 +31,7 @@ const MASTODON_LOGIN_URL = '/api/v1/accounts/verify_credentials'
 const MASTODON_REGISTRATION_URL = '/api/v1/accounts'
 const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
 const MASTODON_USER_NOTIFICATIONS_URL = '/api/v1/notifications'
+const AKKOMA_TRANSLATE_URL = (id, lang) => `/api/v1/statuses/${id}/translations/${lang}`
 const MASTODON_DISMISS_NOTIFICATION_URL = id => `/api/v1/notifications/${id}/dismiss`
 const MASTODON_FAVORITE_URL = id => `/api/v1/statuses/${id}/favourite`
 const MASTODON_UNFAVORITE_URL = id => `/api/v1/statuses/${id}/unfavourite`
@@ -738,6 +739,13 @@ const unretweet = ({ id, credentials }) => {
     .then((data) => parseStatus(data))
 }
 
+const translateStatus = ({ id, credentials, language }) => {
+  return promisedRequest({ url: AKKOMA_TRANSLATE_URL(id, language), method: 'GET', credentials })
+    .then((data) => {
+      return data
+    })
+}
+
 const bookmarkStatus = ({ id, credentials }) => {
   return promisedRequest({
     url: MASTODON_BOOKMARK_STATUS_URL(id),
@@ -1576,7 +1584,8 @@ const apiService = {
   postAnnouncement,
   editAnnouncement,
   deleteAnnouncement,
-  adminFetchAnnouncements
+  adminFetchAnnouncements,
+  translateStatus
 }
 
 export default apiService
-- 
2.34.1


From e7c21ffbd7e51341c6c1098cdf8b6d4ffa0a848a Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Mon, 29 Aug 2022 22:16:59 +0100
Subject: [PATCH 19/50] allow selecting languages for translation

---
 src/components/extra_buttons/extra_buttons.js          |  3 ++-
 .../interface_language_switcher.vue                    | 10 +++++++++-
 src/components/settings_modal/tabs/general_tab.js      | 10 ++++++++++
 src/components/settings_modal/tabs/general_tab.vue     | 10 ++++++++++
 src/i18n/en.json                                       |  1 +
 src/modules/config.js                                  |  3 ++-
 6 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 97fb7d6e..16841539 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -57,7 +57,8 @@ const ExtraButtons = {
     },
 
     translateStatus () {
-      this.$store.dispatch('translateStatus', { id: this.status.id, language: this.$store.state.instance.interfaceLanguage })
+      const translateTo = this.$store.getters.mergedConfig.translationLanguage || this.$store.state.instance.interfaceLanguage
+      this.$store.dispatch('translateStatus', { id: this.status.id, language: translateTo })
         .then(() => this.$emit('onSuccess'))
         .catch(err => this.$emit('onError', err.error.error))
     },
diff --git a/src/components/interface_language_switcher/interface_language_switcher.vue b/src/components/interface_language_switcher/interface_language_switcher.vue
index e46bcf71..e9ebb97a 100644
--- a/src/components/interface_language_switcher/interface_language_switcher.vue
+++ b/src/components/interface_language_switcher/interface_language_switcher.vue
@@ -1,6 +1,10 @@
 <template>
   <div>
-    <FAIcon icon="globe" /> {{ ' ' }}
+    <FAIcon
+      v-if="globeIcon"
+      icon="globe"
+    />
+    {{ ' ' }}
     <label for="interface-language-switcher">
       {{ promptText }}
     </label>
@@ -40,6 +44,10 @@ export default {
     setLanguage: {
       type: Function,
       required: true
+    },
+    globeIcon: {
+      type: Boolean,
+      default: true
     }
   },
   computed: {
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 981da55b..39d9b31e 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -50,6 +50,7 @@ const GeneralTab = {
       Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') ||
       // Future spec, still not supported in Nightly 63 as of 08/2018
       Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks')
+
     }
   },
   components: {
@@ -82,11 +83,20 @@ const GeneralTab = {
         this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
       }
     },
+    translationLanguage: {
+      get: function () { return this.$store.getters.mergedConfig.translationLanguage },
+      set: function (val) {
+        this.$store.dispatch('setOption', { name: 'translationLanguage', value: val })
+      }
+    },
     ...SharedComputedObject()
   },
   methods: {
     changeDefaultScope (value) {
       this.$store.dispatch('setServerSideOption', { name: 'defaultScope', value })
+    },
+    setTranslationLanguage (value) {
+      this.$store.dispatch('setOption', { name: 'translationLanguage', value })
     }
   }
 }
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 1e696d1a..3a8d5157 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -156,6 +156,16 @@
             </li>
           </ul>
         </li>
+        <li>
+          <p>
+            <interface-language-switcher
+              :globe-icon="false"
+              :prompt-text="$t('settings.translation_language')"
+              :language="translationLanguage"
+              :set-language="setTranslationLanguage"
+            />
+          </p>
+        </li>
         <li>
           <BooleanSetting
             path="alwaysShowNewPostButton"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 3671a2a2..ef2586fb 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -794,6 +794,7 @@
         "third_column_mode_postform": "Main post form and navigation",
         "token": "Token",
         "tooltipRadius": "Tooltips/alerts",
+        "translation_language": "Automatic Translation Language",
         "tree_advanced": "Allow more flexible navigation in tree view",
         "tree_fade_ancestors": "Display ancestors of the current post in faint text",
         "type_domains_to_mute": "Search domains to mute",
diff --git a/src/modules/config.js b/src/modules/config.js
index 789c0640..0ccdfc99 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -114,7 +114,8 @@ export const defaultState = {
   conversationTreeAdvanced: undefined, // instance default
   conversationOtherRepliesButton: undefined, // instance default
   conversationTreeFadeAncestors: undefined, // instance default
-  maxDepthInThread: undefined // instance default
+  maxDepthInThread: undefined, // instance default
+  translationLanguage: undefined // instance default
 }
 
 // caching the instance default properties
-- 
2.34.1


From bd4e8271dffc296a8f838924fe410227ff3e079c Mon Sep 17 00:00:00 2001
From: eris <femmediscord@gmail.com>
Date: Tue, 30 Aug 2022 08:51:07 +0000
Subject: [PATCH 20/50] Dont copy local URL if external post

---
 src/components/extra_buttons/extra_buttons.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 16841539..4ac463e6 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -121,7 +121,11 @@ const ExtraButtons = {
       return this.$store.state.instance.translationEnabled === true
     },
     statusLink () {
-      return `${this.$store.state.instance.server}${this.$router.resolve({ name: 'conversation', params: { id: this.status.id } }).href}`
+      if (this.status.is_local) {
+        return `${this.$store.state.instance.server}${this.$router.resolve({ name: 'conversation', params: { id: this.status.id } }).href}`
+      } else {
+        return this.status.external_url
+      }
     },
     shouldConfirmDelete () {
       return this.$store.getters.mergedConfig.modalOnDelete
-- 
2.34.1


From 59eb43484046e8b13a8f34be384d218c1b554d29 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 30 Aug 2022 10:32:34 +0100
Subject: [PATCH 21/50] allow modal to expand with content

---
 src/components/dialog_modal/dialog_modal.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/dialog_modal/dialog_modal.vue b/src/components/dialog_modal/dialog_modal.vue
index 1a42b0e5..0feef27b 100644
--- a/src/components/dialog_modal/dialog_modal.vue
+++ b/src/components/dialog_modal/dialog_modal.vue
@@ -54,6 +54,7 @@
   z-index: 2001;
   cursor: default;
   display: block;
+  width: max-content;
   background-color: $fallback--bg;
   background-color: var(--bg, $fallback--bg);
 
-- 
2.34.1


From ef50c63dc7c48fc7089c79d1eef26e629d7bb1ac Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 30 Aug 2022 14:37:36 +0100
Subject: [PATCH 22/50] use supported languages from service

---
 src/boot/after_store.js                          |  1 +
 .../settings_modal/tabs/general_tab.js           |  3 +++
 .../settings_modal/tabs/general_tab.vue          | 16 ++++++++--------
 src/modules/api.js                               |  6 ++++++
 src/modules/config.js                            |  3 ++-
 src/services/api/api.service.js                  |  8 +++++++-
 .../backend_interactor_service.js                |  4 ++++
 7 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index aab74f2a..d7c549d6 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -397,6 +397,7 @@ const afterStoreSetup = async ({ store, i18n }) => {
   store.dispatch('startFetchingAnnouncements')
   getTOS({ store })
   getStickers({ store })
+  store.dispatch('getSupportedTranslationlanguages')
 
   const router = createRouter({
     history: createWebHistory(),
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index 39d9b31e..f72f309c 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -83,6 +83,9 @@ const GeneralTab = {
         this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
       }
     },
+    translationLanguages () {
+      return (this.$store.getters.mergedConfig.supportedTranslationLanguages || []).map(lang => ({ key: lang.code, value: lang.code, label: lang.name }))
+    },
     translationLanguage: {
       get: function () { return this.$store.getters.mergedConfig.translationLanguage },
       set: function (val) {
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 3a8d5157..72d877bd 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -157,14 +157,14 @@
           </ul>
         </li>
         <li>
-          <p>
-            <interface-language-switcher
-              :globe-icon="false"
-              :prompt-text="$t('settings.translation_language')"
-              :language="translationLanguage"
-              :set-language="setTranslationLanguage"
-            />
-          </p>
+          <ChoiceSetting
+            v-if="user && (translationLanguages.length > 0)"
+            id="translationLanguage"
+            path="translationLanguage"
+            :options="translationLanguages"
+          >
+            {{ $t('settings.translation_language') }}
+          </ChoiceSetting>
         </li>
         <li>
           <BooleanSetting
diff --git a/src/modules/api.js b/src/modules/api.js
index 3e3d2d4b..98f0363e 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -252,6 +252,12 @@ const api = {
       if (!fetcher) return
       store.commit('removeFetcher', { fetcherName: 'announcements', fetcher })
     },
+    getSupportedTranslationlanguages (store) {
+      store.state.backendInteractor.getSupportedTranslationlanguages({ store })
+        .then((data) => {
+          store.dispatch('setInstanceOption', { name: 'supportedTranslationLanguages', value: data })
+        })
+    },
 
     // Pleroma websocket
     setWsToken (store, token) {
diff --git a/src/modules/config.js b/src/modules/config.js
index 0ccdfc99..82257ddf 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -115,7 +115,8 @@ export const defaultState = {
   conversationOtherRepliesButton: undefined, // instance default
   conversationTreeFadeAncestors: undefined, // instance default
   maxDepthInThread: undefined, // instance default
-  translationLanguage: undefined // instance default
+  translationLanguage: undefined, // instance default,
+  supportedTranslationLanguages: [] // instance default
 }
 
 // caching the instance default properties
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index cc2da9c5..771929d4 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -31,6 +31,7 @@ const MASTODON_LOGIN_URL = '/api/v1/accounts/verify_credentials'
 const MASTODON_REGISTRATION_URL = '/api/v1/accounts'
 const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
 const MASTODON_USER_NOTIFICATIONS_URL = '/api/v1/notifications'
+const AKKOMA_LANGUAGES_URL = '/api/v1/akkoma/translation/languages'
 const AKKOMA_TRANSLATE_URL = (id, lang) => `/api/v1/statuses/${id}/translations/${lang}`
 const MASTODON_DISMISS_NOTIFICATION_URL = id => `/api/v1/notifications/${id}/dismiss`
 const MASTODON_FAVORITE_URL = id => `/api/v1/statuses/${id}/favourite`
@@ -739,6 +740,10 @@ const unretweet = ({ id, credentials }) => {
     .then((data) => parseStatus(data))
 }
 
+const getSupportedTranslationlanguages = ({ credentials }) => {
+  return promisedRequest({ url: AKKOMA_LANGUAGES_URL, credentials })
+}
+
 const translateStatus = ({ id, credentials, language }) => {
   return promisedRequest({ url: AKKOMA_TRANSLATE_URL(id, language), method: 'GET', credentials })
     .then((data) => {
@@ -1585,7 +1590,8 @@ const apiService = {
   editAnnouncement,
   deleteAnnouncement,
   adminFetchAnnouncements,
-  translateStatus
+  translateStatus,
+  getSupportedTranslationlanguages
 }
 
 export default apiService
diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
index 41fa34fc..bedc51b2 100644
--- a/src/services/backend_interactor_service/backend_interactor_service.js
+++ b/src/services/backend_interactor_service/backend_interactor_service.js
@@ -40,6 +40,10 @@ const backendInteractorService = credentials => ({
     return ProcessedWS({ url, id: 'User' })
   },
 
+  getSupportedTranslationlanguages ({ store }) {
+    return apiService.getSupportedTranslationlanguages({ store, credentials })
+  },
+
   ...Object.entries(apiService).reduce((acc, [key, func]) => {
     return {
       ...acc,
-- 
2.34.1


From 6440e51b7e2d3dfb381a0bcac568033e16cd9e1e Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 30 Aug 2022 15:43:57 +0100
Subject: [PATCH 23/50] allow translating to any other language

---
 src/components/status_body/status_body.js  | 14 ++++++++++++--
 src/components/status_body/status_body.vue | 21 +++++++++++++++++++++
 src/i18n/en.json                           |  1 +
 src/modules/api.js                         |  2 +-
 src/modules/statuses.js                    |  4 ++--
 src/services/api/api.service.js            |  5 +++--
 6 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/components/status_body/status_body.js b/src/components/status_body/status_body.js
index 91d795f1..f2f0fa2d 100644
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@@ -9,6 +9,7 @@ import {
   faLink,
   faPollH
 } from '@fortawesome/free-solid-svg-icons'
+import Select from 'src/components/select/select.vue'
 
 library.add(
   faFile,
@@ -39,7 +40,8 @@ const StatusContent = {
     return {
       postLength: this.status.text.length,
       parseReadyDone: false,
-      renderMisskeyMarkdown
+      renderMisskeyMarkdown,
+      translateFrom: null
     }
   },
   computed: {
@@ -80,10 +82,14 @@ const StatusContent = {
     attachmentTypes () {
       return this.status.attachments.map(file => fileType.fileType(file.mimetype))
     },
+    translationLanguages () {
+      return (this.$store.getters.mergedConfig.supportedTranslationLanguages || []).map(lang => ({ key: lang.code, value: lang.code, label: lang.name }))
+    },
     ...mapGetters(['mergedConfig'])
   },
   components: {
-    RichContent
+    RichContent,
+    Select
   },
   mounted () {
     this.status.attentions && this.status.attentions.forEach(attn => {
@@ -126,6 +132,10 @@ const StatusContent = {
     },
     generateTagLink (tag) {
       return `/tag/${tag}`
+    },
+    translateStatus () {
+      const translateTo = this.$store.getters.mergedConfig.translationLanguage || this.$store.state.instance.interfaceLanguage
+      this.$store.dispatch('translateStatus', { id: this.status.id, language: translateTo, from: this.translateFrom })
     }
   }
 }
diff --git a/src/components/status_body/status_body.vue b/src/components/status_body/status_body.vue
index c1a3d9e7..ed19261d 100644
--- a/src/components/status_body/status_body.vue
+++ b/src/components/status_body/status_body.vue
@@ -72,6 +72,27 @@
               :attentions="status.attentions"
               @parseReady="onParseReady"
             />
+            <div>
+              <label class="label">{{ $t('status.override_translation_source_language') }}</label>
+              {{ ' ' }}
+              <Select
+                id="source-language-switcher"
+                v-model="translateFrom"
+                class="preset-switcher"
+              >
+                <option
+                  v-for="language in translationLanguages"
+                  :key="language.key"
+                  :value="language.value"
+                >
+                  {{ language.label }}
+                </option>
+              </Select>
+              {{ ' ' }}
+              <button @click="translateStatus" class="btn button-default">
+                {{ $t('status.translate') }}
+              </button>
+            </div>
           </div>
         </div>
         <button
diff --git a/src/i18n/en.json b/src/i18n/en.json
index ef2586fb..aee8ca98 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -846,6 +846,7 @@
         "mute_conversation": "Mute conversation",
         "nsfw": "NSFW",
         "open_gallery": "Open gallery",
+        "override_translation_source_language": "Override source language",
         "pin": "Pin on profile",
         "pinned": "Pinned",
         "plus_more": "+{number} more",
diff --git a/src/modules/api.js b/src/modules/api.js
index 98f0363e..ab0c8555 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -255,7 +255,7 @@ const api = {
     getSupportedTranslationlanguages (store) {
       store.state.backendInteractor.getSupportedTranslationlanguages({ store })
         .then((data) => {
-          store.dispatch('setInstanceOption', { name: 'supportedTranslationLanguages', value: data })
+          store.dispatch('setOption', { name: 'supportedTranslationLanguages', value: data })
         })
     },
 
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 8bb8abb9..ef571632 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -641,8 +641,8 @@ const statuses = {
       rootState.api.backendInteractor.unpinOwnStatus({ id: statusId })
         .then((status) => dispatch('addNewStatuses', { statuses: [status] }))
     },
-    translateStatus ({ rootState, commit }, { id, translation, language }) {
-      return rootState.api.backendInteractor.translateStatus({ id: id, translation, language })
+    translateStatus ({ rootState, commit }, { id, translation, language, from }) {
+      return rootState.api.backendInteractor.translateStatus({ id: id, translation, language, from })
         .then((translation) => commit('setTranslatedStatus', { id, translation }))
     },
     muteConversation ({ rootState, commit }, statusId) {
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index 771929d4..a5f71617 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -744,8 +744,9 @@ const getSupportedTranslationlanguages = ({ credentials }) => {
   return promisedRequest({ url: AKKOMA_LANGUAGES_URL, credentials })
 }
 
-const translateStatus = ({ id, credentials, language }) => {
-  return promisedRequest({ url: AKKOMA_TRANSLATE_URL(id, language), method: 'GET', credentials })
+const translateStatus = ({ id, credentials, language, from }) => {
+  const queryString = from ? `?from=${from}` : ''
+  return promisedRequest({ url: AKKOMA_TRANSLATE_URL(id, language) + queryString, method: 'GET', credentials })
     .then((data) => {
       return data
     })
-- 
2.34.1


From 7dc0464094d44cf4183bd9da37d2d272b5f5d3c8 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 30 Aug 2022 17:46:54 +0100
Subject: [PATCH 24/50] split translation language by source and dest

---
 src/components/settings_modal/tabs/general_tab.js | 2 +-
 src/components/status_body/status_body.js         | 2 +-
 src/modules/config.js                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index f72f309c..c3c18132 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -84,7 +84,7 @@ const GeneralTab = {
       }
     },
     translationLanguages () {
-      return (this.$store.getters.mergedConfig.supportedTranslationLanguages || []).map(lang => ({ key: lang.code, value: lang.code, label: lang.name }))
+      return (this.$store.getters.mergedConfig.supportedTranslationLanguages.target || []).map(lang => ({ key: lang.code, value: lang.code, label: lang.name }))
     },
     translationLanguage: {
       get: function () { return this.$store.getters.mergedConfig.translationLanguage },
diff --git a/src/components/status_body/status_body.js b/src/components/status_body/status_body.js
index f2f0fa2d..9e380f28 100644
--- a/src/components/status_body/status_body.js
+++ b/src/components/status_body/status_body.js
@@ -83,7 +83,7 @@ const StatusContent = {
       return this.status.attachments.map(file => fileType.fileType(file.mimetype))
     },
     translationLanguages () {
-      return (this.$store.getters.mergedConfig.supportedTranslationLanguages || []).map(lang => ({ key: lang.code, value: lang.code, label: lang.name }))
+      return (this.$store.getters.mergedConfig.supportedTranslationLanguages.source || []).map(lang => ({ key: lang.code, value: lang.code, label: lang.name }))
     },
     ...mapGetters(['mergedConfig'])
   },
diff --git a/src/modules/config.js b/src/modules/config.js
index 82257ddf..e43dcdb7 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -116,7 +116,7 @@ export const defaultState = {
   conversationTreeFadeAncestors: undefined, // instance default
   maxDepthInThread: undefined, // instance default
   translationLanguage: undefined, // instance default,
-  supportedTranslationLanguages: [] // instance default
+  supportedTranslationLanguages: {} // instance default
 }
 
 // caching the instance default properties
-- 
2.34.1


From 48826ede36cf00f131b3d6cd126bfbe4af76fbe1 Mon Sep 17 00:00:00 2001
From: Mergan <mergan@noreply.akkoma>
Date: Wed, 31 Aug 2022 15:28:09 +0000
Subject: [PATCH 25/50] Separated Posts & Replies (#145) (#148)

Co-authored-by: David <dmgf2008@hotmail.com>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/148
Co-authored-by: Mergan <mergan@noreply.akkoma>
Co-committed-by: Mergan <mergan@noreply.akkoma>
---
 src/components/user_profile/user_profile.js  |  5 +++++
 src/components/user_profile/user_profile.vue | 12 ++++++++++++
 src/i18n/en.json                             |  1 +
 src/modules/statuses.js                      |  5 +++--
 src/services/api/api.service.js              |  6 +++++-
 5 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index b25a09d3..ed30c02e 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -58,6 +58,9 @@ const UserProfile = {
     timeline () {
       return this.$store.state.statuses.timelines.user
     },
+    replies () {
+      return this.$store.state.statuses.timelines.replies
+    },
     favorites () {
       return this.$store.state.statuses.timelines.favorites
     },
@@ -100,6 +103,7 @@ const UserProfile = {
       const loadById = (userId) => {
         this.userId = userId
         startFetchingTimeline('user', userId)
+        startFetchingTimeline('replies', userId)
         startFetchingTimeline('media', userId)
         if (this.isUs) {
           startFetchingTimeline('favorites', userId)
@@ -137,6 +141,7 @@ const UserProfile = {
     },
     stopFetching () {
       this.$store.dispatch('stopFetchingTimeline', 'user')
+      this.$store.dispatch('stopFetchingTimeline', 'replies')
       this.$store.dispatch('stopFetchingTimeline', 'favorites')
       this.$store.dispatch('stopFetchingTimeline', 'media')
     },
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index f1ded418..760f104c 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -79,6 +79,18 @@
           :in-profile="true"
           :footer-slipgate="footerRef"
         />
+        <Timeline
+          key="replies"
+          :label="$t('user_card.replies')"
+          :count="user.statuses_count"
+          :embedded="true"
+          :title="$t('user_card.replies')"
+          :timeline="replies"
+          timeline-name="replies"
+          :user-id="userId"
+          :in-profile="true"
+          :footer-slipgate="footerRef"
+        />
         <div
           v-if="followsTabVisible"
           key="followees"
diff --git a/src/i18n/en.json b/src/i18n/en.json
index aee8ca98..7f6166f9 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -1022,6 +1022,7 @@
         "note": "Private note",
         "per_day": "per day",
         "remote_follow": "Remote follow",
+        "replies": "With Replies",
         "report": "Report",
         "show_repeats": "Show repeats",
         "statuses": "Posts",
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index ef571632..8f012191 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -64,7 +64,8 @@ export const defaultState = () => ({
     dms: emptyTl(),
     bookmarks: emptyTl(),
     list: emptyTl(),
-    bubble: emptyTl()
+    bubble: emptyTl(),
+    replies: emptyTl()
   }
 })
 
@@ -183,7 +184,7 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
   // This makes sure that user timeline won't get data meant for other
   // user. I.e. opening different user profiles makes request which could
   // return data late after user already viewing different user profile
-  if ((timeline === 'user' || timeline === 'media') && timelineObject.userId !== userId) {
+  if ((timeline === 'user' || timeline === 'media' || timeline === 'replies') && timelineObject.userId !== userId) {
     return
   }
 
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index a5f71617..cb11a05f 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -617,6 +617,7 @@ const fetchTimeline = ({
     notifications: MASTODON_USER_NOTIFICATIONS_URL,
     'publicAndExternal': MASTODON_PUBLIC_TIMELINE,
     user: MASTODON_USER_TIMELINE_URL,
+    replies: MASTODON_USER_TIMELINE_URL,
     media: MASTODON_USER_TIMELINE_URL,
     list: MASTODON_LIST_TIMELINE_URL,
     favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
@@ -628,7 +629,7 @@ const fetchTimeline = ({
 
   let url = timelineUrls[timeline]
 
-  if (timeline === 'user' || timeline === 'media') {
+  if (timeline === 'user' || timeline === 'media' || timeline === 'replies') {
     url = url(userId)
   }
 
@@ -660,6 +661,9 @@ const fetchTimeline = ({
   if (replyVisibility !== 'all') {
     params.push(['reply_visibility', replyVisibility])
   }
+  if (timeline === 'user') {
+    params.push(['exclude_replies', 1])
+  }
 
   params.push(['limit', 20])
 
-- 
2.34.1


From 6f2058a8fcd1a8c830a69c0132ad3fc4b9f60896 Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Wed, 31 Aug 2022 15:44:58 +0000
Subject: [PATCH 26/50] ensure timelines only start fetching on click (#150)

no more parallel fetching

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/150
---
 src/components/user_profile/user_profile.js  | 39 +++++++++++++-------
 src/components/user_profile/user_profile.vue |  3 +-
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index ed30c02e..89cd95fd 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -48,8 +48,9 @@ const UserProfile = {
   },
   created () {
     const routeParams = this.$route.params
+    const hash = get(this.$route, 'hash', defaultTabKey).replace(/^#/, '')
+    if (hash !== '') this.tab = hash
     this.load(routeParams.name || routeParams.id)
-    this.tab = get(this.$route, 'query.hash', defaultTabKey).replace(/^#/, '')
   },
   unmounted () {
     this.stopFetching()
@@ -91,23 +92,31 @@ const UserProfile = {
     setFooterRef (el) {
       this.footerRef = el
     },
-    load (userNameOrId) {
-      const startFetchingTimeline = (timeline, userId) => {
-        // Clear timeline only if load another user's profile
-        if (userId !== this.$store.state.statuses.timelines[timeline].userId) {
-          this.$store.commit('clearTimeline', { timeline })
-        }
-        this.$store.dispatch('startFetchingTimeline', { timeline, userId })
+    onRouteChange (previousTab, nextTab) {
+      const timelineTabMap = {
+        statuses: 'user',
+        replies: 'replies',
+        media: 'media'
       }
+      // only we can see our own favourites
+      if (this.isUs) timelineTabMap['favorites'] = 'favorites'
 
+      const timeline = timelineTabMap[nextTab]
+      const lastTimeline = timelineTabMap[previousTab]
+      if (timeline) {
+        this.stopFetching()
+        if (lastTimeline) this.$store.commit('clearTimeline', { timeline: lastTimeline })
+        this.$store.dispatch('startFetchingTimeline', { timeline: timeline, userId: this.userId })
+      }
+    },
+    load (userNameOrId) {
       const loadById = (userId) => {
         this.userId = userId
-        startFetchingTimeline('user', userId)
-        startFetchingTimeline('replies', userId)
-        startFetchingTimeline('media', userId)
-        if (this.isUs) {
-          startFetchingTimeline('favorites', userId)
-        }
+        const timelines = ['user', 'favorites', 'replies', 'media']
+        timelines.forEach((timeline) => {
+          this.$store.commit('clearTimeline', { timeline: timeline })
+        })
+        this.onRouteChange(null, this.tab)
         // Fetch all pinned statuses immediately
         this.$store.dispatch('fetchPinnedStatuses', userId)
       }
@@ -182,7 +191,9 @@ const UserProfile = {
       }
     },
     '$route.hash': function (newVal) {
+      const oldTab = this.tab
       this.tab = newVal.replace(/^#/, '') || defaultTabKey
+      this.onRouteChange(oldTab, this.tab)
     }
   },
   components: {
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 760f104c..d16483e2 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -121,7 +121,6 @@
         <Timeline
           key="media"
           :label="$t('user_card.media')"
-          :disabled="!media.visibleStatuses.length"
           :embedded="true"
           :title="$t('user_card.media')"
           timeline-name="media"
@@ -134,7 +133,7 @@
           v-if="isUs"
           key="favorites"
           :label="$t('user_card.favorites')"
-          :disabled="!favorites.visibleStatuses.length"
+          :disabled="!isUs"
           :embedded="true"
           :title="$t('user_card.favorites')"
           timeline-name="favorites"
-- 
2.34.1


From a234cd3f00b3dc6d972e45156653ca638c76b362 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 31 Aug 2022 16:45:29 +0000
Subject: [PATCH 27/50] Translated using Weblate (Japanese (ja_PEDANTIC))

Currently translated at 89.3% (806 of 902 strings)

Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ja_pedantic.json | 44 +++++++++++++++++++++++++++++++--------
 1 file changed, 35 insertions(+), 9 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 888afe29..4f8401f5 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -226,7 +226,7 @@
     "notifications": {
         "broken_favorite": "投稿が見つかりません。探しています…",
         "error": "通知の取得に失敗しました: {0}",
-        "favorited_you": "あなたの投稿がいいねされました",
+        "favorited_you": "投稿がお気に入りに登録されました",
         "follow_request": "あなたをフォローしたいです",
         "followed_you": "フォローされました",
         "load_older": "古い通知をみる",
@@ -236,7 +236,7 @@
         "poll_ended": "投票終了",
         "reacted_with": "{0} でリアクションしました",
         "read": "読んだ！",
-        "repeated_you": "あなたの投稿がリピートされました"
+        "repeated_you": "投稿がリピートされました"
     },
     "password_reset": {
         "check_email": "パスワードをリセットするためのリンクが記載されたメールが届いているか確認してください。",
@@ -267,7 +267,7 @@
         "votes_count": "{count} 票 | {count} 票"
     },
     "post_status": {
-        "account_not_locked_warning": "あなたのアカウントは {0} ではありません。あなたをフォローすれば、誰でも、フォロワー限定のステータスを読むことができます。",
+        "account_not_locked_warning": "あなたのアカウントは {0} ではありません。あなたをフォローすれば、誰でも、フォロワー限定の投稿を読むことができます。",
         "account_not_locked_warning_link": "ロックされたアカウント",
         "attachments_sensitive": "ファイルをNSFWにする",
         "content_type": {
@@ -572,7 +572,7 @@
         "security": "セキュリティ",
         "security_tab": "セキュリティ",
         "sensitive_by_default": "はじめから投稿をセンシティブとして設定",
-        "sensitive_if_subject": "ステータスにサブジェクトをついたらNSFWにする",
+        "sensitive_if_subject": "投稿にサブジェクトをついたらNSFWにする",
         "set_new_avatar": "新しいアバターを設定する",
         "set_new_profile_background": "新しいプロフィールのバックグラウンドを設定する",
         "set_new_profile_banner": "新しいプロフィールバナーを設定する",
@@ -769,8 +769,11 @@
     "status": {
         "bookmark": "ブックマーク",
         "copy_link": "リンクをコピー",
-        "delete": "ステータスを削除",
-        "delete_confirm": "本当にこのステータスを削除してもよろしいですか？",
+        "delete": "投稿を削除",
+        "delete_confirm": "投稿を削除しますか？",
+        "delete_confirm_accept_button": "削除",
+        "delete_confirm_cancel_button": "キャンセル",
+        "delete_confirm_title": "削除を確認してください",
         "expand": "広げる",
         "external_source": "外部ソース",
         "favorites": "お気に入り",
@@ -779,9 +782,14 @@
         "mentions": "メンション",
         "mute_conversation": "スレッドをミュート",
         "nsfw": "閲覧注意",
+        "override_translation_source_language": "翻訳元言語",
         "pin": "プロフィールにピン留め",
         "pinned": "ピン留め",
         "plus_more": "ほか{number}件",
+        "repeat_confirm": "リピートしますか？",
+        "repeat_confirm_accept_button": "リピート",
+        "repeat_confirm_cancel_button": "キャンセル",
+        "repeat_confirm_title": "リピートを確認してください",
         "repeats": "リピート",
         "replies_list": "返信:",
         "reply_to": "返信",
@@ -824,10 +832,10 @@
         "collapse": "たたむ",
         "conversation": "スレッド",
         "error": "タイムラインの読み込みに失敗しました: {0}",
-        "load_older": "古いステータス",
+        "load_older": "古い投稿",
         "no_more_statuses": "これで終わりです",
         "no_retweet_hint": "投稿を「フォロワーのみ」または「ダイレクト」にすると、リピートできなくなります",
-        "no_statuses": "ステータスはありません",
+        "no_statuses": "投稿はありません",
         "reload": "再読み込み",
         "repeated": "リピート",
         "show_new": "読み込み",
@@ -881,11 +889,23 @@
             "strip_media": "投稿からメディアを除去する"
         },
         "approve": "受け入れ",
+        "approve_confirm": "フォローリクエストを受け入れますか？",
+        "approve_confirm_accept_button": "受け入れる",
+        "approve_confirm_cancel_button": "キャンセル",
+        "approve_confirm_title": "受け入れを確認してください",
         "block": "ブロック",
+        "block_confirm": "{user}をブロックしますか？",
+        "block_confirm_accept_button": "ブロック",
+        "block_confirm_cancel_button": "キャンセル",
+        "block_confirm_title": "ブロックを確認してください",
         "block_progress": "ブロックしています…",
         "blocked": "ブロックしています！",
         "bot": "bot",
         "deny": "お断り",
+        "deny_confirm": "フォローリクエストを断りますか？",
+        "deny_confirm_accept_button": "お断り",
+        "deny_confirm_cancel_button": "キャンセル",
+        "deny_confirm_title": "お断りを確認してください",
         "edit_profile": "プロフィールを編集",
         "favorites": "お気に入り",
         "follow": "フォロー",
@@ -909,14 +929,20 @@
         "mention": "メンション",
         "message": "メッセージ",
         "mute": "ミュート",
+        "mute_confirm": "{user}をミュートしますか？",
+        "mute_confirm_accept_button": "ミュート",
+        "mute_confirm_cancel_button": "キャンセル",
+        "mute_confirm_title": "ユーザーをミュート",
+        "mute_domain": "ドメインをブロック",
         "mute_progress": "ミュートしています…",
         "muted": "ミュートしています",
         "note": "私的なメモ",
         "per_day": "/日",
         "remote_follow": "リモートフォロー",
+        "replies": "投稿と返信",
         "report": "通報",
         "show_repeats": "リピートを見る",
-        "statuses": "ステータス",
+        "statuses": "投稿",
         "subscribe": "購読",
         "unblock": "ブロック解除",
         "unblock_progress": "ブロックを解除しています…",
-- 
2.34.1


From 49875ef601109b590be3ef3263cdf3593d349109 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 31 Aug 2022 16:45:29 +0000
Subject: [PATCH 28/50] Translated using Weblate (Dutch)

Currently translated at 96.7% (868 of 897 strings)

Co-authored-by: Fristi <fristi@subcon.town>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/nl/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/nl.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index e6761de9..2674c49a 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -394,8 +394,16 @@
         "chatMessageRadius": "Chatbericht",
         "checkboxRadius": "Checkboxen",
         "collapse_subject": "Berichten met een onderwerp inklappen",
+        "columns": "Kolommen",
         "composing": "Opstellen",
+        "confirm_dialogs": "Bevestiging vereisen voor:",
+        "confirm_dialogs_block": "Iemand blokkeren",
+        "confirm_dialogs_delete": "Een bericht verwijderen",
+        "confirm_dialogs_mute": "Iemand negeren",
+        "confirm_dialogs_repeat": "Herhalen van een bericht",
+        "confirm_dialogs_unfollow": "Iemand ontvolgen",
         "confirm_new_password": "Nieuw wachtwoord bevestigen",
+        "confirmation_dialogs": "Bevestigingsopties",
         "conversation_display": "Gespreksweergave stijl",
         "conversation_display_linear": "Lineaire weergave",
         "conversation_display_tree": "Boom weergave",
-- 
2.34.1


From c97cd564396b3f51c6ccdc2993fb06d686603108 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Wed, 31 Aug 2022 23:32:02 +0100
Subject: [PATCH 29/50] only clear timelines on new profile

---
 src/components/user_profile/user_profile.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 89cd95fd..00868d3b 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -102,10 +102,9 @@ const UserProfile = {
       if (this.isUs) timelineTabMap['favorites'] = 'favorites'
 
       const timeline = timelineTabMap[nextTab]
-      const lastTimeline = timelineTabMap[previousTab]
+
       if (timeline) {
         this.stopFetching()
-        if (lastTimeline) this.$store.commit('clearTimeline', { timeline: lastTimeline })
         this.$store.dispatch('startFetchingTimeline', { timeline: timeline, userId: this.userId })
       }
     },
-- 
2.34.1


From 91357aad88f80253007a02012266d4aea160b5ed Mon Sep 17 00:00:00 2001
From: David <dmgf2008@hotmail.com>
Date: Thu, 1 Sep 2022 22:35:42 -0700
Subject: [PATCH 30/50] Fix Announcements Title Style

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

diff --git a/src/components/announcements_page/announcements_page.vue b/src/components/announcements_page/announcements_page.vue
index b1489dec..a548a8a0 100644
--- a/src/components/announcements_page/announcements_page.vue
+++ b/src/components/announcements_page/announcements_page.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="panel panel-default announcements-page">
     <div class="panel-heading">
-      <span>
+      <div class="title">
         {{ $t('announcements.page_header') }}
-      </span>
+      </div>
     </div>
     <div class="panel-body">
       <section
-- 
2.34.1


From 948436ad3ee3e5c7a03f9000b350758265d0b6aa Mon Sep 17 00:00:00 2001
From: David <dmgf2008@hotmail.com>
Date: Fri, 2 Sep 2022 17:05:42 -0700
Subject: [PATCH 31/50] Jump to Top on New *only* in non-profiles

---
 src/components/timeline/timeline.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index c91c8d57..a52a6ac0 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -150,6 +150,9 @@ const Timeline = {
         this.$store.commit('showNewStatuses', { timeline: this.timelineName })
         this.paused = false
       }
+      if (!this.inProfile) {
+        window.scrollTo({ top: 0 })
+      }
     },
     fetchOlderStatuses: throttle(function () {
       const store = this.$store
-- 
2.34.1


From 8e2a4a9f7b2d842ebdc4d56db2a134f004554ae4 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Mon, 5 Sep 2022 01:30:32 +0100
Subject: [PATCH 32/50] remove unused method

---
 src/components/emoji_reactions/emoji_reactions.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js
index 549b9517..06e21f6e 100644
--- a/src/components/emoji_reactions/emoji_reactions.js
+++ b/src/components/emoji_reactions/emoji_reactions.js
@@ -46,14 +46,6 @@ const EmojiReactions = {
     reactedWith (emoji) {
       return this.status.emoji_reactions.find(r => r.name === emoji).me
     },
-    isLocalReaction (emojiUrl) {
-      if (!emojiUrl) return true
-      const reacted = this.accountsForEmoji[emojiUrl]
-      if (reacted.length === 0) {
-        return true
-      }
-      return reacted[0].is_local
-    },
     fetchEmojiReactionsByIfMissing () {
       const hasNoAccounts = this.status.emoji_reactions.find(r => !r.accounts)
       if (hasNoAccounts) {
-- 
2.34.1


From ae1b6ad887d367dd039a47baef1e62a2f66b2a76 Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Mon, 5 Sep 2022 17:02:16 +0000
Subject: [PATCH 33/50] Customisation of default profile tab, clean up settings
 (#156)

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/156
---
 src/components/extra_buttons/extra_buttons.js |  7 ++-
 .../extra_buttons/extra_buttons.vue           | 10 ++++
 .../settings_modal/tabs/general_tab.js        |  5 ++
 .../settings_modal/tabs/general_tab.vue       | 60 +++++++------------
 src/components/user_profile/user_profile.js   | 12 ++--
 src/i18n/en.json                              |  4 ++
 src/modules/config.js                         |  3 +-
 7 files changed, 54 insertions(+), 47 deletions(-)

diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 4ac463e6..042a96a1 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -55,8 +55,10 @@ const ExtraButtons = {
     hideDeleteStatusConfirmDialog () {
       this.showingDeleteDialog = false
     },
-
     translateStatus () {
+      if (this.noTranslationTargetSet) {
+        this.$store.dispatch('pushGlobalNotice', { messageKey: 'toast.no_translation_target_set', level: 'info' })
+      }
       const translateTo = this.$store.getters.mergedConfig.translationLanguage || this.$store.state.instance.interfaceLanguage
       this.$store.dispatch('translateStatus', { id: this.status.id, language: translateTo })
         .then(() => this.$emit('onSuccess'))
@@ -120,6 +122,9 @@ const ExtraButtons = {
     canTranslate () {
       return this.$store.state.instance.translationEnabled === true
     },
+    noTranslationTargetSet () {
+      return this.$store.getters.mergedConfig.translationLanguage === undefined
+    },
     statusLink () {
       if (this.status.is_local) {
         return `${this.$store.state.instance.server}${this.$router.resolve({ name: 'conversation', params: { id: this.status.id } }).href}`
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index bbb140e4..b1cbe8dc 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -126,6 +126,16 @@
             fixed-width
             icon="globe"
           /><span>{{ $t("status.translate") }}</span>
+
+          <template v-if="noTranslationTargetSet">
+            <span class="dropdown-item-icon__badge warning">
+              <FAIcon
+                fixed-width
+                icon="exclamation-triangle"
+                name="test"
+              />
+            </span>
+          </template>
         </button>
       </div>
     </template>
diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
index c3c18132..9fe47eaf 100644
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@@ -43,6 +43,11 @@ const GeneralTab = {
         value: mode,
         label: this.$t(`settings.third_column_mode_${mode}`)
       })),
+      userProfileDefaultTabOptions: ['statuses', 'replies'].map(tab => ({
+        key: tab,
+        value: tab,
+        label: this.$t(`user_card.${tab}`)
+      })),
       loopSilentAvailable:
       // Firefox
       Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') ||
diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
index 72d877bd..608c73af 100644
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@@ -15,11 +15,6 @@
             {{ $t('settings.hide_isp') }}
           </BooleanSetting>
         </li>
-        <li>
-          <BooleanSetting path="sidebarRight">
-            {{ $t('settings.right_sidebar') }}
-          </BooleanSetting>
-        </li>
         <li v-if="instanceWallpaperUsed">
           <BooleanSetting path="hideInstanceWallpaper">
             {{ $t('settings.hide_wallpaper') }}
@@ -104,41 +99,7 @@
             {{ $t('settings.virtual_scrolling') }}
           </BooleanSetting>
         </li>
-        <li>
-          <BooleanSetting path="disableStickyHeaders">
-            {{ $t('settings.disable_sticky_headers') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="showScrollbars">
-            {{ $t('settings.show_scrollbars') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <ChoiceSetting
-            v-if="user"
-            id="thirdColumnMode"
-            path="thirdColumnMode"
-            :options="thirdColumnModeOptions"
-          >
-            {{ $t('settings.third_column_mode') }}
-          </ChoiceSetting>
-        </li>
-        <li>
-          <BooleanSetting path="minimalScopesMode">
-            {{ $t('settings.minimal_scopes_mode') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="sensitiveByDefault">
-            {{ $t('settings.sensitive_by_default') }}
-          </BooleanSetting>
-        </li>
-        <li>
-          <BooleanSetting path="sensitiveIfSubject">
-            {{ $t('settings.sensitive_if_subject') }}
-          </BooleanSetting>
-        </li>
+
         <li>
           <BooleanSetting path="renderMisskeyMarkdown">
             {{ $t('settings.render_mfm') }}
@@ -156,6 +117,15 @@
             </li>
           </ul>
         </li>
+        <li>
+          <ChoiceSetting
+            id="userProfileDefaultTab"
+            path="userProfileDefaultTab"
+            :options="userProfileDefaultTabOptions"
+          >
+            {{ $t('settings.user_profile_default_tab') }}
+          </ChoiceSetting>
+        </li>
         <li>
           <ChoiceSetting
             v-if="user && (translationLanguages.length > 0)"
@@ -487,12 +457,22 @@
             />
           </label>
         </li>
+        <li>
+          <BooleanSetting path="minimalScopesMode">
+            {{ $t('settings.minimal_scopes_mode') }}
+          </BooleanSetting>
+        </li>
         <li>
           <!-- <BooleanSetting path="serverSide_defaultNSFW"> -->
           <BooleanSetting path="sensitiveByDefault">
             {{ $t('settings.sensitive_by_default') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting path="sensitiveIfSubject">
+            {{ $t('settings.sensitive_if_subject') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="scopeCopy"
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 00868d3b..8af757d7 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -33,22 +33,21 @@ const FriendList = withLoadMore({
   additionalPropNames: ['userId']
 })(List)
 
-const defaultTabKey = 'statuses'
-
 const UserProfile = {
   data () {
     return {
       error: false,
       userId: null,
-      tab: defaultTabKey,
+      tab: 'statuses',
       footerRef: null,
       note: null,
       noteLoading: false
     }
   },
   created () {
+    const defaultTabKey = this.defaultTabKey
     const routeParams = this.$route.params
-    const hash = get(this.$route, 'hash', defaultTabKey).replace(/^#/, '')
+    const hash = (get(this.$route, 'hash') || defaultTabKey).replace(/^#/, '')
     if (hash !== '') this.tab = hash
     this.load(routeParams.name || routeParams.id)
   },
@@ -86,6 +85,9 @@ const UserProfile = {
     },
     currentUser () {
       return this.$store.state.users.currentUser
+    },
+    defaultTabKey () {
+      return this.$store.getters.mergedConfig.userProfileDefaultTab || 'statuses'
     }
   },
   methods: {
@@ -191,7 +193,7 @@ const UserProfile = {
     },
     '$route.hash': function (newVal) {
       const oldTab = this.tab
-      this.tab = newVal.replace(/^#/, '') || defaultTabKey
+      this.tab = newVal.replace(/^#/, '') || this.defaultTabKey
       this.onRouteChange(oldTab, this.tab)
     }
   },
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 7f6166f9..b5f7cb7e 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -806,6 +806,7 @@
         "use_one_click_nsfw": "Open NSFW attachments with just one click",
         "user_mutes": "Users",
         "user_profiles": "User Profiles",
+        "user_profile_default_tab": "Default Tab on User Profile",
         "user_settings": "User Settings",
         "valid_until": "Valid until",
         "values": {
@@ -921,6 +922,9 @@
         "socket_reconnected": "Realtime connection established",
         "up_to_date": "Up-to-date"
     },
+    "toast": {
+      "no_translation_target_set": "No translation target language set - this may fail. Please set a target language in your settings."
+    },
     "tool_tip": {
         "accept_follow_request": "Accept follow request",
         "add_reaction": "Add Reaction",
diff --git a/src/modules/config.js b/src/modules/config.js
index e43dcdb7..94b52e92 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -116,7 +116,8 @@ export const defaultState = {
   conversationTreeFadeAncestors: undefined, // instance default
   maxDepthInThread: undefined, // instance default
   translationLanguage: undefined, // instance default,
-  supportedTranslationLanguages: {} // instance default
+  supportedTranslationLanguages: {}, // instance default
+  userProfileDefaultTab: 'statuses'
 }
 
 // caching the instance default properties
-- 
2.34.1


From aecb9f6e2a55d8f00f0b6d1bbebab85a3d1c67eb Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 5 Sep 2022 17:24:25 +0000
Subject: [PATCH 34/50] Translated using Weblate (English)

Currently translated at 99.5% (900 of 904 strings)

Translated using Weblate (English)

Currently translated at 99.5% (900 of 904 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/en.json | 47 +++++++++++++++++++++++------------------------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index b5f7cb7e..f07ff86c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -98,7 +98,6 @@
     "features_panel": {
         "media_proxy": "Media proxy",
         "scope_options": "Scope options",
-        "shout": "Shoutbox",
         "text_limit": "Text limit",
         "title": "Features",
         "upload_limit": "Upload limit",
@@ -396,16 +395,16 @@
         "collapse_subject": "Collapse posts with subjects",
         "columns": "Columns",
         "composing": "Composing",
-        "confirmation_dialogs": "Confirmation options",
         "confirm_dialogs": "Require confirmation for:",
+        "confirm_dialogs_approve_follow": "Accepting a follow request",
+        "confirm_dialogs_block": "Blocking someone",
+        "confirm_dialogs_delete": "Deleting a post",
+        "confirm_dialogs_deny_follow": "Rejecting a follow request",
+        "confirm_dialogs_mute": "Muting someone",
         "confirm_dialogs_repeat": "Repeating a post",
         "confirm_dialogs_unfollow": "Unfollowing someone",
-        "confirm_dialogs_block": "Blocking someone",
-        "confirm_dialogs_mute": "Muting someone",
-        "confirm_dialogs_delete": "Deleting a post",
-        "confirm_dialogs_approve_follow": "Accepting a follow request",
-        "confirm_dialogs_deny_follow": "Rejecting a follow request",
         "confirm_new_password": "Confirm new password",
+        "confirmation_dialogs": "Confirmation options",
         "conversation_display": "Conversation display style",
         "conversation_display_linear": "Linear-style",
         "conversation_display_tree": "Tree-style",
@@ -437,8 +436,8 @@
             "backup_settings_theme": "Backup settings and theme to file",
             "errors": {
                 "file_slightly_new": "File minor version is different, some settings might not load",
-                "file_too_new": "Incompatile major version: {fileMajor}, this PleromaFE (settings ver {feMajor}) is too old to handle it",
-                "file_too_old": "Incompatile major version: {fileMajor}, file version is too old and not supported (min. set. ver. {feMajor})",
+                "file_too_new": "Incompatible major version: {fileMajor}, this PleromaFE (settings ver {feMajor}) is too old to handle it",
+                "file_too_old": "Incompatible major version: {fileMajor}, file version is too old and not supported (min. set. ver. {feMajor})",
                 "invalid_file": "The selected file is not a supported Pleroma settings backup. No changes were made."
             },
             "restore_settings": "Restore settings from file"
@@ -805,8 +804,8 @@
         "use_contain_fit": "Don't crop the attachment in thumbnails",
         "use_one_click_nsfw": "Open NSFW attachments with just one click",
         "user_mutes": "Users",
-        "user_profiles": "User Profiles",
         "user_profile_default_tab": "Default Tab on User Profile",
+        "user_profiles": "User Profiles",
         "user_settings": "User Settings",
         "valid_until": "Valid until",
         "values": {
@@ -831,9 +830,9 @@
         "copy_link": "Copy link to post",
         "delete": "Delete post",
         "delete_confirm": "Do you really want to delete this post?",
-        "delete_confirm_title": "Confirm deletion",
         "delete_confirm_accept_button": "Yes, delete it",
         "delete_confirm_cancel_button": "No, keep it",
+        "delete_confirm_title": "Confirm deletion",
         "expand": "Expand",
         "external_source": "External source",
         "favorites": "Favorites",
@@ -852,14 +851,14 @@
         "pinned": "Pinned",
         "plus_more": "+{number} more",
         "remove_attachment": "Remove attachment",
+        "repeat_confirm": "Do you really want to repeat this post?",
+        "repeat_confirm_accept_button": "Yes, repeat it",
+        "repeat_confirm_cancel_button": "No, don't repeat",
+        "repeat_confirm_title": "Confirm repeat",
         "repeats": "Repeats",
         "replies_list": "Replies:",
         "replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",
         "reply_to": "Reply to",
-        "repeat_confirm": "Do you really want to repeat this post?",
-        "repeat_confirm_title": "Confirm repeat",
-        "repeat_confirm_accept_button": "Yes, repeat it",
-        "repeat_confirm_cancel_button": "No, don't repeat",
         "show_all_attachments": "Show all attachments",
         "show_all_conversation": "Show full conversation ({numStatus} other post) | Show full conversation ({numStatus} other posts)",
         "show_all_conversation_with_icon": "{icon} {text}",
@@ -923,7 +922,7 @@
         "up_to_date": "Up-to-date"
     },
     "toast": {
-      "no_translation_target_set": "No translation target language set - this may fail. Please set a target language in your settings."
+        "no_translation_target_set": "No translation target language set - this may fail. Please set a target language in your settings."
     },
     "tool_tip": {
         "accept_follow_request": "Accept follow request",
@@ -973,24 +972,24 @@
             "strip_media": "Remove media from posts"
         },
         "approve": "Approve",
-        "approve_confirm_title": "Approve follow request",
         "approve_confirm": "Are you sure you want to let this user follow you?",
         "approve_confirm_accept_button": "Yes, accept",
         "approve_confirm_cancel_button": "No, cancel",
+        "approve_confirm_title": "Approve follow request",
         "block": "Block",
         "block_confirm": "Are you sure you want to block {user}?",
-        "block_confirm_title": "Block user",
-        "block_confirm_cancel_button": "No, don't block",
         "block_confirm_accept_button": "Yes, block",
+        "block_confirm_cancel_button": "No, don't block",
+        "block_confirm_title": "Block user",
         "block_progress": "Blocking…",
         "blocked": "Blocked!",
         "bot": "Bot",
         "deactivated": "Deactivated",
         "deny": "Deny",
-        "deny_confirm_title": "Deny follow request",
         "deny_confirm": "Are you sure you want to deny this user's follow request?",
         "deny_confirm_accept_button": "Yes, deny",
         "deny_confirm_cancel_button": "No, cancel",
+        "deny_confirm_title": "Deny follow request",
         "domain_muted": "Unblock domain",
         "edit_profile": "Edit profile",
         "favorites": "Favorites",
@@ -1017,9 +1016,9 @@
         "message": "Message",
         "mute": "Mute",
         "mute_confirm": "Are you sure you want to mute {user}?",
-        "mute_confirm_title": "Mute user",
-        "mute_confirm_cancel_button": "No, don't mute",
         "mute_confirm_accept_button": "Yes, mute",
+        "mute_confirm_cancel_button": "No, don't mute",
+        "mute_confirm_title": "Mute user",
         "mute_domain": "Block domain",
         "mute_progress": "Muting…",
         "muted": "Muted",
@@ -1034,9 +1033,9 @@
         "unblock": "Unblock",
         "unblock_progress": "Unblocking…",
         "unfollow_confirm": "Are you sure you want to unfollow {user}?",
-        "unfollow_confirm_title": "Unfollow user",
-        "unfollow_confirm_cancel_button": "No, don't unfollow",
         "unfollow_confirm_accept_button": "Yes, unfollow",
+        "unfollow_confirm_cancel_button": "No, don't unfollow",
+        "unfollow_confirm_title": "Unfollow user",
         "unmute": "Unmute",
         "unmute_progress": "Unmuting…",
         "unsubscribe": "Unsubscribe"
-- 
2.34.1


From 9220c3859a1f407c313c48533dfb769175085317 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 5 Sep 2022 17:24:25 +0000
Subject: [PATCH 35/50] Translated using Weblate (Catalan)

Currently translated at 94.9% (857 of 903 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ca/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ca.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/i18n/ca.json b/src/i18n/ca.json
index 8fb864c8..405f6bef 100644
--- a/src/i18n/ca.json
+++ b/src/i18n/ca.json
@@ -98,7 +98,6 @@
     "features_panel": {
         "media_proxy": "Proxy per multimèdia",
         "scope_options": "Opcions d'abast",
-        "shout": "Altaveu",
         "text_limit": "Límit de text",
         "title": "Funcionalitats",
         "upload_limit": "Límit de càrrega",
-- 
2.34.1


From b5f90a96cc33a1ddfc04cfe9a2dd1b11c55c2ad9 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 5 Sep 2022 17:24:25 +0000
Subject: [PATCH 36/50] Translated using Weblate (Dutch)

Currently translated at 95.7% (865 of 903 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/nl/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/nl.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/i18n/nl.json b/src/i18n/nl.json
index 2674c49a..6beb00d5 100644
--- a/src/i18n/nl.json
+++ b/src/i18n/nl.json
@@ -98,7 +98,6 @@
     "features_panel": {
         "media_proxy": "Mediaproxy",
         "scope_options": "Zichtbaarheidsopties",
-        "shout": "Shoutbox",
         "text_limit": "Tekstlimiet",
         "title": "Functies",
         "upload_limit": "Upload limiet",
-- 
2.34.1


From d6bbbea5dc5fe4941571f3cc24397fbfb9fae9d8 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 5 Sep 2022 17:24:25 +0000
Subject: [PATCH 37/50] Translated using Weblate (Slovak)

Currently translated at 41.4% (374 of 903 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/sk/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/sk.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/i18n/sk.json b/src/i18n/sk.json
index 0adce47d..50b95a94 100644
--- a/src/i18n/sk.json
+++ b/src/i18n/sk.json
@@ -75,7 +75,6 @@
     "features_panel": {
         "media_proxy": "Proxy pre médiá",
         "scope_options": "Nastavenia rámca",
-        "shout": "Verejné fórum",
         "text_limit": "Limit počtu znakov",
         "title": "Vlastnosti",
         "upload_limit": "Limit nahrávania",
@@ -491,4 +490,4 @@
         "more": "Viac",
         "who_to_follow": "Koho nasledovať"
     }
-}
\ No newline at end of file
+}
-- 
2.34.1


From cffc073aa779030f51509852f87beedd36b3f818 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 5 Sep 2022 17:24:25 +0000
Subject: [PATCH 38/50] Translated using Weblate (Japanese (ja_PEDANTIC))

Currently translated at 90.2% (816 of 904 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ja_pedantic.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 4f8401f5..3af69ca1 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -51,6 +51,7 @@
         "published_time_display": "{time}に告知されました",
         "start_time_display": "{time}で始まる",
         "start_time_prompt": "開始時間 ",
+        "submit_edit_action": "OK",
         "title": "お知らせ"
     },
     "chats": {
@@ -346,11 +347,17 @@
     },
     "settings": {
         "accent": "アクセント",
+        "account_alias": "アカウントのエイリアス名",
+        "account_alias_table_head": "エイリアス名",
         "account_backup": "アカウントのバックアップ",
         "account_backup_description": "投稿やアカウント情報をダウンロードできますが、インポートすることがまだできません",
         "account_backup_table_head": "バックアップ",
         "account_privacy": "プライバシー",
+        "add_alias_error": "エイリアス名を参加できませんでした：{error}",
         "add_backup": "バックアップ作成",
+        "add_backup_error": "バックアップを作成できませんでした：{error}",
+        "added_alias": "エイリアス名を参加しました",
+        "added_backup": "バックアップを作成しました",
         "allow_following_move": "フォロー中のアカウントが引っ越したとき、自動フォローを許可する",
         "always_show_post_button": "投稿ボタンを常に表示",
         "app_name": "アプリの名称",
@@ -362,6 +369,7 @@
         "avatarRadius": "アバター",
         "avatar_size_instruction": "アバターの大きさは、150×150ピクセルか、それよりも大きくするといいです。",
         "background": "バックグラウンド",
+        "backup_not_ready": "バックアップはまだ完成していません",
         "bio": "プロフィール",
         "block_export": "ブロックのエクスポート",
         "block_export_button": "ブロックをCSVファイルにエクスポートする",
@@ -399,6 +407,8 @@
         "conversation_display": "スレッドの表示モード",
         "conversation_display_linear": "リニアー",
         "conversation_display_tree": "ツリー",
+        "conversation_other_replies_button_below": "投稿の下",
+        "conversation_other_replies_button_inside": "投稿の中",
         "current_avatar": "現在のアバター",
         "current_password": "現在のパスワード",
         "data_import_export_tab": "インポートとエクスポート",
-- 
2.34.1


From 4f1d85b05491d407211eb2bee9e4ba6c9fb087e6 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Mon, 5 Sep 2022 17:24:25 +0000
Subject: [PATCH 39/50] Translated using Weblate (French)

Currently translated at 94.9% (857 of 903 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/fr/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/fr.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index 5fc83c69..f00b3153 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -98,7 +98,6 @@
     "features_panel": {
         "media_proxy": "Proxy pièce-jointes",
         "scope_options": "Options de visibilité",
-        "shout": "Shoutbox",
         "text_limit": "Limite du texte",
         "title": "Fonctionnalités",
         "upload_limit": "Limite de téléversement",
-- 
2.34.1


From d42b207b645440bf56e43ec96f3266309176fd1d Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 6 Sep 2022 10:30:23 +0000
Subject: [PATCH 40/50] Translated using Weblate (English)

Currently translated at 100.0% (903 of 903 strings)

Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/en.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index f07ff86c..70f0bacf 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -313,7 +313,7 @@
         "email": "Email",
         "email_language": "In which language do you want to receive emails from the server?",
         "fullname": "Display name",
-        "fullname_placeholder": "e.g. Lain Iwakura",
+        "fullname_placeholder": "e.g. Atsuko Kagari",
         "new_captcha": "Click the image to get a new captcha",
         "password_confirm": "Password confirmation",
         "reason": "Reason to register",
@@ -321,7 +321,7 @@
         "register": "Register",
         "registration": "Registration",
         "token": "Invite token",
-        "username_placeholder": "e.g. lain",
+        "username_placeholder": "e.g. akko",
         "validations": {
             "email_required": "cannot be left blank",
             "fullname_required": "cannot be left blank",
@@ -530,7 +530,7 @@
         "more_settings": "More settings",
         "move_account": "Move account",
         "move_account_error": "Error moving account: {error}",
-        "move_account_notes": "If you want to move the account somewhere else, you must go to your target account and add an alias pointing here.",
+        "move_account_notes": "If you want to move this account somewhere else, you must go to your target account and add an alias pointing here.",
         "move_account_target": "Target account (e.g. {example})",
         "moved_account": "Account is moved.",
         "mute_bot_posts": "Mute bot posts",
@@ -794,7 +794,7 @@
         "token": "Token",
         "tooltipRadius": "Tooltips/alerts",
         "translation_language": "Automatic Translation Language",
-        "tree_advanced": "Allow more flexible navigation in tree view",
+        "tree_advanced": "Display extra buttons to open and close reply chains in threads",
         "tree_fade_ancestors": "Display ancestors of the current post in faint text",
         "type_domains_to_mute": "Search domains to mute",
         "upload_a_photo": "Upload a photo",
@@ -857,25 +857,25 @@
         "repeat_confirm_title": "Confirm repeat",
         "repeats": "Repeats",
         "replies_list": "Replies:",
-        "replies_list_with_others": "Replies (+{numReplies} other): | Replies (+{numReplies} others):",
+        "replies_list_with_others": "View {numReplies} more reply | View {numReplies} more replies",
         "reply_to": "Reply to",
         "show_all_attachments": "Show all attachments",
         "show_all_conversation": "Show full conversation ({numStatus} other post) | Show full conversation ({numStatus} other posts)",
         "show_all_conversation_with_icon": "{icon} {text}",
         "show_attachment_description": "Preview description (open attachment for full description)",
-        "show_attachment_in_modal": "Show in media modal",
+        "show_attachment_in_modal": "Show attachment in a window",
         "show_content": "Show content",
         "show_full_subject": "Show full subject",
         "show_only_conversation_under_this": "Only show replies to this post",
         "status_deleted": "This post was deleted",
         "status_unavailable": "Post unavailable",
-        "thread_follow": "See the remaining part of this thread ({numStatus} post in total) | See the remaining part of this thread ({numStatus} posts in total)",
+        "thread_follow": "View {numStatus} more reply | View {numStatus} more replies",
         "thread_follow_with_icon": "{icon} {text}",
         "thread_hide": "Hide this thread",
         "thread_muted": "Thread muted",
         "thread_muted_and_words": ", has words:",
         "thread_show": "Show this thread",
-        "thread_show_full": "Show everything under this thread ({numStatus} post in total, max depth {depth}) | Show everything under this thread ({numStatus} posts in total, max depth {depth})",
+        "thread_show_full": "Show {numStatus} reply | Show all {numStatus} replies",
         "thread_show_full_with_icon": "{icon} {text}",
         "translate": "Translate",
         "translated_from": "Translated from {language}",
-- 
2.34.1


From ebdcb31c12a53a468a63c54ce9da642dfe5785e1 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 6 Sep 2022 10:35:03 +0000
Subject: [PATCH 41/50] Translated using Weblate (Japanese (ja_PEDANTIC))

Currently translated at 100.0% (903 of 903 strings)

Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ja_pedantic.json | 82 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 81 insertions(+), 1 deletion(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 3af69ca1..404e301a 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -42,6 +42,7 @@
         "edit_action": "更新",
         "end_time_display": "{time}に終わる",
         "end_time_prompt": "終了時間 ",
+        "inactive_message": "無効",
         "mark_as_read_action": "読んだ",
         "page_header": "お知らせ",
         "post_action": "投稿",
@@ -407,9 +408,11 @@
         "conversation_display": "スレッドの表示モード",
         "conversation_display_linear": "リニアー",
         "conversation_display_tree": "ツリー",
+        "conversation_other_replies_button": "「別の返信」のボタンは",
         "conversation_other_replies_button_below": "投稿の下",
         "conversation_other_replies_button_inside": "投稿の中",
         "current_avatar": "現在のアバター",
+        "current_mascot": "現在のマスコット",
         "current_password": "現在のパスワード",
         "data_import_export_tab": "インポートとエクスポート",
         "default_vis": "デフォルトの公開範囲",
@@ -433,6 +436,8 @@
             "backup_settings_theme": "テーマを含む設定をファイルにバックアップする",
             "errors": {
                 "file_slightly_new": "ファイルのマイナーバージョンが異なり、一部の設定が読み込まれないことがあります",
+                "file_too_new": "非対応：Pleroma-FE v{feMajor}は古すぎて、v{fileMajor}の設定を読み込めません",
+                "file_too_old": "非対応：設定ファイル v{fileMajor}は古すぎて、Pleroma-FE v{feMajor}が読み込めません",
                 "invalid_file": "これはPleromaの設定をバックアップしたファイルではありません。"
             },
             "restore_settings": "設定をファイルから復元する"
@@ -451,17 +456,23 @@
         "hide_all_muted_posts": "ミュートした投稿を隠す",
         "hide_attachments_in_convo": "スレッドのファイルを隠す",
         "hide_attachments_in_tl": "タイムラインのファイルを隠す",
+        "hide_bot_indication": "botマークを隠す",
+        "hide_favorites_description": "お気に入りリストを隠す",
         "hide_filtered_statuses": "フィルターされた投稿を隠す",
         "hide_followers_count_description": "フォロワーの数を見せない",
         "hide_followers_description": "フォロワーを見せない",
         "hide_follows_count_description": "フォローしている人の数を見せない",
         "hide_follows_description": "フォローしている人を見せない",
         "hide_isp": "インスタンス固有パネルを隠す",
+        "hide_list_aliases_error_action": "閉じる",
         "hide_media_previews": "メディアのプレビューを隠す",
         "hide_muted_posts": "ミュートしているユーザーの投稿を隠す",
         "hide_muted_threads": "ミュートしているスレを隠す",
         "hide_post_stats": "投稿の統計を隠す (例: お気に入りの数)",
         "hide_shoutbox": "Shoutboxを表示しない",
+        "hide_site_favicon": "ページ上にアイコンを隠す",
+        "hide_site_name": "インスタンス名を隠す",
+        "hide_threads_with_blocked_users": "ブロックしているユーザーをメンションする投稿を隠す",
         "hide_user_stats": "ユーザーの統計を隠す (例: フォロワーの数)",
         "hide_wallpaper": "インスタンスのバックグラウンドを隠す",
         "hide_wordfiltered_statuses": "単語フィルタに一致する投稿を隠す",
@@ -477,14 +488,22 @@
         "invalid_theme_imported": "このファイルはPleromaのテーマではありません。テーマは変更されませんでした。",
         "limited_availability": "あなたのブラウザではできません",
         "links": "リンク",
+        "list_aliases_error": "エイリアス を読み込めませんでした：{error}",
+        "list_backups_error": "バクアップを読み込めませんでした：{error}",
         "lock_account_description": "あなたが認めた人だけ、あなたのアカウントをフォローできる",
         "loop_video": "ビデオを繰り返す",
         "loop_video_silent_only": "音のないビデオだけ繰り返す",
+        "mascot": "マストドンFEのマスコット",
+        "max_depth_in_thread": "スレッドの初期の最大レベル数",
         "max_thumbnails": "投稿に含まれるサムネイルの最大数",
+        "mention_link_bolden_you": "メンションされたら、強調にする",
         "mention_link_display": "メンションリンクの表示モード",
         "mention_link_display_full": "名前とドメイン、例： {'@'}foo{'@'}example.org",
         "mention_link_display_full_for_remote": "ローカルユーザー： 名前のみ、リモートユーザー： 名前とドメイン",
         "mention_link_display_short": "名前のみ、例：{'@'}foo",
+        "mention_link_fade_domain": "ドメインを色あせる",
+        "mention_link_show_avatar": "メンションの側にアバターを表示",
+        "mention_link_show_tooltip": "リモートユーザに名前とドメインのツールチップを付ける",
         "mention_links": "メンションリンク",
         "mfa": {
             "authentication_methods": "認証方法",
@@ -509,6 +528,12 @@
         },
         "minimal_scopes_mode": "公開範囲選択オプションを最小にする",
         "more_settings": "その他の設定",
+        "move_account": "アカウントの引っ越し",
+        "move_account_error": "引っ越しできませんでした：{error}",
+        "move_account_notes": "アカウントを引っ越ししたいなら、先のアカウントでアカウントエイリアスを作成してください",
+        "move_account_target": "引っ越し先",
+        "moved_account": "引っ越ししました",
+        "mute_bot_posts": "botの投稿をミュート",
         "mute_export": "ミュートのエクスポート",
         "mute_export_button": "ミュートをCSVファイルにエクスポートする",
         "mute_import": "ミュートのインポート",
@@ -518,6 +543,7 @@
         "mutes_tab": "ミュート",
         "name": "名前",
         "name_bio": "名前とプロフィール",
+        "new_alias_target": "アカウントエイリアスを作成",
         "new_email": "新しいメールアドレス",
         "new_password": "新しいパスワード",
         "no_blocks": "ブロックはありません",
@@ -527,6 +553,7 @@
         "notification_mutes": "特定のユーザーからの通知を止めるには、ミュートしてください。",
         "notification_setting_block_from_strangers": "フォローしていないユーザーからの通知を拒否する",
         "notification_setting_filters": "フィルター",
+        "notification_setting_hide_if_cw": "説明がつけたら、プッシュ通知で投稿を隠す",
         "notification_setting_hide_notification_contents": "送った人と内容を、プッシュ通知に表示しない",
         "notification_setting_privacy": "プライバシー",
         "notification_visibility": "表示する通知",
@@ -535,6 +562,7 @@
         "notification_visibility_likes": "お気に入り",
         "notification_visibility_mentions": "メンション",
         "notification_visibility_moves": "ユーザーの引っ越し",
+        "notification_visibility_polls": "投票した投票の終了",
         "notification_visibility_repeats": "リピート",
         "notifications": "通知",
         "nsfw_clickthrough": "NSFWなファイルを隠す",
@@ -545,6 +573,7 @@
         "play_videos_in_modal": "ビデオをメディアビューアーで見る",
         "post_look_feel": "投稿の見た目",
         "post_status_content_type": "投稿のコンテントタイプ",
+        "posts": "投稿",
         "preload_images": "画像を先読みする",
         "presets": "プリセット",
         "profile_background": "プロフィールの背景",
@@ -558,7 +587,10 @@
         "profile_tab": "プロフィール",
         "radii_help": "インターフェースの丸さを設定する",
         "refresh_token": "トークンを更新",
+        "remove_alias": "削除",
+        "remove_backup": "削除",
         "render_mfm": "Misskey Markdownを表示",
+        "render_mfm_on_hover": "マウスポインタを置いていないMFMアニメーションを停止",
         "replies_in_timeline": "タイムラインのリプライ",
         "reply_visibility_all": "すべてのリプライを見る",
         "reply_visibility_following": "私に宛てられたリプライと、フォローしている人からのリプライを見る",
@@ -584,13 +616,19 @@
         "sensitive_by_default": "はじめから投稿をセンシティブとして設定",
         "sensitive_if_subject": "投稿にサブジェクトをついたらNSFWにする",
         "set_new_avatar": "新しいアバターを設定する",
+        "set_new_mascot": "マスコットを更新",
         "set_new_profile_background": "新しいプロフィールのバックグラウンドを設定する",
         "set_new_profile_banner": "新しいプロフィールバナーを設定する",
         "setting_changed": "規定の設定と異なっています",
+        "setting_server_side": "この設定は、全クライエントに適用します",
         "settings": "設定",
         "show_admin_badge": "\"管理者\"のバッジを見せる",
         "show_moderator_badge": "\"モデレーター\"のバッジを見せる",
+        "show_nav_shortcuts": "ページ上にショートカットを追加",
+        "show_panel_nav_shortcuts": "ページ上にタイムラインショートカットを追加",
         "show_scrollbars": "カラムのスクロールバーを表示",
+        "show_wider_shortcuts": "ページ上にショートカット間のスペースを増大",
+        "show_yous": "メンション側に「（あなた）」を表示",
         "stop_gifs": "カーソルを重ねたとき、GIFを動かす",
         "streaming": "上までスクロールしたとき、自動的にストリーミングする",
         "style": {
@@ -755,13 +793,19 @@
         "third_column_mode_postform": "で投稿フォームを表示",
         "token": "トークン",
         "tooltipRadius": "ツールチップとアラート",
+        "translation_language": "翻訳先言語",
+        "tree_advanced": "スレッドで「返信を見る」、「閉じる」ボタンを表示",
+        "tree_fade_ancestors": "見ている投稿の親投稿を色あせる",
         "type_domains_to_mute": "ミュートしたいドメインを検索",
         "upload_a_photo": "画像をアップロード",
         "useStreamingApi": "投稿と通知を、すぐに受け取る",
         "useStreamingApiWarning": "（実験中で、投稿を取りこぼすかもしれないので、おすすめしません）",
+        "use_at_icon": "@マークをアイコンにする",
         "use_contain_fit": "画像のサムネイルを、切り抜かない",
         "use_one_click_nsfw": "NSFWなファイルを1クリックで開く",
         "user_mutes": "ユーザー",
+        "user_profile_default_tab": "ユーザープロファイルの初期タブ",
+        "user_profiles": "ユーザーのプロファイル",
         "user_settings": "ユーザー設定",
         "valid_until": "まで有効",
         "values": {
@@ -774,10 +818,15 @@
             "title": "バージョン"
         },
         "virtual_scrolling": "タイムラインの描画を最適化する",
-        "word_filter": "単語フィルタ"
+        "word_filter": "単語フィルタ",
+        "wordfilter": "単語フィルター"
     },
     "status": {
+        "ancestor_follow": "{numReplies}件の返信を見る",
+        "ancestor_follow_with_icon": "{icon} {text}",
+        "attachment_stop_flash": "フラッシュを停止",
         "bookmark": "ブックマーク",
+        "collapse_attachments": "ファイルを隠す",
         "copy_link": "リンクをコピー",
         "delete": "投稿を削除",
         "delete_confirm": "投稿を削除しますか？",
@@ -787,28 +836,47 @@
         "expand": "広げる",
         "external_source": "外部ソース",
         "favorites": "お気に入り",
+        "hide_attachment": "ファイルを隠す",
         "hide_content": "隠す",
         "hide_full_subject": "隠す",
+        "many_attachments": "ファイルは{number}件があります",
         "mentions": "メンション",
+        "move_down": "右に移動",
+        "move_up": "左に移動",
         "mute_conversation": "スレッドをミュート",
         "nsfw": "閲覧注意",
+        "open_gallery": "ギャラリーを見る",
         "override_translation_source_language": "翻訳元言語",
         "pin": "プロフィールにピン留め",
         "pinned": "ピン留め",
         "plus_more": "ほか{number}件",
+        "remove_attachment": "削除",
         "repeat_confirm": "リピートしますか？",
         "repeat_confirm_accept_button": "リピート",
         "repeat_confirm_cancel_button": "キャンセル",
         "repeat_confirm_title": "リピートを確認してください",
         "repeats": "リピート",
         "replies_list": "返信:",
+        "replies_list_with_others": "{numReplies}件の返信を見る",
         "reply_to": "返信",
+        "show_all_attachments": "全ファイルを表示",
+        "show_all_conversation": "スレッドの全部を見る",
+        "show_all_conversation_with_icon": "{icon} {text}",
+        "show_attachment_description": "説明の略を見る",
+        "show_attachment_in_modal": "ファイルをウインドウで見る",
         "show_content": "見る",
         "show_full_subject": "全部見る",
+        "show_only_conversation_under_this": "この投稿を返信する投稿のみ",
         "status_deleted": "この投稿は削除されました",
         "status_unavailable": "利用できません",
+        "thread_follow": "{numStatus}件の返信を見る",
+        "thread_follow_with_icon": "{icon} {text}",
+        "thread_hide": "スレッドを隠す",
         "thread_muted": "ミュートされたスレッド",
         "thread_muted_and_words": "以下の単語を含むため:",
+        "thread_show": "スレッドを表示",
+        "thread_show_full": "{numStatus}件の返信を見る",
+        "thread_show_full_with_icon": "{icon} {text}",
         "translate": "翻訳",
         "translated_from": "{language}から翻訳されました",
         "unbookmark": "ブックマーク解除",
@@ -853,12 +921,16 @@
         "socket_reconnected": "リアルタイム接続が確立されました",
         "up_to_date": "最新"
     },
+    "toast": {
+        "no_translation_target_set": "翻訳先言語の設定していません、設定をしてください"
+    },
     "tool_tip": {
         "accept_follow_request": "フォローリクエストを許可",
         "add_reaction": "リアクションを追加",
         "bookmark": "ブックマーク",
         "favorite": "お気に入り",
         "media_upload": "メディアをアップロード",
+        "quote": "参照",
         "reject_follow_request": "フォローリクエストを拒否",
         "repeat": "リピート",
         "reply": "返信",
@@ -885,6 +957,7 @@
             "deactivate_account": "アカウントをアクティブでなくする",
             "delete_account": "アカウントを削除",
             "delete_user": "ユーザーを削除",
+            "delete_user_data_and_deactivate_confirmation": "本当に削除しますか？削除したら、絶対に取り返せません",
             "disable_any_subscription": "フォローされないようにする",
             "disable_remote_subscription": "他のインスタンスからフォローされないようにする",
             "force_nsfw": "すべての投稿をNSFWにする",
@@ -911,14 +984,17 @@
         "block_progress": "ブロックしています…",
         "blocked": "ブロックしています！",
         "bot": "bot",
+        "deactivated": "無効",
         "deny": "お断り",
         "deny_confirm": "フォローリクエストを断りますか？",
         "deny_confirm_accept_button": "お断り",
         "deny_confirm_cancel_button": "キャンセル",
         "deny_confirm_title": "お断りを確認してください",
+        "domain_muted": "ドメインブロックをやめる",
         "edit_profile": "プロフィールを編集",
         "favorites": "お気に入り",
         "follow": "フォロー",
+        "follow_cancel": "フォローリクエストを取り消す",
         "follow_progress": "リクエストしています…",
         "follow_sent": "リクエストを送りました！",
         "follow_unfollow": "フォローをやめる",
@@ -956,6 +1032,10 @@
         "subscribe": "購読",
         "unblock": "ブロック解除",
         "unblock_progress": "ブロックを解除しています…",
+        "unfollow_confirm": "{user}のフォローをやめますか？",
+        "unfollow_confirm_accept_button": "やめる",
+        "unfollow_confirm_cancel_button": "キャンセル",
+        "unfollow_confirm_title": "フォローをやめる",
         "unmute": "ミュート解除",
         "unmute_progress": "ミュートを解除しています…",
         "unsubscribe": "購読を解除"
-- 
2.34.1


From 1cce6969ccf72eed1c501144c5d1bc0a6cd0516b Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 6 Sep 2022 11:38:23 +0100
Subject: [PATCH 42/50] make linter happy

---
 config/ihba.json                           | 4 ++++
 src/components/desktop_nav/desktop_nav.vue | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 config/ihba.json

diff --git a/config/ihba.json b/config/ihba.json
new file mode 100644
index 00000000..4b0560fa
--- /dev/null
+++ b/config/ihba.json
@@ -0,0 +1,4 @@
+{
+  "target": "https://ihatebeinga.live",
+  "staticConfigPreference": false
+}
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index 32e3c73f..9dc02e68 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -104,8 +104,8 @@
           class="nav-items right"
         >
           <router-link
-            class="nav-icon"
             v-if="currentUser"
+            class="nav-icon"
             :to="{ name: 'interactions', params: { username: currentUser.screen_name } }"
           >
             <FAIcon
-- 
2.34.1


From bd868e47defa539028e7a688220b7637beb1bee5 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Tue, 6 Sep 2022 11:44:53 +0100
Subject: [PATCH 43/50] don't use bare @

---
 src/i18n/ja_pedantic.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 404e301a..73459603 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -800,7 +800,7 @@
         "upload_a_photo": "画像をアップロード",
         "useStreamingApi": "投稿と通知を、すぐに受け取る",
         "useStreamingApiWarning": "（実験中で、投稿を取りこぼすかもしれないので、おすすめしません）",
-        "use_at_icon": "@マークをアイコンにする",
+        "use_at_icon": "{'@'}マークをアイコンにする",
         "use_contain_fit": "画像のサムネイルを、切り抜かない",
         "use_one_click_nsfw": "NSFWなファイルを1クリックで開く",
         "user_mutes": "ユーザー",
-- 
2.34.1


From 6084cbbb00039e3e52d031940c2b24fe7377a579 Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Tue, 6 Sep 2022 17:00:15 +0000
Subject: [PATCH 44/50] collapse statuses with CWs by default (#157)

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/157
---
 src/i18n/en.json        | 16 ++++++++--------
 src/modules/config.js   |  2 +-
 src/modules/instance.js |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 70f0bacf..49c45014 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -279,7 +279,7 @@
             "text/plain": "Plain text",
             "text/x.misskeymarkdown": "MFM"
         },
-        "content_warning": "Subject (optional)",
+        "content_warning": "Content Warning (optional)",
         "default": "Just arrived at Luna Nova Academy",
         "direct_warning_to_all": "This post will be visible to all the mentioned users.",
         "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
@@ -392,7 +392,7 @@
         "changed_password": "Password changed successfully!",
         "chatMessageRadius": "Chat message",
         "checkboxRadius": "Checkboxes",
-        "collapse_subject": "Collapse posts with subjects",
+        "collapse_subject": "Collapse posts with content warnings",
         "columns": "Columns",
         "composing": "Composing",
         "confirm_dialogs": "Require confirmation for:",
@@ -614,7 +614,7 @@
         "security": "Security",
         "security_tab": "Security",
         "sensitive_by_default": "Mark posts as sensitive by default",
-        "sensitive_if_subject": "Automatically mark images as sensitive if a subject line is specified",
+        "sensitive_if_subject": "Automatically mark images as sensitive if a content warning is specified",
         "set_new_avatar": "Set new avatar",
         "set_new_mascot": "Set new mascot",
         "set_new_profile_background": "Set new profile background",
@@ -777,9 +777,9 @@
                 "use_source": "New version"
             }
         },
-        "subject_input_always_show": "Always show subject field",
-        "subject_line_behavior": "Copy subject when replying",
-        "subject_line_email": "Like email: \"re: subject\"",
+        "subject_input_always_show": "Always show content warning field",
+        "subject_line_behavior": "Copy content warning when replying",
+        "subject_line_email": "Like email: \"re: warning\"",
         "subject_line_mastodon": "Like mastodon: copy as is",
         "subject_line_noop": "Do not copy",
         "text": "Text",
@@ -838,7 +838,7 @@
         "favorites": "Favorites",
         "hide_attachment": "Hide attachment",
         "hide_content": "Hide content",
-        "hide_full_subject": "Hide full subject",
+        "hide_full_subject": "Hide full content warning",
         "many_attachments": "Post has {number} attachment | Post has {number} attachments",
         "mentions": "Mentions",
         "move_down": "Shift attachment right",
@@ -865,7 +865,7 @@
         "show_attachment_description": "Preview description (open attachment for full description)",
         "show_attachment_in_modal": "Show attachment in a window",
         "show_content": "Show content",
-        "show_full_subject": "Show full subject",
+        "show_full_subject": "Show full content warning",
         "show_only_conversation_under_this": "Only show replies to this post",
         "status_deleted": "This post was deleted",
         "status_unavailable": "Post unavailable",
diff --git a/src/modules/config.js b/src/modules/config.js
index 94b52e92..e0530101 100644
--- a/src/modules/config.js
+++ b/src/modules/config.js
@@ -34,7 +34,7 @@ export const defaultState = {
   hideThreadsWithBlockedUsers: undefined, // instance default
   hideWordFilteredPosts: undefined, // instance default
   muteBotStatuses: undefined, // instance default
-  collapseMessageWithSubject: undefined, // instance default
+  collapseMessageWithSubject: true, // instance default
   padEmoji: true,
   showNavShortcuts: undefined, // instance default
   showPanelNavShortcuts: undefined, // instance default
diff --git a/src/modules/instance.js b/src/modules/instance.js
index f9118e16..5ab34f85 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -17,7 +17,7 @@ const defaultState = {
   defaultAvatar: '/images/avi.png',
   defaultBanner: '/images/banner.png',
   background: '/static/aurora_borealis.jpg',
-  collapseMessageWithSubject: false,
+  collapseMessageWithSubject: true,
   greentext: false,
   useAtIcon: false,
   mentionLinkDisplay: 'short',
-- 
2.34.1


From 6aadbcecfa7390f2f3332d262f22111e46473608 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 6 Sep 2022 17:00:17 +0000
Subject: [PATCH 45/50] Translated using Weblate (Japanese (ja_PEDANTIC))

Currently translated at 100.0% (903 of 903 strings)

Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ja_pedantic.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 73459603..940d4df7 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -261,7 +261,7 @@
         "multiple_choices": "複数選択式",
         "not_enough_options": "相異なる選択肢が不足しています",
         "option": "選択肢",
-        "people_voted_count": "{count} 人投票 | {count} 人投票",
+        "people_voted_count": "{count} 人投票",
         "single_choice": "択一式",
         "type": "投票の形式",
         "vote": "投票",
@@ -562,7 +562,7 @@
         "notification_visibility_likes": "お気に入り",
         "notification_visibility_mentions": "メンション",
         "notification_visibility_moves": "ユーザーの引っ越し",
-        "notification_visibility_polls": "投票した投票の終了",
+        "notification_visibility_polls": "参加した投票の結果",
         "notification_visibility_repeats": "リピート",
         "notifications": "通知",
         "nsfw_clickthrough": "NSFWなファイルを隠す",
-- 
2.34.1


From 2da92fcd134712273384006a25e051d8593a4472 Mon Sep 17 00:00:00 2001
From: floatingghost <hannah@coffee-and-dreams.uk>
Date: Tue, 6 Sep 2022 19:25:03 +0000
Subject: [PATCH 46/50] editing (#158)

Co-authored-by: Sean King <seanking2919@protonmail.com>
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/158
---
 CONTRIBUTORS.md                               |  2 +
 src/App.js                                    |  5 ++
 src/App.vue                                   |  2 +
 src/boot/after_store.js                       |  1 +
 src/components/attachment/attachment.js       |  3 +
 src/components/conversation/conversation.js   | 16 +++-
 .../edit_status_modal/edit_status_modal.js    | 75 ++++++++++++++++
 .../edit_status_modal/edit_status_modal.vue   | 48 +++++++++++
 src/components/extra_buttons/extra_buttons.js | 31 ++++++-
 .../extra_buttons/extra_buttons.vue           | 22 +++++
 .../post_status_form/post_status_form.js      | 51 ++++++++---
 .../post_status_form/post_status_form.vue     | 18 ++++
 src/components/status/status.js               |  6 ++
 src/components/status/status.scss             |  3 +-
 src/components/status/status.vue              | 24 ++++++
 .../status_history_modal.js                   | 60 +++++++++++++
 .../status_history_modal.vue                  | 46 ++++++++++
 src/i18n/en.json                              |  7 ++
 src/main.js                                   |  6 +-
 src/modules/api.js                            |  7 ++
 src/modules/editStatus.js                     | 25 ++++++
 src/modules/statusHistory.js                  | 25 ++++++
 src/modules/statuses.js                       |  9 ++
 src/services/api/api.service.js               | 85 ++++++++++++++++++-
 .../entity_normalizer.service.js              | 16 ++++
 .../status_poster/status_poster.service.js    | 42 +++++++++
 26 files changed, 616 insertions(+), 19 deletions(-)
 create mode 100644 src/components/edit_status_modal/edit_status_modal.js
 create mode 100644 src/components/edit_status_modal/edit_status_modal.vue
 create mode 100644 src/components/status_history_modal/status_history_modal.js
 create mode 100644 src/components/status_history_modal/status_history_modal.vue
 create mode 100644 src/modules/editStatus.js
 create mode 100644 src/modules/statusHistory.js

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f666a4ef..bfc41ac4 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -10,3 +10,5 @@ Contributors of this project.
 - shpuld (shpuld@shitposter.club): CSS and styling
 - Vincent Guth (https://unsplash.com/photos/XrwVIFy6rTw): Background images.
 - hj (hj@shigusegubu.club): Code
+- Sean King (seanking@freespeechextremist.com): Code
+- Tusooa Zhu (tusooa@kazv.moe): Code
diff --git a/src/App.js b/src/App.js
index 4304787f..3690b944 100644
--- a/src/App.js
+++ b/src/App.js
@@ -10,7 +10,9 @@ import MobilePostStatusButton from './components/mobile_post_status_button/mobil
 import MobileNav from './components/mobile_nav/mobile_nav.vue'
 import DesktopNav from './components/desktop_nav/desktop_nav.vue'
 import UserReportingModal from './components/user_reporting_modal/user_reporting_modal.vue'
+import EditStatusModal from './components/edit_status_modal/edit_status_modal.vue'
 import PostStatusModal from './components/post_status_modal/post_status_modal.vue'
+import StatusHistoryModal from './components/status_history_modal/status_history_modal.vue'
 import GlobalNoticeList from './components/global_notice_list/global_notice_list.vue'
 import { windowWidth, windowHeight } from './services/window_utils/window_utils'
 import { mapGetters } from 'vuex'
@@ -33,6 +35,8 @@ export default {
     SettingsModal,
     UserReportingModal,
     PostStatusModal,
+    EditStatusModal,
+    StatusHistoryModal,
     GlobalNoticeList
   },
   data: () => ({
@@ -83,6 +87,7 @@ export default {
       return this.$store.getters.mergedConfig.alwaysShowNewPostButton || this.layoutType === 'mobile'
     },
     showFeaturesPanel () { return this.$store.state.instance.showFeaturesPanel },
+    editingAvailable () { return this.$store.state.instance.editingAvailable },
     layoutType () { return this.$store.state.interface.layoutType },
     privateMode () { return this.$store.state.instance.private },
     reverseLayout () {
diff --git a/src/App.vue b/src/App.vue
index ed4f318e..e1c0f5dc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -58,6 +58,8 @@
     <MobilePostStatusButton />
     <UserReportingModal />
     <PostStatusModal />
+    <EditStatusModal v-if="editingAvailable" />
+    <StatusHistoryModal v-if="editingAvailable" />
     <SettingsModal />
     <UpdateNotification />
     <GlobalNoticeList />
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index d7c549d6..c12c70f1 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -273,6 +273,7 @@ const getNodeInfo = async ({ store }) => {
       store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') })
       store.dispatch('setInstanceOption', { name: 'safeDM', value: features.includes('safe_dm_mentions') })
       store.dispatch('setInstanceOption', { name: 'pollsAvailable', value: features.includes('polls') })
+      store.dispatch('setInstanceOption', { name: 'editingAvailable', value: features.includes('editing') })
       store.dispatch('setInstanceOption', { name: 'pollLimits', value: metadata.pollLimits })
       store.dispatch('setInstanceOption', { name: 'mailerEnabled', value: metadata.mailerEnabled })
       store.dispatch('setInstanceOption', { name: 'translationEnabled', value: features.includes('akkoma:machine_translation') })
diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js
index 5450f7a1..0568c6e2 100644
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@@ -132,6 +132,9 @@ const Attachment = {
     ...mapGetters(['mergedConfig'])
   },
   watch: {
+    'attachment.description' (newVal) {
+      this.localDescription = newVal
+    },
     localDescription (newVal) {
       this.onEdit(newVal)
     }
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
index 2ef2977a..f8df9eb5 100644
--- a/src/components/conversation/conversation.js
+++ b/src/components/conversation/conversation.js
@@ -1,6 +1,8 @@
 import { reduce, filter, findIndex, clone, get } from 'lodash'
 import Status from '../status/status.vue'
 import ThreadTree from '../thread_tree/thread_tree.vue'
+import { WSConnectionStatus } from '../../services/api/api.service.js'
+import { mapGetters, mapState } from 'vuex'
 
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
@@ -77,6 +79,9 @@ const conversation = {
       const maxDepth = this.$store.getters.mergedConfig.maxDepthInThread - 2
       return maxDepth >= 1 ? maxDepth : 1
     },
+    streamingEnabled () {
+      return this.mergedConfig.useStreamingApi && this.mastoUserSocketStatus === WSConnectionStatus.JOINED
+    },
     displayStyle () {
       return this.$store.getters.mergedConfig.conversationDisplay
     },
@@ -339,7 +344,11 @@ const conversation = {
     },
     maybeHighlight () {
       return this.isExpanded ? this.highlight : null
-    }
+    },
+    ...mapGetters(['mergedConfig']),
+    ...mapState({
+      mastoUserSocketStatus: state => state.api.mastoUserSocketStatus
+    })
   },
   components: {
     Status,
@@ -395,6 +404,11 @@ const conversation = {
     setHighlight (id) {
       if (!id) return
       this.highlight = id
+
+      if (!this.streamingEnabled) {
+        this.$store.dispatch('fetchStatus', id)
+      }
+
       this.$store.dispatch('fetchFavsAndRepeats', id)
       this.$store.dispatch('fetchEmojiReactionsBy', id)
     },
diff --git a/src/components/edit_status_modal/edit_status_modal.js b/src/components/edit_status_modal/edit_status_modal.js
new file mode 100644
index 00000000..75adfea7
--- /dev/null
+++ b/src/components/edit_status_modal/edit_status_modal.js
@@ -0,0 +1,75 @@
+import PostStatusForm from '../post_status_form/post_status_form.vue'
+import Modal from '../modal/modal.vue'
+import statusPosterService from '../../services/status_poster/status_poster.service.js'
+import get from 'lodash/get'
+
+const EditStatusModal = {
+  components: {
+    PostStatusForm,
+    Modal
+  },
+  data () {
+    return {
+      resettingForm: false
+    }
+  },
+  computed: {
+    isLoggedIn () {
+      return !!this.$store.state.users.currentUser
+    },
+    modalActivated () {
+      return this.$store.state.editStatus.modalActivated
+    },
+    isFormVisible () {
+      return this.isLoggedIn && !this.resettingForm && this.modalActivated
+    },
+    params () {
+      return this.$store.state.editStatus.params || {}
+    }
+  },
+  watch: {
+    params (newVal, oldVal) {
+      if (get(newVal, 'statusId') !== get(oldVal, 'statusId')) {
+        this.resettingForm = true
+        this.$nextTick(() => {
+          this.resettingForm = false
+        })
+      }
+    },
+    isFormVisible (val) {
+      if (val) {
+        this.$nextTick(() => this.$el && this.$el.querySelector('textarea').focus())
+      }
+    }
+  },
+  methods: {
+    doEditStatus ({ status, spoilerText, sensitive, media, contentType, poll }) {
+      const params = {
+        store: this.$store,
+        statusId: this.$store.state.editStatus.params.statusId,
+        status,
+        spoilerText,
+        sensitive,
+        poll,
+        media,
+        contentType
+      }
+
+      return statusPosterService.editStatus(params)
+        .then((data) => {
+          return data
+        })
+        .catch((err) => {
+          console.error('Error editing status', err)
+          return {
+            error: err.message
+          }
+        })
+    },
+    closeModal () {
+      this.$store.dispatch('closeEditStatusModal')
+    }
+  }
+}
+
+export default EditStatusModal
diff --git a/src/components/edit_status_modal/edit_status_modal.vue b/src/components/edit_status_modal/edit_status_modal.vue
new file mode 100644
index 00000000..00dde7de
--- /dev/null
+++ b/src/components/edit_status_modal/edit_status_modal.vue
@@ -0,0 +1,48 @@
+<template>
+  <Modal
+    v-if="isFormVisible"
+    class="edit-form-modal-view"
+    @backdropClicked="closeModal"
+  >
+    <div class="edit-form-modal-panel panel">
+      <div class="panel-heading">
+        {{ $t('post_status.edit_status') }}
+      </div>
+      <PostStatusForm
+        class="panel-body"
+        v-bind="params"
+        @posted="closeModal"
+        :disablePolls="true"
+        :disableVisibilitySelector="true"
+        :post-handler="doEditStatus"
+      />
+    </div>
+  </Modal>
+</template>
+
+<script src="./edit_status_modal.js"></script>
+
+<style lang="scss">
+.modal-view.edit-form-modal-view {
+  align-items: flex-start;
+}
+.edit-form-modal-panel {
+  flex-shrink: 0;
+  margin-top: 25%;
+  margin-bottom: 2em;
+  width: 100%;
+  max-width: 700px;
+
+  @media (orientation: landscape) {
+    margin-top: 8%;
+  }
+
+  .form-bottom-left {
+    max-width: 6.5em;
+
+    .emoji-icon {
+      justify-content: right;
+    }
+  }
+}
+</style>
diff --git a/src/components/extra_buttons/extra_buttons.js b/src/components/extra_buttons/extra_buttons.js
index 042a96a1..f24e261b 100644
--- a/src/components/extra_buttons/extra_buttons.js
+++ b/src/components/extra_buttons/extra_buttons.js
@@ -7,7 +7,8 @@ import {
   faEyeSlash,
   faThumbtack,
   faShareAlt,
-  faExternalLinkAlt
+  faExternalLinkAlt,
+  faHistory
 } from '@fortawesome/free-solid-svg-icons'
 import {
   faBookmark as faBookmarkReg,
@@ -22,7 +23,8 @@ library.add(
   faThumbtack,
   faShareAlt,
   faExternalLinkAlt,
-  faFlag
+  faFlag,
+  faHistory
 )
 
 const ExtraButtons = {
@@ -101,6 +103,25 @@ const ExtraButtons = {
     },
     reportStatus () {
       this.$store.dispatch('openUserReportingModal', { userId: this.status.user.id, statusIds: [this.status.id] })
+    },
+    editStatus () {
+      this.$store.dispatch('fetchStatusSource', { id: this.status.id })
+        .then(data => this.$store.dispatch('openEditStatusModal', {
+          statusId: this.status.id,
+          subject: data.spoiler_text,
+          statusText: data.text,
+          statusIsSensitive: this.status.nsfw,
+          statusPoll: this.status.poll,
+          statusFiles: [...this.status.attachments],
+          visibility: this.status.visibility,
+          statusContentType: data.content_type
+        }))
+    },
+    showStatusHistory () {
+      const originalStatus = { ...this.status }
+      const stripFieldsList = ['attachments', 'created_at', 'emojis', 'text', 'raw_html', 'nsfw', 'poll', 'summary', 'summary_raw_html']
+      stripFieldsList.forEach(p => delete originalStatus[p])
+      this.$store.dispatch('openStatusHistoryModal', originalStatus)
     }
   },
   computed: {
@@ -134,7 +155,11 @@ const ExtraButtons = {
     },
     shouldConfirmDelete () {
       return this.$store.getters.mergedConfig.modalOnDelete
-    }
+    },
+    isEdited () {
+      return this.status.edited_at !== null
+    },
+    editingAvailable () { return this.$store.state.instance.editingAvailable }
   }
 }
 
diff --git a/src/components/extra_buttons/extra_buttons.vue b/src/components/extra_buttons/extra_buttons.vue
index b1cbe8dc..a15f0bf2 100644
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@@ -73,6 +73,28 @@
             icon="bookmark"
           /><span>{{ $t("status.unbookmark") }}</span>
         </button>
+        <button
+          v-if="ownStatus && editingAvailable"
+          class="button-default dropdown-item dropdown-item-icon"
+          @click.prevent="editStatus"
+          @click="close"
+        >
+          <FAIcon
+            fixed-width
+            icon="pen"
+          /><span>{{ $t("status.edit") }}</span>
+        </button>
+        <button
+          v-if="isEdited && editingAvailable"
+          class="button-default dropdown-item dropdown-item-icon"
+          @click.prevent="showStatusHistory"
+          @click="close"
+        >
+          <FAIcon
+            fixed-width
+            icon="history"
+          /><span>{{ $t("status.edit_history") }}</span>
+        </button>
         <button
           v-if="canDelete"
           class="button-default dropdown-item dropdown-item-icon"
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 4e59e430..f023397e 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -55,6 +55,14 @@ const pxStringToNumber = (str) => {
 
 const PostStatusForm = {
   props: [
+    'statusId',
+    'statusText',
+    'statusIsSensitive',
+    'statusPoll',
+    'statusFiles',
+    'statusMediaDescriptions',
+    'statusScope',
+    'statusContentType',
     'replyTo',
     'quoteId',
     'repliedUser',
@@ -63,6 +71,7 @@ const PostStatusForm = {
     'subject',
     'disableSubject',
     'disableScopeSelector',
+    'disableVisibilitySelector',
     'disableNotice',
     'disableLockWarning',
     'disablePolls',
@@ -120,23 +129,40 @@ const PostStatusForm = {
 
     const { postContentType: contentType, sensitiveByDefault, sensitiveIfSubject } = this.$store.getters.mergedConfig
 
+    let statusParams = {
+      spoilerText: this.subject || '',
+      status: statusText,
+      sensitiveByDefault,
+      nsfw: !!sensitiveByDefault,
+      files: [],
+      poll: {},
+      mediaDescriptions: {},
+      visibility: this.suggestedVisibility(),
+      contentType
+    }
+
+    if (this.statusId) {
+      const statusContentType = this.statusContentType || contentType
+      statusParams = {
+        spoilerText: this.subject || '',
+        status: this.statusText || '',
+        sensitiveIfSubject,
+        nsfw: this.statusIsSensitive || !!sensitiveByDefault,
+        files: this.statusFiles || [],
+        poll: this.statusPoll || {},
+        mediaDescriptions: this.statusMediaDescriptions || {},
+        visibility: this.statusScope || this.suggestedVisibility(),
+        contentType: statusContentType
+      }
+    }
+
     return {
       dropFiles: [],
       uploadingFiles: false,
       error: null,
       posting: false,
       highlighted: 0,
-      newStatus: {
-        spoilerText: this.subject || '',
-        status: statusText,
-        sensitiveIfSubject,
-        nsfw: !!sensitiveByDefault,
-        files: [],
-        poll: {},
-        mediaDescriptions: {},
-        visibility: this.suggestedVisibility(),
-        contentType
-      },
+      newStatus: statusParams,
       caret: 0,
       pollFormVisible: false,
       showDropIcon: 'hide',
@@ -232,6 +258,9 @@ const PostStatusForm = {
     uploadFileLimitReached () {
       return this.newStatus.files.length >= this.fileLimit
     },
+    isEdit () {
+      return typeof this.statusId !== 'undefined' && this.statusId.trim() !== ''
+    },
     ...mapGetters(['mergedConfig']),
     ...mapState({
       mobileLayout: state => state.interface.mobileLayout
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 4824b723..6c505ddc 100644
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@@ -66,6 +66,13 @@
           <span v-if="safeDMEnabled">{{ $t('post_status.direct_warning_to_first_only') }}</span>
           <span v-else>{{ $t('post_status.direct_warning_to_all') }}</span>
         </p>
+        <div
+          v-if="isEdit"
+          class="visibility-notice edit-warning"
+        >
+          <p>{{ $t('post_status.edit_remote_warning') }}</p>
+          <p>{{ $t('post_status.edit_unsupported_warning') }}</p>
+        </div>
         <div
           v-if="!disablePreview"
           class="preview-heading faint"
@@ -180,6 +187,7 @@
           class="visibility-tray"
         >
           <scope-selector
+            v-if="!disableVisibilitySelector"
             :show-all="showAllScopes"
             :user-default="userDefaultScope"
             :original-scope="copyMessageScope"
@@ -420,6 +428,16 @@
     align-items: baseline;
   }
 
+  .visibility-notice.edit-warning {
+    > :first-child {
+      margin-top: 0;
+    }
+
+    > :last-child {
+      margin-bottom: 0;
+    }
+  }
+
   .media-upload-icon, .poll-icon, .emoji-icon {
     font-size: 1.85em;
     line-height: 1.1;
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 2959c3fd..a794b284 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -437,6 +437,12 @@ const Status = {
     },
     visibilityLocalized () {
       return this.$i18n.t('general.scope_in_timeline.' + this.status.visibility)
+    },
+    isEdited () {
+      return this.status.edited_at !== null
+    },
+    editingAvailable () {
+      return this.$store.state.instance.editingAvailable
     }
   },
   methods: {
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index cc9d4eb7..448577d3 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -160,7 +160,8 @@
     margin-right: 0.2em;
   }
 
-  & .heading-reply-row {
+  & .heading-reply-row,
+  & .heading-edited-row {
     position: relative;
     align-content: baseline;
     font-size: 0.85em;
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index aef375fa..7366670b 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -329,6 +329,30 @@
                 class="mentions-line"
               />
             </div>
+            <div
+              v-if="isEdited && editingAvailable && !isPreview"
+              class="heading-edited-row"
+            >
+              <i18n-t
+                keypath="status.edited_at"
+                tag="span"
+              >
+                <template #time>
+                  <i18n-t
+                    keypath="time.in_past"
+                    tag="span"
+                  >
+                    <template>
+                      <Timeago
+                        :time="status.edited_at"
+                        :auto-update="60"
+                        :long-format="true"
+                      />
+                    </template>
+                  </i18n-t>
+                </template>
+              </i18n-t>
+            </div>
           </div>
 
           <StatusContent
diff --git a/src/components/status_history_modal/status_history_modal.js b/src/components/status_history_modal/status_history_modal.js
new file mode 100644
index 00000000..3941a56f
--- /dev/null
+++ b/src/components/status_history_modal/status_history_modal.js
@@ -0,0 +1,60 @@
+import { get } from 'lodash'
+import Modal from '../modal/modal.vue'
+import Status from '../status/status.vue'
+
+const StatusHistoryModal = {
+  components: {
+    Modal,
+    Status
+  },
+  data () {
+    return {
+      statuses: []
+    }
+  },
+  computed: {
+    modalActivated () {
+      return this.$store.state.statusHistory.modalActivated
+    },
+    params () {
+      return this.$store.state.statusHistory.params
+    },
+    statusId () {
+      return this.params.id
+    },
+    historyCount () {
+      return this.statuses.length
+    },
+    history () {
+      return this.statuses
+    }
+  },
+  watch: {
+    params (newVal, oldVal) {
+      const newStatusId = get(newVal, 'id') !== get(oldVal, 'id')
+      if (newStatusId) {
+        this.resetHistory()
+      }
+
+      if (newStatusId || get(newVal, 'edited_at') !== get(oldVal, 'edited_at')) {
+        this.fetchStatusHistory()
+      }
+    }
+  },
+  methods: {
+    resetHistory () {
+      this.statuses = []
+    },
+    fetchStatusHistory () {
+      this.$store.dispatch('fetchStatusHistory', this.params)
+        .then(data => {
+          this.statuses = data
+        })
+    },
+    closeModal () {
+      this.$store.dispatch('closeStatusHistoryModal')
+    }
+  }
+}
+
+export default StatusHistoryModal
diff --git a/src/components/status_history_modal/status_history_modal.vue b/src/components/status_history_modal/status_history_modal.vue
new file mode 100644
index 00000000..e2729369
--- /dev/null
+++ b/src/components/status_history_modal/status_history_modal.vue
@@ -0,0 +1,46 @@
+<template>
+  <Modal
+    v-if="modalActivated"
+    class="status-history-modal-view"
+    @backdropClicked="closeModal"
+  >
+    <div class="status-history-modal-panel panel">
+      <div class="panel-heading">
+        {{ $tc('status.edit_history_modal_title', historyCount - 1, { historyCount: historyCount - 1 }) }}
+      </div>
+      <div class="panel-body">
+        <div
+          v-if="historyCount > 0"
+          class="history-body"
+        >
+          <status
+            v-for="status in history"
+            :key="status.id"
+            :statusoid="status"
+            :isPreview="true"
+            class="conversation-status status-fadein panel-body"
+        />
+        </div>
+      </div>
+    </div>
+  </Modal>
+</template>
+
+<script src="./status_history_modal.js"></script>
+
+<style lang="scss">
+.modal-view.status-history-modal-view {
+  align-items: flex-start;
+}
+.status-history-modal-panel {
+  flex-shrink: 0;
+  margin-top: 25%;
+  margin-bottom: 2em;
+  width: 100%;
+  max-width: 700px;
+
+  @media (orientation: landscape) {
+    margin-top: 8%;
+  }
+}
+</style>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 49c45014..95dac57c 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -284,6 +284,9 @@
         "direct_warning_to_all": "This post will be visible to all the mentioned users.",
         "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
         "empty_status_error": "Can't send a post with no content and no files",
+        "edit_status": "Edit Status",
+        "edit_remote_warning": "Other instances may not support edits!",
+        "edit_unsupported_warning": "Polls and mentions will not be changed by editing.",
         "media_description": "Media description",
         "media_description_error": "Failed to update media, try again",
         "media_not_sensitive_warning": "You have a Content Warning, but the attachments are not marked as sensitive!",
@@ -833,6 +836,10 @@
         "delete_confirm_accept_button": "Yes, delete it",
         "delete_confirm_cancel_button": "No, keep it",
         "delete_confirm_title": "Confirm deletion",
+        "edit": "Edit",
+        "edited_at": "Edited {time}",
+        "edit_history": "Edit History",
+        "edit_history_modal_title": "Edited {historyCount} time | Edited {historyCount} times",
         "expand": "Expand",
         "external_source": "External source",
         "favorites": "Favorites",
diff --git a/src/main.js b/src/main.js
index 356a45da..e4a793f6 100644
--- a/src/main.js
+++ b/src/main.js
@@ -19,6 +19,8 @@ import reportsModule from './modules/reports.js'
 import pollsModule from './modules/polls.js'
 import postStatusModule from './modules/postStatus.js'
 import announcementsModule from './modules/announcements.js'
+import editStatusModule from './modules/editStatus.js'
+import statusHistoryModule from './modules/statusHistory.js'
 
 import { createI18n } from 'vue-i18n'
 
@@ -81,7 +83,9 @@ const persistedStateOptions = {
       reports: reportsModule,
       polls: pollsModule,
       postStatus: postStatusModule,
-      announcements: announcementsModule
+      announcements: announcementsModule,
+      editStatus: editStatusModule,
+      statusHistory: statusHistoryModule
     },
     plugins,
     strict: false // Socket modifies itself, let's ignore this for now.
diff --git a/src/modules/api.js b/src/modules/api.js
index ab0c8555..6c896c79 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -98,6 +98,13 @@ const api = {
                   showImmediately: timelineData.visibleStatuses.length === 0,
                   timeline: 'friends'
                 })
+              } else if (message.event === 'status.update') {
+                dispatch('addNewStatuses', {
+                  statuses: [message.status],
+                  userId: false,
+                  showImmediately: message.status.id in timelineData.visibleStatusesObject,
+                  timeline: 'friends'
+                })
               } else if (message.event === 'delete') {
                 dispatch('deleteStatusById', message.id)
               }
diff --git a/src/modules/editStatus.js b/src/modules/editStatus.js
new file mode 100644
index 00000000..fd316519
--- /dev/null
+++ b/src/modules/editStatus.js
@@ -0,0 +1,25 @@
+const editStatus = {
+  state: {
+    params: null,
+    modalActivated: false
+  },
+  mutations: {
+    openEditStatusModal (state, params) {
+      state.params = params
+      state.modalActivated = true
+    },
+    closeEditStatusModal (state) {
+      state.modalActivated = false
+    }
+  },
+  actions: {
+    openEditStatusModal ({ commit }, params) {
+      commit('openEditStatusModal', params)
+    },
+    closeEditStatusModal ({ commit }) {
+      commit('closeEditStatusModal')
+    }
+  }
+}
+
+export default editStatus
diff --git a/src/modules/statusHistory.js b/src/modules/statusHistory.js
new file mode 100644
index 00000000..db3d6d4b
--- /dev/null
+++ b/src/modules/statusHistory.js
@@ -0,0 +1,25 @@
+const statusHistory = {
+  state: {
+    params: {},
+    modalActivated: false
+  },
+  mutations: {
+    openStatusHistoryModal (state, params) {
+      state.params = params
+      state.modalActivated = true
+    },
+    closeStatusHistoryModal (state) {
+      state.modalActivated = false
+    }
+  },
+  actions: {
+    openStatusHistoryModal ({ commit }, params) {
+      commit('openStatusHistoryModal', params)
+    },
+    closeStatusHistoryModal ({ commit }) {
+      commit('closeStatusHistoryModal')
+    }
+  }
+}
+
+export default statusHistory
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 8f012191..1080462c 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -251,6 +251,9 @@ const addNewStatuses = (state, { statuses, showImmediately = false, timeline, us
     'status': (status) => {
       addStatus(status, showImmediately)
     },
+    'edit': (status) => {
+      addStatus(status, showImmediately)
+    },
     'retweet': (status) => {
       // RetweetedStatuses are never shown immediately
       const retweetedStatus = addStatus(status.retweeted_status, false, false)
@@ -607,6 +610,12 @@ const statuses = {
       return rootState.api.backendInteractor.fetchStatus({ id })
         .then((status) => dispatch('addNewStatuses', { statuses: [status] }))
     },
+    fetchStatusSource ({ rootState, dispatch }, status) {
+      return apiService.fetchStatusSource({ id: status.id, credentials: rootState.users.currentUser.credentials })
+    },
+    fetchStatusHistory ({ rootState, dispatch }, status) {
+      return apiService.fetchStatusHistory({ status })
+    },
     deleteStatus ({ rootState, commit }, status) {
       commit('setDeleted', { status })
       apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials })
diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
index cb11a05f..8c7f80db 100644
--- a/src/services/api/api.service.js
+++ b/src/services/api/api.service.js
@@ -1,5 +1,5 @@
 import { each, map, concat, last, get } from 'lodash'
-import { parseStatus, parseUser, parseNotification, parseAttachment, parseLinkHeaderPagination } from '../entity_normalizer/entity_normalizer.service.js'
+import { parseStatus, parseSource, parseUser, parseNotification, parseAttachment, parseLinkHeaderPagination } from '../entity_normalizer/entity_normalizer.service.js'
 import { RegistrationError, StatusCodeError } from '../errors/errors'
 
 /* eslint-env browser */
@@ -52,6 +52,8 @@ const MASTODON_USER_HOME_TIMELINE_URL = '/api/v1/timelines/home'
 const AKKOMA_BUBBLE_TIMELINE_URL = '/api/v1/timelines/bubble'
 const MASTODON_STATUS_URL = id => `/api/v1/statuses/${id}`
 const MASTODON_STATUS_CONTEXT_URL = id => `/api/v1/statuses/${id}/context`
+const MASTODON_STATUS_SOURCE_URL = id => `/api/v1/statuses/${id}/source`
+const MASTODON_STATUS_HISTORY_URL = id => `/api/v1/statuses/${id}/history`
 const MASTODON_USER_URL = id => `/api/v1/accounts/${id}?with_relationships=true`
 const MASTODON_USER_RELATIONSHIPS_URL = '/api/v1/accounts/relationships'
 const MASTODON_USER_TIMELINE_URL = id => `/api/v1/accounts/${id}/statuses`
@@ -512,6 +514,31 @@ const fetchStatus = ({ id, credentials }) => {
     .then((data) => parseStatus(data))
 }
 
+const fetchStatusSource = ({ id, credentials }) => {
+  let url = MASTODON_STATUS_SOURCE_URL(id)
+  return fetch(url, { headers: authHeaders(credentials) })
+    .then((data) => {
+      if (data.ok) {
+        return data
+      }
+      throw new Error('Error fetching source', data)
+    })
+    .then((data) => data.json())
+    .then((data) => parseSource(data))
+}
+
+const fetchStatusHistory = ({ status, credentials }) => {
+  let url = MASTODON_STATUS_HISTORY_URL(status.id)
+  return promisedRequest({ url, credentials })
+    .then((data) => {
+      data.reverse()
+      return data.map((item) => {
+        item.originalStatus = status
+        return parseStatus(item)
+      })
+    })
+}
+
 const tagUser = ({ tag, credentials, user }) => {
   const screenName = user.screen_name
   const form = {
@@ -837,6 +864,54 @@ const postStatus = ({
     .then((data) => data.error ? data : parseStatus(data))
 }
 
+const editStatus = ({
+  id,
+  credentials,
+  status,
+  spoilerText,
+  sensitive,
+  poll,
+  mediaIds = [],
+  contentType
+}) => {
+  const form = new FormData()
+  const pollOptions = poll.options || []
+
+  form.append('status', status)
+  if (spoilerText) form.append('spoiler_text', spoilerText)
+  if (sensitive) form.append('sensitive', sensitive)
+  if (contentType) form.append('content_type', contentType)
+  mediaIds.forEach(val => {
+    form.append('media_ids[]', val)
+  })
+
+  if (pollOptions.some(option => option !== '')) {
+    const normalizedPoll = {
+      expires_in: poll.expiresIn,
+      multiple: poll.multiple
+    }
+    Object.keys(normalizedPoll).forEach(key => {
+      form.append(`poll[${key}]`, normalizedPoll[key])
+    })
+
+    pollOptions.forEach(option => {
+      form.append('poll[options][]', option)
+    })
+  }
+
+  let putHeaders = authHeaders(credentials)
+
+  return fetch(MASTODON_STATUS_URL(id), {
+    body: form,
+    method: 'PUT',
+    headers: putHeaders
+  })
+    .then((response) => {
+      return response.json()
+    })
+    .then((data) => data.error ? data : parseStatus(data))
+}
+
 const deleteStatus = ({ id, credentials }) => {
   return fetch(MASTODON_DELETE_URL(id), {
     headers: authHeaders(credentials),
@@ -1393,7 +1468,8 @@ const MASTODON_STREAMING_EVENTS = new Set([
   'update',
   'notification',
   'delete',
-  'filters_changed'
+  'filters_changed',
+  'status.update'
 ])
 
 const PLEROMA_STREAMING_EVENTS = new Set([
@@ -1474,6 +1550,8 @@ export const handleMastoWS = (wsEvent) => {
     const data = payload ? JSON.parse(payload) : null
     if (event === 'update') {
       return { event, status: parseStatus(data) }
+    } else if (event === 'status.update') {
+      return { event, status: parseStatus(data) }
     } else if (event === 'notification') {
       return { event, notification: parseNotification(data) }
     }
@@ -1498,6 +1576,8 @@ const apiService = {
   fetchPinnedStatuses,
   fetchConversation,
   fetchStatus,
+  fetchStatusSource,
+  fetchStatusHistory,
   fetchFriends,
   exportFriends,
   fetchFollowers,
@@ -1518,6 +1598,7 @@ const apiService = {
   bookmarkStatus,
   unbookmarkStatus,
   postStatus,
+  editStatus,
   deleteStatus,
   uploadMedia,
   setMediaDescription,
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index b66191bf..b1aded33 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -242,6 +242,16 @@ export const parseAttachment = (data) => {
   return output
 }
 
+export const parseSource = (data) => {
+  const output = {}
+
+  output.text = data.text
+  output.spoiler_text = data.spoiler_text
+  output.content_type = data.content_type
+
+  return output
+}
+
 export const parseStatus = (data) => {
   const output = {}
   const masto = data.hasOwnProperty('account')
@@ -263,6 +273,8 @@ export const parseStatus = (data) => {
 
     output.tags = data.tags
 
+    output.edited_at = data.edited_at
+
     if (data.pleroma) {
       const { pleroma } = data
       output.text = pleroma.content ? data.pleroma.content['text/plain'] : data.content
@@ -374,6 +386,10 @@ export const parseStatus = (data) => {
   output.favoritedBy = []
   output.rebloggedBy = []
 
+  if (data.hasOwnProperty('originalStatus')) {
+    Object.assign(output, data.originalStatus)
+  }
+
   return output
 }
 
diff --git a/src/services/status_poster/status_poster.service.js b/src/services/status_poster/status_poster.service.js
index d1c5db19..aaef5a7a 100644
--- a/src/services/status_poster/status_poster.service.js
+++ b/src/services/status_poster/status_poster.service.js
@@ -49,6 +49,47 @@ const postStatus = ({
     })
 }
 
+const editStatus = ({
+  store,
+  statusId,
+  status,
+  spoilerText,
+  sensitive,
+  poll,
+  media = [],
+  contentType = 'text/plain'
+}) => {
+  const mediaIds = map(media, 'id')
+
+  return apiService.editStatus({
+    id: statusId,
+    credentials: store.state.users.currentUser.credentials,
+    status,
+    spoilerText,
+    sensitive,
+    poll,
+    mediaIds,
+    contentType
+  })
+    .then((data) => {
+      if (!data.error) {
+        store.dispatch('addNewStatuses', {
+          statuses: [data],
+          timeline: 'friends',
+          showImmediately: true,
+          noIdUpdate: true // To prevent missing notices on next pull.
+        })
+      }
+      return data
+    })
+    .catch((err) => {
+      console.error('Error editing status', err)
+      return {
+        error: err.message
+      }
+    })
+}
+
 const uploadMedia = ({ store, formData }) => {
   const credentials = store.state.users.currentUser.credentials
   return apiService.uploadMedia({ credentials, formData })
@@ -61,6 +102,7 @@ const setMediaDescription = ({ store, id, description }) => {
 
 const statusPosterService = {
   postStatus,
+  editStatus,
   uploadMedia,
   setMediaDescription
 }
-- 
2.34.1


From b980d5b2efc2100666955ce896607379f3848e99 Mon Sep 17 00:00:00 2001
From: FloatingGhost <hannah@coffee-and-dreams.uk>
Date: Wed, 7 Sep 2022 12:55:03 +0100
Subject: [PATCH 47/50] use with-direction in edited timeago

Fixes #159
---
 src/components/status/status.vue | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 7366670b..a160d197 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -338,18 +338,12 @@
                 tag="span"
               >
                 <template #time>
-                  <i18n-t
-                    keypath="time.in_past"
-                    tag="span"
-                  >
-                    <template>
-                      <Timeago
-                        :time="status.edited_at"
-                        :auto-update="60"
-                        :long-format="true"
-                      />
-                    </template>
-                  </i18n-t>
+                  <Timeago
+                    :time="status.edited_at"
+                    :auto-update="60"
+                    :long-format="true"
+                    :with-direction="true"
+                  />
                 </template>
               </i18n-t>
             </div>
-- 
2.34.1


From 58f6dfebe93152623c9198fd838bd6bbdc539a5f Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 8 Sep 2022 10:18:49 +0000
Subject: [PATCH 48/50] Translated using Weblate (English)

Currently translated at 100.0% (910 of 910 strings)

Co-authored-by: Thomate <thomas@burdick.fr>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/en/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/en.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/en.json b/src/i18n/en.json
index 95dac57c..afcb640d 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -283,10 +283,10 @@
         "default": "Just arrived at Luna Nova Academy",
         "direct_warning_to_all": "This post will be visible to all the mentioned users.",
         "direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
-        "empty_status_error": "Can't send a post with no content and no files",
+        "edit_remote_warning": "Changes made to the post may not be visible on some instances!",
         "edit_status": "Edit Status",
-        "edit_remote_warning": "Other instances may not support edits!",
         "edit_unsupported_warning": "Polls and mentions will not be changed by editing.",
+        "empty_status_error": "Can't send a post with no content and no files",
         "media_description": "Media description",
         "media_description_error": "Failed to update media, try again",
         "media_not_sensitive_warning": "You have a Content Warning, but the attachments are not marked as sensitive!",
@@ -837,9 +837,9 @@
         "delete_confirm_cancel_button": "No, keep it",
         "delete_confirm_title": "Confirm deletion",
         "edit": "Edit",
-        "edited_at": "Edited {time}",
         "edit_history": "Edit History",
         "edit_history_modal_title": "Edited {historyCount} time | Edited {historyCount} times",
+        "edited_at": "Edited {time}",
         "expand": "Expand",
         "external_source": "External source",
         "favorites": "Favorites",
-- 
2.34.1


From d813a8528a2d19bf6f2e026a355539e3f257ee49 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 8 Sep 2022 10:18:49 +0000
Subject: [PATCH 49/50] Translated using Weblate (French)

Currently translated at 92.6% (843 of 910 strings)

Translated using Weblate (French)

Currently translated at 92.6% (843 of 910 strings)

Co-authored-by: Thomate <thomas@burdick.fr>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/fr/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/fr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/fr.json b/src/i18n/fr.json
index f00b3153..dd7ede04 100644
--- a/src/i18n/fr.json
+++ b/src/i18n/fr.json
@@ -279,10 +279,12 @@
             "text/plain": "Texte brut",
             "text/x.misskeymarkdown": "Markdown (Misskey)"
         },
-        "content_warning": "Sujet (optionnel)",
+        "content_warning": "Avertissement (optionnel)",
         "default": "Je viens d'arriver au QG de la NERV",
         "direct_warning_to_all": "Ce message sera visible pour toutes les personnes mentionnées.",
         "direct_warning_to_first_only": "Ce message sera visible uniquement pour personnes mentionnées au début du message.",
+        "edit_remote_warning": "Les modifications apportées au status pourraient ne pas être visible sur certaines instances !",
+        "edit_status": "Modifier le statut",
         "empty_status_error": "Impossible de publier un statut vide sans pièces-jointes",
         "media_description": "Description de la pièce-jointe",
         "media_description_error": "Échec de téléversement du media, essayez encore",
-- 
2.34.1


From 3c780adeb2cf935894c663781f42020ec5c431ef Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 8 Sep 2022 10:18:49 +0000
Subject: [PATCH 50/50] Translated using Weblate (Japanese (ja_PEDANTIC))

Currently translated at 100.0% (910 of 910 strings)

Co-authored-by: Weblate Admin <hannah.ward9001@gmail.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_PEDANTIC/
Translation: Pleroma fe/pleroma-fe
---
 src/i18n/ja_pedantic.json | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json
index 940d4df7..65c7e282 100644
--- a/src/i18n/ja_pedantic.json
+++ b/src/i18n/ja_pedantic.json
@@ -279,10 +279,13 @@
             "text/plain": "プレーンテキスト",
             "text/x.misskeymarkdown": "MFM"
         },
-        "content_warning": "説明 (省略可)",
-        "default": "羽田空港に着きました。",
+        "content_warning": "警告 (省略可)",
+        "default": "ただいまルーナノヴァ魔法学校に到着しました",
         "direct_warning_to_all": "この投稿は、メンションされたすべてのユーザーが、見ることができます。",
         "direct_warning_to_first_only": "この投稿は、メッセージの冒頭でメンションされたユーザーだけが、見ることができます。",
+        "edit_remote_warning": "注意：リモートインスタンスには、編集した投稿が見えないかもしれません",
+        "edit_status": "編集",
+        "edit_unsupported_warning": "編集しても投票やメンションが更新されません",
         "empty_status_error": "投稿内容を入力してください",
         "media_description": "メディアの説明",
         "media_description_error": "メディアのアップロードに失敗しました。もう一度お試しください",
@@ -392,7 +395,7 @@
         "changed_password": "パスワードが、変わりました！",
         "chatMessageRadius": "チャットメッセージ",
         "checkboxRadius": "チェックボックス",
-        "collapse_subject": "説明のある投稿をたたむ",
+        "collapse_subject": "警告のある投稿をたたむ",
         "columns": "カラム",
         "composing": "投稿",
         "confirm_dialogs": "選択しているアクションは確認必要があります",
@@ -614,7 +617,7 @@
         "security": "セキュリティ",
         "security_tab": "セキュリティ",
         "sensitive_by_default": "はじめから投稿をセンシティブとして設定",
-        "sensitive_if_subject": "投稿にサブジェクトをついたらNSFWにする",
+        "sensitive_if_subject": "投稿に警告をついたらNSFWにする",
         "set_new_avatar": "新しいアバターを設定する",
         "set_new_mascot": "マスコットを更新",
         "set_new_profile_background": "新しいプロフィールのバックグラウンドを設定する",
@@ -710,7 +713,7 @@
                 "fine_print": "私たちの{0}を、読まないでください！",
                 "header": "プレビュー",
                 "header_faint": "エラーではありません",
-                "input": "羽田空港に着きました。",
+                "input": "ただいまルーナノヴァ魔法学校に到着しました",
                 "link": "ハイパーリンク",
                 "mono": "monospace",
                 "text": "これは{0}と{1}の例です"
@@ -777,9 +780,9 @@
                 "use_source": "新しいバージョン"
             }
         },
-        "subject_input_always_show": "サブジェクトフィールドをいつでも表示する",
-        "subject_line_behavior": "返信するときサブジェクトをコピーする",
-        "subject_line_email": "メール風: \"re: サブジェクト\"",
+        "subject_input_always_show": "警告入力をいつでも表示する",
+        "subject_line_behavior": "返信するとき警告をコピーする",
+        "subject_line_email": "メール風: \"re: 警告\"",
         "subject_line_mastodon": "マストドン風: そのままコピー",
         "subject_line_noop": "コピーしない",
         "text": "文字",
@@ -833,12 +836,16 @@
         "delete_confirm_accept_button": "削除",
         "delete_confirm_cancel_button": "キャンセル",
         "delete_confirm_title": "削除を確認してください",
+        "edit": "編集",
+        "edit_history": "編集履歴",
+        "edit_history_modal_title": "{historyCount}回編集",
+        "edited_at": "{time}に編集",
         "expand": "広げる",
         "external_source": "外部ソース",
         "favorites": "お気に入り",
         "hide_attachment": "ファイルを隠す",
         "hide_content": "隠す",
-        "hide_full_subject": "隠す",
+        "hide_full_subject": "警告を隠す",
         "many_attachments": "ファイルは{number}件があります",
         "mentions": "メンション",
         "move_down": "右に移動",
@@ -865,7 +872,7 @@
         "show_attachment_description": "説明の略を見る",
         "show_attachment_in_modal": "ファイルをウインドウで見る",
         "show_content": "見る",
-        "show_full_subject": "全部見る",
+        "show_full_subject": "警告を見る",
         "show_only_conversation_under_this": "この投稿を返信する投稿のみ",
         "status_deleted": "この投稿は削除されました",
         "status_unavailable": "利用できません",
-- 
2.34.1