Revert "Merge branch 'feature/split-hide-network' into 'develop'"

This reverts merge request !497
This commit is contained in:
Shpuld Shpludson 2019-02-03 14:32:23 +00:00
parent c7ee2ed831
commit d4991d0162
9 changed files with 12 additions and 25 deletions

View File

@ -10,8 +10,7 @@ const UserSettings = {
newLocked: this.$store.state.users.currentUser.locked, newLocked: this.$store.state.users.currentUser.locked,
newNoRichText: this.$store.state.users.currentUser.no_rich_text, newNoRichText: this.$store.state.users.currentUser.no_rich_text,
newDefaultScope: this.$store.state.users.currentUser.default_scope, newDefaultScope: this.$store.state.users.currentUser.default_scope,
hideFollowings: this.$store.state.users.currentUser.hide_followings, newHideNetwork: this.$store.state.users.currentUser.hide_network,
hideFollowers: this.$store.state.users.currentUser.hide_followers,
followList: null, followList: null,
followImportError: false, followImportError: false,
followsImported: false, followsImported: false,
@ -67,8 +66,7 @@ const UserSettings = {
/* eslint-disable camelcase */ /* eslint-disable camelcase */
const default_scope = this.newDefaultScope const default_scope = this.newDefaultScope
const no_rich_text = this.newNoRichText const no_rich_text = this.newNoRichText
const hide_followings = this.hideFollowings const hide_network = this.newHideNetwork
const hide_followers = this.hideFollowers
/* eslint-enable camelcase */ /* eslint-enable camelcase */
this.$store.state.api.backendInteractor this.$store.state.api.backendInteractor
.updateProfile({ .updateProfile({
@ -80,8 +78,7 @@ const UserSettings = {
/* eslint-disable camelcase */ /* eslint-disable camelcase */
default_scope, default_scope,
no_rich_text, no_rich_text,
hide_followings, hide_network
hide_followers
/* eslint-enable camelcase */ /* eslint-enable camelcase */
}}).then((user) => { }}).then((user) => {
if (!user.error) { if (!user.error) {

View File

@ -30,12 +30,8 @@
<label for="account-no-rich-text">{{$t('settings.no_rich_text_description')}}</label> <label for="account-no-rich-text">{{$t('settings.no_rich_text_description')}}</label>
</p> </p>
<p> <p>
<input type="checkbox" v-model="hideFollowings" id="account-hide-followings"> <input type="checkbox" v-model="newHideNetwork" id="account-hide-network">
<label for="account-hide-followings">{{$t('settings.hide_followings_description')}}</label> <label for="account-hide-network">{{$t('settings.hide_network_description')}}</label>
</p>
<p>
<input type="checkbox" v-model="hideFollowers" id="account-hide-followers">
<label for="account-hide-followers">{{$t('settings.hide_followers_description')}}</label>
</p> </p>
<button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button> <button :disabled='newName.length <= 0' class="btn btn-default" @click="updateProfile">{{$t('general.submit')}}</button>
</div> </div>

View File

@ -155,8 +155,7 @@
"notification_visibility_mentions": "Erwähnungen", "notification_visibility_mentions": "Erwähnungen",
"notification_visibility_repeats": "Wiederholungen", "notification_visibility_repeats": "Wiederholungen",
"no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen", "no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen",
"hide_followings_description": "Zeige nicht, wem ich folge", "hide_network_description": "Zeige nicht, wem ich folge und wer mir folgt",
"hide_followers_description": "Zeige nicht, wer mir folgt",
"nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind", "nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind",
"panelRadius": "Panel", "panelRadius": "Panel",
"pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist", "pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist",

View File

@ -162,8 +162,7 @@
"notification_visibility_mentions": "Mentions", "notification_visibility_mentions": "Mentions",
"notification_visibility_repeats": "Repeats", "notification_visibility_repeats": "Repeats",
"no_rich_text_description": "Strip rich text formatting from all posts", "no_rich_text_description": "Strip rich text formatting from all posts",
"hide_followings_description": "Don't show who I'm following", "hide_network_description": "Don't show who I'm following and who's following me",
"hide_followers_description": "Don't show who's following me",
"nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding", "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
"panelRadius": "Panels", "panelRadius": "Panels",
"pause_on_unfocused": "Pause streaming when tab is not focused", "pause_on_unfocused": "Pause streaming when tab is not focused",

View File

@ -157,8 +157,7 @@
"notification_visibility_mentions": "メンション", "notification_visibility_mentions": "メンション",
"notification_visibility_repeats": "リピート", "notification_visibility_repeats": "リピート",
"no_rich_text_description": "リッチテキストをつかわない", "no_rich_text_description": "リッチテキストをつかわない",
"hide_followings_description": "フォローしている人を表示しない", "hide_network_description": "わたしがフォローしているひとと、わたしをフォローしているひとを、みせない",
"hide_followers_description": "フォローしている人を表示しない",
"nsfw_clickthrough": "NSFWなファイルをかくす", "nsfw_clickthrough": "NSFWなファイルをかくす",
"panelRadius": "パネル", "panelRadius": "パネル",
"pause_on_unfocused": "タブにフォーカスがないときストリーミングをとめる", "pause_on_unfocused": "タブにフォーカスがないときストリーミングをとめる",

View File

@ -156,8 +156,7 @@
"notification_visibility_mentions": "멘션", "notification_visibility_mentions": "멘션",
"notification_visibility_repeats": "반복", "notification_visibility_repeats": "반복",
"no_rich_text_description": "모든 게시물의 서식을 지우기", "no_rich_text_description": "모든 게시물의 서식을 지우기",
"hide_followings_description": "내가 팔로우하는 사람을 표시하지 않음", "hide_network_description": "내 팔로우와 팔로워를 숨기기",
"hide_followers_description": "나를 따르는 사람을 보여주지 마라.",
"nsfw_clickthrough": "NSFW 이미지 \"클릭해서 보이기\"를 활성화", "nsfw_clickthrough": "NSFW 이미지 \"클릭해서 보이기\"를 활성화",
"panelRadius": "패널", "panelRadius": "패널",
"pause_on_unfocused": "탭이 활성 상태가 아닐 때 스트리밍 멈추기", "pause_on_unfocused": "탭이 활성 상태가 아닐 때 스트리밍 멈추기",

View File

@ -127,8 +127,7 @@
"notification_visibility_mentions": "Упоминания", "notification_visibility_mentions": "Упоминания",
"notification_visibility_repeats": "Повторы", "notification_visibility_repeats": "Повторы",
"no_rich_text_description": "Убрать форматирование из всех постов", "no_rich_text_description": "Убрать форматирование из всех постов",
"hide_followings_description": "Не показывать кого я читаю", "hide_network_description": "Не показывать кого я читаю и кто меня читает",
"hide_followers_description": "Не показывать кто читает меня",
"nsfw_clickthrough": "Включить скрытие NSFW вложений", "nsfw_clickthrough": "Включить скрытие NSFW вложений",
"panelRadius": "Панели", "panelRadius": "Панели",
"pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе", "pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе",

View File

@ -130,7 +130,7 @@ const updateBanner = ({credentials, params}) => {
// description // description
const updateProfile = ({credentials, params}) => { const updateProfile = ({credentials, params}) => {
// Always include these fields, because they might be empty or false // Always include these fields, because they might be empty or false
const fields = ['description', 'locked', 'no_rich_text', 'hide_followings', 'hide_followers'] const fields = ['description', 'locked', 'no_rich_text', 'hide_network']
let url = PROFILE_UPDATE_URL let url = PROFILE_UPDATE_URL
const form = new FormData() const form = new FormData()

View File

@ -100,8 +100,7 @@ export const parseUser = (data) => {
output.rights = data.rights output.rights = data.rights
output.no_rich_text = data.no_rich_text output.no_rich_text = data.no_rich_text
output.default_scope = data.default_scope output.default_scope = data.default_scope
output.hide_followings = data.hide_followings output.hide_network = data.hide_network
output.hide_followers = data.hide_followers
output.background_image = data.background_image output.background_image = data.background_image
// on mastoapi this info is contained in a "relationship" // on mastoapi this info is contained in a "relationship"
output.following = data.following output.following = data.following