Privateの公開範囲を廃止
This commit is contained in:
		| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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; | ||||
| 		} | ||||
|  | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
| @@ -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; | ||||
| 		} | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 syuilo
					syuilo