No OneTemporary
Actions

Authored By

Unknown

Size

46 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
	index f78f6815cb..9a4ed814d2 100644
	--- a/src/components/settings_modal/tabs/filtering_tab.js
	+++ b/src/components/settings_modal/tabs/filtering_tab.js
	@@ -1,215 +1,258 @@
	import { cloneDeep } from 'lodash'
	import { mapState, mapActions } from 'pinia'
	+import { mapState as mapVuexState } from 'vuex'
	import { v4 as uuidv4 } from 'uuid';

	import { useServerSideStorageStore } from 'src/stores/serverSideStorage'
	import { useInterfaceStore } from 'src/stores/interface'

	import {
	newImporter,
	newExporter
	} from 'src/services/export_import/export_import.js'

	import BooleanSetting from '../helpers/boolean_setting.vue'
	import ChoiceSetting from '../helpers/choice_setting.vue'
	import UnitSetting from '../helpers/unit_setting.vue'
	import IntegerSetting from '../helpers/integer_setting.vue'
	import HelpIndicator from '../helpers/help_indicator.vue'
	import Checkbox from 'src/components/checkbox/checkbox.vue'
	import Select from 'src/components/select/select.vue'

	import SharedComputedObject from '../helpers/shared_computed_object.js'

	const SUPPORTED_TYPES = new Set(['word', 'regexp', 'user', 'user_regexp'])

	const FilteringTab = {
	data () {
	return {
	replyVisibilityOptions: ['all', 'following', 'self'].map(mode => ({
	key: mode,
	value: mode,
	label: this.$t(`settings.reply_visibility_${mode}`)
	})),
	+ muteBlockLv1Options: ['ask', 'forever', 'temporarily'].map(mode => ({
	+ key: mode,
	+ value: mode,
	+ label: this.$t(`user_card.mute_block_${mode}`)
	+ })),
	muteFiltersDraftObject: cloneDeep(useServerSideStorageStore().prefsStorage.simple.muteFilters),
	muteFiltersDraftDirty: Object.fromEntries(
	Object.entries(
	useServerSideStorageStore().prefsStorage.simple.muteFilters
	).map(([k]) => [k, false])
	),
	exportedFilter: null,
	filterImporter: newImporter({
	validator (parsed) {
	if (Array.isArray(parsed)) return false
	if (!SUPPORTED_TYPES.has(parsed.type)) return false
	return true
	},
	onImport: (data) => {
	const {
	enabled = true,
	expires = null,
	hide = false,
	name = '',
	value = ''
	} = data

	this.createFilter({
	enabled,
	expires,
	hide,
	name,
	value
	})
	},
	onImportFailure (result) {
	console.error('Failure importing filter:', result)
	useInterfaceStore()
	.pushGlobalNotice({
	messageKey: 'settings.filter.import_failure',
	level: 'error'
	})
	}
	}),
	filterExporter: newExporter({
	filename: 'pleromafe_mute-filter',
	getExportedObject: () => this.exportedFilter
	})
	}
	},
	components: {
	BooleanSetting,
	ChoiceSetting,
	UnitSetting,
	IntegerSetting,
	Checkbox,
	Select,
	HelpIndicator
	},
	computed: {
	...SharedComputedObject(),
	...mapState(
	useServerSideStorageStore,
	{
	muteFilters: store => Object.entries(store.prefsStorage.simple.muteFilters),
	muteFiltersObject: store => store.prefsStorage.simple.muteFilters
	}
	),
	+ ...mapVuexState({
	+ blockExpirationSupported: state => state.instance.blockExpiration
	+ }),
	+ onMuteDefaultActionLv1: {
	+ get () {
	+ const value = this.$store.state.config.onMuteDefaultAction
	+ if (value === 'ask' \|\| value === 'forever') {
	+ return value
	+ } else {
	+ return 'temporarily'
	+ }
	+ },
	+ set (value) {
	+ let realValue = value
	+ if (value !== 'ask' && value !== 'forever') {
	+ realValue = '14d'
	+ }
	+ this.$store.dispatch('setOption', { name: 'onMuteDefaultAction', value: realValue })
	+ }
	+ },
	+ onBlockDefaultActionLv1: {
	+ get () {
	+ const value = this.$store.state.config.onBlockDefaultAction
	+ if (value === 'ask' \|\| value === 'forever') {
	+ return value
	+ } else {
	+ return 'temporarily'
	+ }
	+ },
	+ set (value) {
	+ let realValue = value
	+ if (value !== 'ask' && value !== 'forever') {
	+ realValue = '14d'
	+ }
	+ this.$store.dispatch('setOption', { name: 'onBlockDefaultAction', value: realValue })
	+ }
	+ },
	muteFiltersDraft () {
	return Object.entries(this.muteFiltersDraftObject)
	},
	muteFiltersExpired () {
	const now = Date.now()
	return Object
	.entries(this.muteFiltersDraftObject)
	.filter(([, { expires }]) => expires != null && expires <= now)
	}
	},
	methods: {
	...mapActions(useServerSideStorageStore, ['setPreference', 'unsetPreference', 'pushServerSideStorage']),
	getDatetimeLocal (timestamp) {
	const date = new Date(timestamp)
	const fmt = new Intl.NumberFormat("en-US", {minimumIntegerDigits: 2})
	const datetime = [
	date.getFullYear(),
	'-',
	fmt.format(date.getMonth() + 1),
	'-',
	fmt.format(date.getDate()),
	'T',
	fmt.format(date.getHours()),
	':',
	fmt.format(date.getMinutes())
	].join('')
	return datetime
	},
	checkRegexValid (id) {
	const filter = this.muteFiltersObject[id]
	if (filter.type !== 'regexp') return true
	if (filter.type !== 'user_regexp') return true
	const { value } = filter
	let valid = true
	try {
	new RegExp(value)
	} catch {
	valid = false
	console.error('Invalid RegExp: ' + value)
	}
	return valid
	},
	createFilter (filter = {
	type: 'word',
	value: '',
	name: 'New Filter',
	enabled: true,
	expires: null,
	hide: false,
	}) {
	const newId = uuidv4()

	filter.order = this.muteFilters.length + 2
	this.muteFiltersDraftObject[newId] = filter
	this.setPreference({ path: 'simple.muteFilters.' + newId , value: filter })
	this.pushServerSideStorage()
	},
	exportFilter(id) {
	this.exportedFilter = { ...this.muteFiltersDraftObject[id] }
	delete this.exportedFilter.order
	this.filterExporter.exportData()
	},
	importFilter() {
	this.filterImporter.importData()
	},
	copyFilter (id) {
	const filter = { ...this.muteFiltersDraftObject[id] }
	const newId = uuidv4()

	this.muteFiltersDraftObject[newId] = filter
	this.setPreference({ path: 'simple.muteFilters.' + newId , value: filter })
	this.pushServerSideStorage()
	},
	deleteFilter (id) {
	delete this.muteFiltersDraftObject[id]
	this.unsetPreference({ path: 'simple.muteFilters.' + id , value: null })
	this.pushServerSideStorage()
	},
	purgeExpiredFilters () {
	this.muteFiltersExpired.forEach(([id]) => {
	console.log(id)
	delete this.muteFiltersDraftObject[id]
	this.unsetPreference({ path: 'simple.muteFilters.' + id , value: null })
	})
	this.pushServerSideStorage()
	},
	updateFilter(id, field, value) {
	const filter = { ...this.muteFiltersDraftObject[id] }
	if (field === 'expires-never') {
	if (!value) {
	const offset = 1000 * 60 * 60 * 24 * 14 // 2 weeks
	const date = Date.now() + offset
	filter.expires = date
	} else {
	filter.expires = null
	}
	} else if (field === 'expires') {
	const parsed = Date.parse(value)
	filter.expires = parsed.valueOf()
	} else {
	filter[field] = value
	}
	this.muteFiltersDraftObject[id] = filter
	this.muteFiltersDraftDirty[id] = true
	},
	saveFilter(id) {
	this.setPreference({ path: 'simple.muteFilters.' + id , value: this.muteFiltersDraftObject[id] })
	this.pushServerSideStorage()
	this.muteFiltersDraftDirty[id] = false
	},
	},
	// Updating nested properties
	watch: {
	replyVisibility () {
	this.$store.dispatch('queueFlushAll')
	}
	}
	}

	export default FilteringTab
	diff --git a/src/components/settings_modal/tabs/filtering_tab.vue b/src/components/settings_modal/tabs/filtering_tab.vue
	index 6db82d3c4c..2b05d1906c 100644
	--- a/src/components/settings_modal/tabs/filtering_tab.vue
	+++ b/src/components/settings_modal/tabs/filtering_tab.vue
	@@ -1,345 +1,405 @@
	<template>
	<div
	:label="$t('settings.filtering')"
	class="filtering-tab"
	>
	<div class="setting-item">
	<h2>{{ $t('settings.filter.clutter') }}</h2>
	<ul class="setting-list">
	<li>
	<ChoiceSetting
	v-if="user"
	id="replyVisibility"
	path="replyVisibility"
	:options="replyVisibilityOptions"
	>
	{{ $t('settings.replies_in_timeline') }}
	</ChoiceSetting>
	</li>
	<li>
	<BooleanSetting
	expert="1"
	path="hidePostStats"
	>
	{{ $t('settings.hide_post_stats') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	expert="1"
	path="hideUserStats"
	>
	{{ $t('settings.hide_user_stats') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="hideBotIndication">
	{{ $t('settings.hide_actor_type_indication') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="hideScrobbles">
	{{ $t('settings.hide_scrobbles') }}
	</BooleanSetting>
	<ul class="setting-list suboptions">
	<li>
	<UnitSetting
	key="hideScrobblesAfter"
	path="hideScrobblesAfter"
	:units="['m', 'h', 'd']"
	unit-set="time"
	expert="1"
	>
	{{ $t('settings.hide_scrobbles_after') }}
	</UnitSetting>
	</li>
	</ul>
	</li>
	<h3>{{ $t('settings.attachments') }}</h3>
	<li>
	<IntegerSetting
	path="maxThumbnails"
	expert="1"
	:min="0"
	>
	{{ $t('settings.max_thumbnails') }}
	</IntegerSetting>
	</li>
	<li>
	<BooleanSetting path="hideAttachments">
	{{ $t('settings.hide_attachments_in_tl') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="hideAttachmentsInConv">
	{{ $t('settings.hide_attachments_in_convo') }}
	</BooleanSetting>
	</li>
	</ul>
	</div>
	<div class="setting-item">
	<h2>{{ $t('settings.filter.mute_filter') }}</h2>
	<ul class="setting-list">
	+ <li>
	+ {{ $t('user_card.default_mute_expiration') }}
	+ <Select
	+ id="onMuteDefaultActionLv1"
	+ v-model="onMuteDefaultActionLv1"
	+ >
	+ <option
	+ v-for="option in muteBlockLv1Options"
	+ :key="option.key"
	+ :value="option.value"
	+ >
	+ {{ option.label }}
	+ </option>
	+ </Select>
	+ <ul
	+ class="setting-list suboptions"
	+ v-if="onMuteDefaultActionLv1 === 'temporarily'"
	+ >
	+ <li>
	+ <UnitSetting
	+ path="onMuteDefaultAction"
	+ unit-set="time"
	+ :units="['s', 'm', 'h', 'd']"
	+ :min="0"
	+ >
	+ {{ $t('user_card.default_expiration_time') }}
	+ </UnitSetting>
	+ </li>
	+ </ul>
	+ </li>
	+ <li v-if="blockExpirationSupported">
	+ {{ $t('user_card.default_block_expiration') }}
	+ <Select
	+ id="onBlockDefaultActionLv1"
	+ v-model="onBlockDefaultActionLv1"
	+ >
	+ <option
	+ v-for="option in muteBlockLv1Options"
	+ :key="option.key"
	+ :value="option.value"
	+ >
	+ {{ option.label }}
	+ </option>
	+ </Select>
	+ <ul
	+ class="setting-list suboptions"
	+ v-if="onBlockDefaultActionLv1 === 'temporarily'"
	+ >
	+ <li>
	+ <UnitSetting
	+ path="onBlockDefaultAction"
	+ unit-set="time"
	+ :units="['s', 'm', 'h', 'd']"
	+ :min="0"
	+ >
	+ {{ $t('user_card.default_expiration_time') }}
	+ </UnitSetting>
	+ </li>
	+ </ul>
	+ </li>
	<li>
	<BooleanSetting path="hideFilteredStatuses">
	{{ $t('settings.hide_muted_statuses') }}
	</BooleanSetting>
	<ul class="setting-list suboptions">
	<li>
	<BooleanSetting
	parent-path="hideFilteredStatuses"
	:parent-invert="true"
	path="hideWordFilteredPosts"
	expert="1"
	>
	{{ $t('settings.hide_filtered_statuses') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	v-if="user"
	parent-path="hideFilteredStatuses"
	:parent-invert="true"
	path="hideMutedThreads"
	>
	{{ $t('settings.hide_muted_threads') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	v-if="user"
	parent-path="hideFilteredStatuses"
	:parent-invert="true"
	path="hideMutedPosts"
	>
	{{ $t('settings.hide_muted_posts') }}
	</BooleanSetting>
	</li>
	</ul>
	</li>
	<li>
	<BooleanSetting path="muteBotStatuses">
	{{ $t('settings.mute_bot_posts') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="muteSensitiveStatuses">
	{{ $t('settings.mute_sensitive_posts') }}
	</BooleanSetting>
	</li>
	<li>
	<h3>{{ $t('settings.filter.custom_filters') }}</h3>
	<p class="muteFiltersActions">
	<span class="total">
	{{ $t('settings.filter.total_count', { count: muteFiltersDraft.length }) }}
	</span>
	<button
	class="add-button button-default"
	type="button"
	@click="createFilter()"
	>
	{{ $t('settings.filter.new') }}
	</button>
	<button
	class="add-button button-default"
	type="button"
	@click="importFilter()"
	>
	{{ $t('settings.filter.import') }}
	</button>
	</p>
	<div class="muteFilterContainer">
	<div
	v-for="filter in muteFiltersDraft"
	:key="filter[0]"
	class="mute-filter"
	:style="{ order: filter[1].order }"
	>
	<div class="filter-name">
	<label
	:for="'filterName' + filter[0]"
	>
	{{ $t('settings.filter.name') }}
	</label>
	{{ ' ' }}
	<input
	:id="'filterName' + filter[0]"
	class="input"
	:value="filter[1].name"
	@input="updateFilter(filter[0], 'name', $event.target.value)"
	>
	<span
	v-if="filter[1].expires !== null && Date.now() > filter[1].expires"
	class="alert neutral"
	>
	{{ $t('settings.filter.expired') }}
	</span>
	</div>
	<div class="filter-enabled">
	<Checkbox
	:id="'filterHide' + filter[0]"
	:model-value="filter[1].hide"
	:name="'filterHide' + filter[0]"
	@update:model-value="updateFilter(filter[0], 'hide', $event)"
	>
	{{ $t('settings.filter.hide') }}
	</Checkbox>
	{{ ' ' }}
	<Checkbox
	:id="'filterEnabled' + filter[0]"
	:model-value="filter[1].enabled"
	:name="'filterEnabled' + filter[0]"
	@update:model-value="updateFilter(filter[0], 'enabled', $event)"
	>
	{{ $t('settings.enabled') }}
	</Checkbox>
	</div>
	<div class="filter-type filter-field">
	<label :for="'filterType' + filter[0]">
	<HelpIndicator>
	<p>
	{{ $t('settings.filter.help.word') }}
	</p>
	<p>
	{{ $t('settings.filter.help.user') }}
	</p>
	<i18n-t
	keypath="settings.filter.help.regexp"
	tag="p"
	>
	<template #link>
	<a
	:href="$t('settings.filter.help.regexp_url')"
	target="_blank"
	>
	{{ $t('settings.filter.help.regexp_link') }}
	</a>
	</template>
	</i18n-t>
	</HelpIndicator>
	{{ $t('settings.filter.type') }}
	</label>
	<Select
	:id="'filterType' + filter[0]"
	class="filter-field-value"
	:model-value="filter[1].type"
	@update:model-value="updateFilter(filter[0], 'type', $event)"
	>
	<option value="word">
	{{ $t('settings.filter.plain') }}
	</option>
	<option value="regexp">
	{{ $t('settings.filter.regexp') }}
	</option>
	<option value="user">
	{{ $t('settings.filter.user') }}
	</option>
	<option value="user_regexp">
	{{ $t('settings.filter.user_regexp') }}
	</option>
	</Select>
	</div>
	<div class="filter-value filter-field">
	<label
	:for="'filterValue' + filter[0]"
	>
	{{ $t('settings.filter.value') }}
	</label>
	{{ ' ' }}
	<input
	:id="'filterValue' + filter[0]"
	class="input filter-field-value"
	:value="filter[1].value"
	@input="updateFilter(filter[0], 'value', $event.target.value)"
	>
	</div>
	<div class="filter-expires filter-field">
	<label
	:for="'filterExpires' + filter[0]"
	>
	{{ $t('settings.filter.expires') }}
	</label>
	{{ ' ' }}
	<div class="filter-field-value">
	<input
	:id="'filterExpires' + filter[0]"
	class="input"
	:class="{ disabled: filter[1].expires === null }"
	type="datetime-local"
	:disabled="filter[1].expires === null"
	:value="filter[1].expires ? getDatetimeLocal(filter[1].expires) : null"
	@input="updateFilter(filter[0], 'expires', $event.target.value)"
	>
	{{ ' ' }}
	<Checkbox
	:id="'filterExpiresNever' + filter[0]"
	:model-value="filter[1].expires === null"
	:name="'filterExpiresNever' + filter[0]"
	class="input-inset input-boolean never"
	@update:model-value="updateFilter(filter[0], 'expires-never', $event)"
	>
	{{ $t('settings.filter.never_expires') }}
	</Checkbox>
	</div>
	</div>
	<div
	v-if="!checkRegexValid(filter[0])"
	class="alert error"
	>
	{{ $t('settings.filter.regexp_error') }}
	</div>
	<div class="filter-buttons">
	<button
	class="delete-button button-default -danger"
	type="button"
	@click="deleteFilter(filter[0])"
	>
	{{ $t('settings.filter.delete') }}
	</button>
	<button
	class="export-button button-default"
	type="button"
	@click="exportFilter(filter[0])"
	>
	{{ $t('settings.filter.export') }}
	</button>
	<button
	class="copy-button button-default"
	type="button"
	@click="copyFilter(filter[0])"
	>
	{{ $t('settings.filter.copy') }}
	</button>
	<button
	class="save-button button-default"
	:class="{ disabled: !muteFiltersDraftDirty[filter[0]] }"
	:disabled="!muteFiltersDraftDirty[filter[0]]"
	type="button"
	@click="saveFilter(filter[0])"
	>
	{{ $t('settings.filter.save') }}
	</button>
	</div>
	</div>
	</div>
	<p class="muteFiltersActionsBottom">
	<span class="total">
	{{ $t('settings.filter.expired_count', { count: muteFiltersExpired.length }) }}
	</span>
	<button
	class="add-button button-default"
	type="button"
	:class="{ disabled: muteFiltersExpired.length === 0 }"
	:disabled="muteFiltersExpired.length === 0"
	@click="purgeExpiredFilters()"
	>
	{{ $t('settings.filter.purge_expired') }}
	</button>
	</p>
	</li>
	</ul>
	</div>
	</div>
	</template>
	<script src="./filtering_tab.js"></script>
	<style src="./filtering_tab.scss"></style>
	diff --git a/src/components/settings_modal/tabs/general_tab.js b/src/components/settings_modal/tabs/general_tab.js
	index 7074a6d81e..879dfd1a34 100644
	--- a/src/components/settings_modal/tabs/general_tab.js
	+++ b/src/components/settings_modal/tabs/general_tab.js
	@@ -1,167 +1,124 @@
	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 IntegerSetting from '../helpers/integer_setting.vue'
	import FloatSetting from '../helpers/float_setting.vue'
	import UnitSetting from '../helpers/unit_setting.vue'
	import InterfaceLanguageSwitcher from 'src/components/interface_language_switcher/interface_language_switcher.vue'
	import Select from 'src/components/select/select.vue'

	import SharedComputedObject from '../helpers/shared_computed_object.js'
	import ProfileSettingIndicator from '../helpers/profile_setting_indicator.vue'

	-import { mapState } from 'vuex'
	import { clearCache, cacheKey, emojiCacheKey } from 'src/services/sw/sw.js'
	import { library } from '@fortawesome/fontawesome-svg-core'
	import {
	faGlobe
	} from '@fortawesome/free-solid-svg-icons'

	library.add(
	faGlobe
	)

	const GeneralTab = {
	data () {
	return {
	subjectLineOptions: ['email', 'noop', 'masto'].map(mode => ({
	key: mode,
	value: mode,
	label: this.$t(`settings.subject_line_${mode === 'masto' ? 'mastodon' : mode}`)
	})),
	conversationDisplayOptions: ['tree', 'linear'].map(mode => ({
	key: mode,
	value: mode,
	label: this.$t(`settings.conversation_display_${mode}`)
	})),
	absoluteTime12hOptions: ['24h', '12h'].map(mode => ({
	key: mode,
	value: mode,
	label: this.$t(`settings.absolute_time_format_12h_${mode}`)
	})),
	conversationOtherRepliesButtonOptions: ['below', 'inside'].map(mode => ({
	key: mode,
	value: mode,
	label: this.$t(`settings.conversation_other_replies_button_${mode}`)
	})),
	mentionLinkDisplayOptions: ['short', 'full_for_remote', 'full'].map(mode => ({
	key: mode,
	value: mode,
	label: this.$t(`settings.mention_link_display_${mode}`)
	})),
	userPopoverAvatarActionOptions: ['close', 'zoom', 'open'].map(mode => ({
	key: mode,
	value: mode,
	label: this.$t(`settings.user_popover_avatar_action_${mode}`)
	})),
	unsavedPostActionOptions: ['save', 'discard', 'confirm'].map(mode => ({
	key: mode,
	value: mode,
	label: this.$t(`settings.unsaved_post_action_${mode}`)
	})),
	- muteBlockLv1Options: ['ask', 'forever', 'temporarily'].map(mode => ({
	- key: mode,
	- value: mode,
	- label: this.$t(`user_card.mute_block_${mode}`)
	- })),
	loopSilentAvailable:
	// Firefox
	Object.getOwnPropertyDescriptor(HTMLVideoElement.prototype, 'mozHasAudio') \|\|
	// Chrome-likes
	Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'webkitAudioDecodedByteCount') \|\|
	// Future spec, still not supported in Nightly 63 as of 08/2018
	Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks')
	}
	},
	components: {
	BooleanSetting,
	ChoiceSetting,
	IntegerSetting,
	FloatSetting,
	UnitSetting,
	InterfaceLanguageSwitcher,
	ScopeSelector,
	ProfileSettingIndicator,
	Select
	},
	computed: {
	postFormats () {
	return this.$store.state.instance.postFormats \|\| []
	},
	- onMuteDefaultActionLv1: {
	- get () {
	- const value = this.$store.state.config.onMuteDefaultAction
	- if (value === 'ask' \|\| value === 'forever') {
	- return value
	- } else {
	- return 'temporarily'
	- }
	- },
	- set (value) {
	- let realValue = value
	- if (value !== 'ask' && value !== 'forever') {
	- realValue = '14d'
	- }
	- this.$store.dispatch('setOption', { name: 'onMuteDefaultAction', value: realValue })
	- }
	- },
	- onBlockDefaultActionLv1: {
	- get () {
	- const value = this.$store.state.config.onBlockDefaultAction
	- if (value === 'ask' \|\| value === 'forever') {
	- return value
	- } else {
	- return 'temporarily'
	- }
	- },
	- set (value) {
	- let realValue = value
	- if (value !== 'ask' && value !== 'forever') {
	- realValue = '14d'
	- }
	- this.$store.dispatch('setOption', { name: 'onBlockDefaultAction', value: realValue })
	- }
	- },
	postContentOptions () {
	return this.postFormats.map(format => ({
	key: format,
	value: format,
	label: this.$t(`post_status.content_type["${format}"]`)
	}))
	},
	language: {
	get: function () { return this.$store.getters.mergedConfig.interfaceLanguage },
	set: function (val) {
	this.$store.dispatch('setOption', { name: 'interfaceLanguage', value: val })
	}
	},
	instanceShoutboxPresent () { return this.$store.state.instance.shoutAvailable },
	instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel },
	- ...SharedComputedObject(),
	- ...mapState({
	- blockExpirationSupported: state => state.instance.blockExpiration
	- })
	+ ...SharedComputedObject()
	},
	methods: {
	changeDefaultScope (value) {
	this.$store.dispatch('setProfileOption', { name: 'defaultScope', value })
	},
	clearCache (key) {
	clearCache(key)
	.then(() => {
	this.$store.dispatch('settingsSaved', { success: true })
	})
	.catch(error => {
	this.$store.dispatch('settingsSaved', { error })
	})
	},
	clearAssetCache () {
	this.clearCache(cacheKey)
	},
	clearEmojiCache () {
	this.clearCache(emojiCacheKey)
	}
	}
	}

	export default GeneralTab
	diff --git a/src/components/settings_modal/tabs/general_tab.vue b/src/components/settings_modal/tabs/general_tab.vue
	index 648d7ac848..40d40bc3e9 100644
	--- a/src/components/settings_modal/tabs/general_tab.vue
	+++ b/src/components/settings_modal/tabs/general_tab.vue
	@@ -1,593 +1,533 @@
	<template>
	<div :label="$t('settings.general')">
	<div class="setting-item">
	<h2>{{ $t('settings.interface') }}</h2>
	<ul class="setting-list">
	<li>
	<interface-language-switcher
	:prompt-text="$t('settings.interfaceLanguage')"
	:language="language"
	:set-language="val => language = val"
	/>
	</li>
	<li v-if="instanceSpecificPanelPresent">
	<BooleanSetting path="hideISP">
	{{ $t('settings.hide_isp') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="stopGifs">
	{{ $t('settings.stop_gifs') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="streaming">
	{{ $t('settings.streaming') }}
	</BooleanSetting>
	<ul class="setting-list suboptions">
	<li>
	<BooleanSetting
	path="pauseOnUnfocused"
	parent-path="streaming"
	>
	{{ $t('settings.pause_on_unfocused') }}
	</BooleanSetting>
	</li>
	</ul>
	</li>
	<li>
	<BooleanSetting
	path="useStreamingApi"
	expert="1"
	>
	{{ $t('settings.useStreamingApi') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="virtualScrolling"
	expert="1"
	>
	{{ $t('settings.virtual_scrolling') }}
	</BooleanSetting>
	</li>
	<li>
	<ChoiceSetting
	id="userPopoverAvatarAction"
	path="userPopoverAvatarAction"
	:options="userPopoverAvatarActionOptions"
	expert="1"
	>
	{{ $t('settings.user_popover_avatar_action') }}
	</ChoiceSetting>
	</li>
	<li>
	<BooleanSetting
	path="userPopoverOverlay"
	expert="1"
	>
	{{ $t('settings.user_popover_avatar_overlay') }}
	</BooleanSetting>
	</li>
	- <li>
	- {{ $t('user_card.default_mute_expiration') }}
	- <Select
	- id="onMuteDefaultActionLv1"
	- v-model="onMuteDefaultActionLv1"
	- >
	- <option
	- v-for="option in muteBlockLv1Options"
	- :key="option.key"
	- :value="option.value"
	- >
	- {{ option.label }}
	- </option>
	- </Select>
	- <ul
	- class="setting-list suboptions"
	- v-if="onMuteDefaultActionLv1 === 'temporarily'"
	- >
	- <li>
	- <UnitSetting
	- path="onMuteDefaultAction"
	- unit-set="time"
	- :units="['s', 'm', 'h', 'd']"
	- :min="0"
	- >
	- {{ $t('user_card.default_expiration_time') }}
	- </UnitSetting>
	- </li>
	- </ul>
	- </li>
	- <li v-if="blockExpirationSupported">
	- {{ $t('user_card.default_block_expiration') }}
	- <Select
	- id="onBlockDefaultActionLv1"
	- v-model="onBlockDefaultActionLv1"
	- >
	- <option
	- v-for="option in muteBlockLv1Options"
	- :key="option.key"
	- :value="option.value"
	- >
	- {{ option.label }}
	- </option>
	- </Select>
	- <ul
	- class="setting-list suboptions"
	- v-if="onBlockDefaultActionLv1 === 'temporarily'"
	- >
	- <li>
	- <UnitSetting
	- path="onBlockDefaultAction"
	- unit-set="time"
	- :units="['s', 'm', 'h', 'd']"
	- :min="0"
	- >
	- {{ $t('user_card.default_expiration_time') }}
	- </UnitSetting>
	- </li>
	- </ul>
	- </li>
	<li>
	<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') }}
	</BooleanSetting>
	</li>
	<li v-if="instanceShoutboxPresent">
	<BooleanSetting
	path="hideShoutbox"
	expert="1"
	>
	{{ $t('settings.hide_shoutbox') }}
	</BooleanSetting>
	</li>
	<li class="select-multiple">
	<span class="label">{{ $t('settings.confirm_dialogs') }}</span>
	<ul class="option-list">
	<li>
	<BooleanSetting path="modalOnRepeat">
	{{ $t('settings.confirm_dialogs_repeat') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="modalOnUnfollow">
	{{ $t('settings.confirm_dialogs_unfollow') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting v-if="!blockExpirationSupported" path="modalOnBlock">
	{{ $t('settings.confirm_dialogs_block') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="modalOnMuteConversation">
	{{ $t('settings.confirm_dialogs_mute_conversation') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="modalOnMuteDomain">
	{{ $t('settings.confirm_dialogs_mute_domain') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="modalOnDelete">
	{{ $t('settings.confirm_dialogs_delete') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="modalOnLogout">
	{{ $t('settings.confirm_dialogs_logout') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="modalOnApproveFollow">
	{{ $t('settings.confirm_dialogs_approve_follow') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="modalOnDenyFollow">
	{{ $t('settings.confirm_dialogs_deny_follow') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="modalOnRemoveUserFromFollowers">
	{{ $t('settings.confirm_dialogs_remove_follower') }}
	</BooleanSetting>
	</li>
	</ul>
	</li>
	</ul>
	</div>
	<div class="setting-item">
	<h2>{{ $t('settings.post_look_feel') }}</h2>
	<ul class="setting-list">
	<li>
	<ChoiceSetting
	id="conversationDisplay"
	path="conversationDisplay"
	:options="conversationDisplayOptions"
	>
	{{ $t('settings.conversation_display') }}
	</ChoiceSetting>
	</li>
	<ul
	v-if="mergedConfig.conversationDisplay !== 'linear'"
	class="setting-list suboptions"
	>
	<li>
	<BooleanSetting path="conversationTreeAdvanced">
	{{ $t('settings.tree_advanced') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="conversationTreeFadeAncestors"
	:expert="1"
	>
	{{ $t('settings.tree_fade_ancestors') }}
	</BooleanSetting>
	</li>
	<li>
	<IntegerSetting
	path="maxDepthInThread"
	:min="3"
	:expert="1"
	>
	{{ $t('settings.max_depth_in_thread') }}
	</IntegerSetting>
	</li>
	<li>
	<ChoiceSetting
	id="conversationOtherRepliesButton"
	path="conversationOtherRepliesButton"
	:options="conversationOtherRepliesButtonOptions"
	:expert="1"
	>
	{{ $t('settings.conversation_other_replies_button') }}
	</ChoiceSetting>
	</li>
	</ul>
	<li>
	<BooleanSetting path="collapseMessageWithSubject">
	{{ $t('settings.collapse_subject') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="emojiReactionsOnTimeline"
	expert="1"
	>
	{{ $t('settings.emoji_reactions_on_timeline') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	v-if="user"
	source="profile"
	path="stripRichContent"
	expert="1"
	>
	{{ $t('settings.no_rich_text_description') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="useAbsoluteTimeFormat"
	expert="1"
	>
	{{ $t('settings.absolute_time_format') }}
	</BooleanSetting>
	</li>
	<ul
	v-if="mergedConfig.useAbsoluteTimeFormat"
	class="setting-list suboptions"
	>
	<li>
	<UnitSetting
	path="absoluteTimeFormatMinAge"
	unit-set="time"
	:units="['s', 'm', 'h', 'd']"
	:min="0"
	>
	{{ $t('settings.absolute_time_format_min_age') }}
	</UnitSetting>
	</li>
	<li>
	<ChoiceSetting
	id="absoluteTime12h"
	path="absoluteTime12h"
	:options="absoluteTime12hOptions"
	:expert="1"
	>
	{{ $t('settings.absolute_time_format_12h') }}
	</ChoiceSetting>
	</li>
	</ul>
	<h3>{{ $t('settings.attachments') }}</h3>
	<li>
	<BooleanSetting
	path="imageCompression"
	expert="1"
	>
	{{ $t('settings.image_compression') }}
	</BooleanSetting>
	</li>
	<ul class="setting-list suboptions">
	<li>
	<BooleanSetting
	path="alwaysUseJpeg"
	expert="1"
	parent-path="imageCompression"
	>
	{{ $t('settings.always_use_jpeg') }}
	</BooleanSetting>
	</li>
	</ul>
	<li>
	<BooleanSetting
	path="useContainFit"
	expert="1"
	>
	{{ $t('settings.use_contain_fit') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="hideNsfw">
	{{ $t('settings.nsfw_clickthrough') }}
	</BooleanSetting>
	</li>
	<ul class="setting-list suboptions">
	<li>
	<BooleanSetting
	path="preloadImage"
	expert="1"
	parent-path="hideNsfw"
	>
	{{ $t('settings.preload_images') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="useOneClickNsfw"
	expert="1"
	parent-path="hideNsfw"
	>
	{{ $t('settings.use_one_click_nsfw') }}
	</BooleanSetting>
	</li>
	</ul>
	<li>
	<BooleanSetting
	path="loopVideo"
	expert="1"
	>
	{{ $t('settings.loop_video') }}
	</BooleanSetting>
	<ul class="setting-list suboptions">
	<li>
	<BooleanSetting
	path="loopVideoSilentOnly"
	expert="1"
	parent-path="loopVideo"
	:disabled="!loopSilentAvailable"
	>
	{{ $t('settings.loop_video_silent_only') }}
	</BooleanSetting>
	<div
	v-if="!loopSilentAvailable"
	class="unavailable"
	>
	<FAIcon icon="globe" />! {{ $t('settings.limited_availability') }}
	</div>
	</li>
	</ul>
	</li>
	<li>
	<BooleanSetting
	path="playVideosInModal"
	expert="1"
	>
	{{ $t('settings.play_videos_in_modal') }}
	</BooleanSetting>
	</li>
	<h3>{{ $t('settings.mention_links') }}</h3>
	<li>
	<ChoiceSetting
	id="mentionLinkDisplay"
	path="mentionLinkDisplay"
	:options="mentionLinkDisplayOptions"
	>
	{{ $t('settings.mention_link_display') }}
	</ChoiceSetting>
	</li>
	<li>
	<BooleanSetting
	path="mentionLinkShowTooltip"
	expert="1"
	>
	{{ $t('settings.mention_link_use_tooltip') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting path="mentionLinkShowAvatar">
	{{ $t('settings.mention_link_show_avatar') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="mentionLinkFadeDomain"
	expert="1"
	>
	{{ $t('settings.mention_link_fade_domain') }}
	</BooleanSetting>
	</li>
	<li v-if="user">
	<BooleanSetting
	path="mentionLinkBoldenYou"
	expert="1"
	>
	{{ $t('settings.mention_link_bolden_you') }}
	</BooleanSetting>
	</li>
	<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>
	</div>

	<div
	v-if="user"
	class="setting-item"
	>
	<h2>{{ $t('settings.composing') }}</h2>
	<ul class="setting-list">
	<li>
	<label for="default-vis">
	{{ $t('settings.default_vis') }} <ProfileSettingIndicator :is-profile="true" />
	<ScopeSelector
	class="scope-selector"
	:show-all="true"
	:user-default="$store.state.profileConfig.defaultScope"
	:initial-scope="$store.state.profileConfig.defaultScope"
	:on-scope-change="changeDefaultScope"
	/>
	</label>
	</li>
	<li>
	<!-- <BooleanSetting source="profile" path="defaultNSFW"> -->
	<BooleanSetting path="sensitiveByDefault">
	{{ $t('settings.sensitive_by_default') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="scopeCopy"
	expert="1"
	>
	{{ $t('settings.scope_copy') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="alwaysShowSubjectInput"
	expert="1"
	>
	{{ $t('settings.subject_input_always_show') }}
	</BooleanSetting>
	</li>
	<li>
	<ChoiceSetting
	id="subjectLineBehavior"
	path="subjectLineBehavior"
	:options="subjectLineOptions"
	expert="1"
	>
	{{ $t('settings.subject_line_behavior') }}
	</ChoiceSetting>
	</li>
	<li v-if="postFormats.length > 0">
	<ChoiceSetting
	id="postContentType"
	path="postContentType"
	:options="postContentOptions"
	>
	{{ $t('settings.post_status_content_type') }}
	</ChoiceSetting>
	</li>
	<li>
	<BooleanSetting
	path="minimalScopesMode"
	expert="1"
	>
	{{ $t('settings.minimal_scopes_mode') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="padEmoji"
	expert="1"
	>
	{{ $t('settings.pad_emoji') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="autocompleteSelect"
	expert="1"
	>
	{{ $t('settings.autocomplete_select_first') }}
	</BooleanSetting>
	</li>
	<li>
	<BooleanSetting
	path="autoSaveDraft"
	>
	{{ $t('settings.auto_save_draft') }}
	</BooleanSetting>
	</li>
	<li v-if="!mergedConfig.autoSaveDraft">
	<ChoiceSetting
	id="unsavedPostAction"
	path="unsavedPostAction"
	:options="unsavedPostActionOptions"
	>
	{{ $t('settings.unsaved_post_action') }}
	</ChoiceSetting>
	</li>
	</ul>
	</div>
	<div
	class="setting-item"
	>
	<h2>{{ $t('settings.cache') }}</h2>
	<ul class="setting-list">
	<li>
	<button
	class="btn button-default"
	@click="clearAssetCache"
	>
	{{ $t('settings.clear_asset_cache') }}
	</button>
	</li>
	<li>
	<button
	class="btn button-default"
	@click="clearEmojiCache"
	>
	{{ $t('settings.clear_emoji_cache') }}
	</button>
	</li>
	</ul>
	</div>
	</div>
	</template>

	<script src="./general_tab.js"></script>

File Metadata

Mime Type: text/x-diff
Expires: Sun, Nov 1, 2:51 AM (18 h, 16 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1802279
Default Alt Text: (46 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions