From a3493c4f07240b1957cb4fe8c17eb79747846bc6 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sat, 29 Dec 2018 02:55:46 +0900
Subject: Privateの公開範囲を廃止
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/app/common/views/components/note-header.vue        | 3 +--
 src/client/app/common/views/components/renote.vue             | 3 +--
 src/client/app/common/views/components/visibility-chooser.vue | 8 +-------
 src/client/app/desktop/views/components/post-form.vue         | 5 ++---
 src/client/app/mobile/views/components/note-detail.vue        | 3 +--
 src/client/app/mobile/views/components/post-form.vue          | 5 ++---
 6 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'src/client')

diff --git a/src/client/app/common/views/components/note-header.vue b/src/client/app/common/views/components/note-header.vue
index 664cb308e7..895313def1 100644
--- a/src/client/app/common/views/components/note-header.vue
+++ b/src/client/app/common/views/components/note-header.vue
@@ -18,8 +18,7 @@
 		<span class="visibility" v-if="note.visibility != 'public'">
 			<fa v-if="note.visibility == 'home'" icon="home"/>
 			<fa v-if="note.visibility == 'followers'" icon="unlock"/>
-			<fa v-if="note.visibility == 'specified'" icon="envelope"/>
-			<fa v-if="note.visibility == 'private'" icon="lock"/>
+			<fa v-if="note.visibility == 'specified'" icon="lock"/>
 		</span>
 		<span class="localOnly" v-if="note.localOnly == true"><fa icon="heart"/></span>
 	</div>
diff --git a/src/client/app/common/views/components/renote.vue b/src/client/app/common/views/components/renote.vue
index eae7bd122d..4efac8b09d 100644
--- a/src/client/app/common/views/components/renote.vue
+++ b/src/client/app/common/views/components/renote.vue
@@ -13,8 +13,7 @@
 		<span class="visibility" v-if="note.visibility != 'public'">
 			<fa v-if="note.visibility == 'home'" icon="home"/>
 			<fa v-if="note.visibility == 'followers'" icon="unlock"/>
-			<fa v-if="note.visibility == 'specified'" icon="envelope"/>
-			<fa v-if="note.visibility == 'private'" icon="lock"/>
+			<fa v-if="note.visibility == 'specified'" icon="lock"/>
 		</span>
 		<span class="localOnly" v-if="note.localOnly == true"><fa icon="heart"/></span>
 	</div>
diff --git a/src/client/app/common/views/components/visibility-chooser.vue b/src/client/app/common/views/components/visibility-chooser.vue
index b7cc56103c..66d617befc 100644
--- a/src/client/app/common/views/components/visibility-chooser.vue
+++ b/src/client/app/common/views/components/visibility-chooser.vue
@@ -23,18 +23,12 @@
 			</div>
 		</div>
 		<div @click="choose('specified')" :class="{ active: v == 'specified' }">
-			<div><fa icon="envelope"/></div>
+			<div><fa icon="lock"/></div>
 			<div>
 				<span>{{ $t('specified') }}</span>
 				<span>{{ $t('specified-desc') }}</span>
 			</div>
 		</div>
-		<div @click="choose('private')" :class="{ active: v == 'private' }">
-			<div><fa icon="lock"/></div>
-			<div>
-				<span>{{ $t('private') }}</span>
-			</div>
-		</div>
 		<div @click="choose('local-public')" :class="{ active: v == 'local-public' }">
 			<div><fa icon="globe"/></div>
 			<div>
diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue
index 7e402f2b59..7ed8cf02ce 100644
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -50,8 +50,7 @@
 		<span v-if="visibility === 'public'"><fa icon="globe"/></span>
 		<span v-if="visibility === 'home'"><fa icon="home"/></span>
 		<span v-if="visibility === 'followers'"><fa icon="unlock"/></span>
-		<span v-if="visibility === 'specified'"><fa icon="envelope"/></span>
-		<span v-if="visibility === 'private'"><fa icon="lock"/></span>
+		<span v-if="visibility === 'specified'"><fa icon="lock"/></span>
 	</button>
 	<p class="text-count" :class="{ over: trimmedLength(text) > maxNoteTextLength }">{{ maxNoteTextLength - trimmedLength(text) }}</p>
 	<ui-button primary :wait="posting" class="submit" :disabled="!canPost" @click="post">
@@ -212,7 +211,7 @@ export default Vue.extend({
 		this.applyVisibility(this.$store.state.settings.rememberNoteVisibility ? (this.$store.state.device.visibility || this.$store.state.settings.defaultNoteVisibility) : this.$store.state.settings.defaultNoteVisibility);
 
 		// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
-		if (this.reply && ['home', 'followers', 'specified', 'private'].includes(this.reply.visibility)) {
+		if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) {
 			this.visibility = this.reply.visibility;
 		}
 
diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
index 61274a246a..72f522bbca 100644
--- a/src/client/app/mobile/views/components/note-detail.vue
+++ b/src/client/app/mobile/views/components/note-detail.vue
@@ -54,8 +54,7 @@
 			<span class="visibility" v-if="appearNote.visibility != 'public'">
 				<fa v-if="appearNote.visibility == 'home'" icon="home"/>
 				<fa v-if="appearNote.visibility == 'followers'" icon="unlock"/>
-				<fa v-if="appearNote.visibility == 'specified'" icon="envelope"/>
-				<fa v-if="appearNote.visibility == 'private'" icon="lock"/>
+				<fa v-if="appearNote.visibility == 'specified'" icon="lock"/>
 			</span>
 			<span class="localOnly" v-if="appearNote.localOnly == true"><fa icon="heart"/></span>
 		</div>
diff --git a/src/client/app/mobile/views/components/post-form.vue b/src/client/app/mobile/views/components/post-form.vue
index 282ecc387c..599547858d 100644
--- a/src/client/app/mobile/views/components/post-form.vue
+++ b/src/client/app/mobile/views/components/post-form.vue
@@ -41,8 +41,7 @@
 					<span v-if="visibility === 'public'"><fa icon="globe"/></span>
 					<span v-if="visibility === 'home'"><fa icon="home"/></span>
 					<span v-if="visibility === 'followers'"><fa icon="unlock"/></span>
-					<span v-if="visibility === 'specified'"><fa icon="envelope"/></span>
-					<span v-if="visibility === 'private'"><fa icon="lock"/></span>
+					<span v-if="visibility === 'specified'"><fa icon="lock"/></span>
 				</button>
 			</footer>
 			<input ref="file" class="file" type="file" multiple="multiple" @change="onChangeFile"/>
@@ -202,7 +201,7 @@ export default Vue.extend({
 		this.applyVisibility(this.$store.state.settings.rememberNoteVisibility ? (this.$store.state.device.visibility || this.$store.state.settings.defaultNoteVisibility) : this.$store.state.settings.defaultNoteVisibility);
 
 		// 公開以外へのリプライ時は元の公開範囲を引き継ぐ
-		if (this.reply && ['home', 'followers', 'specified', 'private'].includes(this.reply.visibility)) {
+		if (this.reply && ['home', 'followers', 'specified'].includes(this.reply.visibility)) {
 			this.visibility = this.reply.visibility;
 		}
 
-- 
cgit v1.2.3-freya