Merge branch 'develop' into fedi-absturztau-be

2021-02-13 10:59:52 +01:00 · 2021-02-13 10:59:52 +01:00 · 0cfd263ef4
parent 94c96345e1 7f3fd9ca21
commit 0cfd263ef4
24 changed files with 352 additions and 176 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Button to remove uploaded media in post status form is now properly placed and sized.
 - Fixed shoutbox not working in mobile layout

+### Changed
+- Display 'people voted' instead of 'votes' for multi-choice polls

 ## [2.2.3] - 2021-01-18
 ### Added
@ -29,6 +31,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added some missing unicode emoji
 - Added the upload limit to the Features panel in the About page
 - Support for solid color wallpaper, instance doesn't have to define a wallpaper anymore
+- Group staff members by role in the About page

 ### Fixed
 - Fixed the occasional bug where screen would scroll 1px when typing into a reply form
--- a/src/components/emoji_input/emoji_input.vue
+++ b/src/components/emoji_input/emoji_input.vue
@ -10,6 +10,7 @@
        v-if="!hideEmojiButton"
        class="button-unstyled emoji-picker-icon"
        @click.prevent="togglePicker"
+        type="button"
      >
        <FAIcon :icon="['far', 'smile-beam']" />
      </button>
--- a/src/components/extra_buttons/extra_buttons.vue
+++ b/src/components/extra_buttons/extra_buttons.vue
@ -139,6 +139,11 @@
@import '../../_variables.scss';

 .ExtraButtons {
+  /* override of popover internal stuff */
+  .popover-trigger-button {
+    width: auto;
+  }
+
  .popover-trigger {
    position: static;
    padding: 10px;
--- a/src/components/mfa_form/recovery_form.vue
+++ b/src/components/mfa_form/recovery_form.vue
@ -26,6 +26,7 @@
              <button
                class="button-unstyled -link"
                @click.prevent="requireTOTP"
+                type="button"
              >
                {{ $t('login.enter_two_factor_code') }}
              </button>
@ -33,6 +34,7 @@
              <button
                class="button-unstyled -link"
                @click.prevent="abortMFA"
+                type="button"
              >
                {{ $t('general.cancel') }}
              </button>
--- a/src/components/mfa_form/totp_form.vue
+++ b/src/components/mfa_form/totp_form.vue
@ -28,6 +28,7 @@
              <button
                class="button-unstyled -link"
                @click.prevent="requireRecovery"
+                type="button"
              >
                {{ $t('login.enter_recovery_code') }}
              </button>
@ -35,6 +36,7 @@
              <button
                class="button-unstyled -link"
                @click.prevent="abortMFA"
+                type="button"
              >
                {{ $t('general.cancel') }}
              </button>
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@ -58,7 +58,12 @@
        {{ $t('polls.vote') }}
      </button>
      <div class="total">
-        {{ totalVotesCount }} {{ $t("polls.votes") }}&nbsp;·&nbsp;
+        <template v-if="typeof poll.voters_count === 'number'">
+          {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}&nbsp;·&nbsp;
+        </template>
+        <template v-else>
+          {{ $tc("polls.votes_count", poll.votes_count, { count: poll.votes_count }) }}&nbsp;·&nbsp;
+        </template>
      </div>
      <i18n :path="expired ? 'polls.expired' : 'polls.expires_in'">
        <Timeago
--- a/src/components/popover/popover.vue
+++ b/src/components/popover/popover.vue
@ -7,6 +7,7 @@
      ref="trigger"
      class="button-unstyled -fullwidth popover-trigger-button"
      @click="onClick"
+      type="button"
    >
      <slot name="trigger" />
    </button>
--- a/src/components/react_button/react_button.vue
+++ b/src/components/react_button/react_button.vue
@ -1,6 +1,7 @@
 <template>
  <Popover
    trigger="click"
+    class="ReactButton"
    placement="top"
    :offset="{ y: 5 }"
    :bound-to="{ x: 'container' }"
@ -42,7 +43,7 @@
    </div>
    <span
      slot="trigger"
-      class="ReactButton"
+      class="popover-trigger"
      :title="$t('tool_tip.add_reaction')"
    >
      <FAIcon
@ -58,63 +59,72 @@
 <style lang="scss">
@import '../../_variables.scss';

-.reaction-picker-filter {
-  padding: 0.5em;
-  display: flex;
-  input {
-    flex: 1;
+.ReactButton {
+  .reaction-picker-filter {
+    padding: 0.5em;
+    display: flex;
+
+    input {
+      flex: 1;
+    }
  }
-}

-.reaction-picker-divider {
-  height: 1px;
-  width: 100%;
-  margin: 0.5em;
-  background-color: var(--border, $fallback--border);
-}
+  .reaction-picker-divider {
+    height: 1px;
+    width: 100%;
+    margin: 0.5em;
+    background-color: var(--border, $fallback--border);
+  }

-.reaction-picker {
-  width: 10em;
-  height: 9em;
-  font-size: 1.5em;
-  overflow-y: scroll;
-  display: flex;
-  flex-wrap: wrap;
-  padding: 0.5em;
-  text-align: center;
-  align-content: flex-start;
-  user-select: none;
+  .reaction-picker {
+    width: 10em;
+    height: 9em;
+    font-size: 1.5em;
+    overflow-y: scroll;
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0.5em;
+    text-align: center;
+    align-content: flex-start;
+    user-select: none;

-  mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
-    linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
-    linear-gradient(to top, white, white);
-  transition: mask-size 150ms;
-  mask-size: 100% 20px, 100% 20px, auto;
-  // Autoprefixed seem to ignore this one, and also syntax is different
-  -webkit-mask-composite: xor;
-  mask-composite: exclude;
+    mask: linear-gradient(to top, white 0, transparent 100%) bottom no-repeat,
+          linear-gradient(to bottom, white 0, transparent 100%) top no-repeat,
+          linear-gradient(to top, white, white);
+    transition: mask-size 150ms;
+    mask-size: 100% 20px, 100% 20px, auto;

-  .emoji-button {
-    cursor: pointer;
+    /* Autoprefixed seem to ignore this one, and also syntax is different */
+    -webkit-mask-composite: xor;
+    mask-composite: exclude;

-    flex-basis: 20%;
-    line-height: 1.5em;
-    align-content: center;
+    .emoji-button {
+      cursor: pointer;

-    &:hover {
-      transform: scale(1.25);
+      flex-basis: 20%;
+      line-height: 1.5em;
+      align-content: center;
+
+      &:hover {
+        transform: scale(1.25);
+      }
+    }
+  }
+
+  /* override of popover internal stuff */
+  .popover-trigger-button {
+    width: auto;
+  }
+
+  .popover-trigger {
+    padding: 10px;
+    margin: -10px;
+
+    &:hover .svg-inline--fa {
+      color: $fallback--text;
+      color: var(--text, $fallback--text);
    }
  }
 }

-.ReactButton {
-  padding: 10px;
-  margin: -10px;
-
-  &:hover .svg-inline--fa {
-    color: $fallback--text;
-    color: var(--text, $fallback--text);
-  }
-}
-
 </style>
--- a/src/components/scope_selector/scope_selector.vue
+++ b/src/components/scope_selector/scope_selector.vue
@ -9,6 +9,7 @@
      :class="css.direct"
      :title="$t('post_status.scope.direct')"
      @click="changeVis('direct')"
+      type="button"
    >
      <FAIcon
        icon="envelope"
@ -21,6 +22,7 @@
      :class="css.private"
      :title="$t('post_status.scope.private')"
      @click="changeVis('private')"
+      type="button"
    >
      <FAIcon
        icon="lock"
@ -33,6 +35,7 @@
      :class="css.unlisted"
      :title="$t('post_status.scope.unlisted')"
      @click="changeVis('unlisted')"
+      type="button"
    >
      <FAIcon
        icon="lock-open"
@ -45,6 +48,7 @@
      :class="css.public"
      :title="$t('post_status.scope.public')"
      @click="changeVis('public')"
+      type="button"
    >
      <FAIcon
        icon="globe"
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@ -16,6 +16,7 @@
      <button
        class="btn button-default search-button"
        @click="newQuery(searchTerm)"
+        type="submit"
      >
        <FAIcon icon="search" />
      </button>
--- a/src/components/search_bar/search_bar.vue
+++ b/src/components/search_bar/search_bar.vue
@ -8,6 +8,7 @@
      class="button-unstyled nav-icon"
      :title="$t('nav.search')"
      @click.prevent.stop="toggleHidden"
+      type="button"
    >
      <FAIcon
        fixed-width
@ -28,6 +29,7 @@
      <button
        class="button-default search-button"
        @click="find(searchTerm)"
+        type="submit"
      >
        <FAIcon
          fixed-width
@ -37,6 +39,7 @@
      <button
        class="button-unstyled cancel-search"
        @click.prevent.stop="toggleHidden"
+        type="button"
      >
        <FAIcon
          fixed-width
--- a/src/components/settings_modal/helpers/boolean_setting.vue
+++ b/src/components/settings_modal/helpers/boolean_setting.vue
@ -0,0 +1,57 @@
+<template>
+  <label
+    class="BooleanSetting"
+  >
+    <Checkbox
+      :checked="state"
+      @change="update"
+      :disabled="disabled"
+    >
+      <span
+        v-if="!!$slots.default"
+        class="label"
+        >
+        <slot />
+      </span>
+      <ModifiedIndicator :changed="isChanged" />
+    </Checkbox>
+  </label>
+</template>
+
+<script>
+import { get, set } from 'lodash'
+import Checkbox from 'src/components/checkbox/checkbox.vue'
+import ModifiedIndicator from './modified_indicator.vue'
+export default {
+  props: [
+    'path',
+    'disabled'
+  ],
+  components: {
+    Checkbox,
+    ModifiedIndicator
+  },
+  computed: {
+    pathDefault () {
+      const [firstSegment, ...rest] = this.path.split('.')
+      return [firstSegment + 'DefaultValue', ...rest].join('.')
+    },
+    state () {
+      return get(this.$parent, this.path)
+    },
+    isChanged () {
+      return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault)
+    }
+  },
+  methods: {
+    update (e) {
+      set(this.$parent, this.path, e)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.BooleanSetting {
+}
+</style>
--- a/src/components/settings_modal/helpers/modified_indicator.vue
+++ b/src/components/settings_modal/helpers/modified_indicator.vue
@ -0,0 +1,51 @@
+<template>
+  <span
+    v-if="changed"
+    class="ModifiedIndicator"
+    >
+    <Popover
+      trigger="hover"
+      >
+      <span slot="trigger">
+        &nbsp;
+          <FAIcon
+            icon="wrench"
+          />
+      </span>
+      <div
+        class="modified-tooltip"
+        slot="content"
+        >
+      {{ $t('settings.setting_changed') }}
+      </div>
+    </Popover>
+  </span>
+</template>
+
+<script>
+import Popover from 'src/components/popover/popover.vue'
+import { library } from '@fortawesome/fontawesome-svg-core'
+import { faWrench } from '@fortawesome/free-solid-svg-icons'
+
+library.add(
+  faWrench
+)
+
+export default {
+  props: ['changed'],
+  components: { Popover }
+}
+</script>
+
+<style lang="scss">
+.ModifiedIndicator {
+  display: inline-block;
+  position: relative;
+
+  .modified-tooltip {
+    margin: 0.5em 1em;
+    min-width: 10em;
+    text-align: center;
+  }
+}
+</style>
--- a/src/components/settings_modal/helpers/shared_computed_object.js
+++ b/src/components/settings_modal/helpers/shared_computed_object.js
@ -1,29 +1,15 @@
-import {
-  instanceDefaultProperties,
-  multiChoiceProperties,
-  defaultState as configDefaultState
-} from 'src/modules/config.js'
+import { defaultState as configDefaultState } from 'src/modules/config.js'

 const SharedComputedObject = () => ({
  user () {
    return this.$store.state.users.currentUser
  },
-  // Getting localized values for instance-default properties
-  ...instanceDefaultProperties
-    .filter(key => multiChoiceProperties.includes(key))
+  // Getting values for default properties
+  ...Object.keys(configDefaultState)
    .map(key => [
      key + 'DefaultValue',
      function () {
-        return this.$store.getters.instanceDefaultConfig[key]
-      }
-    ])
-    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
-  ...instanceDefaultProperties
-    .filter(key => !multiChoiceProperties.includes(key))
-    .map(key => [
-      key + 'LocalizedValue',
-      function () {
-        return this.$t('settings.values.' + this.$store.getters.instanceDefaultConfig[key])
+        return this.$store.getters.defaultConfig[key]
      }
    ])
    .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@ -1,5 +1,5 @@
 import { filter, trim } from 'lodash'
-import Checkbox from 'src/components/checkbox/checkbox.vue'
+import BooleanSetting from '../helpers/boolean_setting.vue'

 import SharedComputedObject from '../helpers/shared_computed_object.js'
 import { library } from '@fortawesome/fontawesome-svg-core'
@ -18,7 +18,7 @@ const FilteringTab = {
    }
  },
  components: {
-    Checkbox
+    BooleanSetting
  },
  computed: {
    ...SharedComputedObject(),
--- a/src/components/settings_modal/tabs/filtering_tab.vue
+++ b/src/components/settings_modal/tabs/filtering_tab.vue
@ -5,34 +5,34 @@
        <span class="label">{{ $t('settings.notification_visibility') }}</span>
        <ul class="option-list">
          <li>
-            <Checkbox v-model="notificationVisibility.likes">
+            <BooleanSetting path="notificationVisibility.likes">
              {{ $t('settings.notification_visibility_likes') }}
-            </Checkbox>
+            </BooleanSetting>
          </li>
          <li>
-            <Checkbox v-model="notificationVisibility.repeats">
+            <BooleanSetting path="notificationVisibility.repeats">
              {{ $t('settings.notification_visibility_repeats') }}
-            </Checkbox>
+            </BooleanSetting>
          </li>
          <li>
-            <Checkbox v-model="notificationVisibility.follows">
+            <BooleanSetting path="notificationVisibility.follows">
              {{ $t('settings.notification_visibility_follows') }}
-            </Checkbox>
+            </BooleanSetting>
          </li>
          <li>
-            <Checkbox v-model="notificationVisibility.mentions">
+            <BooleanSetting path="notificationVisibility.mentions">
              {{ $t('settings.notification_visibility_mentions') }}
-            </Checkbox>
+            </BooleanSetting>
          </li>
          <li>
-            <Checkbox v-model="notificationVisibility.moves">
+            <BooleanSetting path="notificationVisibility.moves">
              {{ $t('settings.notification_visibility_moves') }}
-            </Checkbox>
+            </BooleanSetting>
          </li>
          <li>
-            <Checkbox v-model="notificationVisibility.emojiReactions">
+            <BooleanSetting path="notificationVisibility.emojiReactions">
              {{ $t('settings.notification_visibility_emoji_reactions') }}
-            </Checkbox>
+            </BooleanSetting>
          </li>
        </ul>
      </div>
@ -60,14 +60,14 @@
        </label>
      </div>
      <div>
-        <Checkbox v-model="hidePostStats">
-          {{ $t('settings.hide_post_stats') }} {{ $t('settings.instance_default', { value: hidePostStatsLocalizedValue }) }}
-        </Checkbox>
+        <BooleanSetting path="hidePostStats">
+          {{ $t('settings.hide_post_stats') }}
+        </BooleanSetting>
      </div>
      <div>
-        <Checkbox v-model="hideUserStats">
-          {{ $t('settings.hide_user_stats') }} {{ $t('settings.instance_default', { value: hideUserStatsLocalizedValue }) }}
-        </Checkbox>
+        <BooleanSetting path="hideUserStats">
+          {{ $t('settings.hide_user_stats') }}
+        </BooleanSetting>
      </div>
    </div>
    <div class="setting-item">
@ -80,9 +80,9 @@
        />
      </div>
      <div>
-        <Checkbox v-model="hideFilteredStatuses">
-          {{ $t('settings.hide_filtered_statuses') }} {{ $t('settings.instance_default', { value: hideFilteredStatusesLocalizedValue }) }}
-        </Checkbox>
+        <BooleanSetting path="hideFilteredStatuses">
+          {{ $t('settings.hide_filtered_statuses') }}
+        </BooleanSetting>
      </div>
    </div>
  </div>
--- a/src/components/settings_modal/tabs/general_tab.js
+++ b/src/components/settings_modal/tabs/general_tab.js
@ -1,4 +1,4 @@
-import Checkbox from 'src/components/checkbox/checkbox.vue'
+import BooleanSetting from '../helpers/boolean_setting.vue'
 import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'

 import SharedComputedObject from '../helpers/shared_computed_object.js'
@ -26,7 +26,7 @@ const GeneralTab = {
    }
  },
  components: {
-    Checkbox,
+    BooleanSetting,
    InterfaceLanguageSwitcher
  },
  computed: {
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@ -7,9 +7,9 @@
          <interface-language-switcher />
        </li>
        <li v-if="instanceSpecificPanelPresent">
-          <Checkbox v-model="hideISP">
+          <BooleanSetting path="hideISP">
            {{ $t('settings.hide_isp') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
        <li>
          <Checkbox v-model="showThirdColumn">
@ -17,9 +17,9 @@
          </Checkbox>
        </li>
        <li v-if="instanceWallpaperUsed">
-          <Checkbox v-model="hideInstanceWallpaper">
+          <BooleanSetting path="hideInstanceWallpaper">
            {{ $t('settings.hide_wallpaper') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
      </ul>
    </div>
@ -27,51 +27,51 @@
      <h2>{{ $t('nav.timeline') }}</h2>
      <ul class="setting-list">
        <li>
-          <Checkbox v-model="hideMutedPosts">
-            {{ $t('settings.hide_muted_posts') }} {{ $t('settings.instance_default', { value: hideMutedPostsLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="hideMutedPosts">
+            {{ $t('settings.hide_muted_posts') }}
+          </BooleanSetting>
        </li>
        <li>
-          <Checkbox v-model="collapseMessageWithSubject">
-            {{ $t('settings.collapse_subject') }} {{ $t('settings.instance_default', { value: collapseMessageWithSubjectLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="collapseMessageWithSubject">
+            {{ $t('settings.collapse_subject') }}
+          </BooleanSetting>
        </li>
        <li>
-          <Checkbox v-model="streaming">
+          <BooleanSetting path="streaming">
            {{ $t('settings.streaming') }}
-          </Checkbox>
+          </BooleanSetting>
          <ul
            class="setting-list suboptions"
            :class="[{disabled: !streaming}]"
          >
            <li>
-              <Checkbox
-                v-model="pauseOnUnfocused"
+              <BooleanSetting
+                path="pauseOnUnfocused"
                :disabled="!streaming"
              >
                {{ $t('settings.pause_on_unfocused') }}
-              </Checkbox>
+              </BooleanSetting>
            </li>
          </ul>
        </li>
        <li>
-          <Checkbox v-model="useStreamingApi">
+          <BooleanSetting path="useStreamingApi">
            {{ $t('settings.useStreamingApi') }}
            <br>
            <small>
              {{ $t('settings.useStreamingApiWarning') }}
            </small>
-          </Checkbox>
+          </BooleanSetting>
        </li>
        <li>
-          <Checkbox v-model="emojiReactionsOnTimeline">
+          <BooleanSetting path="emojiReactionsOnTimeline">
            {{ $t('settings.emoji_reactions_on_timeline') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
        <li>
-          <Checkbox v-model="virtualScrolling">
+          <BooleanSetting path="virtualScrolling">
            {{ $t('settings.virtual_scrolling') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
      </ul>
    </div>
@ -80,14 +80,14 @@
      <h2>{{ $t('settings.composing') }}</h2>
      <ul class="setting-list">
        <li>
-          <Checkbox v-model="scopeCopy">
-            {{ $t('settings.scope_copy') }} {{ $t('settings.instance_default', { value: scopeCopyLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="scopeCopy">
+            {{ $t('settings.scope_copy') }}
+          </BooleanSetting>
        </li>
        <li>
-          <Checkbox v-model="alwaysShowSubjectInput">
-            {{ $t('settings.subject_input_always_show') }} {{ $t('settings.instance_default', { value: alwaysShowSubjectInputLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="alwaysShowSubjectInput">
+            {{ $t('settings.subject_input_always_show') }}
+          </BooleanSetting>
        </li>
        <li>
          <div>
@ -148,19 +148,19 @@
          </div>
        </li>
        <li>
-          <Checkbox v-model="minimalScopesMode">
-            {{ $t('settings.minimal_scopes_mode') }} {{ $t('settings.instance_default', { value: minimalScopesModeLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="minimalScopesMode">
+            {{ $t('settings.minimal_scopes_mode') }} {{ minimalScopesModeDefaultValue }}
+          </BooleanSetting>
        </li>
        <li>
-          <Checkbox v-model="autohideFloatingPostButton">
+          <BooleanSetting path="autohideFloatingPostButton">
            {{ $t('settings.autohide_floating_post_button') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
        <li>
-          <Checkbox v-model="padEmoji">
+          <BooleanSetting path="padEmoji">
            {{ $t('settings.pad_emoji') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
      </ul>
    </div>
@ -169,14 +169,14 @@
      <h2>{{ $t('settings.attachments') }}</h2>
      <ul class="setting-list">
        <li>
-          <Checkbox v-model="hideAttachments">
+          <BooleanSetting path="hideAttachments">
            {{ $t('settings.hide_attachments_in_tl') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
        <li>
-          <Checkbox v-model="hideAttachmentsInConv">
+          <BooleanSetting path="hideAttachmentsInConv">
            {{ $t('settings.hide_attachments_in_convo') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
        <li>
          <label for="maxThumbnails">
@ -184,7 +184,7 @@
          </label>
          <input
            id="maxThumbnails"
-            v-model.number="maxThumbnails"
+            path.number="maxThumbnails"
            class="number-input"
            type="number"
            min="0"
@ -192,48 +192,48 @@
          >
        </li>
        <li>
-          <Checkbox v-model="hideNsfw">
+          <BooleanSetting path="hideNsfw">
            {{ $t('settings.nsfw_clickthrough') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
        <ul class="setting-list suboptions">
          <li>
-            <Checkbox
-              v-model="preloadImage"
+            <BooleanSetting
+              path="preloadImage"
              :disabled="!hideNsfw"
            >
              {{ $t('settings.preload_images') }}
-            </Checkbox>
+            </BooleanSetting>
          </li>
          <li>
-            <Checkbox
-              v-model="useOneClickNsfw"
+            <BooleanSetting
+              path="useOneClickNsfw"
              :disabled="!hideNsfw"
            >
              {{ $t('settings.use_one_click_nsfw') }}
-            </Checkbox>
+            </BooleanSetting>
          </li>
        </ul>
        <li>
-          <Checkbox v-model="stopGifs">
+          <BooleanSetting path="stopGifs">
            {{ $t('settings.stop_gifs') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
        <li>
-          <Checkbox v-model="loopVideo">
+          <BooleanSetting path="loopVideo">
            {{ $t('settings.loop_video') }}
-          </Checkbox>
+          </BooleanSetting>
          <ul
            class="setting-list suboptions"
            :class="[{disabled: !streaming}]"
          >
            <li>
-              <Checkbox
-                v-model="loopVideoSilentOnly"
+              <BooleanSetting
+                path="loopVideoSilentOnly"
                :disabled="!loopVideo || !loopSilentAvailable"
              >
                {{ $t('settings.loop_video_silent_only') }}
-              </Checkbox>
+              </BooleanSetting>
              <div
                v-if="!loopSilentAvailable"
                class="unavailable"
@ -244,14 +244,14 @@
          </ul>
        </li>
        <li>
-          <Checkbox v-model="playVideosInModal">
+          <BooleanSetting path="playVideosInModal">
            {{ $t('settings.play_videos_in_modal') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
        <li>
-          <Checkbox v-model="useContainFit">
+          <BooleanSetting path="useContainFit">
            {{ $t('settings.use_contain_fit') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
      </ul>
    </div>
@ -260,9 +260,9 @@
      <h2>{{ $t('settings.notifications') }}</h2>
      <ul class="setting-list">
        <li>
-          <Checkbox v-model="webPushNotifications">
+          <BooleanSetting path="webPushNotifications">
            {{ $t('settings.enable_web_push_notifications') }}
-          </Checkbox>
+          </BooleanSetting>
        </li>
      </ul>
    </div>
@ -271,9 +271,9 @@
      <h2>{{ $t('settings.fun') }}</h2>
      <ul class="setting-list">
        <li>
-          <Checkbox v-model="greentext">
-            {{ $t('settings.greentext') }} {{ $t('settings.instance_default', { value: greentextLocalizedValue }) }}
-          </Checkbox>
+          <BooleanSetting path="greentext">
+            {{ $t('settings.greentext') }}
+          </BooleanSetting>
        </li>
      </ul>
    </div>
--- a/src/components/staff_panel/staff_panel.js
+++ b/src/components/staff_panel/staff_panel.js
@ -1,4 +1,6 @@
 import map from 'lodash/map'
+import groupBy from 'lodash/groupBy'
+import { mapGetters, mapState } from 'vuex'
 import BasicUserCard from '../basic_user_card/basic_user_card.vue'

 const StaffPanel = {
@ -10,9 +12,21 @@ const StaffPanel = {
    BasicUserCard
  },
  computed: {
-    staffAccounts () {
-      return map(this.$store.state.instance.staffAccounts, nickname => this.$store.getters.findUser(nickname)).filter(_ => _)
-    }
+    groupedStaffAccounts () {
+      const staffAccounts = map(this.staffAccounts, this.findUser).filter(_ => _)
+      const groupedStaffAccounts = groupBy(staffAccounts, 'role')
+
+      return [
+        { role: 'admin', users: groupedStaffAccounts['admin'] },
+        { role: 'moderator', users: groupedStaffAccounts['moderator'] }
+      ].filter(group => group.users)
+    },
+    ...mapGetters([
+      'findUser'
+    ]),
+    ...mapState({
+      staffAccounts: state => state.instance.staffAccounts
+    })
  }
 }

--- a/src/components/staff_panel/staff_panel.vue
+++ b/src/components/staff_panel/staff_panel.vue
@ -7,11 +7,18 @@
        </div>
      </div>
      <div class="panel-body">
-        <basic-user-card
-          v-for="user in staffAccounts"
-          :key="user.screen_name"
-          :user="user"
-        />
+        <div
+          v-for="group in groupedStaffAccounts"
+          :key="group.role"
+          class="staff-group"
+        >
+          <h4>{{ $t('general.role.' + group.role) }}</h4>
+          <basic-user-card
+            v-for="user in group.users"
+            :key="user.screen_name"
+            :user="user"
+          />
+        </div>
      </div>
    </div>
  </div>
@ -20,4 +27,14 @@
 <script src="./staff_panel.js" ></script>

 <style lang="scss">
+
+.staff-group {
+  padding-left: 1em;
+  padding-top: 1em;
+
+  .basic-user-card {
+    padding-left: 0;
+  }
+}
+
 </style>
--- a/src/components/tab_switcher/tab_switcher.js
+++ b/src/components/tab_switcher/tab_switcher.js
@ -93,7 +93,9 @@ export default Vue.component('tab-switcher', {
              <button
                disabled={slot.data.attrs.disabled}
                onClick={this.clickTab(index)}
-                class={classesTab.join(' ')}>
+                class={classesTab.join(' ')}
+                type="button"
+              >
                <img src={slot.data.attrs.image} title={slot.data.attrs['image-tooltip']}/>
                {slot.data.attrs.label ? '' : slot.data.attrs.label}
              </button>
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@ -89,7 +89,7 @@
                  v-if="user.bot"
                  class="alert user-role"
                >
-                  bot
+                  {{ $t('user_card.bot') }}
                </span>
              </template>
              <span v-if="user.locked">
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@ -75,7 +75,11 @@
    "confirm": "Confirm",
    "verify": "Verify",
    "close": "Close",
-    "peek": "Peek"
+    "peek": "Peek",
+    "role": {
+      "admin": "Admin",
+      "moderator": "Moderator"
+    }
  },
  "image_cropper": {
    "crop_picture": "Crop picture",
@ -148,6 +152,8 @@
    "add_option": "Add Option",
    "option": "Option",
    "votes": "votes",
+    "people_voted_count": "{count} person voted | {count} people voted",
+    "votes_count": "{count} vote | {count} votes",
    "vote": "Vote",
    "type": "Poll type",
    "single_choice": "Single choice",
@ -242,6 +248,7 @@
  "settings": {
    "app_name": "App name",
    "security": "Security",
+    "setting_changed": "Setting is different from default",
    "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
    "mfa": {
      "otp": "OTP",
@ -712,6 +719,7 @@
    "mute_progress": "Muting…",
    "hide_repeats": "Hide repeats",
    "show_repeats": "Show repeats",
+    "bot": "Bot",
    "admin_menu": {
      "moderation": "Moderation",
      "grant_admin": "Grant Admin",
--- a/src/modules/config.js
+++ b/src/modules/config.js
@ -77,18 +77,22 @@ export const instanceDefaultProperties = Object.entries(defaultState)
  .map(([key, value]) => key)

 const config = {
-  state: defaultState,
+  state: { ...defaultState },
  getters: {
-    mergedConfig (state, getters, rootState, rootGetters) {
+    defaultConfig (state, getters, rootState, rootGetters) {
      const { instance } = rootState
      return {
-        ...state,
-        ...instanceDefaultProperties
-          .map(key => [key, state[key] === undefined
-            ? instance[key]
-            : state[key]
-          ])
-          .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
+        ...defaultState,
+        ...Object.fromEntries(
+          instanceDefaultProperties.map(key => [key, instance[key]])
+        )
+      }
+    },
+    mergedConfig (state, getters, rootState, rootGetters) {
+      const { defaultConfig } = rootGetters
+      return {
+        ...defaultConfig,
+        ...state
      }
    }
  },