No OneTemporary
Actions

Size

150 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/boot/after_store.js b/src/boot/after_store.js
	index 0a4ec857d0..a5f8c97875 100644
	--- a/src/boot/after_store.js
	+++ b/src/boot/after_store.js
	@@ -1,261 +1,267 @@
	import Vue from 'vue'
	import VueRouter from 'vue-router'
	import routes from './routes'

	import App from '../App.vue'

	const getStatusnetConfig = async ({ store }) => {
	try {
	const res = await window.fetch('/api/statusnet/config.json')
	if (res.ok) {
	const data = await res.json()
	const { name, closed: registrationClosed, textlimit, uploadlimit, server, vapidPublicKey } = data.site

	store.dispatch('setInstanceOption', { name: 'name', value: name })
	store.dispatch('setInstanceOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
	store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) })
	store.dispatch('setInstanceOption', { name: 'server', value: server })

	// TODO: default values for this stuff, added if to not make it break on
	// my dev config out of the box.
	if (uploadlimit) {
	store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadlimit.uploadlimit) })
	store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadlimit.avatarlimit) })
	store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadlimit.backgroundlimit) })
	store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadlimit.bannerlimit) })
	}

	if (vapidPublicKey) {
	store.dispatch('setInstanceOption', { name: 'vapidPublicKey', value: vapidPublicKey })
	}

	return data.site.pleromafe
	} else {
	throw (res)
	}
	} catch (error) {
	console.error('Could not load statusnet config, potentially fatal')
	console.error(error)
	}
	}

	const getStaticConfig = async () => {
	try {
	const res = await window.fetch('/static/config.json')
	if (res.ok) {
	return res.json()
	} else {
	throw (res)
	}
	} catch (error) {
	console.warn('Failed to load static/config.json, continuing without it.')
	console.warn(error)
	return {}
	}
	}

	const setSettings = async ({ apiConfig, staticConfig, store }) => {
	const overrides = window.___pleromafe_dev_overrides \|\| {}
	const env = window.___pleromafe_mode.NODE_ENV

	// This takes static config and overrides properties that are present in apiConfig
	let config = {}
	if (overrides.staticConfigPreference && env === 'development') {
	console.warn('OVERRIDING API CONFIG WITH STATIC CONFIG')
	config = Object.assign({}, apiConfig, staticConfig)
	} else {
	config = Object.assign({}, staticConfig, apiConfig)
	}

	const copyInstanceOption = (name) => {
	store.dispatch('setInstanceOption', { name, value: config[name] })
	}

	copyInstanceOption('nsfwCensorImage')
	copyInstanceOption('background')
	copyInstanceOption('hidePostStats')
	copyInstanceOption('hideUserStats')
	copyInstanceOption('hideFilteredStatuses')
	copyInstanceOption('logo')

	store.dispatch('setInstanceOption', {
	name: 'logoMask',
	value: typeof config.logoMask === 'undefined'
	? true
	: config.logoMask
	})

	store.dispatch('setInstanceOption', {
	name: 'logoMargin',
	value: typeof config.logoMargin === 'undefined'
	? 0
	: config.logoMargin
	})

	copyInstanceOption('redirectRootNoLogin')
	copyInstanceOption('redirectRootLogin')
	copyInstanceOption('showInstanceSpecificPanel')
	copyInstanceOption('scopeOptionsEnabled')
	copyInstanceOption('formattingOptionsEnabled')
	copyInstanceOption('collapseMessageWithSubject')
	copyInstanceOption('loginMethod')
	copyInstanceOption('scopeCopy')
	copyInstanceOption('subjectLineBehavior')
	copyInstanceOption('postContentType')
	copyInstanceOption('alwaysShowSubjectInput')
	copyInstanceOption('noAttachmentLinks')
	copyInstanceOption('showFeaturesPanel')

	if ((config.chatDisabled)) {
	store.dispatch('disableChat')
	} else {
	store.dispatch('initializeSocket')
	}

	return store.dispatch('setTheme', config['theme'])
	}

	const getTOS = async ({ store }) => {
	try {
	const res = await window.fetch('/static/terms-of-service.html')
	if (res.ok) {
	const html = await res.text()
	store.dispatch('setInstanceOption', { name: 'tos', value: html })
	} else {
	throw (res)
	}
	} catch (e) {
	console.warn("Can't load TOS")
	console.warn(e)
	}
	}

	const getInstancePanel = async ({ store }) => {
	try {
	const res = await window.fetch('/instance/panel.html')
	if (res.ok) {
	const html = await res.text()
	store.dispatch('setInstanceOption', { name: 'instanceSpecificPanelContent', value: html })
	} else {
	throw (res)
	}
	} catch (e) {
	console.warn("Can't load instance panel")
	console.warn(e)
	}
	}

	const getStaticEmoji = async ({ store }) => {
	try {
	const res = await window.fetch('/static/emoji.json')
	if (res.ok) {
	const values = await res.json()
	const emoji = Object.keys(values).map((key) => {
	return { shortcode: key, image_url: false, 'utf': values[key] }
	})
	store.dispatch('setInstanceOption', { name: 'emoji', value: emoji })
	} else {
	throw (res)
	}
	} catch (e) {
	console.warn("Can't load static emoji")
	console.warn(e)
	}
	}

	// This is also used to indicate if we have a 'pleroma backend' or not.
	// Somewhat weird, should probably be somewhere else.
	const getCustomEmoji = async ({ store }) => {
	try {
	const res = await window.fetch('/api/pleroma/emoji.json')
	if (res.ok) {
	const values = await res.json()
	const emoji = Object.keys(values).map((key) => {
	return { shortcode: key, image_url: values[key] }
	})
	store.dispatch('setInstanceOption', { name: 'customEmoji', value: emoji })
	store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: true })
	} else {
	throw (res)
	}
	} catch (e) {
	store.dispatch('setInstanceOption', { name: 'pleromaBackend', value: false })
	console.warn("Can't load custom emojis, maybe not a Pleroma instance?")
	console.warn(e)
	}
	}

	const getNodeInfo = async ({ store }) => {
	try {
	const res = await window.fetch('/nodeinfo/2.0.json')
	if (res.ok) {
	const data = await res.json()
	const metadata = data.metadata

	const features = metadata.features
	store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') })
	store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') })
	store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') })

	store.dispatch('setInstanceOption', { name: 'restrictedNicknames', value: metadata.restrictedNicknames })
	store.dispatch('setInstanceOption', { name: 'postFormats', value: metadata.postFormats })

	const suggestions = metadata.suggestions
	store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
	store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web })
	+
	+ const software = data.software
	+ store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
	+
	+ const frontendVersion = window.___pleromafe_commit_hash
	+ store.dispatch('setInstanceOption', { name: 'frontendVersion', value: frontendVersion })
	} else {
	throw (res)
	}
	} catch (e) {
	console.warn('Could not load nodeinfo')
	console.warn(e)
	}
	}

	const afterStoreSetup = async ({ store, i18n }) => {
	if (store.state.config.customTheme) {
	// This is a hack to deal with async loading of config.json and themes
	// See: style_setter.js, setPreset()
	window.themeLoaded = true
	store.dispatch('setOption', {
	name: 'customTheme',
	value: store.state.config.customTheme
	})
	}

	const apiConfig = await getStatusnetConfig({ store })
	const staticConfig = await getStaticConfig()
	await setSettings({ store, apiConfig, staticConfig })
	await getTOS({ store })
	await getInstancePanel({ store })
	await getStaticEmoji({ store })
	await getCustomEmoji({ store })
	await getNodeInfo({ store })

	// Now we have the server settings and can try logging in
	if (store.state.oauth.token) {
	store.dispatch('loginUser', store.state.oauth.token)
	}

	const router = new VueRouter({
	mode: 'history',
	routes: routes(store),
	scrollBehavior: (to, _from, savedPosition) => {
	if (to.matched.some(m => m.meta.dontScroll)) {
	return false
	}
	return savedPosition \|\| { x: 0, y: 0 }
	}
	})

	/* eslint-disable no-new */
	return new Vue({
	router,
	store,
	i18n,
	el: '#app',
	render: h => h(App)
	})
	}

	export default afterStoreSetup
	diff --git a/src/components/follow_card/follow_card.js b/src/components/follow_card/follow_card.js
	index 425c9c3e8f..ac4e265a78 100644
	--- a/src/components/follow_card/follow_card.js
	+++ b/src/components/follow_card/follow_card.js
	@@ -1,45 +1,50 @@
	import BasicUserCard from '../basic_user_card/basic_user_card.vue'
	+import RemoteFollow from '../remote_follow/remote_follow.vue'
	import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'

	const FollowCard = {
	props: [
	'user',
	'noFollowsYou'
	],
	data () {
	return {
	inProgress: false,
	requestSent: false,
	updated: false
	}
	},
	components: {
	- BasicUserCard
	+ BasicUserCard,
	+ RemoteFollow
	},
	computed: {
	isMe () { return this.$store.state.users.currentUser.id === this.user.id },
	following () { return this.updated ? this.updated.following : this.user.following },
	showFollow () {
	return !this.following \|\| this.updated && !this.updated.following
	+ },
	+ loggedIn () {
	+ return this.$store.state.users.currentUser
	}
	},
	methods: {
	followUser () {
	this.inProgress = true
	requestFollow(this.user, this.$store).then(({ sent, updated }) => {
	this.inProgress = false
	this.requestSent = sent
	this.updated = updated
	})
	},
	unfollowUser () {
	this.inProgress = true
	requestUnfollow(this.user, this.$store).then(({ updated }) => {
	this.inProgress = false
	this.updated = updated
	})
	}
	}
	}

	export default FollowCard
	diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
	index 6cb064eb70..9bd21cfd39 100644
	--- a/src/components/follow_card/follow_card.vue
	+++ b/src/components/follow_card/follow_card.vue
	@@ -1,53 +1,56 @@
	<template>
	<basic-user-card :user="user">
	<div class="follow-card-content-container">
	<span class="faint" v-if="!noFollowsYou && user.follows_you">
	{{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
	</span>
	+ <div class="btn-follow" v-if="showFollow && !loggedIn">
	+ <RemoteFollow :user="user" />
	+ </div>
	<button
	- v-if="showFollow"
	- class="btn btn-default"
	+ v-if="showFollow && loggedIn"
	+ class="btn btn-default btn-follow"
	@click="followUser"
	:disabled="inProgress"
	:title="requestSent ? $t('user_card.follow_again') : ''"
	>
	<template v-if="inProgress">
	{{ $t('user_card.follow_progress') }}
	</template>
	<template v-else-if="requestSent">
	{{ $t('user_card.follow_sent') }}
	</template>
	<template v-else>
	{{ $t('user_card.follow') }}
	</template>
	</button>
	<button v-if="following" class="btn btn-default pressed" @click="unfollowUser" :disabled="inProgress">
	<template v-if="inProgress">
	{{ $t('user_card.follow_progress') }}
	</template>
	<template v-else>
	{{ $t('user_card.follow_unfollow') }}
	</template>
	</button>
	</div>
	</basic-user-card>
	</template>

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

	<style lang="scss">
	.follow-card-content-container {
	flex-shrink: 0;
	display: flex;
	flex-direction: row;
	justify-content: space-between;
	flex-wrap: wrap;
	line-height: 1.5em;

	- .btn {
	+ .btn-follow {
	margin-top: 0.5em;
	margin-left: auto;
	width: 10em;
	}
	}
	</style>
	diff --git a/src/components/image_cropper/image_cropper.js b/src/components/image_cropper/image_cropper.js
	index 49d51846d0..5ba8f04ed6 100644
	--- a/src/components/image_cropper/image_cropper.js
	+++ b/src/components/image_cropper/image_cropper.js
	@@ -1,128 +1,146 @@
	import Cropper from 'cropperjs'
	import 'cropperjs/dist/cropper.css'

	const ImageCropper = {
	props: {
	trigger: {
	type: [String, window.Element],
	required: true
	},
	submitHandler: {
	type: Function,
	required: true
	},
	cropperOptions: {
	type: Object,
	default () {
	return {
	aspectRatio: 1,
	autoCropArea: 1,
	viewMode: 1,
	movable: false,
	zoomable: false,
	guides: false
	}
	}
	},
	mimes: {
	type: String,
	default: 'image/png, image/gif, image/jpeg, image/bmp, image/x-icon'
	},
	saveButtonLabel: {
	type: String
	},
	+ saveWithoutCroppingButtonlabel: {
	+ type: String
	+ },
	cancelButtonLabel: {
	type: String
	}
	},
	data () {
	return {
	cropper: undefined,
	dataUrl: undefined,
	filename: undefined,
	submitting: false,
	submitError: null
	}
	},
	computed: {
	saveText () {
	return this.saveButtonLabel \|\| this.$t('image_cropper.save')
	},
	+ saveWithoutCroppingText () {
	+ return this.saveWithoutCroppingButtonlabel \|\| this.$t('image_cropper.save_without_cropping')
	+ },
	cancelText () {
	return this.cancelButtonLabel \|\| this.$t('image_cropper.cancel')
	},
	submitErrorMsg () {
	return this.submitError && this.submitError instanceof Error ? this.submitError.toString() : this.submitError
	}
	},
	methods: {
	destroy () {
	if (this.cropper) {
	this.cropper.destroy()
	}
	this.$refs.input.value = ''
	this.dataUrl = undefined
	this.$emit('close')
	},
	submit () {
	this.submitting = true
	this.avatarUploadError = null
	this.submitHandler(this.cropper, this.file)
	.then(() => this.destroy())
	.catch((err) => {
	this.submitError = err
	})
	.finally(() => {
	this.submitting = false
	})
	},
	+ submitWithoutCropping () {
	+ this.submitting = true
	+ this.avatarUploadError = null
	+ this.submitHandler(false, this.dataUrl)
	+ .then(() => this.destroy())
	+ .catch((err) => {
	+ this.submitError = err
	+ })
	+ .finally(() => {
	+ this.submitting = false
	+ })
	+ },
	pickImage () {
	this.$refs.input.click()
	},
	createCropper () {
	this.cropper = new Cropper(this.$refs.img, this.cropperOptions)
	},
	getTriggerDOM () {
	return typeof this.trigger === 'object' ? this.trigger : document.querySelector(this.trigger)
	},
	readFile () {
	const fileInput = this.$refs.input
	if (fileInput.files != null && fileInput.files[0] != null) {
	this.file = fileInput.files[0]
	let reader = new window.FileReader()
	reader.onload = (e) => {
	this.dataUrl = e.target.result
	this.$emit('open')
	}
	reader.readAsDataURL(this.file)
	this.$emit('changed', this.file, reader)
	}
	},
	clearError () {
	this.submitError = null
	}
	},
	mounted () {
	// listen for click event on trigger
	const trigger = this.getTriggerDOM()
	if (!trigger) {
	this.$emit('error', 'No image make trigger found.', 'user')
	} else {
	trigger.addEventListener('click', this.pickImage)
	}
	// listen for input file changes
	const fileInput = this.$refs.input
	fileInput.addEventListener('change', this.readFile)
	},
	beforeDestroy: function () {
	// remove the event listeners
	const trigger = this.getTriggerDOM()
	if (trigger) {
	trigger.removeEventListener('click', this.pickImage)
	}
	const fileInput = this.$refs.input
	fileInput.removeEventListener('change', this.readFile)
	}
	}

	export default ImageCropper
	diff --git a/src/components/image_cropper/image_cropper.vue b/src/components/image_cropper/image_cropper.vue
	index 24a6f3bd51..129e6f469f 100644
	--- a/src/components/image_cropper/image_cropper.vue
	+++ b/src/components/image_cropper/image_cropper.vue
	@@ -1,42 +1,47 @@
	<template>
	<div class="image-cropper">
	<div v-if="dataUrl">
	<div class="image-cropper-image-container">
	<img ref="img" :src="dataUrl" alt="" @load.stop="createCropper" />
	</div>
	<div class="image-cropper-buttons-wrapper">
	<button class="btn" type="button" :disabled="submitting" @click="submit" v-text="saveText"></button>
	<button class="btn" type="button" :disabled="submitting" @click="destroy" v-text="cancelText"></button>
	+ <button class="btn" type="button" :disabled="submitting" @click="submitWithoutCropping" v-text="saveWithoutCroppingText"></button>
	<i class="icon-spin4 animate-spin" v-if="submitting"></i>
	</div>
	<div class="alert error" v-if="submitError">
	{{submitErrorMsg}}
	<i class="button-icon icon-cancel" @click="clearError"></i>
	</div>
	</div>
	<input ref="input" type="file" class="image-cropper-img-input" :accept="mimes">
	</div>
	</template>

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

	<style lang="scss">
	.image-cropper {
	&-img-input {
	display: none;
	}

	&-image-container {
	position: relative;

	img {
	display: block;
	max-width: 100%;
	}
	}

	&-buttons-wrapper {
	- margin-top: 15px;
	+ margin-top: 10px;
	+
	+ button {
	+ margin-top: 5px;
	+ }
	}
	}
	</style>
	diff --git a/src/components/remote_follow/remote_follow.js b/src/components/remote_follow/remote_follow.js
	new file mode 100644
	index 0000000000..461d58c9c3
	--- /dev/null
	+++ b/src/components/remote_follow/remote_follow.js
	@@ -0,0 +1,10 @@
	+export default {
	+ props: [ 'user' ],
	+ computed: {
	+ subscribeUrl () {
	+ // eslint-disable-next-line no-undef
	+ const serverUrl = new URL(this.user.statusnet_profile_url)
	+ return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
	+ }
	+ }
	+}
	diff --git a/src/components/remote_follow/remote_follow.vue b/src/components/remote_follow/remote_follow.vue
	new file mode 100644
	index 0000000000..fb2147bda6
	--- /dev/null
	+++ b/src/components/remote_follow/remote_follow.vue
	@@ -0,0 +1,24 @@
	+<template>
	+ <div class="remote-follow">
	+ <form method="POST" :action='subscribeUrl'>
	+ <input type="hidden" name="nickname" :value="user.screen_name">
	+ <input type="hidden" name="profile" value="">
	+ <button click="submit" class="remote-button">
	+ {{ $t('user_card.remote_follow') }}
	+ </button>
	+ </form>
	+ </div>
	+</template>
	+
	+<script src="./remote_follow.js"></script>
	+
	+<style lang="scss">
	+.remote-follow {
	+ max-width: 220px;
	+
	+ .remote-button {
	+ width: 100%;
	+ min-height: 28px;
	+ }
	+}
	+</style>
	diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
	index 979457a56f..b77c5197b5 100644
	--- a/src/components/settings/settings.js
	+++ b/src/components/settings/settings.js
	@@ -1,201 +1,215 @@
	/* eslint-env browser */
	+import { filter, trim } from 'lodash'
	+
	import TabSwitcher from '../tab_switcher/tab_switcher.js'
	import StyleSwitcher from '../style_switcher/style_switcher.vue'
	import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue'
	-import { filter, trim } from 'lodash'
	+import { extractCommit } from '../../services/version/version.service'
	+
	+const pleromaFeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
	+const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'

	const settings = {
	data () {
	const user = this.$store.state.config
	const instance = this.$store.state.instance

	return {
	hideAttachmentsLocal: user.hideAttachments,
	hideAttachmentsInConvLocal: user.hideAttachmentsInConv,
	maxThumbnails: user.maxThumbnails,
	hideNsfwLocal: user.hideNsfw,
	useOneClickNsfw: user.useOneClickNsfw,
	hideISPLocal: user.hideISP,
	preloadImage: user.preloadImage,

	hidePostStatsLocal: typeof user.hidePostStats === 'undefined'
	? instance.hidePostStats
	: user.hidePostStats,
	hidePostStatsDefault: this.$t('settings.values.' + instance.hidePostStats),

	hideUserStatsLocal: typeof user.hideUserStats === 'undefined'
	? instance.hideUserStats
	: user.hideUserStats,
	hideUserStatsDefault: this.$t('settings.values.' + instance.hideUserStats),

	hideFilteredStatusesLocal: typeof user.hideFilteredStatuses === 'undefined'
	? instance.hideFilteredStatuses
	: user.hideFilteredStatuses,
	hideFilteredStatusesDefault: this.$t('settings.values.' + instance.hideFilteredStatuses),

	notificationVisibilityLocal: user.notificationVisibility,
	replyVisibilityLocal: user.replyVisibility,
	loopVideoLocal: user.loopVideo,
	muteWordsString: user.muteWords.join('\n'),
	autoLoadLocal: user.autoLoad,
	streamingLocal: user.streaming,
	pauseOnUnfocusedLocal: user.pauseOnUnfocused,
	hoverPreviewLocal: user.hoverPreview,

	collapseMessageWithSubjectLocal: typeof user.collapseMessageWithSubject === 'undefined'
	? instance.collapseMessageWithSubject
	: user.collapseMessageWithSubject,
	collapseMessageWithSubjectDefault: this.$t('settings.values.' + instance.collapseMessageWithSubject),

	subjectLineBehaviorLocal: typeof user.subjectLineBehavior === 'undefined'
	? instance.subjectLineBehavior
	: user.subjectLineBehavior,
	subjectLineBehaviorDefault: instance.subjectLineBehavior,

	postContentTypeLocal: typeof user.postContentType === 'undefined'
	? instance.postContentType
	: user.postContentType,
	postContentTypeDefault: instance.postContentType,

	alwaysShowSubjectInputLocal: typeof user.alwaysShowSubjectInput === 'undefined'
	? instance.alwaysShowSubjectInput
	: user.alwaysShowSubjectInput,
	alwaysShowSubjectInputDefault: instance.alwaysShowSubjectInput,

	scopeCopyLocal: typeof user.scopeCopy === 'undefined'
	? instance.scopeCopy
	: user.scopeCopy,
	scopeCopyDefault: this.$t('settings.values.' + instance.scopeCopy),

	stopGifs: user.stopGifs,
	webPushNotificationsLocal: user.webPushNotifications,
	loopVideoSilentOnlyLocal: user.loopVideosSilentOnly,
	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'),
	playVideosInModal: user.playVideosInModal,
	- useContainFit: user.useContainFit
	+ useContainFit: user.useContainFit,
	+
	+ backendVersion: instance.backendVersion,
	+ frontendVersion: instance.frontendVersion
	}
	},
	components: {
	TabSwitcher,
	StyleSwitcher,
	InterfaceLanguageSwitcher
	},
	computed: {
	user () {
	return this.$store.state.users.currentUser
	},
	currentSaveStateNotice () {
	return this.$store.state.interface.settings.currentSaveStateNotice
	},
	postFormats () {
	return this.$store.state.instance.postFormats \|\| []
	},
	- instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel }
	+ instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel },
	+ frontendVersionLink () {
	+ return pleromaFeCommitUrl + this.frontendVersion
	+ },
	+ backendVersionLink () {
	+ return pleromaBeCommitUrl + extractCommit(this.backendVersion)
	+ }
	},
	watch: {
	hideAttachmentsLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideAttachments', value })
	},
	hideAttachmentsInConvLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideAttachmentsInConv', value })
	},
	hidePostStatsLocal (value) {
	this.$store.dispatch('setOption', { name: 'hidePostStats', value })
	},
	hideUserStatsLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideUserStats', value })
	},
	hideFilteredStatusesLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideFilteredStatuses', value })
	},
	hideNsfwLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideNsfw', value })
	},
	useOneClickNsfw (value) {
	this.$store.dispatch('setOption', { name: 'useOneClickNsfw', value })
	},
	preloadImage (value) {
	this.$store.dispatch('setOption', { name: 'preloadImage', value })
	},
	hideISPLocal (value) {
	this.$store.dispatch('setOption', { name: 'hideISP', value })
	},
	'notificationVisibilityLocal.likes' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	'notificationVisibilityLocal.follows' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	'notificationVisibilityLocal.repeats' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	'notificationVisibilityLocal.mentions' (value) {
	this.$store.dispatch('setOption', { name: 'notificationVisibility', value: this.$store.state.config.notificationVisibility })
	},
	replyVisibilityLocal (value) {
	this.$store.dispatch('setOption', { name: 'replyVisibility', value })
	},
	loopVideoLocal (value) {
	this.$store.dispatch('setOption', { name: 'loopVideo', value })
	},
	loopVideoSilentOnlyLocal (value) {
	this.$store.dispatch('setOption', { name: 'loopVideoSilentOnly', value })
	},
	autoLoadLocal (value) {
	this.$store.dispatch('setOption', { name: 'autoLoad', value })
	},
	streamingLocal (value) {
	this.$store.dispatch('setOption', { name: 'streaming', value })
	},
	pauseOnUnfocusedLocal (value) {
	this.$store.dispatch('setOption', { name: 'pauseOnUnfocused', value })
	},
	hoverPreviewLocal (value) {
	this.$store.dispatch('setOption', { name: 'hoverPreview', value })
	},
	muteWordsString (value) {
	value = filter(value.split('\n'), (word) => trim(word).length > 0)
	this.$store.dispatch('setOption', { name: 'muteWords', value })
	},
	collapseMessageWithSubjectLocal (value) {
	this.$store.dispatch('setOption', { name: 'collapseMessageWithSubject', value })
	},
	scopeCopyLocal (value) {
	this.$store.dispatch('setOption', { name: 'scopeCopy', value })
	},
	alwaysShowSubjectInputLocal (value) {
	this.$store.dispatch('setOption', { name: 'alwaysShowSubjectInput', value })
	},
	subjectLineBehaviorLocal (value) {
	this.$store.dispatch('setOption', { name: 'subjectLineBehavior', value })
	},
	postContentTypeLocal (value) {
	this.$store.dispatch('setOption', { name: 'postContentType', value })
	},
	stopGifs (value) {
	this.$store.dispatch('setOption', { name: 'stopGifs', value })
	},
	webPushNotificationsLocal (value) {
	this.$store.dispatch('setOption', { name: 'webPushNotifications', value })
	if (value) this.$store.dispatch('registerPushNotifications')
	},
	playVideosInModal (value) {
	this.$store.dispatch('setOption', { name: 'playVideosInModal', value })
	},
	useContainFit (value) {
	this.$store.dispatch('setOption', { name: 'useContainFit', value })
	},
	maxThumbnails (value) {
	value = this.maxThumbnails = Math.floor(Math.max(value, 0))
	this.$store.dispatch('setOption', { name: 'maxThumbnails', value })
	}
	}
	}

	export default settings
	diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
	index d234674728..17f1f1a1cb 100644
	--- a/src/components/settings/settings.vue
	+++ b/src/components/settings/settings.vue
	@@ -1,338 +1,360 @@
	<template>
	<div class="settings panel panel-default">
	<div class="panel-heading">
	<div class="title">
	{{$t('settings.settings')}}
	</div>

	<transition name="fade">
	<template v-if="currentSaveStateNotice">
	<div @click.prevent class="alert error" v-if="currentSaveStateNotice.error">
	{{ $t('settings.saving_err') }}
	</div>

	<div @click.prevent class="alert transparent" v-if="!currentSaveStateNotice.error">
	{{ $t('settings.saving_ok') }}
	</div>
	</template>
	</transition>
	</div>
	<div class="panel-body">
	<keep-alive>
	<tab-switcher>
	<div :label="$t('settings.general')" >
	<div class="setting-item">
	<h2>{{ $t('settings.interface') }}</h2>
	<ul class="setting-list">
	<li>
	<interface-language-switcher />
	</li>
	<li v-if="instanceSpecificPanelPresent">
	<input type="checkbox" id="hideISP" v-model="hideISPLocal">
	<label for="hideISP">{{$t('settings.hide_isp')}}</label>
	</li>
	</ul>
	</div>
	<div class="setting-item">
	<h2>{{$t('nav.timeline')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="collapseMessageWithSubject" v-model="collapseMessageWithSubjectLocal">
	<label for="collapseMessageWithSubject">
	{{$t('settings.collapse_subject')}} {{$t('settings.instance_default', { value: collapseMessageWithSubjectDefault })}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="streaming" v-model="streamingLocal">
	<label for="streaming">{{$t('settings.streaming')}}</label>
	<ul class="setting-list suboptions" :class="[{disabled: !streamingLocal}]">
	<li>
	<input :disabled="!streamingLocal" type="checkbox" id="pauseOnUnfocused" v-model="pauseOnUnfocusedLocal">
	<label for="pauseOnUnfocused">{{$t('settings.pause_on_unfocused')}}</label>
	</li>
	</ul>
	</li>
	<li>
	<input type="checkbox" id="autoload" v-model="autoLoadLocal">
	<label for="autoload">{{$t('settings.autoload')}}</label>
	</li>
	<li>
	<input type="checkbox" id="hoverPreview" v-model="hoverPreviewLocal">
	<label for="hoverPreview">{{$t('settings.reply_link_preview')}}</label>
	</li>
	</ul>
	</div>

	<div class="setting-item">
	<h2>{{$t('settings.composing')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="scopeCopy" v-model="scopeCopyLocal">
	<label for="scopeCopy">
	{{$t('settings.scope_copy')}} {{$t('settings.instance_default', { value: scopeCopyDefault })}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="subjectHide" v-model="alwaysShowSubjectInputLocal">
	<label for="subjectHide">
	{{$t('settings.subject_input_always_show')}} {{$t('settings.instance_default', { value: alwaysShowSubjectInputDefault })}}
	</label>
	</li>
	<li>
	<div>
	{{$t('settings.subject_line_behavior')}}
	<label for="subjectLineBehavior" class="select">
	<select id="subjectLineBehavior" v-model="subjectLineBehaviorLocal">
	<option value="email">
	{{$t('settings.subject_line_email')}}
	{{subjectLineBehaviorDefault == 'email' ? $t('settings.instance_default_simple') : ''}}
	</option>
	<option value="masto">
	{{$t('settings.subject_line_mastodon')}}
	{{subjectLineBehaviorDefault == 'mastodon' ? $t('settings.instance_default_simple') : ''}}
	</option>
	<option value="noop">
	{{$t('settings.subject_line_noop')}}
	{{subjectLineBehaviorDefault == 'noop' ? $t('settings.instance_default_simple') : ''}}
	</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	</li>
	<li>
	<div>
	{{$t('settings.post_status_content_type')}}
	<label for="postContentType" class="select">
	<select id="postContentType" v-model="postContentTypeLocal">
	<option v-for="postFormat in postFormats" :key="postFormat" :value="postFormat">
	{{$t(`post_status.content_type["${postFormat}"]`)}}
	{{postContentTypeDefault === postFormat ? $t('settings.instance_default_simple') : ''}}
	</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	</li>
	</ul>
	</div>

	<div class="setting-item">
	<h2>{{$t('settings.attachments')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="hideAttachments" v-model="hideAttachmentsLocal">
	<label for="hideAttachments">{{$t('settings.hide_attachments_in_tl')}}</label>
	</li>
	<li>
	<input type="checkbox" id="hideAttachmentsInConv" v-model="hideAttachmentsInConvLocal">
	<label for="hideAttachmentsInConv">{{$t('settings.hide_attachments_in_convo')}}</label>
	</li>
	<li>
	<label for="maxThumbnails">{{$t('settings.max_thumbnails')}}</label>
	<input class="number-input" type="number" id="maxThumbnails" v-model.number="maxThumbnails" min="0" step="1">
	</li>
	<li>
	<input type="checkbox" id="hideNsfw" v-model="hideNsfwLocal">
	<label for="hideNsfw">{{$t('settings.nsfw_clickthrough')}}</label>
	</li>
	<ul class="setting-list suboptions" >
	<li>
	<input :disabled="!hideNsfwLocal" type="checkbox" id="preloadImage" v-model="preloadImage">
	<label for="preloadImage">{{$t('settings.preload_images')}}</label>
	</li>
	<li>
	<input :disabled="!hideNsfwLocal" type="checkbox" id="useOneClickNsfw" v-model="useOneClickNsfw">
	<label for="useOneClickNsfw">{{$t('settings.use_one_click_nsfw')}}</label>
	</li>
	</ul>
	<li>
	<input type="checkbox" id="stopGifs" v-model="stopGifs">
	<label for="stopGifs">{{$t('settings.stop_gifs')}}</label>
	</li>
	<li>
	<input type="checkbox" id="loopVideo" v-model="loopVideoLocal">
	<label for="loopVideo">{{$t('settings.loop_video')}}</label>
	<ul class="setting-list suboptions" :class="[{disabled: !streamingLocal}]">
	<li>
	<input :disabled="!loopVideoLocal \|\| !loopSilentAvailable" type="checkbox" id="loopVideoSilentOnly" v-model="loopVideoSilentOnlyLocal">
	<label for="loopVideoSilentOnly">{{$t('settings.loop_video_silent_only')}}</label>
	<div v-if="!loopSilentAvailable" class="unavailable">
	<i class="icon-globe"/>! {{$t('settings.limited_availability')}}
	</div>
	</li>
	</ul>
	</li>
	<li>
	<input type="checkbox" id="playVideosInModal" v-model="playVideosInModal">
	<label for="playVideosInModal">{{$t('settings.play_videos_in_modal')}}</label>
	</li>
	<li>
	<input type="checkbox" id="useContainFit" v-model="useContainFit">
	<label for="useContainFit">{{$t('settings.use_contain_fit')}}</label>
	</li>
	</ul>
	</div>

	<div class="setting-item">
	<h2>{{$t('settings.notifications')}}</h2>
	<ul class="setting-list">
	<li>
	<input type="checkbox" id="webPushNotifications" v-model="webPushNotificationsLocal">
	<label for="webPushNotifications">
	{{$t('settings.enable_web_push_notifications')}}
	</label>
	</li>
	</ul>
	</div>
	</div>

	<div :label="$t('settings.theme')" >
	<div class="setting-item">
	<style-switcher></style-switcher>
	</div>
	</div>

	<div :label="$t('settings.filtering')" >
	<div class="setting-item">
	<div class="select-multiple">
	<span class="label">{{$t('settings.notification_visibility')}}</span>
	<ul class="option-list">
	<li>
	<input type="checkbox" id="notification-visibility-likes" v-model="notificationVisibilityLocal.likes">
	<label for="notification-visibility-likes">
	{{$t('settings.notification_visibility_likes')}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="notification-visibility-repeats" v-model="notificationVisibilityLocal.repeats">
	<label for="notification-visibility-repeats">
	{{$t('settings.notification_visibility_repeats')}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="notification-visibility-follows" v-model="notificationVisibilityLocal.follows">
	<label for="notification-visibility-follows">
	{{$t('settings.notification_visibility_follows')}}
	</label>
	</li>
	<li>
	<input type="checkbox" id="notification-visibility-mentions" v-model="notificationVisibilityLocal.mentions">
	<label for="notification-visibility-mentions">
	{{$t('settings.notification_visibility_mentions')}}
	</label>
	</li>
	</ul>
	</div>
	<div>
	{{$t('settings.replies_in_timeline')}}
	<label for="replyVisibility" class="select">
	<select id="replyVisibility" v-model="replyVisibilityLocal">
	<option value="all" selected>{{$t('settings.reply_visibility_all')}}</option>
	<option value="following">{{$t('settings.reply_visibility_following')}}</option>
	<option value="self">{{$t('settings.reply_visibility_self')}}</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	<div>
	<input type="checkbox" id="hidePostStats" v-model="hidePostStatsLocal">
	<label for="hidePostStats">
	{{$t('settings.hide_post_stats')}} {{$t('settings.instance_default', { value: hidePostStatsDefault })}}
	</label>
	</div>
	<div>
	<input type="checkbox" id="hideUserStats" v-model="hideUserStatsLocal">
	<label for="hideUserStats">
	{{$t('settings.hide_user_stats')}} {{$t('settings.instance_default', { value: hideUserStatsDefault })}}
	</label>
	</div>
	</div>
	<div class="setting-item">
	<div>
	<p>{{$t('settings.filtering_explanation')}}</p>
	<textarea id="muteWords" v-model="muteWordsString"></textarea>
	</div>
	<div>
	<input type="checkbox" id="hideFilteredStatuses" v-model="hideFilteredStatusesLocal">
	<label for="hideFilteredStatuses">
	{{$t('settings.hide_filtered_statuses')}} {{$t('settings.instance_default', { value: hideFilteredStatusesDefault })}}
	</label>
	</div>
	</div>
	</div>
	+ <div :label="$t('settings.version.title')" >
	+ <div class="setting-item">
	+ <ul class="setting-list">
	+ <li>
	+ <p>{{$t('settings.version.backend_version')}}</p>
	+ <ul class="option-list">
	+ <li>
	+ <a :href="backendVersionLink" target="_blank">{{backendVersion}}</a>
	+ </li>
	+ </ul>
	+ </li>
	+ <li>
	+ <p>{{$t('settings.version.frontend_version')}}</p>
	+ <ul class="option-list">
	+ <li>
	+ <a :href="frontendVersionLink" target="_blank">{{frontendVersion}}</a>
	+ </li>
	+ </ul>
	+ </li>
	+ </ul>
	+ </div>
	+ </div>
	</tab-switcher>
	</keep-alive>
	</div>
	</div>
	</template>

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

	<style lang="scss">
	@import '../../_variables.scss';

	.setting-item {
	border-bottom: 2px solid var(--fg, $fallback--fg);
	margin: 1em 1em 1.4em;
	padding-bottom: 1.4em;

	> div {
	margin-bottom: .5em;
	&:last-child {
	margin-bottom: 0;
	}
	}

	&:last-child {
	border-bottom: none;
	padding-bottom: 0;
	margin-bottom: 1em;
	}

	select {
	min-width: 10em;
	}


	textarea {
	width: 100%;
	height: 100px;
	}

	.unavailable,
	.unavailable i {
	color: var(--cRed, $fallback--cRed);
	color: $fallback--cRed;
	}

	.btn {
	min-height: 28px;
	min-width: 10em;
	padding: 0 2em;
	}

	.number-input {
	max-width: 6em;
	}
	}
	.select-multiple {
	display: flex;
	.option-list {
	margin: 0;
	padding-left: .5em;
	}
	}
	.setting-list,
	.option-list{
	list-style-type: none;
	padding-left: 2em;
	li {
	margin-bottom: 0.5em;
	}
	.suboptions {
	margin-top: 0.3em
	}
	}
	</style>
	diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
	index 43a77f45bf..b07da6752f 100644
	--- a/src/components/user_card/user_card.js
	+++ b/src/components/user_card/user_card.js
	@@ -1,159 +1,161 @@
	import UserAvatar from '../user_avatar/user_avatar.vue'
	+import RemoteFollow from '../remote_follow/remote_follow.vue'
	import { hex2rgb } from '../../services/color_convert/color_convert.js'
	import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
	import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'

	export default {
	props: [ 'user', 'switcher', 'selected', 'hideBio', 'rounded', 'bordered' ],
	data () {
	return {
	followRequestInProgress: false,
	followRequestSent: false,
	hideUserStatsLocal: typeof this.$store.state.config.hideUserStats === 'undefined'
	? this.$store.state.instance.hideUserStats
	: this.$store.state.config.hideUserStats,
	betterShadow: this.$store.state.interface.browserSupport.cssFilter
	}
	},
	created () {
	this.$store.dispatch('fetchUserRelationship', this.user.id)
	},
	computed: {
	classes () {
	return [{
	'user-card-rounded-t': this.rounded === 'top', // set border-top-left-radius and border-top-right-radius
	'user-card-rounded': this.rounded === true, // set border-radius for all sides
	'user-card-bordered': this.bordered === true // set border for all sides
	}]
	},
	style () {
	const color = this.$store.state.config.customTheme.colors
	? this.$store.state.config.customTheme.colors.bg // v2
	: this.$store.state.config.colors.bg // v1

	if (color) {
	const rgb = (typeof color === 'string') ? hex2rgb(color) : color
	const tintColor = `rgba(${Math.floor(rgb.r)}, ${Math.floor(rgb.g)}, ${Math.floor(rgb.b)}, .5)`

	const gradient = [
	[tintColor, this.hideBio ? '60%' : ''],
	this.hideBio ? [
	color, '100%'
	] : [
	tintColor, ''
	]
	].map(_ => _.join(' ')).join(', ')

	return {
	backgroundColor: `rgb(${Math.floor(rgb.r * 0.53)}, ${Math.floor(rgb.g * 0.56)}, ${Math.floor(rgb.b * 0.59)})`,
	backgroundImage: [
	`linear-gradient(to bottom, ${gradient})`,
	`url(${this.user.cover_photo})`
	].join(', ')
	}
	}
	},
	isOtherUser () {
	return this.user.id !== this.$store.state.users.currentUser.id
	},
	subscribeUrl () {
	// eslint-disable-next-line no-undef
	const serverUrl = new URL(this.user.statusnet_profile_url)
	return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
	},
	loggedIn () {
	return this.$store.state.users.currentUser
	},
	dailyAvg () {
	const days = Math.ceil((new Date() - new Date(this.user.created_at)) / (60 * 60 * 24 * 1000))
	return Math.round(this.user.statuses_count / days)
	},
	userHighlightType: {
	get () {
	const data = this.$store.state.config.highlight[this.user.screen_name]
	return data && data.type \|\| 'disabled'
	},
	set (type) {
	const data = this.$store.state.config.highlight[this.user.screen_name]
	if (type !== 'disabled') {
	this.$store.dispatch('setHighlight', { user: this.user.screen_name, color: data && data.color \|\| '#FFFFFF', type })
	} else {
	this.$store.dispatch('setHighlight', { user: this.user.screen_name, color: undefined })
	}
	}
	},
	userHighlightColor: {
	get () {
	const data = this.$store.state.config.highlight[this.user.screen_name]
	return data && data.color
	},
	set (color) {
	this.$store.dispatch('setHighlight', { user: this.user.screen_name, color })
	}
	},
	visibleRole () {
	const validRole = (this.user.role === 'admin' \|\| this.user.role === 'moderator')
	const showRole = this.isOtherUser \|\| this.user.show_role

	return validRole && showRole && this.user.role
	}
	},
	components: {
	- UserAvatar
	+ UserAvatar,
	+ RemoteFollow
	},
	methods: {
	followUser () {
	const store = this.$store
	this.followRequestInProgress = true
	requestFollow(this.user, store).then(({sent}) => {
	this.followRequestInProgress = false
	this.followRequestSent = sent
	})
	},
	unfollowUser () {
	const store = this.$store
	this.followRequestInProgress = true
	requestUnfollow(this.user, store).then(() => {
	this.followRequestInProgress = false
	store.commit('removeStatus', { timeline: 'friends', userId: this.user.id })
	})
	},
	blockUser () {
	const store = this.$store
	store.state.api.backendInteractor.blockUser(this.user.id)
	.then((blockedUser) => {
	store.commit('addNewUsers', [blockedUser])
	store.commit('removeStatus', { timeline: 'friends', userId: this.user.id })
	store.commit('removeStatus', { timeline: 'public', userId: this.user.id })
	store.commit('removeStatus', { timeline: 'publicAndExternal', userId: this.user.id })
	})
	},
	unblockUser () {
	const store = this.$store
	store.state.api.backendInteractor.unblockUser(this.user.id)
	.then((unblockedUser) => store.commit('addNewUsers', [unblockedUser]))
	},
	toggleMute () {
	const store = this.$store
	store.commit('setMuted', {user: this.user, muted: !this.user.muted})
	store.state.api.backendInteractor.setUserMute(this.user)
	},
	setProfileView (v) {
	if (this.switcher) {
	const store = this.$store
	store.commit('setProfileView', { v })
	}
	},
	linkClicked ({target}) {
	if (target.tagName === 'SPAN') {
	target = target.parentNode
	}
	if (target.tagName === 'A') {
	window.open(target.href, '_blank')
	}
	},
	userProfileLink (user) {
	return generateProfileLink(user.id, user.screen_name, this.$store.state.instance.restrictedNicknames)
	}
	}
	}
	diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
	index 690e1bde92..f4114e6e60 100644
	--- a/src/components/user_card/user_card.vue
	+++ b/src/components/user_card/user_card.vue
	@@ -1,431 +1,420 @@
	<template>
	<div class="user-card" :class="classes" :style="style">
	<div class="panel-heading">
	<div class='user-info'>
	<div class='container'>
	<router-link :to="userProfileLink(user)">
	<UserAvatar :betterShadow="betterShadow" :src="user.profile_image_url_original"/>
	</router-link>
	<div class="name-and-screen-name">
	<div class="top-line">
	<div :title="user.name" class='user-name' v-if="user.name_html" v-html="user.name_html"></div>
	<div :title="user.name" class='user-name' v-else>{{user.name}}</div>
	<router-link :to="{ name: 'user-settings' }" v-if="!isOtherUser">
	<i class="button-icon icon-pencil usersettings" :title="$t('tool_tip.user_settings')"></i>
	</router-link>
	<a :href="user.statusnet_profile_url" target="_blank" v-if="isOtherUser && !user.is_local">
	<i class="icon-link-ext usersettings"></i>
	</a>
	</div>

	<router-link class='user-screen-name' :to="userProfileLink(user)">
	<span class="handle">@{{user.screen_name}}
	<span class="alert staff" v-if="!hideBio && !!visibleRole">{{visibleRole}}</span>
	</span><span v-if="user.locked"><i class="icon icon-lock"></i></span>
	<span v-if="!hideUserStatsLocal && !hideBio" class="dailyAvg">{{dailyAvg}} {{ $t('user_card.per_day') }}</span>
	</router-link>
	</div>
	</div>
	<div class="user-meta">
	<div v-if="user.follows_you && loggedIn && isOtherUser" class="following">
	{{ $t('user_card.follows_you') }}
	</div>
	<div class="highlighter" v-if="isOtherUser && (loggedIn \|\| !switcher)">
	<!-- id's need to be unique, otherwise vue confuses which user-card checkbox belongs to -->
	<input class="userHighlightText" type="text" :id="'userHighlightColorTx'+user.id" v-if="userHighlightType !== 'disabled'" v-model="userHighlightColor"/>
	<input class="userHighlightCl" type="color" :id="'userHighlightColor'+user.id" v-if="userHighlightType !== 'disabled'" v-model="userHighlightColor"/>
	<label for="style-switcher" class='userHighlightSel select'>
	<select class="userHighlightSel" :id="'userHighlightSel'+user.id" v-model="userHighlightType">
	<option value="disabled">No highlight</option>
	<option value="solid">Solid bg</option>
	<option value="striped">Striped bg</option>
	<option value="side">Side stripe</option>
	</select>
	<i class="icon-down-open"/>
	</label>
	</div>
	</div>
	<div v-if="isOtherUser" class="user-interactions">
	<div class="follow" v-if="loggedIn">
	<span v-if="user.following">
	<!--Following them!-->
	<button @click="unfollowUser" class="pressed" :disabled="followRequestInProgress" :title="$t('user_card.follow_unfollow')">
	<template v-if="followRequestInProgress">
	{{ $t('user_card.follow_progress') }}
	</template>
	<template v-else>
	{{ $t('user_card.following') }}
	</template>
	</button>
	</span>
	<span v-if="!user.following">
	<button @click="followUser" :disabled="followRequestInProgress" :title="followRequestSent ? $t('user_card.follow_again') : ''">
	<template v-if="followRequestInProgress">
	{{ $t('user_card.follow_progress') }}
	</template>
	<template v-else-if="followRequestSent">
	{{ $t('user_card.follow_sent') }}
	</template>
	<template v-else>
	{{ $t('user_card.follow') }}
	</template>
	</button>
	</span>
	</div>
	<div class='mute' v-if='isOtherUser && loggedIn'>
	<span v-if='user.muted'>
	<button @click="toggleMute" class="pressed">
	{{ $t('user_card.muted') }}
	</button>
	</span>
	<span v-if='!user.muted'>
	<button @click="toggleMute">
	{{ $t('user_card.mute') }}
	</button>
	</span>
	</div>
	- <div class="remote-follow" v-if='!loggedIn && user.is_local'>
	- <form method="POST" :action='subscribeUrl'>
	- <input type="hidden" name="nickname" :value="user.screen_name">
	- <input type="hidden" name="profile" value="">
	- <button click="submit" class="remote-button">
	- {{ $t('user_card.remote_follow') }}
	- </button>
	- </form>
	+ <div v-if='!loggedIn && user.is_local'>
	+ <RemoteFollow :user="user" />
	</div>
	<div class='block' v-if='isOtherUser && loggedIn'>
	<span v-if='user.statusnet_blocking'>
	<button @click="unblockUser" class="pressed">
	{{ $t('user_card.blocked') }}
	</button>
	</span>
	<span v-if='!user.statusnet_blocking'>
	<button @click="blockUser">
	{{ $t('user_card.block') }}
	</button>
	</span>
	</div>
	</div>
	</div>
	</div>
	<div class="panel-body" v-if="!hideBio">
	<div v-if="!hideUserStatsLocal && switcher" class="user-counts">
	<div class="user-count" v-on:click.prevent="setProfileView('statuses')">
	<h5>{{ $t('user_card.statuses') }}</h5>
	<span>{{user.statuses_count}} <br></span>
	</div>
	<div class="user-count" v-on:click.prevent="setProfileView('friends')">
	<h5>{{ $t('user_card.followees') }}</h5>
	<span>{{user.friends_count}}</span>
	</div>
	<div class="user-count" v-on:click.prevent="setProfileView('followers')">
	<h5>{{ $t('user_card.followers') }}</h5>
	<span>{{user.followers_count}}</span>
	</div>
	</div>
	<p @click.prevent="linkClicked" v-if="!hideBio && user.description_html" class="user-card-bio" v-html="user.description_html"></p>
	<p v-else-if="!hideBio" class="user-card-bio">{{ user.description }}</p>
	</div>
	</div>
	</template>

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

	<style lang="scss">
	@import '../../_variables.scss';

	.user-card {
	background-size: cover;
	overflow: hidden;

	.panel-heading {
	padding: .5em 0;
	text-align: center;
	box-shadow: none;
	background: transparent;
	flex-direction: column;
	align-items: stretch;
	}

	.panel-body {
	word-wrap: break-word;
	background: linear-gradient(to bottom, rgba(0, 0, 0, 0), $fallback--bg 80%);
	background: linear-gradient(to bottom, rgba(0, 0, 0, 0), var(--bg, $fallback--bg) 80%);
	}

	p {
	margin-bottom: 0;
	}

	&-bio {
	text-align: center;

	img {
	object-fit: contain;
	vertical-align: middle;
	max-width: 100%;
	max-height: 400px;

	.emoji {
	width: 32px;
	height: 32px;
	}
	}
	}

	// Modifiers

	&-rounded-t {
	border-top-left-radius: $fallback--panelRadius;
	border-top-left-radius: var(--panelRadius, $fallback--panelRadius);
	border-top-right-radius: $fallback--panelRadius;
	border-top-right-radius: var(--panelRadius, $fallback--panelRadius);
	}

	&-rounded {
	border-radius: $fallback--panelRadius;
	border-radius: var(--panelRadius, $fallback--panelRadius);
	}

	&-bordered {
	border-width: 1px;
	border-style: solid;
	border-color: $fallback--border;
	border-color: var(--border, $fallback--border);
	}
	}

	.user-info {
	color: $fallback--lightText;
	color: var(--lightText, $fallback--lightText);
	padding: 0 26px;

	.container {
	padding: 16px 0 6px;
	display: flex;
	max-height: 56px;

	.avatar {
	flex: 1 0 100%;
	width: 56px;
	height: 56px;
	box-shadow: 0px 1px 8px rgba(0,0,0,0.75);
	box-shadow: var(--avatarShadow);
	object-fit: cover;
	}
	}

	&:hover .animated.avatar {
	canvas {
	display: none;
	}
	img {
	visibility: visible;
	}
	}

	.usersettings {
	color: $fallback--lightText;
	color: var(--lightText, $fallback--lightText);
	opacity: .8;
	}

	.name-and-screen-name {
	display: block;
	margin-left: 0.6em;
	text-align: left;
	text-overflow: ellipsis;
	white-space: nowrap;
	flex: 1 1 0;
	// This is so that text doesn't get overlapped by avatar's shadow if it has
	// big one
	z-index: 1;

	img {
	width: 26px;
	height: 26px;
	vertical-align: middle;
	object-fit: contain
	}
	.top-line {
	display: flex;
	}
	}

	.user-name {
	text-overflow: ellipsis;
	overflow: hidden;
	flex: 1 1 auto;
	margin-right: 1em;
	font-size: 15px;

	img {
	object-fit: contain;
	height: 16px;
	width: 16px;
	vertical-align: middle;
	}
	}

	.user-screen-name {
	color: $fallback--lightText;
	color: var(--lightText, $fallback--lightText);
	display: inline-block;
	font-weight: light;
	font-size: 15px;
	padding-right: 0.1em;
	width: 100%;
	display: flex;

	.dailyAvg {
	min-width: 1px;
	flex: 0 0 auto;
	margin-left: 1em;
	font-size: 0.7em;
	color: $fallback--text;
	color: var(--text, $fallback--text);
	}

	.handle {
	min-width: 1px;
	flex: 0 1 auto;
	text-overflow: ellipsis;
	overflow: hidden;
	}

	// TODO use proper colors
	.staff {
	text-transform: capitalize;
	color: $fallback--text;
	color: var(--btnText, $fallback--text);
	background-color: $fallback--fg;
	background-color: var(--btn, $fallback--fg);
	}
	}

	.user-meta {
	margin-bottom: .15em;
	display: flex;
	align-items: baseline;
	font-size: 14px;
	line-height: 22px;
	flex-wrap: wrap;

	.following {
	flex: 1 0 auto;
	margin: 0;
	margin-bottom: .25em;
	text-align: left;
	}

	.highlighter {
	flex: 0 1 auto;
	display: flex;
	flex-wrap: wrap;
	margin-right: -.5em;
	align-self: start;

	.userHighlightCl {
	padding: 2px 10px;
	flex: 1 0 auto;
	}

	.userHighlightSel,
	.userHighlightSel.select {
	padding-top: 0;
	padding-bottom: 0;
	flex: 1 0 auto;
	}
	.userHighlightSel.select i {
	line-height: 22px;
	}

	.userHighlightText {
	width: 70px;
	flex: 1 0 auto;
	}

	.userHighlightCl,
	.userHighlightText,
	.userHighlightSel,
	.userHighlightSel.select {
	height: 22px;
	vertical-align: top;
	margin-right: .5em;
	margin-bottom: .25em;
	}
	}
	}
	.user-interactions {
	display: flex;
	flex-flow: row wrap;
	justify-content: space-between;

	margin-right: -.75em;

	div {
	flex: 1 0 0;
	margin-right: .75em;
	margin-bottom: .6em;
	white-space: nowrap;
	}

	.mute {
	max-width: 220px;
	min-height: 28px;
	}

	- .remote-follow {
	- max-width: 220px;
	- min-height: 28px;
	- }
	-
	.follow {
	max-width: 220px;
	min-height: 28px;
	}

	button {
	width: 100%;
	height: 100%;
	margin: 0;
	}

	.remote-button {
	height: 28px !important;
	width: 92%;
	}

	.pressed {
	border-bottom-color: rgba(255, 255, 255, 0.2);
	border-top-color: rgba(0, 0, 0, 0.2);
	}
	}
	}

	.user-counts {
	display: flex;
	line-height:16px;
	padding: .5em 1.5em 0em 1.5em;
	text-align: center;
	justify-content: space-between;
	color: $fallback--lightText;
	color: var(--lightText, $fallback--lightText);
	flex-wrap: wrap;
	}

	.user-count {
	flex: 1 0 auto;
	padding: .5em 0 .5em 0;
	margin: 0 .5em;

	h5 {
	font-size:1em;
	font-weight: bolder;
	margin: 0 0 0.25em;
	}
	a {
	text-decoration: none;
	}
	}
	</style>
	diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
	index 6dbf007af1..d719d98009 100644
	--- a/src/components/user_settings/user_settings.js
	+++ b/src/components/user_settings/user_settings.js
	@@ -1,364 +1,369 @@
	import { compose } from 'vue-compose'
	import unescape from 'lodash/unescape'
	import get from 'lodash/get'
	import TabSwitcher from '../tab_switcher/tab_switcher.js'
	import ImageCropper from '../image_cropper/image_cropper.vue'
	import StyleSwitcher from '../style_switcher/style_switcher.vue'
	import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
	import BlockCard from '../block_card/block_card.vue'
	import MuteCard from '../mute_card/mute_card.vue'
	import withSubscription from '../../hocs/with_subscription/with_subscription'
	import withList from '../../hocs/with_list/with_list'

	const BlockList = compose(
	withSubscription({
	fetch: (props, $store) => $store.dispatch('fetchBlocks'),
	select: (props, $store) => get($store.state.users.currentUser, 'blockIds', []),
	childPropName: 'entries'
	}),
	withList({ getEntryProps: userId => ({ userId }) })
	)(BlockCard)

	const MuteList = compose(
	withSubscription({
	fetch: (props, $store) => $store.dispatch('fetchMutes'),
	select: (props, $store) => get($store.state.users.currentUser, 'muteIds', []),
	childPropName: 'entries'
	}),
	withList({ getEntryProps: userId => ({ userId }) })
	)(MuteCard)

	const UserSettings = {
	data () {
	return {
	newName: this.$store.state.users.currentUser.name,
	newBio: unescape(this.$store.state.users.currentUser.description),
	newLocked: this.$store.state.users.currentUser.locked,
	newNoRichText: this.$store.state.users.currentUser.no_rich_text,
	newDefaultScope: this.$store.state.users.currentUser.default_scope,
	hideFollows: this.$store.state.users.currentUser.hide_follows,
	hideFollowers: this.$store.state.users.currentUser.hide_followers,
	showRole: this.$store.state.users.currentUser.show_role,
	role: this.$store.state.users.currentUser.role,
	followList: null,
	followImportError: false,
	followsImported: false,
	enableFollowsExport: true,
	pickAvatarBtnVisible: true,
	bannerUploading: false,
	backgroundUploading: false,
	followListUploading: false,
	bannerPreview: null,
	backgroundPreview: null,
	bannerUploadError: null,
	backgroundUploadError: null,
	deletingAccount: false,
	deleteAccountConfirmPasswordInput: '',
	deleteAccountError: false,
	changePasswordInputs: [ '', '', '' ],
	changedPassword: false,
	changePasswordError: false,
	activeTab: 'profile'
	}
	},
	created () {
	this.$store.dispatch('fetchTokens')
	},
	components: {
	StyleSwitcher,
	TabSwitcher,
	ImageCropper,
	BlockList,
	MuteList
	},
	computed: {
	user () {
	return this.$store.state.users.currentUser
	},
	pleromaBackend () {
	return this.$store.state.instance.pleromaBackend
	},
	scopeOptionsEnabled () {
	return this.$store.state.instance.scopeOptionsEnabled
	},
	vis () {
	return {
	public: { selected: this.newDefaultScope === 'public' },
	unlisted: { selected: this.newDefaultScope === 'unlisted' },
	private: { selected: this.newDefaultScope === 'private' },
	direct: { selected: this.newDefaultScope === 'direct' }
	}
	},
	currentSaveStateNotice () {
	return this.$store.state.interface.settings.currentSaveStateNotice
	},
	oauthTokens () {
	return this.$store.state.oauthTokens.tokens.map(oauthToken => {
	return {
	id: oauthToken.id,
	appName: oauthToken.app_name,
	validUntil: new Date(oauthToken.valid_until).toLocaleDateString()
	}
	})
	}
	},
	methods: {
	updateProfile () {
	const name = this.newName
	const description = this.newBio
	const locked = this.newLocked
	// Backend notation.
	/* eslint-disable camelcase */
	const default_scope = this.newDefaultScope
	const no_rich_text = this.newNoRichText
	const hide_follows = this.hideFollows
	const hide_followers = this.hideFollowers
	const show_role = this.showRole

	/* eslint-enable camelcase */
	this.$store.state.api.backendInteractor
	.updateProfile({
	params: {
	name,
	description,
	locked,
	// Backend notation.
	/* eslint-disable camelcase */
	default_scope,
	no_rich_text,
	hide_follows,
	hide_followers,
	show_role
	/* eslint-enable camelcase */
	}}).then((user) => {
	if (!user.error) {
	this.$store.commit('addNewUsers', [user])
	this.$store.commit('setCurrentUser', user)
	}
	})
	},
	changeVis (visibility) {
	this.newDefaultScope = visibility
	},
	uploadFile (slot, e) {
	const file = e.target.files[0]
	if (!file) { return }
	if (file.size > this.$store.state.instance[slot + 'limit']) {
	const filesize = fileSizeFormatService.fileSizeFormat(file.size)
	const allowedsize = fileSizeFormatService.fileSizeFormat(this.$store.state.instance[slot + 'limit'])
	this[slot + 'UploadError'] = this.$t('upload.error.base') + ' ' + this.$t('upload.error.file_too_big', {filesize: filesize.num, filesizeunit: filesize.unit, allowedsize: allowedsize.num, allowedsizeunit: allowedsize.unit})
	return
	}
	// eslint-disable-next-line no-undef
	const reader = new FileReader()
	reader.onload = ({target}) => {
	const img = target.result
	this[slot + 'Preview'] = img
	}
	reader.readAsDataURL(file)
	},
	submitAvatar (cropper, file) {
	- const img = cropper.getCroppedCanvas().toDataURL(file.type)
	+ let img
	+ if (cropper) {
	+ img = cropper.getCroppedCanvas().toDataURL(file.type)
	+ } else {
	+ img = file
	+ }
	const params = { img }
	return this.updateAvatar(params)
	},
	resetAvatar () {
	const confirmed = window.confirm(this.$t('settings.reset_avatar_confirm'))
	if (confirmed) {
	this.updateAvatar()
	}
	},
	updateAvatar (params = {}) {
	this.avatarUploading = true
	return this.$store.state.api.backendInteractor.updateAvatar({params}).then((user) => {
	if (!user.error) {
	this.$store.commit('addNewUsers', [user])
	this.$store.commit('setCurrentUser', user)
	} else {
	throw new Error(this.$t('upload.error.base') + user.error)
	}
	})
	},
	clearUploadError (slot) {
	this[slot + 'UploadError'] = null
	},
	submitBanner () {
	if (!this.bannerPreview) { return }

	let banner = this.bannerPreview
	// eslint-disable-next-line no-undef
	let imginfo = new Image()
	/* eslint-disable camelcase */
	let offset_top, offset_left, width, height
	imginfo.src = banner
	width = imginfo.width
	height = imginfo.height
	offset_top = 0
	offset_left = 0
	const params = { banner, offset_top, offset_left, width, height }
	this.updateBanner(params)
	},
	resetBanner () {
	const confirmed = window.confirm(this.$t('settings.reset_banner_confirm'))
	if (confirmed) {
	this.updateBanner()
	}
	},
	updateBanner (params = {}) {
	this.bannerUploading = true
	this.$store.state.api.backendInteractor.updateBanner({params}).then((data) => {
	if (!data.error) {
	let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser))
	clone.cover_photo = data.url
	clone.is_default_banner = data.is_default_banner
	this.$store.commit('addNewUsers', [clone])
	this.$store.commit('setCurrentUser', clone)
	this.bannerPreview = null
	} else {
	this.bannerUploadError = this.$t('upload.error.base') + data.error
	}
	this.bannerUploading = false
	})
	/* eslint-enable camelcase */
	},
	submitBg () {
	if (!this.backgroundPreview) { return }
	let img = this.backgroundPreview
	// eslint-disable-next-line no-undef
	let imginfo = new Image()
	let cropX, cropY, cropW, cropH
	imginfo.src = img
	cropX = 0
	cropY = 0
	cropW = imginfo.width
	cropH = imginfo.width
	const params = { img, cropX, cropY, cropW, cropH }
	this.updateBg(params)
	},
	resetBg () {
	const confirmed = window.confirm(this.$t('settings.reset_background_confirm'))
	if (confirmed) {
	this.updateBg()
	}
	},
	updateBg (params = {}) {
	this.backgroundUploading = true
	this.$store.state.api.backendInteractor.updateBg({ params }).then((data) => {
	if (!data.error) {
	let clone = JSON.parse(JSON.stringify(this.$store.state.users.currentUser))
	clone.background_image = data.url
	clone.is_default_background = data.is_default_background
	this.$store.commit('addNewUsers', [clone])
	this.$store.commit('setCurrentUser', clone)
	this.backgroundPreview = null
	} else {
	this.backgroundUploadError = this.$t('upload.error.base') + data.error
	}
	this.backgroundUploading = false
	})
	},
	importFollows () {
	this.followListUploading = true
	const followList = this.followList
	this.$store.state.api.backendInteractor.followImport({params: followList})
	.then((status) => {
	if (status) {
	this.followsImported = true
	} else {
	this.followImportError = true
	}
	this.followListUploading = false
	})
	},
	/* This function takes an Array of Users
	* and outputs a file with all the addresses for the user to download
	*/
	exportPeople (users, filename) {
	// Get all the friends addresses
	var UserAddresses = users.map(function (user) {
	// check is it's a local user
	if (user && user.is_local) {
	// append the instance address
	// eslint-disable-next-line no-undef
	user.screen_name += '@' + location.hostname
	}
	return user.screen_name
	}).join('\n')
	// Make the user download the file
	var fileToDownload = document.createElement('a')
	fileToDownload.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(UserAddresses))
	fileToDownload.setAttribute('download', filename)
	fileToDownload.style.display = 'none'
	document.body.appendChild(fileToDownload)
	fileToDownload.click()
	document.body.removeChild(fileToDownload)
	},
	exportFollows () {
	this.enableFollowsExport = false
	this.$store.state.api.backendInteractor
	.exportFriends({
	id: this.$store.state.users.currentUser.id
	})
	.then((friendList) => {
	this.exportPeople(friendList, 'friends.csv')
	setTimeout(() => { this.enableFollowsExport = true }, 2000)
	})
	},
	followListChange () {
	// eslint-disable-next-line no-undef
	let formData = new FormData()
	formData.append('list', this.$refs.followlist.files[0])
	this.followList = formData
	},
	dismissImported () {
	this.followsImported = false
	this.followImportError = false
	},
	confirmDelete () {
	this.deletingAccount = true
	},
	deleteAccount () {
	this.$store.state.api.backendInteractor.deleteAccount({password: this.deleteAccountConfirmPasswordInput})
	.then((res) => {
	if (res.status === 'success') {
	this.$store.dispatch('logout')
	this.$router.push({name: 'root'})
	} else {
	this.deleteAccountError = res.error
	}
	})
	},
	changePassword () {
	const params = {
	password: this.changePasswordInputs[0],
	newPassword: this.changePasswordInputs[1],
	newPasswordConfirmation: this.changePasswordInputs[2]
	}
	this.$store.state.api.backendInteractor.changePassword(params)
	.then((res) => {
	if (res.status === 'success') {
	this.changedPassword = true
	this.changePasswordError = false
	this.logout()
	} else {
	this.changedPassword = false
	this.changePasswordError = res.error
	}
	})
	},
	activateTab (tabName) {
	this.activeTab = tabName
	},
	logout () {
	this.$store.dispatch('logout')
	this.$router.replace('/')
	},
	revokeToken (id) {
	if (window.confirm(`${this.$i18n.t('settings.revoke_token')}?`)) {
	this.$store.dispatch('revokeToken', id)
	}
	}
	}
	}

	export default UserSettings
	diff --git a/src/i18n/en.json b/src/i18n/en.json
	index 19c203505f..b75776a3f1 100644
	--- a/src/i18n/en.json
	+++ b/src/i18n/en.json
	@@ -1,433 +1,439 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Media proxy",
	"scope_options": "Scope options",
	"text_limit": "Text limit",
	"title": "Features",
	"who_to_follow": "Who to follow"
	},
	"finder": {
	"error_fetching_user": "Error fetching user",
	"find_user": "Find user"
	},
	"general": {
	"apply": "Apply",
	"submit": "Submit",
	"more": "More",
	"generic_error": "An error occured",
	"optional": "optional"
	},
	"image_cropper": {
	"crop_picture": "Crop picture",
	"save": "Save",
	+ "save_without_cropping": "Save without cropping",
	"cancel": "Cancel"
	},
	"login": {
	"login": "Log in",
	"description": "Log in with OAuth",
	"logout": "Log out",
	"password": "Password",
	"placeholder": "e.g. lain",
	"register": "Register",
	"username": "Username",
	"hint": "Log in to join the discussion"
	},
	"media_modal": {
	"previous": "Previous",
	"next": "Next"
	},
	"nav": {
	"about": "About",
	"back": "Back",
	"chat": "Local Chat",
	"friend_requests": "Follow Requests",
	"mentions": "Mentions",
	"dms": "Direct Messages",
	"public_tl": "Public Timeline",
	"timeline": "Timeline",
	"twkn": "The Whole Known Network",
	"user_search": "User Search",
	"who_to_follow": "Who to follow",
	"preferences": "Preferences"
	},
	"notifications": {
	"broken_favorite": "Unknown status, searching for it...",
	"favorited_you": "favorited your status",
	"followed_you": "followed you",
	"load_older": "Load older notifications",
	"notifications": "Notifications",
	"read": "Read!",
	"repeated_you": "repeated your status",
	"no_more_notifications": "No more notifications"
	},
	"post_status": {
	"new_status": "Post new status",
	"account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.",
	"account_not_locked_warning_link": "locked",
	"attachments_sensitive": "Mark attachments as sensitive",
	"content_type": {
	"text/plain": "Plain text",
	"text/html": "HTML",
	"text/markdown": "Markdown"
	},
	"content_warning": "Subject (optional)",
	"default": "Just landed in L.A.",
	"direct_warning": "This post will only be visible to all the mentioned users.",
	"posting": "Posting",
	"scope": {
	"direct": "Direct - Post to mentioned users only",
	"private": "Followers-only - Post to followers only",
	"public": "Public - Post to public timelines",
	"unlisted": "Unlisted - Do not post to public timelines"
	}
	},
	"registration": {
	"bio": "Bio",
	"email": "Email",
	"fullname": "Display name",
	"password_confirm": "Password confirmation",
	"registration": "Registration",
	"token": "Invite token",
	"captcha": "CAPTCHA",
	"new_captcha": "Click the image to get a new captcha",
	"username_placeholder": "e.g. lain",
	"fullname_placeholder": "e.g. Lain Iwakura",
	"bio_placeholder": "e.g.\nHi, I'm Lain\nI’m an anime girl living in suburban Japan. You may know me from the Wired.",
	"validations": {
	"username_required": "cannot be left blank",
	"fullname_required": "cannot be left blank",
	"email_required": "cannot be left blank",
	"password_required": "cannot be left blank",
	"password_confirmation_required": "cannot be left blank",
	"password_confirmation_match": "should be the same as password"
	}
	},
	"settings": {
	"app_name": "App name",
	"attachmentRadius": "Attachments",
	"attachments": "Attachments",
	"autoload": "Enable automatic loading when scrolled to the bottom",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatars (Notifications)",
	"avatarRadius": "Avatars",
	"background": "Background",
	"bio": "Bio",
	"blocks_tab": "Blocks",
	"btnRadius": "Buttons",
	"cBlue": "Blue (Reply, follow)",
	"cGreen": "Green (Retweet)",
	"cOrange": "Orange (Favorite)",
	"cRed": "Red (Cancel)",
	"change_password": "Change Password",
	"change_password_error": "There was an issue changing your password.",
	"changed_password": "Password changed successfully!",
	"collapse_subject": "Collapse posts with subjects",
	"composing": "Composing",
	"confirm_new_password": "Confirm new password",
	"current_avatar": "Your current avatar",
	"current_password": "Current password",
	"current_profile_banner": "Your current profile banner",
	"data_import_export_tab": "Data Import / Export",
	"default_vis": "Default visibility scope",
	"delete_account": "Delete Account",
	"delete_account_description": "Permanently delete your account and all your messages.",
	"delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.",
	"delete_account_instructions": "Type your password in the input below to confirm account deletion.",
	"avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
	"export_theme": "Save preset",
	"filtering": "Filtering",
	"filtering_explanation": "All statuses containing these words will be muted, one per line",
	"follow_export": "Follow export",
	"follow_export_button": "Export your follows to a csv file",
	"follow_export_processing": "Processing, you'll soon be asked to download your file",
	"follow_import": "Follow import",
	"follow_import_error": "Error importing followers",
	"follows_imported": "Follows imported! Processing them will take a while.",
	"foreground": "Foreground",
	"general": "General",
	"hide_attachments_in_convo": "Hide attachments in conversations",
	"hide_attachments_in_tl": "Hide attachments in timeline",
	"max_thumbnails": "Maximum amount of thumbnails per post",
	"hide_isp": "Hide instance-specific panel",
	"preload_images": "Preload images",
	"use_one_click_nsfw": "Open NSFW attachments with just one click",
	"hide_post_stats": "Hide post statistics (e.g. the number of favorites)",
	"hide_user_stats": "Hide user statistics (e.g. the number of followers)",
	"hide_filtered_statuses": "Hide filtered statuses",
	"import_followers_from_a_csv_file": "Import follows from a csv file",
	"import_theme": "Load preset",
	"inputRadius": "Input fields",
	"checkboxRadius": "Checkboxes",
	"instance_default": "(default: {value})",
	"instance_default_simple": "(default)",
	"interface": "Interface",
	"interfaceLanguage": "Interface language",
	"invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.",
	"limited_availability": "Unavailable in your browser",
	"links": "Links",
	"lock_account_description": "Restrict your account to approved followers only",
	"loop_video": "Loop videos",
	"loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
	"mutes_tab": "Mutes",
	"play_videos_in_modal": "Play videos directly in the media viewer",
	"use_contain_fit": "Don't crop the attachment in thumbnails",
	"name": "Name",
	"name_bio": "Name & Bio",
	"new_password": "New password",
	"notification_visibility": "Types of notifications to show",
	"notification_visibility_follows": "Follows",
	"notification_visibility_likes": "Likes",
	"notification_visibility_mentions": "Mentions",
	"notification_visibility_repeats": "Repeats",
	"no_rich_text_description": "Strip rich text formatting from all posts",
	"no_blocks": "No blocks",
	"no_mutes": "No mutes",
	"hide_follows_description": "Don't show who I'm following",
	"hide_followers_description": "Don't show who's following me",
	"show_admin_badge": "Show Admin badge in my profile",
	"show_moderator_badge": "Show Moderator badge in my profile",
	"nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding",
	"oauth_tokens": "OAuth tokens",
	"token": "Token",
	"refresh_token": "Refresh Token",
	"valid_until": "Valid Until",
	"revoke_token": "Revoke",
	"panelRadius": "Panels",
	"pause_on_unfocused": "Pause streaming when tab is not focused",
	"presets": "Presets",
	"profile_background": "Profile Background",
	"profile_banner": "Profile Banner",
	"profile_tab": "Profile",
	"radii_help": "Set up interface edge rounding (in pixels)",
	"replies_in_timeline": "Replies in timeline",
	"reply_link_preview": "Enable reply-link preview on mouse hover",
	"reply_visibility_all": "Show all replies",
	"reply_visibility_following": "Only show replies directed at me or users I'm following",
	"reply_visibility_self": "Only show replies directed at me",
	"saving_err": "Error saving settings",
	"saving_ok": "Settings saved",
	"security_tab": "Security",
	"scope_copy": "Copy scope when replying (DMs are always copied)",
	"set_new_avatar": "Set new avatar",
	"set_new_profile_background": "Set new profile background",
	"set_new_profile_banner": "Set new profile banner",
	"reset_avatar": "Reset avatar",
	"reset_profile_background": "Reset profile background",
	"reset_profile_banner": "Reset profile banner",
	"reset_avatar_confirm": "Do you really want to reset the avatar image?",
	"reset_banner_confirm": "Do you really want to reset the banner image?",
	"reset_background_confirm": "Do you really want to reset the background image?",
	"settings": "Settings",
	"subject_input_always_show": "Always show subject field",
	"subject_line_behavior": "Copy subject when replying",
	"subject_line_email": "Like email: \"re: subject\"",
	"subject_line_mastodon": "Like mastodon: copy as is",
	"subject_line_noop": "Do not copy",
	"post_status_content_type": "Post status content type",
	"stop_gifs": "Play-on-hover GIFs",
	"streaming": "Enable automatic streaming of new posts when scrolled to the top",
	"text": "Text",
	"theme": "Theme",
	"theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
	"theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
	"theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
	"tooltipRadius": "Tooltips/alerts",
	"upload_a_photo": "Upload a photo",
	"user_settings": "User Settings",
	"values": {
	"false": "no",
	"true": "yes"
	},
	"notifications": "Notifications",
	"enable_web_push_notifications": "Enable web push notifications",
	"style": {
	"switcher": {
	"keep_color": "Keep colors",
	"keep_shadows": "Keep shadows",
	"keep_opacity": "Keep opacity",
	"keep_roundness": "Keep roundness",
	"keep_fonts": "Keep fonts",
	"save_load_hint": "\"Keep\" options preserve currently set options when selecting or loading themes, it also stores said options when exporting a theme. When all checkboxes unset, exporting theme will save everything.",
	"reset": "Reset",
	"clear_all": "Clear all",
	"clear_opacity": "Clear opacity"
	},
	"common": {
	"color": "Color",
	"opacity": "Opacity",
	"contrast": {
	"hint": "Contrast ratio is {ratio}, it {level} {context}",
	"level": {
	"aa": "meets Level AA guideline (minimal)",
	"aaa": "meets Level AAA guideline (recommended)",
	"bad": "doesn't meet any accessibility guidelines"
	},
	"context": {
	"18pt": "for large (18pt+) text",
	"text": "for text"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Common",
	"main": "Common colors",
	"foreground_hint": "See \"Advanced\" tab for more detailed control",
	"rgbo": "Icons, accents, badges"
	},
	"advanced_colors": {
	"_tab_label": "Advanced",
	"alert": "Alert background",
	"alert_error": "Error",
	"badge": "Badge background",
	"badge_notification": "Notification",
	"panel_header": "Panel header",
	"top_bar": "Top bar",
	"borders": "Borders",
	"buttons": "Buttons",
	"inputs": "Input fields",
	"faint_text": "Faded text"
	},
	"radii": {
	"_tab_label": "Roundness"
	},
	"shadows": {
	"_tab_label": "Shadow and lighting",
	"component": "Component",
	"override": "Override",
	"shadow_id": "Shadow #{value}",
	"blur": "Blur",
	"spread": "Spread",
	"inset": "Inset",
	"hint": "For shadows you can also use --variable as a color value to use CSS3 variables. Please note that setting opacity won't work in this case.",
	"filter_hint": {
	"always_drop_shadow": "Warning, this shadow always uses {0} when browser supports it.",
	"drop_shadow_syntax": "{0} does not support {1} parameter and {2} keyword.",
	"avatar_inset": "Please note that combining both inset and non-inset shadows on avatars might give unexpected results with transparent avatars.",
	"spread_zero": "Shadows with spread > 0 will appear as if it was set to zero",
	"inset_classic": "Inset shadows will be using {0}"
	},
	"components": {
	"panel": "Panel",
	"panelHeader": "Panel header",
	"topBar": "Top bar",
	"avatar": "User avatar (in profile view)",
	"avatarStatus": "User avatar (in post display)",
	"popup": "Popups and tooltips",
	"button": "Button",
	"buttonHover": "Button (hover)",
	"buttonPressed": "Button (pressed)",
	"buttonPressedHover": "Button (pressed+hover)",
	"input": "Input field"
	}
	},
	"fonts": {
	"_tab_label": "Fonts",
	"help": "Select font to use for elements of UI. For \"custom\" you have to enter exact font name as it appears in system.",
	"components": {
	"interface": "Interface",
	"input": "Input fields",
	"post": "Post text",
	"postCode": "Monospaced text in a post (rich text)"
	},
	"family": "Font name",
	"size": "Size (in px)",
	"weight": "Weight (boldness)",
	"custom": "Custom"
	},
	"preview": {
	"header": "Preview",
	"content": "Content",
	"error": "Example error",
	"button": "Button",
	"text": "A bunch of more {0} and {1}",
	"mono": "content",
	"input": "Just landed in L.A.",
	"faint_link": "helpful manual",
	"fine_print": "Read our {0} to learn nothing useful!",
	"header_faint": "This is fine",
	"checkbox": "I have skimmed over terms and conditions",
	"link": "a nice lil' link"
	}
	+ },
	+ "version": {
	+ "title": "Version",
	+ "backend_version": "Backend Version",
	+ "frontend_version": "Frontend Version"
	}
	},
	"timeline": {
	"collapse": "Collapse",
	"conversation": "Conversation",
	"error_fetching": "Error fetching updates",
	"load_older": "Load older statuses",
	"no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated",
	"repeated": "repeated",
	"show_new": "Show new",
	"up_to_date": "Up-to-date",
	"no_more_statuses": "No more statuses",
	"no_statuses": "No statuses"
	},
	"status": {
	"reply_to": "Reply to",
	"replies_list": "Replies:"
	},
	"user_card": {
	"approve": "Approve",
	"block": "Block",
	"blocked": "Blocked!",
	"deny": "Deny",
	"favorites": "Favorites",
	"follow": "Follow",
	"follow_sent": "Request sent!",
	"follow_progress": "Requesting…",
	"follow_again": "Send request again?",
	"follow_unfollow": "Unfollow",
	"followees": "Following",
	"followers": "Followers",
	"following": "Following!",
	"follows_you": "Follows you!",
	"its_you": "It's you!",
	"media": "Media",
	"mute": "Mute",
	"muted": "Muted",
	"per_day": "per day",
	"remote_follow": "Remote follow",
	"statuses": "Statuses",
	"unblock": "Unblock",
	"unblock_progress": "Unblocking...",
	"block_progress": "Blocking...",
	"unmute": "Unmute",
	"unmute_progress": "Unmuting...",
	"mute_progress": "Muting..."
	},
	"user_profile": {
	"timeline_title": "User Timeline",
	"profile_does_not_exist": "Sorry, this profile does not exist.",
	"profile_loading_error": "Sorry, there was an error loading this profile."
	},
	"who_to_follow": {
	"more": "More",
	"who_to_follow": "Who to follow"
	},
	"tool_tip": {
	"media_upload": "Upload Media",
	"repeat": "Repeat",
	"reply": "Reply",
	"favorite": "Favorite",
	"user_settings": "User Settings"
	},
	"upload":{
	"error": {
	"base": "Upload failed.",
	"file_too_big": "File too big [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Try again later"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/i18n/oc.json b/src/i18n/oc.json
	index baac3d25c9..ecc4df61dd 100644
	--- a/src/i18n/oc.json
	+++ b/src/i18n/oc.json
	@@ -1,312 +1,427 @@
	{
	"chat": {
	"title": "Messatjariá"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Servidor mandatari mèdia",
	"scope_options": "Nivèls de confidencialitat",
	"text_limit": "Limita de tèxte",
	"title": "Foncionalitats",
	"who_to_follow": "Qual seguir"
	},
	"finder": {
	"error_fetching_user": "Error pendent la cèrca d’un utilizaire",
	"find_user": "Cercar un utilizaire"
	},
	"general": {
	"apply": "Aplicar",
	"submit": "Mandar",
	"more": "Mai",
	"generic_error": "Una error s’es producha",
	"optional": "opcional"
	},
	"image_cropper": {
	"crop_picture": "Talhar l’imatge",
	"save": "Salvar",
	"cancel": "Anullar"
	},
	"login": {
	"login": "Connexion",
	"description": "Connexion via OAuth",
	"logout": "Desconnexion",
	"password": "Senhal",
	"placeholder": "e.g. lain",
	"register": "Se marcar",
	"username": "Nom d’utilizaire",
	"hint": "Connectatz-vos per participar a la discutida"
	},
	"media_modal": {
	"previous": "Precedent",
	"next": "Seguent"
	},
	"nav": {
	"about": "A prepaus",
	"back": "Tornar",
	"chat": "Chat local",
	"friend_requests": "Demandas de seguiment",
	"mentions": "Notificacions",
	"dms": "Messatges privats",
	"public_tl": "Estatuts locals",
	"timeline": "Flux d’actualitat",
	"twkn": "Lo malhum conegut",
	"user_search": "Cèrca d’utilizaires",
	"who_to_follow": "Qual seguir",
	"preferences": "Preferéncias"
	},
	"notifications": {
	"broken_favorite": "Estatut desconegut, sèm a lo cercar...",
	"favorited_you": "a aimat vòstre estatut",
	"followed_you": "vos a seguit",
	- "load_older": "Cargar las notificaciones mai ancianas",
	+ "load_older": "Cargar las notificacions mai ancianas",
	"notifications": "Notficacions",
	- "read": "Legit !",
	+ "read": "Legit !",
	"repeated_you": "a repetit vòstre estatut",
	"no_more_notifications": "Pas mai de notificacions"
	},
	"post_status": {
	"new_status": "Publicar d’estatuts novèls",
	- "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu'a vòstres seguidors.",
	+ "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu’a vòstres seguidors.",
	"account_not_locked_warning_link": "clavat",
	"attachments_sensitive": "Marcar las pèças juntas coma sensiblas",
	"content_type": {
	- "text/plain": "Tèxte brut"
	+ "text/plain": "Tèxte brut",
	+ "text/html": "HTML",
	+ "text/markdown": "Markdown"
	},
	"content_warning": "Avís de contengut (opcional)",
	"default": "Escrivètz aquí vòstre estatut.",
	"direct_warning": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats.",
	"posting": "Mandadís",
	"scope": {
	"direct": "Dirècte - Publicar pels utilizaires mencionats solament",
	"private": "Seguidors solament - Publicar pels sols seguidors",
	"public": "Public - Publicar pel flux d’actualitat public",
	"unlisted": "Pas listat - Publicar pas pel flux public"
	}
	},
	"registration": {
	"bio": "Biografia",
	"email": "Adreça de corrièl",
	"fullname": "Nom complèt",
	"password_confirm": "Confirmar lo senhal",
	"registration": "Inscripcion",
	"token": "Geton de convidat",
	"captcha": "CAPTCHA",
	"new_captcha": "Clicatz l’imatge per obténer una nòva captcha",
	"username_placeholder": "e.g. lain",
	"fullname_placeholder": "e.g. Lain Iwakura",
	"bio_placeholder": "e.g.\nHi, Soi lo Lain\nSoi afocada d’animes e vivi al Japan. Benlèu que me coneissètz de the Wired.",
	"validations": {
	"username_required": "pòt pas èsser void",
	"fullname_required": "pòt pas èsser void",
	"email_required": "pòt pas èsser void",
	"password_required": "pòt pas èsser void",
	"password_confirmation_required": "pòt pas èsser void",
	"password_confirmation_match": "deu èsser lo meteis senhal"
	}
	},
	"settings": {
	"app_name": "Nom de l’aplicacion",
	"attachmentRadius": "Pèças juntas",
	"attachments": "Pèças juntas",
	"autoload": "Activar lo cargament automatic un còp arribat al cap de la pagina",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatars (Notificacions)",
	"avatarRadius": "Avatars",
	"background": "Rèire plan",
	"bio": "Biografia",
	"blocks_tab": "Blocatges",
	"btnRadius": "Botons",
	"cBlue": "Blau (Respondre, seguir)",
	- "cGreen": "Verd (Repartajar)",
	+ "cGreen": "Verd (Repertir)",
	"cOrange": "Irange (Aimar)",
	"cRed": "Roge (Anullar)",
	"change_password": "Cambiar lo senhal",
	"change_password_error": "Una error s’es producha en cambiant lo senhal.",
	- "changed_password": "Senhal corrèctament cambiat !",
	+ "changed_password": "Senhal corrèctament cambiat !",
	"collapse_subject": "Replegar las publicacions amb de subjèctes",
	"composing": "Escritura",
	"confirm_new_password": "Confirmatz lo nòu senhal",
	"current_avatar": "Vòstre avatar actual",
	"current_password": "Senhal actual",
	"current_profile_banner": "Bandièra actuala del perfil",
	"data_import_export_tab": "Importar / Exportar las donadas",
	"default_vis": "Nivèl de visibilitat per defaut",
	"delete_account": "Suprimir lo compte",
	"delete_account_description": "Suprimir vòstre compte e los messatges per sempre.",
	- "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.",
	+ "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrator d’instància.",
	"delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.",
	"avatar_size_instruction": "La talha minimum recomandada pels imatges d’avatar es 150x150 pixèls.",
	"export_theme": "Enregistrar la preconfiguracion",
	"filtering": "Filtratge",
	"filtering_explanation": "Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha",
	"follow_export": "Exportar los abonaments",
	"follow_export_button": "Exportar vòstres abonaments dins un fichièr csv",
	"follow_export_processing": "Tractament, vos demandarem lèu de telecargar lo fichièr",
	"follow_import": "Importar los abonaments",
	"follow_import_error": "Error en important los seguidors",
	"follows_imported": "Seguidors importats. Lo tractament pòt trigar una estona.",
	"foreground": "Endavant",
	"general": "General",
	"hide_attachments_in_convo": "Rescondre las pèças juntas dins las conversacions",
	"hide_attachments_in_tl": "Rescondre las pèças juntas",
	"max_thumbnails": "Nombre maximum de vinhetas per publicacion",
	"hide_isp": "Amagar lo panèl especial instància",
	"preload_images": "Precargar los imatges",
	"use_one_click_nsfw": "Dobrir las pèças juntas NSFW amb un clic",
	- "hide_post_stats": "Amagar los estatistics de publicacion (ex. lo ombre de favorits)",
	+ "hide_post_stats": "Amagar las estatisticas de publicacion (ex. lo nombre de favorits)",
	"hide_user_stats": "Amagar las estatisticas de l’utilizaire (ex. lo nombre de seguidors)",
	"hide_filtered_statuses": "Amagar los estatuts filtrats",
	"import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv",
	"import_theme": "Cargar un tèma",
	"inputRadius": "Camps tèxte",
	"checkboxRadius": "Casas de marcar",
	- "instance_default": "(defaut : {value})",
	+ "instance_default": "(defaut : {value})",
	"instance_default_simple": "(defaut)",
	"interface": "Interfàcia",
	"interfaceLanguage": "Lenga de l’interfàcia",
	"invalid_theme_imported": "Lo fichièr seleccionat es pas un tèma Pleroma valid. Cap de cambiament es estat fach a vòstre tèma.",
	"limited_availability": "Pas disponible per vòstre navigador",
	"links": "Ligams",
	"lock_account_description": "Limitar vòstre compte als seguidors acceptats solament",
	"loop_video": "Bocla vidèo",
	"loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)",
	"mutes_tab": "Agamats",
	- "play_videos_in_modal": "Legir las vidèoas dirèctament dins la visualizaira mèdia",
	+ "play_videos_in_modal": "Legir las vidèos dirèctament dins la visualizaira mèdia",
	"use_contain_fit": "Talhar pas las pèças juntas per las vinhetas",
	"name": "Nom",
	"name_bio": "Nom & Bio",
	"new_password": "Nòu senhal",
	"notification_visibility_follows": "Abonaments",
	"notification_visibility_likes": "Aimar",
	"notification_visibility_mentions": "Mencions",
	"notification_visibility_repeats": "Repeticions",
	"notification_visibility": "Tipes de notificacion de mostrar",
	"no_rich_text_description": "Netejar lo format tèxte de totas las publicacions",
	"no_blocks": "Cap de blocatge",
	"no_mutes": "Cap d’amagat",
	"hide_follows_description": "Mostrar pas qual seguissi",
	"hide_followers_description": "Mostrar pas qual me seguisson",
	"show_admin_badge": "Mostrar lo badge Admin badge al perfil meu",
	"show_moderator_badge": "Mostrar lo badge Moderator al perfil meu",
	"nsfw_clickthrough": "Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles",
	"oauth_tokens": "Listats OAuth",
	"token": "Geton",
	"refresh_token": "Actualizar lo geton",
	"valid_until": "Valid fins a",
	"revoke_token": "Revocar",
	"panelRadius": "Panèls",
	"pause_on_unfocused": "Pausar la difusion quand l’onglet es pas seleccionat",
	"presets": "Pre-enregistrats",
	"profile_background": "Imatge de fons",
	"profile_banner": "Bandièra del perfil",
	"profile_tab": "Perfil",
	"radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)",
	"replies_in_timeline": "Responsas del flux",
	"reply_link_preview": "Activar l’apercebut en passar la mirga",
	"reply_visibility_all": "Mostrar totas las responsas",
	"reply_visibility_following": "Mostrar pas que las responsas que me son destinada a ieu o un utilizaire que seguissi",
	"reply_visibility_self": "Mostrar pas que las responsas que me son destinadas",
	"saving_err": "Error en enregistrant los paramètres",
	"saving_ok": "Paramètres enregistrats",
	"scope_copy": "Copiar lo nivèl de confidencialitat per las responsas (Totjorn aissí pels Messatges Dirèctes)",
	"security_tab": "Seguretat",
	"set_new_avatar": "Definir un nòu avatar",
	"set_new_profile_background": "Definir un nòu fons de perfil",
	"set_new_profile_banner": "Definir una nòva bandièra de perfil",
	"settings": "Paramètres",
	"subject_input_always_show": "Totjorn mostrar lo camp de subjècte",
	"subject_line_behavior": "Copiar lo subjècte per las responsas",
	"subject_line_email": "Coma los corrièls : \"re: subjècte\"",
	"subject_line_mastodon": "Coma mastodon : copiar tal coma es",
	"subject_line_noop": "Copiar pas",
	"post_status_content_type": "Publicar lo tipe de contengut dels estatuts",
	"stop_gifs": "Lançar los GIFs al subrevòl",
	"streaming": "Activar lo cargament automatic dels novèls estatus en anar amont",
	- "text": "Tèxt",
	+ "text": "Tèxte",
	"theme": "Tèma",
	"theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
	"theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
	"theme_help": "Emplegatz los còdis de color hex (#rrggbb) per personalizar vòstre tèma de color.",
	"tooltipRadius": "Astúcias/alèrtas",
	"upload_a_photo": "Enviar una fotografia",
	"user_settings": "Paramètres utilizaire",
	"values": {
	"false": "non",
	"true": "òc"
	+ },
	+ "notifications": "Notificacions",
	+ "enable_web_push_notifications": "Activar las notificacions web push",
	+ "style": {
	+ "switcher": {
	+ "keep_color": "Gardar las colors",
	+ "keep_shadows": "Gardar las ombras",
	+ "keep_opacity": "Gardar l’opacitat",
	+ "keep_roundness": "Gardar la redondetat",
	+ "keep_fonts": "Gardar las polissas",
	+ "save_load_hint": "Las opcions « Gardar » permeton de servar las opcions configuradas actualament quand seleccionatz o cargatz un tèma, permeton tanben d’enregistrar aquelas opcions quand exportatz un tèma. Quand totas las casas son pas marcadas, l’exportacion de tèma o enregistrarà tot.",
	+ "reset": "Restablir",
	+ "clear_all": "O escafar tot",
	+ "clear_opacity": "Escafar l’opacitat"
	+ },
	+ "common": {
	+ "color": "Color",
	+ "opacity": "Opacitat",
	+ "contrast": {
	+ "hint": "Lo coeficient de contraste es de {ratio}. Dòna {level} {context}",
	+ "level": {
	+ "aa": "un nivèl AA minimum recomandat",
	+ "aaa": "un nivèl AAA recomandat",
	+ "bad": "pas un nivèl d’accessibilitat recomandat"
	+ },
	+ "context": {
	+ "18pt": "pel tèxte grand (18pt+)",
	+ "text": "pel tèxte"
	+ }
	+ }
	+ },
	+ "common_colors": {
	+ "_tab_label": "Comun",
	+ "main": "Colors comunas",
	+ "foreground_hint": "Vejatz « Avançat » per mai de paramètres detalhats",
	+ "rgbo": "Icònas, accents, badges"
	+ },
	+ "advanced_colors": {
	+ "_tab_label": "Avançat",
	+ "alert": "Rèire plan d’alèrtas",
	+ "alert_error": "Error",
	+ "badge": "Rèire plan dels badges",
	+ "badge_notification": "Notificacion",
	+ "panel_header": "Bandièra del tablèu de bòrd",
	+ "top_bar": "Barra amont",
	+ "borders": "Caires",
	+ "buttons": "Botons",
	+ "inputs": "Camps tèxte",
	+ "faint_text": "Tèxte descolorit"
	+ },
	+ "radii": {
	+ "_tab_label": "Redondetat"
	+ },
	+ "shadows": {
	+ "_tab_label": "Ombra e luminositat",
	+ "component": "Compausant",
	+ "override": "Subrecargar",
	+ "shadow_id": "Ombra #{value}",
	+ "blur": "Fosc",
	+ "spread": "Espandiment",
	+ "inset": "Incrustacion",
	+ "hint": "Per las ombras podètz tanben utilizar --variable coma valor de color per emplegar una variable CSS3. Notatz que lo paramètre d’opacitat foncionarà pas dins aquel cas.",
	+ "filter_hint": {
	+ "always_drop_shadow": "Avertiment, aquel ombra utiliza totjorn {0} quand lo navigator es compatible.",
	+ "drop_shadow_syntax": "{0} es pas compatible amb lo paramètre {1} e lo mot clau {2}.",
	+ "avatar_inset": "Notatz que combinar d’ombras incrustadas e pas incrustadas pòt donar de resultats inesperats amb los avatars transparents.",
	+ "spread_zero": "L’ombra amb un espandiment de > 0 apareisserà coma reglat a zèro",
	+ "inset_classic": "L’ombra d’incrustacion utilizarà {0}"
	+ },
	+ "components": {
	+ "panel": "Tablèu",
	+ "panelHeader": "Bandièra del tablèu",
	+ "topBar": "Barra amont",
	+ "avatar": "Utilizar l’avatar (vista perfil)",
	+ "avatarStatus": "Avatar de l’utilizaire (afichatge publicacion)",
	+ "popup": "Fenèstras sorgissentas e astúcias",
	+ "button": "Boton",
	+ "buttonHover": "Boton (en passar la mirga)",
	+ "buttonPressed": "Boton (en quichar)",
	+ "buttonPressedHover": "Boton (en quichar e passar)",
	+ "input": "Camp tèxte"
	+ }
	+ },
	+ "fonts": {
	+ "_tab_label": "Polissas",
	+ "help": "Selecionatz la polissa d’utilizar pels elements de l’UI. Per « Personalizada » vos cal picar lo nom exacte tal coma apareis sul sistèma.",
	+ "components": {
	+ "interface": "Interfàcia",
	+ "input": "Camps tèxte",
	+ "post": "Tèxte de publicacion",
	+ "postCode": "Tèxte Monospaced dins las publicacion (tèxte formatat)"
	+ },
	+ "family": "Nom de la polissa",
	+ "size": "Talha (en px)",
	+ "weight": "Largor (gras)",
	+ "custom": "Personalizada"
	+ },
	+ "preview": {
	+ "header": "Apercebut",
	+ "content": "Contengut",
	+ "error": "Error d’exemple",
	+ "button": "Boton",
	+ "text": "A tròç de mai de {0} e {1}",
	+ "mono": "contengut",
	+ "input": "arribada al país.",
	+ "faint_link": "manual d’ajuda",
	+ "fine_print": "Legissètz nòstre {0} per legir pas res d’util !",
	+ "header_faint": "Va plan",
	+ "checkbox": "Ai legit los tèrmes e condicions d’utilizacion",
	+ "link": "un pichon ligam simpatic"
	+ }
	}
	},
	"timeline": {
	"collapse": "Tampar",
	"conversation": "Conversacion",
	"error_fetching": "Error en cercant de mesas a jorn",
	"load_older": "Ne veire mai",
	+ "no_retweet_hint": "Las publicacions marcadas pels seguidors solament o dirèctas se pòdon pas repetir",
	"repeated": "repetit",
	"show_new": "Ne veire mai",
	"up_to_date": "A jorn",
	- "no_retweet_hint": "La publicacion marcada coma pels seguidors solament o dirècte pòt pas èsser repetida"
	+ "no_more_statuses": "Pas mai d’estatuts",
	+ "no_statuses": "Cap d’estatuts"
	},
	"status": {
	- "reply_to": "Respondre à",
	+ "reply_to": "Respond a",
	"replies_list": "Responsas :"
	},
	"user_card": {
	"approve": "Validar",
	"block": "Blocar",
	- "blocked": "Blocat !",
	+ "blocked": "Blocat !",
	"deny": "Refusar",
	"favorites": "Favorits",
	"follow": "Seguir",
	"follow_sent": "Demanda enviada !",
	"follow_progress": "Demanda…",
	"follow_again": "Tornar enviar la demanda ?",
	"follow_unfollow": "Quitar de seguir",
	"followees": "Abonaments",
	"followers": "Seguidors",
	- "following": "Seguit !",
	- "follows_you": "Vos sèc !",
	+ "following": "Seguit !",
	+ "follows_you": "Vos sèc !",
	"its_you": "Sètz vos !",
	"media": "Mèdia",
	"mute": "Amagar",
	"muted": "Amagat",
	"per_day": "per jorn",
	"remote_follow": "Seguir a distància",
	"statuses": "Estatuts",
	"unblock": "Desblocar",
	"unblock_progress": "Desblocatge...",
	"block_progress": "Blocatge...",
	"unmute": "Tornar mostrar",
	"unmute_progress": "Afichatge...",
	"mute_progress": "A amagar..."
	},
	"user_profile": {
	"timeline_title": "Flux utilizaire",
	"profile_does_not_exist": "Aqueste perfil existís pas.",
	"profile_loading_error": "Una error s’es producha en cargant aqueste perfil."
	},
	"who_to_follow": {
	"more": "Mai",
	"who_to_follow": "Qual seguir"
	},
	"tool_tip": {
	"media_upload": "Enviar un mèdia",
	"repeat": "Repetir",
	"reply": "Respondre",
	"favorite": "aimar",
	"user_settings": "Paramètres utilizaire"
	},
	"upload":{
	"error": {
	"base": "Mandadís fracassat.",
	"file_too_big": "Fichièr tròp grand [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Tornatz ensajar mai tard"
	},
	"file_size_units": {
	"B": "o",
	"KiB": "Kio",
	"MiB": "Mio",
	"GiB": "Gio",
	"TiB": "Tio"
	}
	}
	}
	\ No newline at end of file
	diff --git a/src/i18n/pt.json b/src/i18n/pt.json
	index 29ab995b9d..41a3448380 100644
	--- a/src/i18n/pt.json
	+++ b/src/i18n/pt.json
	@@ -1,425 +1,425 @@
	{
	"chat": {
	"title": "Chat"
	},
	"features_panel": {
	"chat": "Chat",
	"gopher": "Gopher",
	"media_proxy": "Proxy de mídia",
	"scope_options": "Opções de privacidade",
	"text_limit": "Limite de caracteres",
	"title": "Funções",
	"who_to_follow": "Quem seguir"
	},
	"finder": {
	"error_fetching_user": "Erro ao procurar usuário",
	"find_user": "Buscar usuário"
	},
	"general": {
	"apply": "Aplicar",
	"submit": "Enviar",
	"more": "Mais",
	"generic_error": "Houve um erro",
	"optional": "opcional"
	},
	"image_cropper": {
	"crop_picture": "Cortar imagem",
	"save": "Salvar",
	"cancel": "Cancelar"
	},
	"login": {
	"login": "Entrar",
	"description": "Entrar com OAuth",
	"logout": "Sair",
	"password": "Senha",
	"placeholder": "p.e. lain",
	"register": "Registrar",
	"username": "Usuário",
	"hint": "Entre para participar da discussão"
	},
	"media_modal": {
	"previous": "Anterior",
	"next": "Próximo"
	},
	"nav": {
	"about": "Sobre",
	"back": "Voltar",
	"chat": "Chat local",
	"friend_requests": "Solicitações de seguidores",
	"mentions": "Menções",
	"dms": "Mensagens diretas",
	"public_tl": "Linha do tempo pública",
	"timeline": "Linha do tempo",
	"twkn": "Toda a rede conhecida",
	- "user_search": "Busca de usuário",
	+ "user_search": "Buscar usuários",
	"who_to_follow": "Quem seguir",
	"preferences": "Preferências"
	},
	"notifications": {
	"broken_favorite": "Status desconhecido, buscando...",
	"favorited_you": "favoritou sua postagem",
	"followed_you": "seguiu você",
	"load_older": "Carregar notificações antigas",
	"notifications": "Notificações",
	"read": "Lido!",
	"repeated_you": "repetiu sua postagem",
	"no_more_notifications": "Mais nenhuma notificação"
	},
	"post_status": {
	"new_status": "Postar novo status",
	- "account_not_locked_warning": "Sua conta não está {0}. Qualquer pessoa pode te seguir para ver seus posts restritos.",
	- "account_not_locked_warning_link": "fechada",
	+ "account_not_locked_warning": "Sua conta não é {0}. Qualquer pessoa pode te seguir e ver seus posts privados (só para seguidores).",
	+ "account_not_locked_warning_link": "restrita",
	"attachments_sensitive": "Marcar anexos como sensíveis",
	"content_type": {
	"text/plain": "Texto puro"
	},
	"content_warning": "Assunto (opcional)",
	"default": "Acabei de chegar no Rio!",
	"direct_warning": "Este post será visível apenas para os usuários mencionados.",
	"posting": "Publicando",
	"scope": {
	"direct": "Direto - Enviar somente aos usuários mencionados",
	"private": "Apenas para seguidores - Enviar apenas para seguidores",
	"public": "Público - Enviar a linhas do tempo públicas",
	"unlisted": "Não listado - Não enviar a linhas do tempo públicas"
	}
	},
	"registration": {
	"bio": "Biografia",
	"email": "Correio eletrônico",
	"fullname": "Nome para exibição",
	"password_confirm": "Confirmação de senha",
	"registration": "Registro",
	"token": "Código do convite",
	"captcha": "CAPTCHA",
	"new_captcha": "Clique na imagem para carregar um novo captcha",
	"username_placeholder": "p. ex. lain",
	"fullname_placeholder": "p. ex. Lain Iwakura",
	"bio_placeholder": "e.g.\nOi, sou Lain\nSou uma garota que vive no subúrbio do Japão. Você deve me conhecer da Rede.",
	"validations": {
	"username_required": "não pode ser deixado em branco",
	"fullname_required": "não pode ser deixado em branco",
	"email_required": "não pode ser deixado em branco",
	"password_required": "não pode ser deixado em branco",
	"password_confirmation_required": "não pode ser deixado em branco",
	"password_confirmation_match": "deve ser idêntica à senha"
	}
	},
	"settings": {
	"app_name": "Nome do aplicativo",
	"attachmentRadius": "Anexos",
	"attachments": "Anexos",
	"autoload": "Habilitar carregamento automático quando a rolagem chegar ao fim.",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatares (Notificações)",
	"avatarRadius": "Avatares",
	"background": "Pano de Fundo",
	"bio": "Biografia",
	- "blocks_tab": "Blocos",
	+ "blocks_tab": "Bloqueios",
	"btnRadius": "Botões",
	"cBlue": "Azul (Responder, seguir)",
	"cGreen": "Verde (Repetir)",
	"cOrange": "Laranja (Favoritar)",
	"cRed": "Vermelho (Cancelar)",
	"change_password": "Mudar senha",
	"change_password_error": "Houve um erro ao modificar sua senha.",
	"changed_password": "Senha modificada com sucesso!",
	"collapse_subject": "Esconder posts com assunto",
	- "composing": "Escrevendo",
	+ "composing": "Escrita",
	"confirm_new_password": "Confirmar nova senha",
	"current_avatar": "Seu avatar atual",
	"current_password": "Sua senha atual",
	"current_profile_banner": "Sua capa de perfil atual",
	"data_import_export_tab": "Importação/exportação de dados",
	"default_vis": "Opção de privacidade padrão",
	"delete_account": "Deletar conta",
	"delete_account_description": "Deletar sua conta e mensagens permanentemente.",
	"delete_account_error": "Houve um problema ao deletar sua conta. Se ele persistir, por favor entre em contato com o/a administrador/a da instância.",
	"delete_account_instructions": "Digite sua senha no campo abaixo para confirmar a exclusão da conta.",
	"avatar_size_instruction": "O tamanho mínimo recomendado para imagens de avatar é 150x150 pixels.",
	"export_theme": "Salvar predefinições",
	"filtering": "Filtragem",
	- "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas, uma por linha.",
	+ "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas; uma palavra por linha.",
	"follow_export": "Exportar quem você segue",
	"follow_export_button": "Exportar quem você segue para um arquivo CSV",
	"follow_export_processing": "Processando. Em breve você receberá a solicitação de download do arquivo",
	"follow_import": "Importar quem você segue",
	"follow_import_error": "Erro ao importar seguidores",
	"follows_imported": "Seguidores importados! O processamento pode demorar um pouco.",
	"foreground": "Primeiro Plano",
	"general": "Geral",
	"hide_attachments_in_convo": "Ocultar anexos em conversas",
	"hide_attachments_in_tl": "Ocultar anexos na linha do tempo.",
	"max_thumbnails": "Número máximo de miniaturas por post",
	"hide_isp": "Esconder painel específico da instância",
	"preload_images": "Pré-carregar imagens",
	"use_one_click_nsfw": "Abrir anexos sensíveis com um clique",
	"hide_post_stats": "Esconder estatísticas de posts (p. ex. número de favoritos)",
	"hide_user_stats": "Esconder estatísticas do usuário (p. ex. número de seguidores)",
	"hide_filtered_statuses": "Esconder posts filtrados",
	"import_followers_from_a_csv_file": "Importe seguidores a partir de um arquivo CSV",
	"import_theme": "Carregar pré-definição",
	"inputRadius": "Campos de entrada",
	"checkboxRadius": "Checkboxes",
	"instance_default": "(padrão: {value})",
	"instance_default_simple": "(padrão)",
	"interface": "Interface",
	"interfaceLanguage": "Idioma da interface",
	"invalid_theme_imported": "O arquivo selecionado não é um tema compatível com o Pleroma. Nenhuma mudança no tema foi feita.",
	"limited_availability": "Indisponível para seu navegador",
	"links": "Links",
	"lock_account_description": "Restringir sua conta a seguidores aprovados",
	"loop_video": "Repetir vídeos",
	"loop_video_silent_only": "Repetir apenas vídeos sem som (como os \"gifs\" do Mastodon)",
	"mutes_tab": "Silenciados",
	"play_videos_in_modal": "Tocar vídeos diretamente no visualizador de mídia",
	"use_contain_fit": "Não cortar o anexo na miniatura",
	"name": "Nome",
	"name_bio": "Nome & Biografia",
	"new_password": "Nova senha",
	"notification_visibility": "Tipos de notificação para mostrar",
	- "notification_visibility_follows": "Seguidos",
	+ "notification_visibility_follows": "Seguidas",
	"notification_visibility_likes": "Favoritos",
	"notification_visibility_mentions": "Menções",
	"notification_visibility_repeats": "Repetições",
	"no_rich_text_description": "Remover formatação de todos os posts",
	"no_blocks": "Sem bloqueios",
	"no_mutes": "Sem silenciados",
	"hide_follows_description": "Não mostrar quem estou seguindo",
	"hide_followers_description": "Não mostrar quem me segue",
	- "show_admin_badge": "Mostrar distintivo de Administrador em meu perfil",
	+ "show_admin_badge": "Mostrar título de Administrador em meu perfil",
	"show_moderator_badge": "Mostrar título de Moderador em meu perfil",
	"nsfw_clickthrough": "Habilitar clique para ocultar anexos sensíveis",
	"oauth_tokens": "Token OAuth",
	"token": "Token",
	"refresh_token": "Atualizar Token",
	"valid_until": "Válido até",
	"revoke_token": "Revogar",
	"panelRadius": "Paineis",
	"pause_on_unfocused": "Parar transmissão quando a aba não estiver em primeiro plano",
	"presets": "Predefinições",
	"profile_background": "Pano de fundo de perfil",
	"profile_banner": "Capa de perfil",
	"profile_tab": "Perfil",
	- "radii_help": "Arredondar arestas da interface (em píxeis)",
	+ "radii_help": "Arredondar arestas da interface (em pixel)",
	"replies_in_timeline": "Respostas na linha do tempo",
	- "reply_link_preview": "Habilitar a pré-visualização de link de respostas ao passar o mouse.",
	+ "reply_link_preview": "Habilitar a pré-visualização de de respostas ao passar o mouse.",
	"reply_visibility_all": "Mostrar todas as respostas",
	"reply_visibility_following": "Só mostrar respostas direcionadas a mim ou a usuários que sigo",
	"reply_visibility_self": "Só mostrar respostas direcionadas a mim",
	"saving_err": "Erro ao salvar configurações",
	"saving_ok": "Configurações salvas",
	"security_tab": "Segurança",
	"scope_copy": "Copiar opções de privacidade ao responder (Mensagens diretas sempre copiam)",
	"set_new_avatar": "Alterar avatar",
	- "set_new_profile_background": "Alterar o plano de fundo de perfil",
	+ "set_new_profile_background": "Alterar o pano de fundo de perfil",
	"set_new_profile_banner": "Alterar capa de perfil",
	"settings": "Configurações",
	"subject_input_always_show": "Sempre mostrar campo de assunto",
	"subject_line_behavior": "Copiar assunto ao responder",
	"subject_line_email": "Como em email: \"re: assunto\"",
	"subject_line_mastodon": "Como o Mastodon: copiar como está",
	"subject_line_noop": "Não copiar",
	- "post_status_content_type": "Postar tipo de conteúdo do status",
	- "stop_gifs": "Reproduzir GIFs ao passar o cursor em cima",
	- "streaming": "Habilitar o fluxo automático de postagens quando ao topo da página",
	+ "post_status_content_type": "Tipo de conteúdo do status",
	+ "stop_gifs": "Reproduzir GIFs ao passar o cursor",
	+ "streaming": "Habilitar o fluxo automático de postagens no topo da página",
	"text": "Texto",
	"theme": "Tema",
	"theme_help": "Use cores em código hexadecimal (#rrggbb) para personalizar seu esquema de cores.",
	"theme_help_v2_1": "Você também pode sobrescrever as cores e opacidade de alguns componentes ao modificar o checkbox, use \"Limpar todos\" para limpar todas as modificações.",
	"theme_help_v2_2": "Alguns ícones sob registros são indicadores de fundo/contraste de textos, passe por cima para informações detalhadas. Tenha ciência de que os indicadores de contraste não funcionam muito bem com transparência.",
	"tooltipRadius": "Dicas/alertas",
	"upload_a_photo": "Enviar uma foto",
	"user_settings": "Configurações de Usuário",
	"values": {
	"false": "não",
	"true": "sim"
	},
	- "notifications": "Notifications",
	+ "notifications": "Notificações",
	"enable_web_push_notifications": "Habilitar notificações web push",
	"style": {
	"switcher": {
	"keep_color": "Manter cores",
	"keep_shadows": "Manter sombras",
	"keep_opacity": "Manter opacidade",
	"keep_roundness": "Manter arredondado",
	"keep_fonts": "Manter fontes",
	"save_load_hint": "Manter as opções preserva as opções atuais ao selecionar ou carregar temas; também salva as opções ao exportar um tempo. Quanto todos os campos estiverem desmarcados, tudo será salvo ao exportar o tema.",
	- "reset": "Voltar ao padrão",
	+ "reset": "Restaurar o padrão",
	"clear_all": "Limpar tudo",
	"clear_opacity": "Limpar opacidade"
	},
	"common": {
	"color": "Cor",
	"opacity": "Opacidade",
	"contrast": {
	"hint": "A taxa de contraste é {ratio}, {level} {context}",
	"level": {
	"aa": "padrão Nível AA (mínimo)",
	"aaa": "padrão Nível AAA (recomendado)",
	"bad": "nenhum padrão de acessibilidade"
	},
	"context": {
	"18pt": "para textos longos (18pt+)",
	"text": "para texto"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Comum",
	"main": "Cores Comuns",
	"foreground_hint": "Configurações mais detalhadas na aba\"Avançado\"",
	"rgbo": "Ícones, acentuação, distintivos"
	},
	"advanced_colors": {
	"_tab_label": "Avançado",
	"alert": "Fundo de alerta",
	"alert_error": "Erro",
	"badge": "Fundo do distintivo",
	"badge_notification": "Notificação",
	"panel_header": "Topo do painel",
	"top_bar": "Barra do topo",
	"borders": "Bordas",
	"buttons": "Botões",
	"inputs": "Caixas de entrada",
	"faint_text": "Texto esmaecido"
	},
	"radii": {
	"_tab_label": "Arredondado"
	},
	"shadows": {
	"_tab_label": "Luz e sombra",
	"component": "Componente",
	"override": "Sobrescrever",
	"shadow_id": "Sombra #{value}",
	"blur": "Borrado",
	"spread": "Difusão",
	"inset": "Inserção",
	"hint": "Para as sombras você também pode usar --variável como valor de cor para utilizar variáveis do CSS3. Tenha em mente que configurar a opacidade não será possível neste caso.",
	"filter_hint": {
	"always_drop_shadow": "Atenção, esta sombra sempre utiliza {0} quando compatível com o navegador.",
	"drop_shadow_syntax": "{0} não é compatível com o parâmetro {1} e a palavra-chave {2}.",
	"avatar_inset": "Tenha em mente que combinar as sombras de inserção e a não-inserção em avatares pode causar resultados inesperados em avatares transparentes.",
	"spread_zero": "Sombras com uma difusão > 0 aparecerão como se fossem definidas como 0.",
	"inset_classic": "Sombras de inserção utilizarão {0}"
	},
	"components": {
	"panel": "Painel",
	"panelHeader": "Topo do painel",
	"topBar": "Barra do topo",
	"avatar": "Avatar do usuário (na visualização do perfil)",
	"avatarStatus": "Avatar do usuário (na exibição de posts)",
	"popup": "Dicas e notificações",
	"button": "Botão",
	"buttonHover": "Botão (em cima)",
	"buttonPressed": "Botão (pressionado)",
	"buttonPressedHover": "Botão (pressionado+em cima)",
	"input": "Campo de entrada"
	}
	},
	"fonts": {
	"_tab_label": "Fontes",
	- "help": "Selecionar fonte dos elementos da interface. Para fonte \"personalizada\" você deve entrar exatamente o nome da fonte no sistema.",
	+ "help": "Selecione as fontes dos elementos da interface. Para fonte \"personalizada\" você deve inserir o mesmo nome da fonte no sistema.",
	"components": {
	"interface": "Interface",
	"input": "Campo de entrada",
	"post": "Postar texto",
	"postCode": "Texto monoespaçado em post (formatação rica)"
	},
	"family": "Nome da fonte",
	"size": "Tamanho (em px)",
	"weight": "Peso",
	"custom": "Personalizada"
	},
	"preview": {
	"header": "Pré-visualizar",
	"content": "Conteúdo",
	"error": "Erro de exemplo",
	"button": "Botão",
	"text": "Vários {0} e {1}",
	"mono": "conteúdo",
	"input": "Acabei de chegar no Rio!",
	"faint_link": "manual útil",
	"fine_print": "Leia nosso {0} para não aprender nada!",
	"header_faint": "Está ok!",
	"checkbox": "Li os termos e condições",
	"link": "um belo link"
	}
	}
	},
	"timeline": {
	"collapse": "Esconder",
	"conversation": "Conversa",
	"error_fetching": "Erro ao buscar atualizações",
	"load_older": "Carregar postagens antigas",
	"no_retweet_hint": "Posts apenas para seguidores ou diretos não podem ser repetidos",
	"repeated": "Repetido",
	"show_new": "Mostrar novas",
	"up_to_date": "Atualizado",
	"no_more_statuses": "Sem mais posts",
	"no_statuses": "Sem posts"
	},
	"status": {
	"reply_to": "Responder a",
	"replies_list": "Respostas:"
	},
	"user_card": {
	"approve": "Aprovar",
	"block": "Bloquear",
	"blocked": "Bloqueado!",
	"deny": "Negar",
	"favorites": "Favoritos",
	"follow": "Seguir",
	"follow_sent": "Pedido enviado!",
	"follow_progress": "Enviando…",
	"follow_again": "Enviar solicitação novamente?",
	"follow_unfollow": "Deixar de seguir",
	"followees": "Seguindo",
	"followers": "Seguidores",
	"following": "Seguindo!",
	"follows_you": "Segue você!",
	"its_you": "É você!",
	"media": "Mídia",
	"mute": "Silenciar",
	"muted": "Silenciado",
	"per_day": "por dia",
	- "remote_follow": "Seguidor Remoto",
	+ "remote_follow": "Seguir remotamente",
	"statuses": "Postagens",
	"unblock": "Desbloquear",
	"unblock_progress": "Desbloqueando...",
	"block_progress": "Bloqueando...",
	"unmute": "Retirar silêncio",
	"unmute_progress": "Retirando silêncio...",
	"mute_progress": "Silenciando..."
	},
	"user_profile": {
	"timeline_title": "Linha do tempo do usuário",
	"profile_does_not_exist": "Desculpe, este perfil não existe.",
	"profile_loading_error": "Desculpe, houve um erro ao carregar este perfil."
	},
	"who_to_follow": {
	"more": "Mais",
	"who_to_follow": "Quem seguir"
	},
	"tool_tip": {
	"media_upload": "Envio de mídia",
	"repeat": "Repetir",
	"reply": "Responder",
	"favorite": "Favoritar",
	"user_settings": "Configurações do usuário"
	},
	"upload":{
	"error": {
	"base": "Falha no envio.",
	"file_too_big": "Arquivo grande demais [{filesize}{filesizeunit} / {allowedsize}{allowedsizeunit}]",
	"default": "Tente novamente mais tarde"
	},
	"file_size_units": {
	"B": "B",
	"KiB": "KiB",
	"MiB": "MiB",
	"GiB": "GiB",
	"TiB": "TiB"
	}
	}
	}
	diff --git a/src/modules/instance.js b/src/modules/instance.js
	index 24c52f9c11..155aa2eb71 100644
	--- a/src/modules/instance.js
	+++ b/src/modules/instance.js
	@@ -1,79 +1,83 @@
	import { set } from 'vue'
	import { setPreset } from '../services/style_setter/style_setter.js'

	const defaultState = {
	// Stuff from static/config.json and apiConfig
	name: 'Pleroma FE',
	registrationOpen: true,
	textlimit: 5000,
	server: 'http://localhost:4040/',
	theme: 'pleroma-dark',
	background: '/static/aurora_borealis.jpg',
	logo: '/static/logo.png',
	logoMask: true,
	logoMargin: '.2em',
	redirectRootNoLogin: '/main/all',
	redirectRootLogin: '/main/friends',
	showInstanceSpecificPanel: false,
	scopeOptionsEnabled: true,
	formattingOptionsEnabled: false,
	alwaysShowSubjectInput: true,
	collapseMessageWithSubject: false,
	hidePostStats: false,
	hideUserStats: false,
	hideFilteredStatuses: false,
	disableChat: false,
	scopeCopy: true,
	subjectLineBehavior: 'email',
	postContentType: 'text/plain',
	loginMethod: 'password',
	nsfwCensorImage: undefined,
	vapidPublicKey: undefined,
	noAttachmentLinks: false,
	showFeaturesPanel: true,

	// Nasty stuff
	pleromaBackend: true,
	emoji: [],
	customEmoji: [],
	restrictedNicknames: [],
	postFormats: [],

	// Feature-set, apparently, not everything here is reported...
	mediaProxyAvailable: false,
	chatAvailable: false,
	gopherAvailable: false,
	suggestionsEnabled: false,
	suggestionsWeb: '',

	// Html stuff
	instanceSpecificPanelContent: '',
	- tos: ''
	+ tos: '',
	+
	+ // Version Information
	+ backendVersion: '',
	+ frontendVersion: ''
	}

	const instance = {
	state: defaultState,
	mutations: {
	setInstanceOption (state, { name, value }) {
	if (typeof value !== 'undefined') {
	set(state, name, value)
	}
	}
	},
	actions: {
	setInstanceOption ({ commit, dispatch }, { name, value }) {
	commit('setInstanceOption', {name, value})
	switch (name) {
	case 'name':
	dispatch('setPageTitle')
	break
	}
	},
	setTheme ({ commit }, themeName) {
	commit('setInstanceOption', { name: 'theme', value: themeName })
	return setPreset(themeName, commit)
	}
	}
	}

	export default instance
	diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js
	index 1c6703b72a..176f1c18dc 100644
	--- a/src/services/api/api.service.js
	+++ b/src/services/api/api.service.js
	@@ -1,638 +1,643 @@
	/* eslint-env browser */
	const LOGIN_URL = '/api/account/verify_credentials.json'
	const FRIENDS_TIMELINE_URL = '/api/statuses/friends_timeline.json'
	const ALL_FOLLOWING_URL = '/api/qvitter/allfollowing'
	const PUBLIC_TIMELINE_URL = '/api/statuses/public_timeline.json'
	const PUBLIC_AND_EXTERNAL_TIMELINE_URL = '/api/statuses/public_and_external_timeline.json'
	const TAG_TIMELINE_URL = '/api/statusnet/tags/timeline'
	const FAVORITE_URL = '/api/favorites/create'
	const UNFAVORITE_URL = '/api/favorites/destroy'
	const RETWEET_URL = '/api/statuses/retweet'
	const UNRETWEET_URL = '/api/statuses/unretweet'
	const STATUS_UPDATE_URL = '/api/statuses/update.json'
	const STATUS_DELETE_URL = '/api/statuses/destroy'
	const STATUS_URL = '/api/statuses/show'
	const MEDIA_UPLOAD_URL = '/api/statusnet/media/upload'
	const CONVERSATION_URL = '/api/statusnet/conversation'
	const MENTIONS_URL = '/api/statuses/mentions.json'
	const DM_TIMELINE_URL = '/api/statuses/dm_timeline.json'
	const FOLLOWERS_URL = '/api/statuses/followers.json'
	const FRIENDS_URL = '/api/statuses/friends.json'
	const BLOCKS_URL = '/api/statuses/blocks.json'
	const FOLLOWING_URL = '/api/friendships/create.json'
	const UNFOLLOWING_URL = '/api/friendships/destroy.json'
	const QVITTER_USER_PREF_URL = '/api/qvitter/set_profile_pref.json'
	const REGISTRATION_URL = '/api/account/register.json'
	const AVATAR_UPDATE_URL = '/api/qvitter/update_avatar.json'
	const BG_UPDATE_URL = '/api/qvitter/update_background_image.json'
	const BANNER_UPDATE_URL = '/api/account/update_profile_banner.json'
	const PROFILE_UPDATE_URL = '/api/account/update_profile.json'
	const EXTERNAL_PROFILE_URL = '/api/externalprofile/show.json'
	const QVITTER_USER_NOTIFICATIONS_URL = '/api/qvitter/statuses/notifications.json'
	const QVITTER_USER_NOTIFICATIONS_READ_URL = '/api/qvitter/statuses/notifications/read.json'
	const BLOCKING_URL = '/api/blocks/create.json'
	const UNBLOCKING_URL = '/api/blocks/destroy.json'
	const FOLLOW_IMPORT_URL = '/api/pleroma/follow_import'
	const DELETE_ACCOUNT_URL = '/api/pleroma/delete_account'
	const CHANGE_PASSWORD_URL = '/api/pleroma/change_password'
	const FOLLOW_REQUESTS_URL = '/api/pleroma/friend_requests'
	const APPROVE_USER_URL = '/api/pleroma/friendships/approve'
	const DENY_USER_URL = '/api/pleroma/friendships/deny'
	const SUGGESTIONS_URL = '/api/v1/suggestions'

	const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites'
	const MASTODON_USER_URL = '/api/v1/accounts'
	const MASTODON_USER_RELATIONSHIPS_URL = '/api/v1/accounts/relationships'
	const MASTODON_USER_TIMELINE_URL = id => `/api/v1/accounts/${id}/statuses`

	import { each, map } from 'lodash'
	import { parseStatus, parseUser, parseNotification } from '../entity_normalizer/entity_normalizer.service.js'
	import 'whatwg-fetch'
	import { StatusCodeError } from '../errors/errors'

	const oldfetch = window.fetch

	let fetch = (url, options) => {
	options = options \|\| {}
	const baseUrl = ''
	const fullUrl = baseUrl + url
	options.credentials = 'same-origin'
	return oldfetch(fullUrl, options)
	}

	// Params
	// cropH
	// cropW
	// cropX
	// cropY
	// img (base 64 encodend data url)
	const updateAvatar = ({credentials, params}) => {
	let url = AVATAR_UPDATE_URL

	const form = new FormData()

	each(params, (value, key) => {
	if (value) {
	form.append(key, value)
	}
	})

	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST',
	body: form
	}).then((data) => data.json())
	}

	const updateBg = ({credentials, params}) => {
	let url = BG_UPDATE_URL

	const form = new FormData()

	each(params, (value, key) => {
	if (value) {
	form.append(key, value)
	}
	})

	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST',
	body: form
	}).then((data) => data.json())
	}

	// Params
	// height
	// width
	// offset_left
	// offset_top
	// banner (base 64 encodend data url)
	const updateBanner = ({credentials, params}) => {
	let url = BANNER_UPDATE_URL

	const form = new FormData()

	each(params, (value, key) => {
	if (value) {
	form.append(key, value)
	}
	})

	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST',
	body: form
	}).then((data) => data.json())
	}

	// Params
	// name
	// url
	// location
	// description
	const updateProfile = ({credentials, params}) => {
	// Always include these fields, because they might be empty or false
	const fields = ['description', 'locked', 'no_rich_text', 'hide_follows', 'hide_followers', 'show_role']
	let url = PROFILE_UPDATE_URL

	const form = new FormData()

	each(params, (value, key) => {
	if (fields.includes(key) \|\| value) {
	form.append(key, value)
	}
	})
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST',
	body: form
	}).then((data) => data.json())
	}

	// Params needed:
	// nickname
	// email
	// fullname
	// password
	// password_confirm
	//
	// Optional
	// bio
	// homepage
	// location
	// token
	const register = (params) => {
	const form = new FormData()

	each(params, (value, key) => {
	if (value) {
	form.append(key, value)
	}
	})

	return fetch(REGISTRATION_URL, {
	method: 'POST',
	body: form
	})
	}

	const getCaptcha = () => fetch('/api/pleroma/captcha').then(resp => resp.json())

	const authHeaders = (accessToken) => {
	if (accessToken) {
	return { 'Authorization': `Bearer ${accessToken}` }
	} else {
	return { }
	}
	}

	const externalProfile = ({profileUrl, credentials}) => {
	let url = `${EXTERNAL_PROFILE_URL}?profileurl=${profileUrl}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'GET'
	}).then((data) => data.json())
	}

	const followUser = ({id, credentials}) => {
	let url = `${FOLLOWING_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const unfollowUser = ({id, credentials}) => {
	let url = `${UNFOLLOWING_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const blockUser = ({id, credentials}) => {
	let url = `${BLOCKING_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const unblockUser = ({id, credentials}) => {
	let url = `${UNBLOCKING_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const approveUser = ({id, credentials}) => {
	let url = `${APPROVE_USER_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const denyUser = ({id, credentials}) => {
	let url = `${DENY_USER_URL}?user_id=${id}`
	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const fetchUser = ({id, credentials}) => {
	let url = `${MASTODON_USER_URL}/${id}`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((response) => {
	return new Promise((resolve, reject) => response.json()
	.then((json) => {
	if (!response.ok) {
	return reject(new StatusCodeError(response.status, json, { url }, response))
	}
	return resolve(json)
	}))
	})
	.then((data) => parseUser(data))
	}

	const fetchUserRelationship = ({id, credentials}) => {
	let url = `${MASTODON_USER_RELATIONSHIPS_URL}/?id=${id}`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((response) => {
	return new Promise((resolve, reject) => response.json()
	.then((json) => {
	if (!response.ok) {
	return reject(new StatusCodeError(response.status, json, { url }, response))
	}
	return resolve(json)
	}))
	})
	}

	const fetchFriends = ({id, page, credentials}) => {
	let url = `${FRIENDS_URL}?user_id=${id}`
	if (page) {
	url = url + `&page=${page}`
	}
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => data.json())
	.then((data) => data.map(parseUser))
	}

	const exportFriends = ({id, credentials}) => {
	let url = `${FRIENDS_URL}?user_id=${id}&all=true`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => data.json())
	.then((data) => data.map(parseUser))
	}

	const fetchFollowers = ({id, page, credentials}) => {
	let url = `${FOLLOWERS_URL}?user_id=${id}`
	if (page) {
	url = url + `&page=${page}`
	}
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => data.json())
	.then((data) => data.map(parseUser))
	}

	const fetchAllFollowing = ({username, credentials}) => {
	const url = `${ALL_FOLLOWING_URL}/${username}.json`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => data.json())
	.then((data) => data.map(parseUser))
	}

	const fetchFollowRequests = ({credentials}) => {
	const url = FOLLOW_REQUESTS_URL
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => data.json())
	}

	const fetchConversation = ({id, credentials}) => {
	let url = `${CONVERSATION_URL}/${id}.json?count=100`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => {
	if (data.ok) {
	return data
	}
	throw new Error('Error fetching timeline', data)
	})
	.then((data) => data.json())
	.then((data) => data.map(parseStatus))
	}

	const fetchStatus = ({id, credentials}) => {
	let url = `${STATUS_URL}/${id}.json`
	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => {
	if (data.ok) {
	return data
	}
	throw new Error('Error fetching timeline', data)
	})
	.then((data) => data.json())
	.then((data) => parseStatus(data))
	}

	const setUserMute = ({id, credentials, muted = true}) => {
	const form = new FormData()

	const muteInteger = muted ? 1 : 0

	form.append('namespace', 'qvitter')
	form.append('data', muteInteger)
	form.append('topic', `mute:${id}`)

	return fetch(QVITTER_USER_PREF_URL, {
	method: 'POST',
	headers: authHeaders(credentials),
	body: form
	})
	}

	const fetchTimeline = ({timeline, credentials, since = false, until = false, userId = false, tag = false}) => {
	const timelineUrls = {
	public: PUBLIC_TIMELINE_URL,
	friends: FRIENDS_TIMELINE_URL,
	mentions: MENTIONS_URL,
	dms: DM_TIMELINE_URL,
	notifications: QVITTER_USER_NOTIFICATIONS_URL,
	'publicAndExternal': PUBLIC_AND_EXTERNAL_TIMELINE_URL,
	user: MASTODON_USER_TIMELINE_URL,
	media: MASTODON_USER_TIMELINE_URL,
	favorites: MASTODON_USER_FAVORITES_TIMELINE_URL,
	tag: TAG_TIMELINE_URL
	}
	const isNotifications = timeline === 'notifications'
	const params = []

	let url = timelineUrls[timeline]

	if (timeline === 'user' \|\| timeline === 'media') {
	url = url(userId)
	}

	if (since) {
	params.push(['since_id', since])
	}
	if (until) {
	params.push(['max_id', until])
	}
	if (tag) {
	url += `/${tag}.json`
	}
	if (timeline === 'media') {
	params.push(['only_media', 1])
	}

	params.push(['count', 20])

	const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
	url += `?${queryString}`

	return fetch(url, { headers: authHeaders(credentials) })
	.then((data) => {
	if (data.ok) {
	return data
	}
	throw new Error('Error fetching timeline', data)
	})
	.then((data) => data.json())
	.then((data) => data.map(isNotifications ? parseNotification : parseStatus))
	}

	const verifyCredentials = (user) => {
	return fetch(LOGIN_URL, {
	method: 'POST',
	headers: authHeaders(user)
	})
	.then((response) => {
	if (response.ok) {
	return response.json()
	} else {
	return {
	error: response
	}
	}
	})
	.then((data) => data.error ? data : parseUser(data))
	}

	const favorite = ({ id, credentials }) => {
	return fetch(`${FAVORITE_URL}/${id}.json`, {
	headers: authHeaders(credentials),
	method: 'POST'
	})
	}

	const unfavorite = ({ id, credentials }) => {
	return fetch(`${UNFAVORITE_URL}/${id}.json`, {
	headers: authHeaders(credentials),
	method: 'POST'
	})
	}

	const retweet = ({ id, credentials }) => {
	return fetch(`${RETWEET_URL}/${id}.json`, {
	headers: authHeaders(credentials),
	method: 'POST'
	})
	}

	const unretweet = ({ id, credentials }) => {
	return fetch(`${UNRETWEET_URL}/${id}.json`, {
	headers: authHeaders(credentials),
	method: 'POST'
	})
	}

	const postStatus = ({credentials, status, spoilerText, visibility, sensitive, mediaIds, inReplyToStatusId, contentType, noAttachmentLinks}) => {
	const idsText = mediaIds.join(',')
	const form = new FormData()

	form.append('status', status)
	form.append('source', 'Pleroma FE')
	if (noAttachmentLinks) form.append('no_attachment_links', noAttachmentLinks)
	if (spoilerText) form.append('spoiler_text', spoilerText)
	if (visibility) form.append('visibility', visibility)
	if (sensitive) form.append('sensitive', sensitive)
	if (contentType) form.append('content_type', contentType)
	form.append('media_ids', idsText)
	if (inReplyToStatusId) {
	form.append('in_reply_to_status_id', inReplyToStatusId)
	}

	return fetch(STATUS_UPDATE_URL, {
	body: form,
	method: 'POST',
	headers: authHeaders(credentials)
	})
	.then((response) => {
	if (response.ok) {
	return response.json()
	} else {
	return {
	error: response
	}
	}
	})
	.then((data) => data.error ? data : parseStatus(data))
	}

	const deleteStatus = ({ id, credentials }) => {
	return fetch(`${STATUS_DELETE_URL}/${id}.json`, {
	headers: authHeaders(credentials),
	method: 'POST'
	})
	}

	const uploadMedia = ({formData, credentials}) => {
	return fetch(MEDIA_UPLOAD_URL, {
	body: formData,
	method: 'POST',
	headers: authHeaders(credentials)
	})
	.then((response) => response.text())
	.then((text) => (new DOMParser()).parseFromString(text, 'application/xml'))
	}

	const followImport = ({params, credentials}) => {
	return fetch(FOLLOW_IMPORT_URL, {
	body: params,
	method: 'POST',
	headers: authHeaders(credentials)
	})
	.then((response) => response.ok)
	}

	const deleteAccount = ({credentials, password}) => {
	const form = new FormData()

	form.append('password', password)

	return fetch(DELETE_ACCOUNT_URL, {
	body: form,
	method: 'POST',
	headers: authHeaders(credentials)
	})
	.then((response) => response.json())
	}

	const changePassword = ({credentials, password, newPassword, newPasswordConfirmation}) => {
	const form = new FormData()

	form.append('password', password)
	form.append('new_password', newPassword)
	form.append('new_password_confirmation', newPasswordConfirmation)

	return fetch(CHANGE_PASSWORD_URL, {
	body: form,
	method: 'POST',
	headers: authHeaders(credentials)
	})
	.then((response) => response.json())
	}

	const fetchMutes = ({credentials}) => {
	const url = '/api/qvitter/mutes.json'

	return fetch(url, {
	headers: authHeaders(credentials)
	}).then((data) => data.json())
	}

	const fetchBlocks = ({page, credentials}) => {
	return fetch(BLOCKS_URL, {
	headers: authHeaders(credentials)
	}).then((data) => {
	if (data.ok) {
	return data.json()
	}
	throw new Error('Error fetching blocks', data)
	})
	}

	const fetchOAuthTokens = ({credentials}) => {
	const url = '/api/oauth_tokens.json'

	return fetch(url, {
	headers: authHeaders(credentials)
	- }).then((data) => data.json())
	+ }).then((data) => {
	+ if (data.ok) {
	+ return data.json()
	+ }
	+ throw new Error('Error fetching auth tokens', data)
	+ })
	}

	const revokeOAuthToken = ({id, credentials}) => {
	const url = `/api/oauth_tokens/${id}`

	return fetch(url, {
	headers: authHeaders(credentials),
	method: 'DELETE'
	})
	}

	const suggestions = ({credentials}) => {
	return fetch(SUGGESTIONS_URL, {
	headers: authHeaders(credentials)
	}).then((data) => data.json())
	}

	const markNotificationsAsSeen = ({id, credentials}) => {
	const body = new FormData()

	body.append('latest_id', id)

	return fetch(QVITTER_USER_NOTIFICATIONS_READ_URL, {
	body,
	headers: authHeaders(credentials),
	method: 'POST'
	}).then((data) => data.json())
	}

	const apiService = {
	verifyCredentials,
	fetchTimeline,
	fetchConversation,
	fetchStatus,
	fetchFriends,
	exportFriends,
	fetchFollowers,
	followUser,
	unfollowUser,
	blockUser,
	unblockUser,
	fetchUser,
	fetchUserRelationship,
	favorite,
	unfavorite,
	retweet,
	unretweet,
	postStatus,
	deleteStatus,
	uploadMedia,
	fetchAllFollowing,
	setUserMute,
	fetchMutes,
	fetchBlocks,
	fetchOAuthTokens,
	revokeOAuthToken,
	register,
	getCaptcha,
	updateAvatar,
	updateBg,
	updateProfile,
	updateBanner,
	externalProfile,
	followImport,
	deleteAccount,
	changePassword,
	fetchFollowRequests,
	approveUser,
	denyUser,
	suggestions,
	markNotificationsAsSeen
	}

	export default apiService
	diff --git a/src/services/version/version.service.js b/src/services/version/version.service.js
	new file mode 100644
	index 0000000000..a750b0dd17
	--- /dev/null
	+++ b/src/services/version/version.service.js
	@@ -0,0 +1,6 @@
	+
	+export const extractCommit = versionString => {
	+ const regex = /-g(\w+)$/i
	+ const matches = versionString.match(regex)
	+ return matches ? matches[1] : ''
	+}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Aug 9, 10:22 AM (1 d, 18 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1724456
Default Alt Text: (150 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions