Merge branch 'expert-settings-and-serverside' into shigusegubu

* expert-settings-and-serverside:
  lint
  pre-emptively wipe serverside settings on logout
  fix errors in choicesetting
  fix typos in profile page
  hidden away more settings when logged out
  fix settings behaving erratically and not updating properly
  fix stripping rich content not working
  revert changes related to streaming/firehose setting, reword it so it's not confused with websocket streaming
  fix firefox rendering (??????????)
  revert to using local setting for default nsfw since backend is broken
  better phrasing
  new defaults
  expert settings toggle + server-side settings

src/components/settings_modal/tabs/general_tab.js

@@ -1,8 +1,10 @@
 import BooleanSetting from '../helpers/boolean_setting.vue'
 import ChoiceSetting from '../helpers/choice_setting.vue'
+import ScopeSelector from 'src/components/scope_selector/scope_selector.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
 
 import SharedComputedObject from '../helpers/shared_computed_object.js'
+import ServerSideIndicator from '../helpers/server_side_indicator.vue'
 import { library } from '@fortawesome/fontawesome-svg-core'
 import {
   faGlobe
@@ -47,7 +49,9 @@ const GeneralTab = {
   components: {
     BooleanSetting,
     ChoiceSetting,
-    InterfaceLanguageSwitcher
+    InterfaceLanguageSwitcher,
+    ScopeSelector,
+    ServerSideIndicator
   },
   computed: {
     postFormats () {
@@ -67,6 +71,11 @@ const GeneralTab = {
     },
     instanceShoutboxPresent () { return this.$store.state.instance.shoutAvailable },
     ...SharedComputedObject()
+  },
+  methods: {
+    changeDefaultScope (value) {
+      this.$store.dispatch('setServerSideOption', { name: 'defaultScope', value })
+    }
   }
 }