From 9216ff8efcc8f3af0a9b0e72a342bdc746abc9d9 Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Fri, 12 Apr 2019 22:45:27 -0600
Subject: [PATCH] Fixes #704

---
 resources/assets/js/components/ComposeModal.vue     |  5 ++++-
 resources/views/timeline/partial/new-form.blade.php | 12 +++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/components/ComposeModal.vue b/resources/assets/js/components/ComposeModal.vue
index 71352fe6d..4d200647a 100644
--- a/resources/assets/js/components/ComposeModal.vue
+++ b/resources/assets/js/components/ComposeModal.vue
@@ -135,7 +135,7 @@
 											</div> 
 										</div>
 									</a>
-									<a :class="[visibility=='private'?'dropdown-item active':'dropdown-item']" href="#" data-id="private" data-title="Followers Only" v-on:click.prevent="visibility = 'unlisted'">
+									<a :class="[visibility=='unlisted'?'dropdown-item active':'dropdown-item']" href="#" data-id="private" data-title="Unlisted" v-on:click.prevent="visibility = 'unlisted'">
 										<div class="row">
 											<div class="d-none d-block-sm col-sm-2 px-0 text-center">
 												<i class="fas fa-lock"></i>
@@ -301,6 +301,9 @@ export default {
 		fetchProfile() {
 			axios.get('/api/v1/accounts/verify_credentials').then(res => {
 				this.profile = res.data;
+				if(res.data.locked == true) {
+					this.visibility = 'private';
+				}
 			}).catch(err => {
 				console.log(err)
 			});
diff --git a/resources/views/timeline/partial/new-form.blade.php b/resources/views/timeline/partial/new-form.blade.php
index ebd4f5c95..9fdcdc862 100644
--- a/resources/views/timeline/partial/new-form.blade.php
+++ b/resources/views/timeline/partial/new-form.blade.php
@@ -34,9 +34,15 @@
                 <label class="font-weight-bold text-muted small">Visibility</label>
                 <div class="switch switch-sm">
                   <select class="form-control" name="visibility">
-                    <option value="public" selected="">Public</option>
-                    <option value="unlisted">Unlisted (hidden from public timelines)</option>
-                    <option value="private">Followers Only</option>
+                    @if(Auth::user()->profile->is_private)
+                      <option value="public">Public</option>
+                      <option value="unlisted">Unlisted (hidden from public timelines)</option>
+                      <option value="private" selected="">Followers Only</option>
+                    @else
+                      <option value="public" selected="">Public</option>
+                      <option value="unlisted">Unlisted (hidden from public timelines)</option>
+                      <option value="private">Followers Only</option>
+                    @endif
                   </select>
                 </div>
                 <small class="form-text text-muted">