From 887999cefac3675be73185cc209e29f8f99c6144 Mon Sep 17 00:00:00 2001
From: Roman Kostetskii <roman.kostetskiy@relexsolutions.com>
Date: Fri, 28 Jun 2019 15:45:29 +0300
Subject: [PATCH] add new setting

---
 src/components/user_settings/user_settings.js               | 2 ++
 src/components/user_settings/user_settings.vue              | 4 ++++
 src/i18n/en.json                                            | 1 +
 src/i18n/ru.json                                            | 1 +
 src/services/entity_normalizer/entity_normalizer.service.js | 1 +
 5 files changed, 9 insertions(+)

diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index ced3efaa1e..a534c15b29 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -39,6 +39,7 @@ const UserSettings = {
       newBio: unescape(this.$store.state.users.currentUser.description),
       newLocked: this.$store.state.users.currentUser.locked,
       newNoRichText: this.$store.state.users.currentUser.no_rich_text,
+      newSkipThreadContainment: this.$store.state.users.currentUser.skip_thread_containment,
       newDefaultScope: this.$store.state.users.currentUser.default_scope,
       hideFollows: this.$store.state.users.currentUser.hide_follows,
       hideFollowers: this.$store.state.users.currentUser.hide_followers,
@@ -140,6 +141,7 @@ const UserSettings = {
             display_name: this.newName,
             default_scope: this.newDefaultScope,
             no_rich_text: this.newNoRichText,
+            skip_thread_containment: this.newSkipThreadContainment,
             hide_follows: this.hideFollows,
             hide_followers: this.hideFollowers,
             show_role: this.showRole
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 94f1b1f149..cafb1a9e4d 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -54,6 +54,10 @@
               <input type="checkbox" v-model="newNoRichText" id="account-no-rich-text">
               <label for="account-no-rich-text">{{$t('settings.no_rich_text_description')}}</label>
             </p>
+            <p>
+              <input type="checkbox" v-model="newSkipThreadContainment" id="account-skip-thread-containment">
+              <label for="account-skip-Thread-Containment">{{$t('settings.skip_thread_containment_description')}}</label>
+            </p>
             <p>
               <input type="checkbox" v-model="hideFollows" id="account-hide-follows">
               <label for="account-hide-follows">{{$t('settings.hide_follows_description')}}</label>
diff --git a/src/i18n/en.json b/src/i18n/en.json
index dd34a95d98..bf41ae8ee9 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -268,6 +268,7 @@
     "notification_visibility_likes": "Likes",
     "notification_visibility_mentions": "Mentions",
     "notification_visibility_repeats": "Repeats",
+    "skip_thread_containment_description": "Hide replies to inaccessible posts",
     "no_rich_text_description": "Strip rich text formatting from all posts",
     "no_blocks": "No blocks",
     "no_mutes": "No mutes",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index d24ef0cb71..94b972ebcb 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -174,6 +174,7 @@
     "notification_visibility_likes": "Лайки",
     "notification_visibility_mentions": "Упоминания",
     "notification_visibility_repeats": "Повторы",
+    "skip_thread_containment_description": "Прятать ответы к недоступным постам",
     "no_rich_text_description": "Убрать форматирование из всех постов",
     "hide_follows_description": "Не показывать кого я читаю",
     "hide_followers_description": "Не показывать кто читает меня",
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
index 9af71e4f40..b1798629a2 100644
--- a/src/services/entity_normalizer/entity_normalizer.service.js
+++ b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -90,6 +90,7 @@ export const parseUser = (data) => {
       if (data.source.pleroma) {
         output.no_rich_text = data.source.pleroma.no_rich_text
         output.show_role = data.source.pleroma.show_role
+        output.skip_thread_containment = data.source.skip_thread_containment
       }
     }