worst/pleroma-fe
1
0
Fork 0
forked from AkkomaGang/akkoma-fe
Code Issues Pull requests Projects Releases Packages Wiki Activity

expert settings toggle + server-side settings

Browse source
This commit is contained in:
Henry Jameson 2022-02-22 23:31:40 +02:00
parent 0300db6c63
commit 9c1814d122
21 changed files with 433 additions and 204 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/components/settings_modal/helpers/boolean_setting.js
View file

@ -1,14 +1,17 @@
import { get, set } from 'lodash' import { get, set } from 'lodash'
import Checkbox from 'src/components/checkbox/checkbox.vue' import Checkbox from 'src/components/checkbox/checkbox.vue'
import ModifiedIndicator from './modified_indicator.vue' import ModifiedIndicator from './modified_indicator.vue'
import ServerSideIndicator from './server_side_indicator.vue'
export default { export default {
components: { components: {
Checkbox, Checkbox,
ModifiedIndicator ModifiedIndicator,
ServerSideIndicator
}, },
props: [ props: [
'path', 'path',
'disabled' 'disabled',
'expert'
], ],
computed: { computed: {
pathDefault () { pathDefault () {
@ -26,8 +29,14 @@ export default {
defaultState () { defaultState () {
return get(this.$parent, this.pathDefault) return get(this.$parent, this.pathDefault)
}, },
isServerSide () {
return this.path.startsWith('serverSide_')
},
isChanged () { isChanged () {
return this.state !== this.defaultState return !this.path.startsWith('serverSide_') && this.state !== this.defaultState
},
matchesExpertLevel () {
return (this.expert || 0) <= this.$parent.expertLevel
} }
}, },
methods: { methods: {

2
src/components/settings_modal/helpers/boolean_setting.vue
View file

@ -1,6 +1,7 @@
<template> <template>
<label <label
class="BooleanSetting" class="BooleanSetting"
v-if="matchesExpertLevel"
> >
<Checkbox <Checkbox
:checked="state" :checked="state"
@ -14,6 +15,7 @@
<slot /> <slot />
</span> </span>
<ModifiedIndicator :changed="isChanged" /> <ModifiedIndicator :changed="isChanged" />
<ServerSideIndicator :serverSide="isServerSide" />
</Checkbox> </Checkbox>
</label> </label>
</template> </template>

8
src/components/settings_modal/helpers/choice_setting.js
View file

@ -9,7 +9,8 @@ export default {
props: [ props: [
'path', 'path',
'disabled', 'disabled',
'options' 'options',
'expert'
], ],
computed: { computed: {
pathDefault () { pathDefault () {
@ -28,7 +29,10 @@ export default {
return get(this.$parent, this.pathDefault) return get(this.$parent, this.pathDefault)
}, },
isChanged () { isChanged () {
return this.state !== this.defaultState return !this.path.startsWith('serverSide_') && this.state !== this.defaultState
},
matchesExpertLevel () {
return (this.expert || 0) <= this.$parent.expertLevel
} }
}, },
methods: { methods: {

2
src/components/settings_modal/helpers/choice_setting.vue
View file

@ -1,6 +1,7 @@
<template> <template>
<label <label
class="ChoiceSetting" class="ChoiceSetting"
v-if="matchesExpertLevel"
> >
<slot /> <slot />
<Select <Select
@ -18,6 +19,7 @@
</option> </option>
</Select> </Select>
<ModifiedIndicator :changed="isChanged" /> <ModifiedIndicator :changed="isChanged" />
<ServerSideIndicator :serverSide="isServerSide" />
</label> </label>
</template> </template>

51
src/components/settings_modal/helpers/server_side_indicator.vue Normal file
View file

@ -0,0 +1,51 @@
<template>
<span
v-if="serverSide"
class="ServerSideIndicator"
>
<Popover
trigger="hover"
>
<template v-slot:trigger>
&nbsp;
<FAIcon
icon="server"
:aria-label="$t('settings.setting_server_side')"
/>
</template>
<template v-slot:content>
<div class="serverside-tooltip">
{{ $t('settings.setting_server_side') }}
</div>
</template>
</Popover>
</span>
</template>
<script>
import Popover from 'src/components/popover/popover.vue'
import { library } from '@fortawesome/fontawesome-svg-core'
import { faServer } from '@fortawesome/free-solid-svg-icons'
library.add(
faServer
)
export default {
components: { Popover },
props: ['serverSide']
}
</script>
<style lang="scss">
.ServerSideIndicator {
display: inline-block;
position: relative;
.serverside-tooltip {
margin: 0.5em 1em;
min-width: 10em;
text-align: center;
}
}
</style>

9
src/components/settings_modal/helpers/shared_computed_object.js
View file

@ -1,4 +1,5 @@
import { defaultState as configDefaultState } from 'src/modules/config.js' import { defaultState as configDefaultState } from 'src/modules/config.js'
import { defaultState as serverSideConfigDefaultState } from 'src/modules/serverSideConfig.js'
const SharedComputedObject = () => ({ const SharedComputedObject = () => ({
user () { user () {
@ -22,6 +23,14 @@ const SharedComputedObject = () => ({
} }
}]) }])
.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}), .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
...Object.keys(serverSideConfigDefaultState)
.map(key => ['serverSide_' + key, {
get () { return this.$store.state.serverSideConfig[key] },
set (value) {
this.$store.dispatch('setServerSideOption', { name: key, value })
}
}])
.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {}),
// Special cases (need to transform values or perform actions first) // Special cases (need to transform values or perform actions first)
useStreamingApi: { useStreamingApi: {
get () { return this.$store.getters.mergedConfig.useStreamingApi }, get () { return this.$store.getters.mergedConfig.useStreamingApi },

11
src/components/settings_modal/settings_modal.js
View file

@ -3,6 +3,7 @@ import PanelLoading from 'src/components/panel_loading/panel_loading.vue'
import AsyncComponentError from 'src/components/async_component_error/async_component_error.vue' import AsyncComponentError from 'src/components/async_component_error/async_component_error.vue'
import getResettableAsyncComponent from 'src/services/resettable_async_component.js' import getResettableAsyncComponent from 'src/services/resettable_async_component.js'
import Popover from '../popover/popover.vue' import Popover from '../popover/popover.vue'
import Checkbox from 'src/components/checkbox/checkbox.vue'
import { library } from '@fortawesome/fontawesome-svg-core' import { library } from '@fortawesome/fontawesome-svg-core'
import { cloneDeep } from 'lodash' import { cloneDeep } from 'lodash'
import { import {
@ -51,6 +52,7 @@ const SettingsModal = {
components: { components: {
Modal, Modal,
Popover, Popover,
Checkbox,
SettingsModalContent: getResettableAsyncComponent( SettingsModalContent: getResettableAsyncComponent(
() => import('./settings_modal_content.vue'), () => import('./settings_modal_content.vue'),
{ {
@ -159,6 +161,15 @@ const SettingsModal = {
}, },
modalPeeked () { modalPeeked () {
return this.$store.state.interface.settingsModalState === 'minimized' return this.$store.state.interface.settingsModalState === 'minimized'
},
expertLevel: {
get () {
return this.$store.state.config.expertLevel > 0
},
set (value) {
console.log(value)
this.$store.dispatch('setOption', { name: 'expertLevel', value: value ? 1 : 0 })
}
} }
} }
} }

7
src/components/settings_modal/settings_modal.scss
View file

@ -48,4 +48,11 @@
} }
} }
} }
.settings-footer {
display: flex;
>* {
margin-right: 0.5em;
}
}
} }

6
src/components/settings_modal/settings_modal.vue
View file

@ -53,7 +53,7 @@
<div class="panel-body"> <div class="panel-body">
<SettingsModalContent v-if="modalOpenedOnce" /> <SettingsModalContent v-if="modalOpenedOnce" />
</div> </div>
<div class="panel-footer"> <div class="panel-footer settings-footer">
<Popover <Popover
class="export" class="export"
trigger="click" trigger="click"
@ -108,6 +108,10 @@
</div> </div>
</template> </template>
</Popover> </Popover>
<Checkbox v-model="expertLevel" >
{{ $t("settings.expert_mode")}}
</Checkbox>
</div> </div>
</div> </div>
</Modal> </Modal>

46
src/components/settings_modal/tabs/filtering_tab.vue
View file

@ -38,7 +38,7 @@
</ul> </ul>
</li> </li>
<li> <li>
<BooleanSetting path="hidePostStats"> <BooleanSetting path="hidePostStats" expert="1">
{{ $t('settings.hide_post_stats') }} {{ $t('settings.hide_post_stats') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
@ -59,7 +59,7 @@
<div>{{ $t('settings.filtering_explanation') }}</div> <div>{{ $t('settings.filtering_explanation') }}</div>
</li> </li>
<h3>{{ $t('settings.attachments') }}</h3> <h3>{{ $t('settings.attachments') }}</h3>
<li> <li v-if="expertLevel > 0">
<label for="maxThumbnails"> <label for="maxThumbnails">
{{ $t('settings.max_thumbnails') }} {{ $t('settings.max_thumbnails') }}
</label> </label>
@ -84,7 +84,7 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="setting-item"> <div class="setting-item" v-if="expertLevel > 0">
<h2>{{ $t('settings.user_profiles') }}</h2> <h2>{{ $t('settings.user_profiles') }}</h2>
<ul class="setting-list"> <ul class="setting-list">
<li> <li>
@ -94,46 +94,6 @@
</li> </li>
</ul> </ul>
</div> </div>
<div class="setting-item">
<h2>{{ $t('settings.notifications') }}</h2>
<ul class="setting-list">
<li class="select-multiple">
<span class="label">{{ $t('settings.notification_visibility') }}</span>
<ul class="option-list">
<li>
<BooleanSetting path="notificationVisibility.likes">
{{ $t('settings.notification_visibility_likes') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationVisibility.repeats">
{{ $t('settings.notification_visibility_repeats') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationVisibility.follows">
{{ $t('settings.notification_visibility_follows') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationVisibility.mentions">
{{ $t('settings.notification_visibility_mentions') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationVisibility.moves">
{{ $t('settings.notification_visibility_moves') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationVisibility.emojiReactions">
{{ $t('settings.notification_visibility_emoji_reactions') }}
</BooleanSetting>
</li>
</ul>
</li>
</ul>
</div>
</div> </div>
</template> </template>
<script src="./filtering_tab.js"></script> <script src="./filtering_tab.js"></script>

11
src/components/settings_modal/tabs/general_tab.js
View file

@ -1,8 +1,10 @@
import BooleanSetting from '../helpers/boolean_setting.vue' import BooleanSetting from '../helpers/boolean_setting.vue'
import ChoiceSetting from '../helpers/choice_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 InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js' import SharedComputedObject from '../helpers/shared_computed_object.js'
import ServerSideIndicator from '../helpers/server_side_indicator.vue'
import { library } from '@fortawesome/fontawesome-svg-core' import { library } from '@fortawesome/fontawesome-svg-core'
import { import {
faGlobe faGlobe
@ -37,7 +39,9 @@ const GeneralTab = {
components: { components: {
BooleanSetting, BooleanSetting,
ChoiceSetting, ChoiceSetting,
InterfaceLanguageSwitcher InterfaceLanguageSwitcher,
ScopeSelector,
ServerSideIndicator,
}, },
computed: { computed: {
postFormats () { postFormats () {
@ -57,6 +61,11 @@ const GeneralTab = {
}, },
instanceShoutboxPresent () { return this.$store.state.instance.shoutAvailable }, instanceShoutboxPresent () { return this.$store.state.instance.shoutAvailable },
...SharedComputedObject() ...SharedComputedObject()
},
methods: {
changeDefaultScope (value) {
this.$store.dispatch('setServerSideOption', { name: 'defaultScope', value })
}
} }
} }

122
src/components/settings_modal/tabs/general_tab.vue
View file

@ -27,7 +27,7 @@
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="streaming"> <BooleanSetting path="streaming" expert="1">
{{ $t('settings.streaming') }} {{ $t('settings.streaming') }}
</BooleanSetting> </BooleanSetting>
<ul <ul
@ -38,6 +38,7 @@
<BooleanSetting <BooleanSetting
path="pauseOnUnfocused" path="pauseOnUnfocused"
:disabled="!streaming" :disabled="!streaming"
expert="1"
> >
{{ $t('settings.pause_on_unfocused') }} {{ $t('settings.pause_on_unfocused') }}
</BooleanSetting> </BooleanSetting>
@ -45,7 +46,7 @@
</ul> </ul>
</li> </li>
<li> <li>
<BooleanSetting path="useStreamingApi"> <BooleanSetting path="useStreamingApi" expert="1">
{{ $t('settings.useStreamingApi') }} {{ $t('settings.useStreamingApi') }}
<br> <br>
<small> <small>
@ -54,17 +55,22 @@
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="virtualScrolling"> <BooleanSetting path="virtualScrolling" expert="1">
{{ $t('settings.virtual_scrolling') }} {{ $t('settings.virtual_scrolling') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="autohideFloatingPostButton"> <BooleanSetting path="alwaysShowNewPostButton" expert="1">
{{ $t('settings.always_show_post_button') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="autohideFloatingPostButton" expert="1">
{{ $t('settings.autohide_floating_post_button') }} {{ $t('settings.autohide_floating_post_button') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li v-if="instanceShoutboxPresent"> <li v-if="instanceShoutboxPresent">
<BooleanSetting path="hideShoutbox"> <BooleanSetting path="hideShoutbox" expert="1">
{{ $t('settings.hide_shoutbox') }} {{ $t('settings.hide_shoutbox') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
@ -79,13 +85,18 @@
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="emojiReactionsOnTimeline"> <BooleanSetting path="emojiReactionsOnTimeline" expert="1">
{{ $t('settings.emoji_reactions_on_timeline') }} {{ $t('settings.emoji_reactions_on_timeline') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li>
<BooleanSetting path="serverSide_stripRichContent" expert="1" v-if="user">
{{ $t('settings.no_rich_text_description') }}
</BooleanSetting>
</li>
<h3>{{ $t('settings.attachments') }}</h3> <h3>{{ $t('settings.attachments') }}</h3>
<li> <li>
<BooleanSetting path="useContainFit"> <BooleanSetting path="useContainFit" expert="1">
{{ $t('settings.use_contain_fit') }} {{ $t('settings.use_contain_fit') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
@ -97,7 +108,7 @@
<ul class="setting-list suboptions"> <ul class="setting-list suboptions">
<li> <li>
<BooleanSetting <BooleanSetting
path="preloadImage" path="preloadImage" expert="1"
:disabled="!hideNsfw" :disabled="!hideNsfw"
> >
{{ $t('settings.preload_images') }} {{ $t('settings.preload_images') }}
@ -105,7 +116,7 @@
</li> </li>
<li> <li>
<BooleanSetting <BooleanSetting
path="useOneClickNsfw" path="useOneClickNsfw" expert="1"
:disabled="!hideNsfw" :disabled="!hideNsfw"
> >
{{ $t('settings.use_one_click_nsfw') }} {{ $t('settings.use_one_click_nsfw') }}
@ -113,7 +124,7 @@
</li> </li>
</ul> </ul>
<li> <li>
<BooleanSetting path="loopVideo"> <BooleanSetting path="loopVideo" expert="1">
{{ $t('settings.loop_video') }} {{ $t('settings.loop_video') }}
</BooleanSetting> </BooleanSetting>
<ul <ul
@ -122,7 +133,7 @@
> >
<li> <li>
<BooleanSetting <BooleanSetting
path="loopVideoSilentOnly" path="loopVideoSilentOnly" expert="1"
:disabled="!loopVideo || !loopSilentAvailable" :disabled="!loopVideo || !loopSilentAvailable"
> >
{{ $t('settings.loop_video_silent_only') }} {{ $t('settings.loop_video_silent_only') }}
@ -137,21 +148,11 @@
</ul> </ul>
</li> </li>
<li> <li>
<BooleanSetting path="playVideosInModal"> <BooleanSetting path="playVideosInModal" expert="1">
{{ $t('settings.play_videos_in_modal') }} {{ $t('settings.play_videos_in_modal') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<h3>{{ $t('settings.fun') }}</h3> <h3>{{ $t('settings.mention_links') }}</h3>
<li>
<BooleanSetting path="greentext">
{{ $t('settings.greentext') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="mentionLinkShowYous">
{{ $t('settings.show_yous') }}
</BooleanSetting>
</li>
<li> <li>
<ChoiceSetting <ChoiceSetting
id="mentionLinkDisplay" id="mentionLinkDisplay"
@ -164,15 +165,14 @@
<ul <ul
class="setting-list suboptions" class="setting-list suboptions"
> >
<li <li v-if="mentionLinkDisplay === 'short'">
v-if="mentionLinkDisplay === 'short'" <BooleanSetting path="mentionLinkShowTooltip" expert="1">
>
<BooleanSetting path="mentionLinkShowTooltip">
{{ $t('settings.mention_link_show_tooltip') }} {{ $t('settings.mention_link_show_tooltip') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
</ul>
<li> <li>
<BooleanSetting path="useAtIcon"> <BooleanSetting path="useAtIcon" expert="1">
{{ $t('settings.use_at_icon') }} {{ $t('settings.use_at_icon') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
@ -182,29 +182,56 @@
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="mentionLinkFadeDomain"> <BooleanSetting path="mentionLinkFadeDomain" expert="1">
{{ $t('settings.mention_link_fade_domain') }} {{ $t('settings.mention_link_fade_domain') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li v-if="user">
<BooleanSetting path="mentionLinkBoldenYou"> <BooleanSetting path="mentionLinkBoldenYou" expert="1">
{{ $t('settings.mention_link_bolden_you') }} {{ $t('settings.mention_link_bolden_you') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
</ul> <h3 v-if="expertLevel > 0">{{ $t('settings.fun') }}</h3>
<li>
<BooleanSetting path="greentext" expert="1">
{{ $t('settings.greentext') }}
</BooleanSetting>
</li>
<li v-if="user">
<BooleanSetting path="mentionLinkShowYous" expert="1">
{{ $t('settings.show_yous') }}
</BooleanSetting>
</li>
</ul> </ul>
</div> </div>
<div class="setting-item"> <div class="setting-item" v-if="user">
<h2>{{ $t('settings.composing') }}</h2> <h2>{{ $t('settings.composing') }}</h2>
<ul class="setting-list"> <ul class="setting-list">
<li> <li>
<BooleanSetting path="scopeCopy"> <label for="default-vis">
{{ $t('settings.default_vis') }} <ServerSideIndicator :serverSide="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="serverSide_defaultNSFW">
{{ $t('settings.sensitive_by_default') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="scopeCopy" expert="1">
{{ $t('settings.scope_copy') }} {{ $t('settings.scope_copy') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="alwaysShowSubjectInput"> <BooleanSetting path="alwaysShowSubjectInput" expert="1">
{{ $t('settings.subject_input_always_show') }} {{ $t('settings.subject_input_always_show') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
@ -213,6 +240,7 @@
id="subjectLineBehavior" id="subjectLineBehavior"
path="subjectLineBehavior" path="subjectLineBehavior"
:options="subjectLineOptions" :options="subjectLineOptions"
expert="1"
> >
{{ $t('settings.subject_line_behavior') }} {{ $t('settings.subject_line_behavior') }}
</ChoiceSetting> </ChoiceSetting>
@ -227,43 +255,27 @@
</ChoiceSetting> </ChoiceSetting>
</li> </li>
<li> <li>
<BooleanSetting path="minimalScopesMode"> <BooleanSetting path="minimalScopesMode" expert="1">
{{ $t('settings.minimal_scopes_mode') }} {{ $t('settings.minimal_scopes_mode') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="sensitiveByDefault"> <BooleanSetting path="alwaysShowNewPostButton" expert="1">
{{ $t('settings.sensitive_by_default') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="alwaysShowNewPostButton">
{{ $t('settings.always_show_post_button') }} {{ $t('settings.always_show_post_button') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="autohideFloatingPostButton"> <BooleanSetting path="autohideFloatingPostButton" expert="1">
{{ $t('settings.autohide_floating_post_button') }} {{ $t('settings.autohide_floating_post_button') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
<li> <li>
<BooleanSetting path="padEmoji"> <BooleanSetting path="padEmoji" expert="1">
{{ $t('settings.pad_emoji') }} {{ $t('settings.pad_emoji') }}
</BooleanSetting> </BooleanSetting>
</li> </li>
</ul> </ul>
</div> </div>
<div class="setting-item">
<h2>{{ $t('settings.notifications') }}</h2>
<ul class="setting-list">
<li>
<BooleanSetting path="webPushNotifications">
{{ $t('settings.enable_web_push_notifications') }}
</BooleanSetting>
</li>
</ul>
</div>
</div> </div>
</template> </template>

8
src/components/settings_modal/tabs/notifications_tab.js
View file

@ -1,4 +1,5 @@
import Checkbox from 'src/components/checkbox/checkbox.vue' import BooleanSetting from '../helpers/boolean_setting.vue'
import SharedComputedObject from '../helpers/shared_computed_object.js'
const NotificationsTab = { const NotificationsTab = {
data () { data () {
@ -9,12 +10,13 @@ const NotificationsTab = {
} }
}, },
components: { components: {
Checkbox BooleanSetting
}, },
computed: { computed: {
user () { user () {
return this.$store.state.users.currentUser return this.$store.state.users.currentUser
} },
...SharedComputedObject()
}, },
methods: { methods: {
updateNotificationSettings () { updateNotificationSettings () {

72
src/components/settings_modal/tabs/notifications_tab.vue
View file

@ -2,30 +2,68 @@
<div :label="$t('settings.notifications')"> <div :label="$t('settings.notifications')">
<div class="setting-item"> <div class="setting-item">
<h2>{{ $t('settings.notification_setting_filters') }}</h2> <h2>{{ $t('settings.notification_setting_filters') }}</h2>
<p> <ul class="setting-list">
<Checkbox v-model="notificationSettings.block_from_strangers"> <li>
{{ $t('settings.notification_setting_block_from_strangers') }} <BooleanSetting path="serverSide_blockNotificationsFromStrangers">
</Checkbox> {{ $t('settings.notification_setting_block_from_strangers') }}
</p> </BooleanSetting>
</li>
<li class="select-multiple">
<span class="label">{{ $t('settings.notification_visibility') }}</span>
<ul class="option-list">
<li>
<BooleanSetting path="notificationVisibility.likes">
{{ $t('settings.notification_visibility_likes') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationVisibility.repeats">
{{ $t('settings.notification_visibility_repeats') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationVisibility.follows">
{{ $t('settings.notification_visibility_follows') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationVisibility.mentions">
{{ $t('settings.notification_visibility_mentions') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationVisibility.moves">
{{ $t('settings.notification_visibility_moves') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="notificationVisibility.emojiReactions">
{{ $t('settings.notification_visibility_emoji_reactions') }}
</BooleanSetting>
</li>
</ul>
</li>
</ul>
</div> </div>
<div class="setting-item"> <div class="setting-item" v-if="expertLevel > 0">
<h2>{{ $t('settings.notification_setting_privacy') }}</h2> <h2>{{ $t('settings.notification_setting_privacy') }}</h2>
<p> <ul class="setting-list">
<Checkbox v-model="notificationSettings.hide_notification_contents"> <li>
{{ $t('settings.notification_setting_hide_notification_contents') }} <BooleanSetting path="webPushNotifications" expert="1">
</Checkbox> {{ $t('settings.enable_web_push_notifications') }}
</p> </BooleanSetting>
</li>
<li>
<BooleanSetting path="serverSide_webPushHideContents" expert="1">
{{ $t('settings.notification_setting_hide_notification_contents') }}
</BooleanSetting>
</li>
</ul>
</div> </div>
<div class="setting-item"> <div class="setting-item">
<p>{{ $t('settings.notification_mutes') }}</p> <p>{{ $t('settings.notification_mutes') }}</p>
<p>{{ $t('settings.notification_blocks') }}</p> <p>{{ $t('settings.notification_blocks') }}</p>
<button
class="btn button-default"
@click="updateNotificationSettings"
>
{{ $t('settings.save') }}
</button>
</div> </div>
</div> </div>
</template> </template>

23
src/components/settings_modal/tabs/profile_tab.js
View file

@ -8,6 +8,9 @@ import EmojiInput from 'src/components/emoji_input/emoji_input.vue'
import suggestor from 'src/components/emoji_input/suggestor.js' import suggestor from 'src/components/emoji_input/suggestor.js'
import Autosuggest from 'src/components/autosuggest/autosuggest.vue' import Autosuggest from 'src/components/autosuggest/autosuggest.vue'
import Checkbox from 'src/components/checkbox/checkbox.vue' 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' import { library } from '@fortawesome/fontawesome-svg-core'
import { import {
faTimes, faTimes,
@ -27,18 +30,10 @@ const ProfileTab = {
newName: this.$store.state.users.currentUser.name_unescaped, newName: this.$store.state.users.currentUser.name_unescaped,
newBio: unescape(this.$store.state.users.currentUser.description), newBio: unescape(this.$store.state.users.currentUser.description),
newLocked: this.$store.state.users.currentUser.locked, newLocked: this.$store.state.users.currentUser.locked,
newNoRichText: this.$store.state.users.currentUser.no_rich_text,
newDefaultScope: this.$store.state.users.currentUser.default_scope,
newFields: this.$store.state.users.currentUser.fields.map(field => ({ name: field.name, value: field.value })), newFields: this.$store.state.users.currentUser.fields.map(field => ({ name: field.name, value: field.value })),
hideFollows: this.$store.state.users.currentUser.hide_follows,
hideFollowers: this.$store.state.users.currentUser.hide_followers,
hideFollowsCount: this.$store.state.users.currentUser.hide_follows_count,
hideFollowersCount: this.$store.state.users.currentUser.hide_followers_count,
showRole: this.$store.state.users.currentUser.show_role, showRole: this.$store.state.users.currentUser.show_role,
role: this.$store.state.users.currentUser.role, role: this.$store.state.users.currentUser.role,
discoverable: this.$store.state.users.currentUser.discoverable,
bot: this.$store.state.users.currentUser.bot, bot: this.$store.state.users.currentUser.bot,
allowFollowingMove: this.$store.state.users.currentUser.allow_following_move,
pickAvatarBtnVisible: true, pickAvatarBtnVisible: true,
bannerUploading: false, bannerUploading: false,
backgroundUploading: false, backgroundUploading: false,
@ -54,12 +49,14 @@ const ProfileTab = {
EmojiInput, EmojiInput,
Autosuggest, Autosuggest,
ProgressButton, ProgressButton,
Checkbox Checkbox,
BooleanSetting
}, },
computed: { computed: {
user () { user () {
return this.$store.state.users.currentUser return this.$store.state.users.currentUser
}, },
...SharedComputedObject(),
emojiUserSuggestor () { emojiUserSuggestor () {
return suggestor({ return suggestor({
emoji: [ emoji: [
@ -123,15 +120,7 @@ const ProfileTab = {
/* eslint-disable camelcase */ /* eslint-disable camelcase */
display_name: this.newName, display_name: this.newName,
fields_attributes: this.newFields.filter(el => el != null), fields_attributes: this.newFields.filter(el => el != null),
default_scope: this.newDefaultScope,
no_rich_text: this.newNoRichText,
hide_follows: this.hideFollows,
hide_followers: this.hideFollowers,
discoverable: this.discoverable,
bot: this.bot, bot: this.bot,
allow_following_move: this.allowFollowingMove,
hide_follows_count: this.hideFollowsCount,
hide_followers_count: this.hideFollowersCount,
show_role: this.showRole show_role: this.showRole
/* eslint-enable camelcase */ /* eslint-enable camelcase */
} }).then((user) => { } }).then((user) => {

124
src/components/settings_modal/tabs/profile_tab.vue
View file

@ -25,61 +25,6 @@
class="bio resize-height" class="bio resize-height"
/> />
</EmojiInput> </EmojiInput>
<p>
<Checkbox v-model="newLocked">
{{ $t('settings.lock_account_description') }}
</Checkbox>
</p>
<div>
<label for="default-vis">{{ $t('settings.default_vis') }}</label>
<div
id="default-vis"
class="visibility-tray"
>
<scope-selector
:show-all="true"
:user-default="newDefaultScope"
:initial-scope="newDefaultScope"
:on-scope-change="changeVis"
/>
</div>
</div>
<p>
<Checkbox v-model="newNoRichText">
{{ $t('settings.no_rich_text_description') }}
</Checkbox>
</p>
<p>
<Checkbox v-model="hideFollows">
{{ $t('settings.hide_follows_description') }}
</Checkbox>
</p>
<p class="setting-subitem">
<Checkbox
v-model="hideFollowsCount"
:disabled="!hideFollows"
>
{{ $t('settings.hide_follows_count_description') }}
</Checkbox>
</p>
<p>
<Checkbox v-model="hideFollowers">
{{ $t('settings.hide_followers_description') }}
</Checkbox>
</p>
<p class="setting-subitem">
<Checkbox
v-model="hideFollowersCount"
:disabled="!hideFollowers"
>
{{ $t('settings.hide_followers_count_description') }}
</Checkbox>
</p>
<p>
<Checkbox v-model="allowFollowingMove">
{{ $t('settings.allow_following_move') }}
</Checkbox>
</p>
<p v-if="role === 'admin' || role === 'moderator'"> <p v-if="role === 'admin' || role === 'moderator'">
<Checkbox v-model="showRole"> <Checkbox v-model="showRole">
<template v-if="role === 'admin'"> <template v-if="role === 'admin'">
@ -90,11 +35,6 @@
</template> </template>
</Checkbox> </Checkbox>
</p> </p>
<p>
<Checkbox v-model="discoverable">
{{ $t('settings.discoverable') }}
</Checkbox>
</p>
<div v-if="maxFields > 0"> <div v-if="maxFields > 0">
<p>{{ $t('settings.profile_fields.label') }}</p> <p>{{ $t('settings.profile_fields.label') }}</p>
<div <div
@ -161,8 +101,7 @@
<p class="visibility-notice"> <p class="visibility-notice">
{{ $t('settings.avatar_size_instruction') }} {{ $t('settings.avatar_size_instruction') }}
</p> </p>
<div class="current-avatar-container"> <div class="current-avatar-container"> <img
<img
:src="user.profile_image_url_original" :src="user.profile_image_url_original"
class="current-avatar" class="current-avatar"
> >
@ -269,6 +208,67 @@
{{ $t('settings.save') }} {{ $t('settings.save') }}
</button> </button>
</div> </div>
<div class="setting-item">
<h2>{{ $t('settings.account_privacy') }}</h2>
<ul class="setting-list">
<li>
<BooleanSetting path="serverSide_locked">
{{ $t('settings.lock_account_description') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="serverSide_discoverable">
{{ $t('settings.discoverable') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="serverSide_allowFollowingMove">
{{ $t('settings.allow_following_move') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="serverSide_hideFavorites">
{{ $t('settings.hide_favorites_description') }}
</BooleanSetting>
</li>
<li>
<BooleanSetting path="serverSide_hideFollowers">
{{ $t('settings.hide_followers_description') }}
</BooleanSetting>
<ul
class="setting-list suboptions"
:class="[{disabled: !serverSide_hideFollowers}]"
>
<li>
<BooleanSetting
path="serverSide_hideFollowersCount"
:disabled="!severSide_hideFollowers"
>
{{ $t('settings.hide_followers_count_description') }}
</BooleanSetting>
</li>
</ul>
</li>
<li>
<BooleanSetting path="serverSide_hideFollows">
{{ $t('settings.hide_follows_description') }}
</BooleanSetting>
<ul
class="setting-list suboptions"
:class="[{disabled: !serverSide_hideFollows}]"
>
<li>
<BooleanSetting
path="serverSide_hideFollowsCount"
:disabled="!severSide_hideFollows"
>
{{ $t('settings.hide_follows_count_description') }}
</BooleanSetting>
</li>
</ul>
</li>
</ul>
</div>
</div> </div>
</template> </template>

5
src/i18n/en.json
View file

@ -259,11 +259,14 @@
}, },
"settings": { "settings": {
"app_name": "App name", "app_name": "App name",
"expert_mode": "Expert mode",
"save": "Save changes", "save": "Save changes",
"security": "Security", "security": "Security",
"setting_changed": "Setting is different from default", "setting_changed": "Setting is different from default",
"setting_server_side": "This setting is tied to your profile and affects all sessions and clients",
"enter_current_password_to_confirm": "Enter your current password to confirm your identity", "enter_current_password_to_confirm": "Enter your current password to confirm your identity",
"post_look_feel": "Posts Look & Feel", "post_look_feel": "Posts Look & Feel",
"mention_links": "Mention links",
"mfa": { "mfa": {
"otp": "OTP", "otp": "OTP",
"setup_otp": "Setup OTP", "setup_otp": "Setup OTP",
@ -400,6 +403,7 @@
"name": "Label", "name": "Label",
"value": "Content" "value": "Content"
}, },
"account_privacy": "Privacy",
"use_contain_fit": "Don't crop the attachment in thumbnails", "use_contain_fit": "Don't crop the attachment in thumbnails",
"name": "Name", "name": "Name",
"name_bio": "Name & bio", "name_bio": "Name & bio",
@ -417,6 +421,7 @@
"no_rich_text_description": "Strip rich text formatting from all posts", "no_rich_text_description": "Strip rich text formatting from all posts",
"no_blocks": "No blocks", "no_blocks": "No blocks",
"no_mutes": "No mutes", "no_mutes": "No mutes",
"hide_favorites_description": "Don't show list of my favorites (people still get notified)",
"hide_follows_description": "Don't show who I'm following", "hide_follows_description": "Don't show who I'm following",
"hide_followers_description": "Don't show who's following me", "hide_followers_description": "Don't show who's following me",
"hide_follows_count_description": "Don't show follow count", "hide_follows_count_description": "Don't show follow count",

2
src/main.js
View file

@ -11,6 +11,7 @@ import statusesModule from './modules/statuses.js'
import usersModule from './modules/users.js' import usersModule from './modules/users.js'
import apiModule from './modules/api.js' import apiModule from './modules/api.js'
import configModule from './modules/config.js' import configModule from './modules/config.js'
import serverSideConfigModule from './modules/serverSideConfig.js'
import shoutModule from './modules/shout.js' import shoutModule from './modules/shout.js'
import oauthModule from './modules/oauth.js' import oauthModule from './modules/oauth.js'
import authFlowModule from './modules/auth_flow.js' import authFlowModule from './modules/auth_flow.js'
@ -88,6 +89,7 @@ const persistedStateOptions = {
users: usersModule, users: usersModule,
api: apiModule, api: apiModule,
config: configModule, config: configModule,
serverSideConfig: serverSideConfigModule,
shout: shoutModule, shout: shoutModule,
oauth: oauthModule, oauth: oauthModule,
authFlow: authFlowModule, authFlow: authFlowModule,

1
src/modules/config.js
View file

@ -16,6 +16,7 @@ export const multiChoiceProperties = [
] ]
export const defaultState = { export const defaultState = {
expertLevel: 0, // used to track which settings to show and hide
colors: {}, colors: {},
theme: undefined, theme: undefined,
customTheme: undefined, customTheme: undefined,

111
src/modules/serverSideConfig.js Normal file
View file

@ -0,0 +1,111 @@
import { get, set } from 'lodash'
export const settingsMapGet = {
'defaultScope': 'source.privacy',
'defaultNSFW': 'source.sensitive',
'stripRichContent': 'source.pleroma.no_rich_content',
// Privacy
'locked': 'locked',
'acceptChatMessages': 'pleroma.accepts_chat_messages',
'allowFollowingMove': 'pleroma.allow_following_move',
'discoverable': 'source.discoverable',
'hideFavorites': 'pleroma.hide_favorites',
'hideFollowers': 'pleroma.hide_followers',
'hideFollows': 'pleroma.hide_follows',
'hideFollowersCount': 'pleroma.hide_followers_count',
'hideFollowsCount': 'pleroma.hide_follows_count',
// NotificationSettingsAPIs
'webPushHideContents': 'pleroma.notification_settings.hide_notification_contents',
'blockNotificationsFromStrangers': 'pleroma.notification_settings.block_from_strangers'
}
export const settingsMapSet = {
'defaultScope': 'source.privacy',
'defaultNSFW': 'source.sensitive',
'stripRichContent': 'source.pleroma.no_rich_content',
// Privacy
'locked': 'locked',
'acceptChatMessages': 'accepts_chat_messages',
'allowFollowingMove': 'allow_following_move',
'discoverable': 'source.discoverable',
'hideFavorites': 'hide_favorites',
'hideFollowers': 'hide_followers',
'hideFollows': 'hide_follows',
'hideFollowersCount': 'hide_followers_count',
'hideFollowsCount': 'hide_follows_count',
// NotificationSettingsAPIs
'webPushHideContents': 'hide_notification_contents',
'blockNotificationsFromStrangers': 'block_from_strangers'
}
export const customAPIs = {
__defaultApi: 'updateProfile',
'webPushHideContents': 'updateNotificationSettings',
'blockNotificationsFromStrangers': 'updateNotificationSettings'
}
export const defaultState = Object.fromEntries(Object.keys(settingsMapGet).map(key => [key, undefined]))
const serverSideConfig = {
state: { ...defaultState },
mutations: {
confirmServerSideOption (state, { name, value }) {
set(state, name, value)
},
wipeServerSideOption (state, { name }) {
set(state, name, undefined)
},
// Set the settings based on their path location
setCurrentUser (state, user) {
Object.entries(settingsMapGet).forEach(([name, path]) => {
set(state, name, get(user._original, path))
})
}
},
actions: {
setServerSideOption ({ rootState, state, commit, dispatch }, { name, value }) {
const oldValue = get(state, name)
const params = {}
const path = settingsMapSet[name]
if (!path) throw new Error('Invalid server-side setting')
commit('wipeServerSideOption', { name })
const customAPIName = customAPIs[name] || customAPIs.__defaultApi
const api = rootState.api.backendInteractor[customAPIName]
let prefix = ''
switch (customAPIName) {
case 'updateNotificationSettings':
prefix = 'settings.'
break
default:
prefix = 'params.'
break
}
set(params, prefix + path, value)
api(params)
.then((result) => {
switch (customAPIName) {
case 'updateNotificationSettings':
console.log(result)
if (result.status === 'success') {
commit('confirmServerSideOption', { name, value })
} else {
commit('confirmServerSideOption', { name, value: oldValue })
}
break
default:
commit('addNewUsers', [result])
commit('setCurrentUser', result)
break
}
console.log(state)
})
.catch((e) => {
console.warn('Error setting server-side option:', e)
commit('confirmServerSideOption', { name, value: oldValue })
})
}
}
}
export default serverSideConfig

1
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -44,6 +44,7 @@ export const parseUser = (data) => {
const mastoShort = masto && !data.hasOwnProperty('avatar') const mastoShort = masto && !data.hasOwnProperty('avatar')
output.id = String(data.id) output.id = String(data.id)
output._original = data // used for server-side settings
if (masto) { if (masto) {
output.screen_name = data.acct output.screen_name = data.acct