really obnoxious change

revert Prevent replying with a more open visibility than the parent post

docs/docs/CONFIGURATION.md

@@ -70,6 +70,9 @@ Default post formatting option (markdown/bbcode/plaintext/etc...)
 ### `redirectRootNoLogin`, `redirectRootLogin`
 These two settings should point to where FE should redirect visitor when they login/open up website root
 
+### `scopeCopy`
+Copy post scope (visibility) when replying to a post. Instance-default.
+
 ### `sidebarRight`
 Change alignment of sidebar and panels to the right. Defaults to `false`.
 

src/boot/after_store.js

@@ -173,8 +173,10 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
   copyInstanceOption('redirectRootNoLogin')
   copyInstanceOption('redirectRootLogin')
   copyInstanceOption('showInstanceSpecificPanel')
+  copyInstanceOption('minimalScopesMode')
   copyInstanceOption('hideMutedPosts')
   copyInstanceOption('collapseMessageWithSubject')
+  copyInstanceOption('scopeCopy')
   copyInstanceOption('subjectLineBehavior')
   copyInstanceOption('postContentType')
   copyInstanceOption('alwaysShowSubjectInput')

src/components/features_panel/features_panel.js

@@ -4,6 +4,7 @@ const FeaturesPanel = {
   computed: {
     whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled },
     mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable },
+    minimalScopesMode: function () { return this.$store.state.instance.minimalScopesMode },
     textlimit: function () { return this.$store.state.instance.textlimit },
     uploadlimit: function () { return fileSizeFormatService.fileSizeFormat(this.$store.state.instance.uploadlimit) }
   }

src/components/post_status_form/post_status_form.js

@@ -185,6 +185,9 @@ const PostStatusForm = {
     userDefaultScope () {
       return this.$store.state.users.currentUser.default_scope
     },
+    showAllScopes () {
+      return !this.mergedConfig.minimalScopesMode
+    },
     emojiUserSuggestor () {
       return suggestor({
         emoji: [
@@ -226,6 +229,9 @@ const PostStatusForm = {
     isOverLengthLimit () {
       return this.hasStatusLengthLimit && (this.charactersLeft < 0)
     },
+    minimalScopesMode () {
+      return this.$store.state.instance.minimalScopesMode
+    },
     alwaysShowSubject () {
       return this.mergedConfig.alwaysShowSubjectInput
     },
@@ -651,8 +657,10 @@ const PostStatusForm = {
         if (this.copyMessageScope === 'direct') {
           return this.copyMessageScope
         }
-        if (this.copyMessageScope !== 'public' && this.$store.state.users.currentUser.default_scope !== 'private') {
-          return this.copyMessageScope
+        if (this.$store.getters.mergedConfig.scopeCopy) {
+          if (this.copyMessageScope !== 'public' && this.$store.state.users.currentUser.default_scope !== 'private') {
+            return this.copyMessageScope
+          }
         }
       }
       return this.$store.state.users.currentUser.default_scope

src/components/post_status_form/post_status_form.vue

@@ -188,6 +188,7 @@
         >
           <scope-selector
             v-if="!disableVisibilitySelector"
+            :show-all="showAllScopes"
             :user-default="userDefaultScope"
             :original-scope="copyMessageScope"
             :initial-scope="newStatus.visibility"

src/components/scope_selector/scope_selector.js

@@ -13,14 +13,6 @@ library.add(
   faLockOpen
 )
 
-const SCOPE_LEVELS = {
-  'direct': 0,
-  'private': 1,
-  'local': 2,
-  'unlisted': 2,
-  'public': 3
-}
-
 const ScopeSelector = {
   props: [
     'showAll',
@@ -65,15 +57,11 @@ const ScopeSelector = {
   },
   methods: {
     shouldShow (scope) {
-      if (!this.originalScope) {
-        return true
-      }
-
-      if (this.originalScope === 'local') {
-        return scope === 'direct' || scope === 'local'
-      }
-
-      return SCOPE_LEVELS[scope] <= SCOPE_LEVELS[this.originalScope]
+      return this.showAll ||
+        this.currentScope === scope ||
+        this.originalScope === scope ||
+        this.userDefault === scope ||
+        scope === 'direct'
     },
     changeVis (scope) {
       this.currentScope = scope

src/components/settings_modal/tabs/general_tab.vue

@@ -537,12 +537,18 @@
             {{ $t('settings.default_vis') }} <ServerSideIndicator :server-side="true" />
             <ScopeSelector
               class="scope-selector"
+              :show-all="true"
               :user-default="serverSide_defaultScope"
               :initial-scope="serverSide_defaultScope"
               :on-scope-change="changeDefaultScope"
             />
           </label>
         </li>
+        <li>
+          <BooleanSetting path="minimalScopesMode">
+            {{ $t('settings.minimal_scopes_mode') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting path="sensitiveByDefault">
             {{ $t('settings.sensitive_by_default') }}
@@ -553,6 +559,14 @@
             {{ $t('settings.sensitive_if_subject') }}
           </BooleanSetting>
         </li>
+        <li>
+          <BooleanSetting
+            path="scopeCopy"
+            expert="1"
+          >
+            {{ $t('settings.scope_copy') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="alwaysShowSubjectInput"
@@ -580,6 +594,14 @@
             {{ $t('settings.post_status_content_type') }}
           </ChoiceSetting>
         </li>
+        <li>
+          <BooleanSetting
+            path="minimalScopesMode"
+            expert="1"
+          >
+            {{ $t('settings.minimal_scopes_mode') }}
+          </BooleanSetting>
+        </li>
         <li>
           <BooleanSetting
             path="alwaysShowNewPostButton"

src/modules/config.js

@@ -76,9 +76,11 @@ export const defaultState = {
   hideScopeNotice: false,
   useStreamingApi: false,
   sidebarRight: undefined, // instance default
+  scopeCopy: undefined, // instance default
   subjectLineBehavior: undefined, // instance default
   alwaysShowSubjectInput: undefined, // instance default
   postContentType: undefined, // instance default
+  minimalScopesMode: undefined, // instance default
   // This hides statuses filtered via a word filter
   hideFilteredStatuses: undefined, // instance default
   modalOnRepeat: undefined, // instance default

src/modules/instance.js

@@ -53,10 +53,12 @@ const defaultState = {
   logoMargin: '.2em',
   logoMask: true,
   logoLeft: false,
+  minimalScopesMode: false,
   nsfwCensorImage: undefined,
   postContentType: 'text/plain',
   redirectRootLogin: '/main/friends',
   redirectRootNoLogin: '/main/all',
+  scopeCopy: true,
   showFeaturesPanel: true,
   showInstanceSpecificPanel: false,
   showNavShortcuts: true,

static/config.json

@@ -13,10 +13,12 @@
   "logoMargin": ".1em",
   "logoMask": true,
   "logoLeft": false,
+  "minimalScopesMode": false,
   "nsfwCensorImage": "",
   "postContentType": "text/plain",
   "redirectRootLogin": "/main/friends",
   "redirectRootNoLogin": "/main/all",
+  "scopeCopy": true,
   "showFeaturesPanel": true,
   "showInstanceSpecificPanel": false,
   "sidebarRight": false,