commit: 9ef0e65b25bf2bbf1153acf1c927cd66e0c0f217 parent: 4369ce6f1bd7d6f44247a1b3f3d8d3892f71ff9b Author: kaniini <ariadne@dereferenced.org> Date: Thu, 26 Sep 2019 22:31:28 +0000 Merge branch 'feature/add-discoverable-preference' into 'develop' Feature/Add _Allow user discovery services_ preference See merge request pleroma/pleroma-fe!947Diffstat:
6 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js @@ -45,6 +45,7 @@ const UserSettings = { hideFollowersCount: this.$store.state.users.currentUser.hide_followers_count, showRole: this.$store.state.users.currentUser.show_role, role: this.$store.state.users.currentUser.role, + discoverable: this.$store.state.users.currentUser.discoverable, pickAvatarBtnVisible: true, bannerUploading: false, backgroundUploading: false, @@ -144,6 +145,7 @@ const UserSettings = { no_rich_text: this.newNoRichText, hide_follows: this.hideFollows, hide_followers: this.hideFollowers, + discoverable: this.discoverable, hide_follows_count: this.hideFollowsCount, hide_followers_count: this.hideFollowersCount, show_role: this.showRole diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue @@ -131,6 +131,14 @@ for="account-show-role" >{{ $t('settings.show_moderator_badge') }}</label> </p> + <p> + <input + id="discoverable" + v-model="discoverable" + type="checkbox" + > + <label for="discoverable">{{ $t('settings.discoverable') }}</label> + </p> <button :disabled="newName && newName.length === 0" class="btn btn-default" diff --git a/src/i18n/en.json b/src/i18n/en.json @@ -231,6 +231,7 @@ "delete_account_description": "Permanently delete your account and all your messages.", "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.", "delete_account_instructions": "Type your password in the input below to confirm account deletion.", + "discoverable": "Allow discovery of this account in search results and other services", "avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.", "pad_emoji": "Pad emoji with spaces when adding from picker", "export_theme": "Save preset", diff --git a/src/i18n/ja.json b/src/i18n/ja.json @@ -226,6 +226,7 @@ "delete_account_description": "あなたのアカウントとメッセージが、きえます。", "delete_account_error": "アカウントをけすことが、できなかったかもしれません。インスタンスのかんりしゃに、れんらくしてください。", "delete_account_instructions": "ほんとうにアカウントをけしてもいいなら、パスワードをかいてください。", + "discoverable": "けんさくなどのサービスで、このアカウントをみつけてもよい", "avatar_size_instruction": "アバターのおおきさは、150×150ピクセルか、それよりもおおきくするといいです。", "export_theme": "セーブ", "filtering": "フィルタリング", diff --git a/src/i18n/ja_pedantic.json b/src/i18n/ja_pedantic.json @@ -226,6 +226,7 @@ "delete_account_description": "あなたのアカウントとメッセージが、消えます。", "delete_account_error": "アカウントを消すことが、できなかったかもしれません。インスタンスの管理者に、連絡してください。", "delete_account_instructions": "本当にアカウントを消してもいいなら、パスワードを入力してください。", + "discoverable": "検索などのサービスでこのアカウントを見つけることを許可する", "avatar_size_instruction": "アバターの大きさは、150×150ピクセルか、それよりも大きくするといいです。", "export_theme": "保存", "filtering": "フィルタリング", diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js @@ -97,6 +97,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.discoverable = data.source.pleroma.discoverable } }