No OneTemporary
Actions

Authored By

Unknown

Size

184 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
	index 9d42288e13..7f6d3c924b 100644
	--- a/.gitlab-ci.yml
	+++ b/.gitlab-ci.yml
	@@ -1,46 +1,46 @@
	# This file is a template, and might need editing before it works on your project.
	# Official framework image. Look for the different tagged releases at:
	# https://hub.docker.com/r/library/node/tags/
	image: node:8

	stages:
	- lint
	- build
	- test
	- deploy

	lint:
	stage: lint
	script:
	- yarn
	- npm run lint

	test:
	stage: test
	variables:
	APT_CACHE_DIR: apt-cache
	script:
	- mkdir -pv $APT_CACHE_DIR && apt-get -qq update
	- apt install firefox-esr -y --no-install-recommends
	- firefox --version
	- yarn
	- - npm run unit
	+ - yarn unit

	build:
	stage: build
	script:
	- yarn
	- npm run build
	artifacts:
	paths:
	- dist/

	docs-deploy:
	stage: deploy
	image: alpine:latest
	only:
	- develop@pleroma/pleroma-fe
	before_script:
	- apk add curl
	script:
	- curl -X POST -F"token=$DOCS_PIPELINE_TRIGGER" -F'ref=master' https://git.pleroma.social/api/v4/projects/673/trigger/pipeline
	diff --git a/src/components/nav_panel/nav_panel.js b/src/components/nav_panel/nav_panel.js
	index aa3f760533..7f783acbaa 100644
	--- a/src/components/nav_panel/nav_panel.js
	+++ b/src/components/nav_panel/nav_panel.js
	@@ -1,25 +1,20 @@
	-import followRequestFetcher from '../../services/follow_request_fetcher/follow_request_fetcher.service'
	-
	const NavPanel = {
	created () {
	if (this.currentUser && this.currentUser.locked) {
	- const store = this.$store
	- const credentials = store.state.users.currentUser.credentials
	-
	- followRequestFetcher.startFetching({ store, credentials })
	+ this.$store.dispatch('startFetchingFollowRequest')
	}
	},
	computed: {
	currentUser () {
	return this.$store.state.users.currentUser
	},
	chat () {
	return this.$store.state.chat.channel
	},
	followRequestCount () {
	return this.$store.state.api.followRequests.length
	}
	}
	}

	export default NavPanel
	diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
	index a83489d2cc..c4021137e7 100644
	--- a/src/components/settings/settings.vue
	+++ b/src/components/settings/settings.vue
	@@ -1,389 +1,400 @@
	<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
	v-if="currentSaveStateNotice.error"
	class="alert error"
	@click.prevent
	>
	{{ $t('settings.saving_err') }}
	</div>

	<div
	v-if="!currentSaveStateNotice.error"
	class="alert transparent"
	@click.prevent
	>
	{{ $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">
	<Checkbox v-model="hideISP">
	{{ $t('settings.hide_isp') }}
	</Checkbox>
	</li>
	</ul>
	</div>
	<div class="setting-item">
	<h2>{{ $t('nav.timeline') }}</h2>
	<ul class="setting-list">
	<li>
	<Checkbox v-model="hideMutedPosts">
	{{ $t('settings.hide_muted_posts') }} {{ $t('settings.instance_default', { value: hideMutedPostsLocalizedValue }) }}
	</Checkbox>
	</li>
	<li>
	<Checkbox v-model="collapseMessageWithSubject">
	{{ $t('settings.collapse_subject') }} {{ $t('settings.instance_default', { value: collapseMessageWithSubjectLocalizedValue }) }}
	</Checkbox>
	</li>
	<li>
	<Checkbox v-model="streaming">
	{{ $t('settings.streaming') }}
	</Checkbox>
	<ul
	class="setting-list suboptions"
	:class="[{disabled: !streaming}]"
	>
	<li>
	<Checkbox
	v-model="pauseOnUnfocused"
	:disabled="!streaming"
	>
	{{ $t('settings.pause_on_unfocused') }}
	</Checkbox>
	</li>
	</ul>
	</li>
	<li>
	<Checkbox v-model="autoLoad">
	{{ $t('settings.autoload') }}
	</Checkbox>
	</li>
	<li>
	<Checkbox v-model="hoverPreview">
	{{ $t('settings.reply_link_preview') }}
	</Checkbox>
	</li>
	</ul>
	</div>

	<div class="setting-item">
	<h2>{{ $t('settings.composing') }}</h2>
	<ul class="setting-list">
	<li>
	<Checkbox v-model="scopeCopy">
	{{ $t('settings.scope_copy') }} {{ $t('settings.instance_default', { value: scopeCopyLocalizedValue }) }}
	</Checkbox>
	</li>
	<li>
	<Checkbox v-model="alwaysShowSubjectInput">
	{{ $t('settings.subject_input_always_show') }} {{ $t('settings.instance_default', { value: alwaysShowSubjectInputLocalizedValue }) }}
	</Checkbox>
	</li>
	<li>
	<div>
	{{ $t('settings.subject_line_behavior') }}
	<label
	for="subjectLineBehavior"
	class="select"
	>
	<select
	id="subjectLineBehavior"
	v-model="subjectLineBehavior"
	>
	<option value="email">
	{{ $t('settings.subject_line_email') }}
	{{ subjectLineBehaviorDefaultValue == 'email' ? $t('settings.instance_default_simple') : '' }}
	</option>
	<option value="masto">
	{{ $t('settings.subject_line_mastodon') }}
	{{ subjectLineBehaviorDefaultValue == 'mastodon' ? $t('settings.instance_default_simple') : '' }}
	</option>
	<option value="noop">
	{{ $t('settings.subject_line_noop') }}
	{{ subjectLineBehaviorDefaultValue == 'noop' ? $t('settings.instance_default_simple') : '' }}
	</option>
	</select>
	<i class="icon-down-open" />
	</label>
	</div>
	</li>
	<li v-if="postFormats.length > 0">
	<div>
	{{ $t('settings.post_status_content_type') }}
	<label
	for="postContentType"
	class="select"
	>
	<select
	id="postContentType"
	v-model="postContentType"
	>
	<option
	v-for="postFormat in postFormats"
	:key="postFormat"
	:value="postFormat"
	>
	{{ $t(`post_status.content_type["${postFormat}"]`) }}
	{{ postContentTypeDefaultValue === postFormat ? $t('settings.instance_default_simple') : '' }}
	</option>
	</select>
	<i class="icon-down-open" />
	</label>
	</div>
	</li>
	<li>
	<Checkbox v-model="minimalScopesMode">
	{{ $t('settings.minimal_scopes_mode') }} {{ $t('settings.instance_default', { value: minimalScopesModeLocalizedValue }) }}
	</Checkbox>
	</li>
	<li>
	<Checkbox v-model="autohideFloatingPostButton">
	{{ $t('settings.autohide_floating_post_button') }}
	</Checkbox>
	</li>
	<li>
	<Checkbox v-model="padEmoji">
	{{ $t('settings.pad_emoji') }}
	</Checkbox>
	</li>
	</ul>
	</div>

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

	<div class="setting-item">
	<h2>{{ $t('settings.notifications') }}</h2>
	<ul class="setting-list">
	<li>
	<Checkbox v-model="webPushNotifications">
	{{ $t('settings.enable_web_push_notifications') }}
	</Checkbox>
	</li>
	</ul>
	</div>
	+
	+ <div class="setting-item">
	+ <h2>{{ $t('settings.fun') }}</h2>
	+ <ul class="setting-list">
	+ <li>
	+ <Checkbox v-model="greentext">
	+ {{ $t('settings.greentext') }} {{ $t('settings.instance_default', { value: greentextLocalizedValue }) }}
	+ </Checkbox>
	+ </li>
	+ </ul>
	+ </div>
	</div>

	<div :label="$t('settings.theme')">
	<div class="setting-item">
	<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>
	<Checkbox v-model="notificationVisibility.likes">
	{{ $t('settings.notification_visibility_likes') }}
	</Checkbox>
	</li>
	<li>
	<Checkbox v-model="notificationVisibility.repeats">
	{{ $t('settings.notification_visibility_repeats') }}
	</Checkbox>
	</li>
	<li>
	<Checkbox v-model="notificationVisibility.follows">
	{{ $t('settings.notification_visibility_follows') }}
	</Checkbox>
	</li>
	<li>
	<Checkbox v-model="notificationVisibility.mentions">
	{{ $t('settings.notification_visibility_mentions') }}
	</Checkbox>
	</li>
	</ul>
	</div>
	<div>
	{{ $t('settings.replies_in_timeline') }}
	<label
	for="replyVisibility"
	class="select"
	>
	<select
	id="replyVisibility"
	v-model="replyVisibility"
	>
	<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>
	<Checkbox v-model="hidePostStats">
	{{ $t('settings.hide_post_stats') }} {{ $t('settings.instance_default', { value: hidePostStatsLocalizedValue }) }}
	</Checkbox>
	</div>
	<div>
	<Checkbox v-model="hideUserStats">
	{{ $t('settings.hide_user_stats') }} {{ $t('settings.instance_default', { value: hideUserStatsLocalizedValue }) }}
	</Checkbox>
	</div>
	</div>
	<div class="setting-item">
	<div>
	<p>{{ $t('settings.filtering_explanation') }}</p>
	<textarea
	id="muteWords"
	v-model="muteWordsString"
	/>
	</div>
	<div>
	<Checkbox v-model="hideFilteredStatuses">
	{{ $t('settings.hide_filtered_statuses') }} {{ $t('settings.instance_default', { value: hideFilteredStatusesLocalizedValue }) }}
	</Checkbox>
	</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>
	diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
	index 567d2e5e65..0188cf3e40 100644
	--- a/src/components/side_drawer/side_drawer.js
	+++ b/src/components/side_drawer/side_drawer.js
	@@ -1,56 +1,60 @@
	import UserCard from '../user_card/user_card.vue'
	import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
	import GestureService from '../../services/gesture_service/gesture_service'

	const SideDrawer = {
	props: [ 'logout' ],
	data: () => ({
	closed: true,
	closeGesture: undefined
	}),
	created () {
	this.closeGesture = GestureService.swipeGesture(GestureService.DIRECTION_LEFT, this.toggleDrawer)
	+
	+ if (this.currentUser && this.currentUser.locked) {
	+ this.$store.dispatch('startFetchingFollowRequest')
	+ }
	},
	components: { UserCard },
	computed: {
	currentUser () {
	return this.$store.state.users.currentUser
	},
	chat () { return this.$store.state.chat.channel.state === 'joined' },
	unseenNotifications () {
	return unseenNotificationsFromStore(this.$store)
	},
	unseenNotificationsCount () {
	return this.unseenNotifications.length
	},
	suggestionsEnabled () {
	return this.$store.state.instance.suggestionsEnabled
	},
	logo () {
	return this.$store.state.instance.logo
	},
	sitename () {
	return this.$store.state.instance.name
	},
	followRequestCount () {
	return this.$store.state.api.followRequests.length
	}
	},
	methods: {
	toggleDrawer () {
	this.closed = !this.closed
	},
	doLogout () {
	this.logout()
	this.toggleDrawer()
	},
	touchStart (e) {
	GestureService.beginSwipe(e, this.closeGesture)
	},
	touchMove (e) {
	GestureService.updateSwipe(e, this.closeGesture)
	}
	}
	}

	export default SideDrawer
	diff --git a/src/components/status/status.js b/src/components/status/status.js
	index 4fbd5ac3e0..714ea6d222 100644
	--- a/src/components/status/status.js
	+++ b/src/components/status/status.js
	@@ -1,418 +1,453 @@
	import Attachment from '../attachment/attachment.vue'
	import FavoriteButton from '../favorite_button/favorite_button.vue'
	import RetweetButton from '../retweet_button/retweet_button.vue'
	import Poll from '../poll/poll.vue'
	import ExtraButtons from '../extra_buttons/extra_buttons.vue'
	import PostStatusForm from '../post_status_form/post_status_form.vue'
	import UserCard from '../user_card/user_card.vue'
	import UserAvatar from '../user_avatar/user_avatar.vue'
	import Gallery from '../gallery/gallery.vue'
	import LinkPreview from '../link-preview/link-preview.vue'
	import AvatarList from '../avatar_list/avatar_list.vue'
	import Timeago from '../timeago/timeago.vue'
	import StatusPopover from '../status_popover/status_popover.vue'
	import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
	import fileType from 'src/services/file_type/file_type.service'
	+import { processHtml } from 'src/services/tiny_post_html_processor/tiny_post_html_processor.service.js'
	import { highlightClass, highlightStyle } from '../../services/user_highlighter/user_highlighter.js'
	import { mentionMatchesUrl, extractTagFromUrl } from 'src/services/matcher/matcher.service.js'
	import { filter, unescape, uniqBy } from 'lodash'
	-import { mapGetters } from 'vuex'
	+import { mapGetters, mapState } from 'vuex'

	const Status = {
	name: 'Status',
	props: [
	'statusoid',
	'expandable',
	'inConversation',
	'focused',
	'highlight',
	'compact',
	'replies',
	'isPreview',
	'noHeading',
	'inlineExpanded',
	'showPinned',
	'inProfile'
	],
	data () {
	return {
	replying: false,
	unmuted: false,
	userExpanded: false,
	showingTall: this.inConversation && this.focused,
	showingLongSubject: false,
	error: null,
	- expandingSubject: !this.$store.getters.mergedConfig.collapseMessageWithSubject,
	- betterShadow: this.$store.state.interface.browserSupport.cssFilter
	+ // not as computed because it sets the initial state which will be changed later
	+ expandingSubject: !this.$store.getters.mergedConfig.collapseMessageWithSubject
	}
	},
	computed: {
	localCollapseSubjectDefault () {
	return this.mergedConfig.collapseMessageWithSubject
	},
	muteWords () {
	return this.mergedConfig.muteWords
	},
	repeaterClass () {
	const user = this.statusoid.user
	return highlightClass(user)
	},
	userClass () {
	const user = this.retweet ? (this.statusoid.retweeted_status.user) : this.statusoid.user
	return highlightClass(user)
	},
	deleted () {
	return this.statusoid.deleted
	},
	repeaterStyle () {
	const user = this.statusoid.user
	const highlight = this.mergedConfig.highlight
	return highlightStyle(highlight[user.screen_name])
	},
	userStyle () {
	if (this.noHeading) return
	const user = this.retweet ? (this.statusoid.retweeted_status.user) : this.statusoid.user
	const highlight = this.mergedConfig.highlight
	return highlightStyle(highlight[user.screen_name])
	},
	hideAttachments () {
	return (this.mergedConfig.hideAttachments && !this.inConversation) \|\|
	(this.mergedConfig.hideAttachmentsInConv && this.inConversation)
	},
	userProfileLink () {
	return this.generateUserProfileLink(this.status.user.id, this.status.user.screen_name)
	},
	replyProfileLink () {
	if (this.isReply) {
	return this.generateUserProfileLink(this.status.in_reply_to_user_id, this.replyToName)
	}
	},
	retweet () { return !!this.statusoid.retweeted_status },
	retweeter () { return this.statusoid.user.name \|\| this.statusoid.user.screen_name },
	retweeterHtml () { return this.statusoid.user.name_html },
	retweeterProfileLink () { return this.generateUserProfileLink(this.statusoid.user.id, this.statusoid.user.screen_name) },
	status () {
	if (this.retweet) {
	return this.statusoid.retweeted_status
	} else {
	return this.statusoid
	}
	},
	statusFromGlobalRepository () {
	// NOTE: Consider to replace status with statusFromGlobalRepository
	return this.$store.state.statuses.allStatusesObject[this.status.id]
	},
	loggedIn () {
	- return !!this.$store.state.users.currentUser
	+ return !!this.currentUser
	},
	muteWordHits () {
	const statusText = this.status.text.toLowerCase()
	const statusSummary = this.status.summary.toLowerCase()
	const hits = filter(this.muteWords, (muteWord) => {
	return statusText.includes(muteWord.toLowerCase()) \|\| statusSummary.includes(muteWord.toLowerCase())
	})

	return hits
	},
	muted () { return !this.unmuted && ((!this.inProfile && this.status.user.muted) \|\| (!this.inConversation && this.status.thread_muted) \|\| this.muteWordHits.length > 0) },
	hideFilteredStatuses () {
	return this.mergedConfig.hideFilteredStatuses
	},
	hideStatus () {
	return (this.hideReply \|\| this.deleted) \|\| (this.muted && this.hideFilteredStatuses)
	},
	isFocused () {
	// retweet or root of an expanded conversation
	if (this.focused) {
	return true
	} else if (!this.inConversation) {
	return false
	}
	// use conversation highlight only when in conversation
	return this.status.id === this.highlight
	},
	// This is a bit hacky, but we want to approximate post height before rendering
	// so we count newlines (masto uses <p> for paragraphs, GS uses <br> between them)
	// as well as approximate line count by counting characters and approximating ~80
	// per line.
	//
	// Using max-height + overflow: auto for status components resulted in false positives
	// very often with japanese characters, and it was very annoying.
	tallStatus () {
	const lengthScore = this.status.statusnet_html.split(/<p\|<br/).length + this.status.text.length / 80
	return lengthScore > 20
	},
	longSubject () {
	return this.status.summary.length > 900
	},
	isReply () {
	return !!(this.status.in_reply_to_status_id && this.status.in_reply_to_user_id)
	},
	replyToName () {
	if (this.status.in_reply_to_screen_name) {
	return this.status.in_reply_to_screen_name
	} else {
	const user = this.$store.getters.findUser(this.status.in_reply_to_user_id)
	return user && user.screen_name
	}
	},
	hideReply () {
	if (this.mergedConfig.replyVisibility === 'all') {
	return false
	}
	if (this.inConversation \|\| !this.isReply) {
	return false
	}
	- if (this.status.user.id === this.$store.state.users.currentUser.id) {
	+ if (this.status.user.id === this.currentUser.id) {
	return false
	}
	if (this.status.type === 'retweet') {
	return false
	}
	const checkFollowing = this.mergedConfig.replyVisibility === 'following'
	for (var i = 0; i < this.status.attentions.length; ++i) {
	if (this.status.user.id === this.status.attentions[i].id) {
	continue
	}
	const taggedUser = this.$store.getters.findUser(this.status.attentions[i].id)
	if (checkFollowing && taggedUser && taggedUser.following) {
	return false
	}
	- if (this.status.attentions[i].id === this.$store.state.users.currentUser.id) {
	+ if (this.status.attentions[i].id === this.currentUser.id) {
	return false
	}
	}
	return this.status.attentions.length > 0
	},
	hideSubjectStatus () {
	if (this.tallStatus && !this.localCollapseSubjectDefault) {
	return false
	}
	return !this.expandingSubject && this.status.summary
	},
	hideTallStatus () {
	if (this.status.summary && this.localCollapseSubjectDefault) {
	return false
	}
	if (this.showingTall) {
	return false
	}
	return this.tallStatus
	},
	showingMore () {
	return (this.tallStatus && this.showingTall) \|\| (this.status.summary && this.expandingSubject)
	},
	nsfwClickthrough () {
	if (!this.status.nsfw) {
	return false
	}
	if (this.status.summary && this.localCollapseSubjectDefault) {
	return false
	}
	return true
	},
	replySubject () {
	if (!this.status.summary) return ''
	const decodedSummary = unescape(this.status.summary)
	const behavior = this.mergedConfig.subjectLineBehavior
	const startsWithRe = decodedSummary.match(/^re[: ]/i)
	if ((behavior !== 'noop' && startsWithRe) \|\| behavior === 'masto') {
	return decodedSummary
	} else if (behavior === 'email') {
	return 're: '.concat(decodedSummary)
	} else if (behavior === 'noop') {
	return ''
	}
	},
	attachmentSize () {
	if ((this.mergedConfig.hideAttachments && !this.inConversation) \|\|
	(this.mergedConfig.hideAttachmentsInConv && this.inConversation) \|\|
	(this.status.attachments.length > this.maxThumbnails)) {
	return 'hide'
	} else if (this.compact) {
	return 'small'
	}
	return 'normal'
	},
	galleryTypes () {
	if (this.attachmentSize === 'hide') {
	return []
	}
	return this.mergedConfig.playVideosInModal
	? ['image', 'video']
	: ['image']
	},
	galleryAttachments () {
	return this.status.attachments.filter(
	file => fileType.fileMatchesSomeType(this.galleryTypes, file)
	)
	},
	nonGalleryAttachments () {
	return this.status.attachments.filter(
	file => !fileType.fileMatchesSomeType(this.galleryTypes, file)
	)
	},
	maxThumbnails () {
	return this.mergedConfig.maxThumbnails
	},
	+ postBodyHtml () {
	+ const html = this.status.statusnet_html
	+
	+ if (this.mergedConfig.greentext) {
	+ try {
	+ if (html.includes('>')) {
	+ // This checks if post has '>' at the beginning, excluding mentions so that @mention >impying works
	+ return processHtml(html, (string) => {
	+ if (string.includes('>') &&
	+ string
	+ .replace(/<[^>]+?>/gi, '') // remove all tags
	+ .replace(/@\w+/gi, '') // remove mentions (even failed ones)
	+ .trim()
	+ .startsWith('>')) {
	+ return `<span class='greentext'>${string}</span>`
	+ } else {
	+ return string
	+ }
	+ })
	+ } else {
	+ return html
	+ }
	+ } catch (e) {
	+ console.err('Failed to process status html', e)
	+ return html
	+ }
	+ } else {
	+ return html
	+ }
	+ },
	contentHtml () {
	if (!this.status.summary_html) {
	- return this.status.statusnet_html
	+ return this.postBodyHtml
	}
	- return this.status.summary_html + '<br />' + this.status.statusnet_html
	+ return this.status.summary_html + '<br />' + this.postBodyHtml
	},
	combinedFavsAndRepeatsUsers () {
	// Use the status from the global status repository since favs and repeats are saved in it
	const combinedUsers = [].concat(
	this.statusFromGlobalRepository.favoritedBy,
	this.statusFromGlobalRepository.rebloggedBy
	)
	return uniqBy(combinedUsers, 'id')
	},
	ownStatus () {
	- return this.status.user.id === this.$store.state.users.currentUser.id
	+ return this.status.user.id === this.currentUser.id
	},
	tags () {
	return this.status.tags.filter(tagObj => tagObj.hasOwnProperty('name')).map(tagObj => tagObj.name).join(' ')
	},
	hidePostStats () {
	return this.mergedConfig.hidePostStats
	},
	- ...mapGetters(['mergedConfig'])
	+ ...mapGetters(['mergedConfig']),
	+ ...mapState({
	+ betterShadow: state => state.interface.browserSupport.cssFilter,
	+ currentUser: state => state.users.currentUser
	+ })
	},
	components: {
	Attachment,
	FavoriteButton,
	RetweetButton,
	ExtraButtons,
	PostStatusForm,
	Poll,
	UserCard,
	UserAvatar,
	Gallery,
	LinkPreview,
	AvatarList,
	Timeago,
	StatusPopover
	},
	methods: {
	visibilityIcon (visibility) {
	switch (visibility) {
	case 'private':
	return 'icon-lock'
	case 'unlisted':
	return 'icon-lock-open-alt'
	case 'direct':
	return 'icon-mail-alt'
	default:
	return 'icon-globe'
	}
	},
	showError (error) {
	this.error = error
	},
	clearError () {
	this.error = undefined
	},
	linkClicked (event) {
	const target = event.target.closest('.status-content a')
	if (target) {
	if (target.className.match(/mention/)) {
	const href = target.href
	const attn = this.status.attentions.find(attn => mentionMatchesUrl(attn, href))
	if (attn) {
	event.stopPropagation()
	event.preventDefault()
	const link = this.generateUserProfileLink(attn.id, attn.screen_name)
	this.$router.push(link)
	return
	}
	}
	if (target.rel.match(/(?:^\|\s)tag(?:$\|\s)/) \|\| target.className.match(/hashtag/)) {
	// Extract tag name from link url
	const tag = extractTagFromUrl(target.href)
	if (tag) {
	const link = this.generateTagLink(tag)
	this.$router.push(link)
	return
	}
	}
	window.open(target.href, '_blank')
	}
	},
	toggleReplying () {
	this.replying = !this.replying
	},
	gotoOriginal (id) {
	if (this.inConversation) {
	this.$emit('goto', id)
	}
	},
	toggleExpanded () {
	this.$emit('toggleExpanded')
	},
	toggleMute () {
	this.unmuted = !this.unmuted
	},
	toggleUserExpanded () {
	this.userExpanded = !this.userExpanded
	},
	toggleShowMore () {
	if (this.showingTall) {
	this.showingTall = false
	} else if (this.expandingSubject && this.status.summary) {
	this.expandingSubject = false
	} else if (this.hideTallStatus) {
	this.showingTall = true
	} else if (this.hideSubjectStatus && this.status.summary) {
	this.expandingSubject = true
	}
	},
	generateUserProfileLink (id, name) {
	return generateProfileLink(id, name, this.$store.state.instance.restrictedNicknames)
	},
	generateTagLink (tag) {
	return `/tag/${tag}`
	},
	setMedia () {
	const attachments = this.attachmentSize === 'hide' ? this.status.attachments : this.galleryAttachments
	return () => this.$store.dispatch('setMedia', attachments)
	}
	},
	watch: {
	'highlight': function (id) {
	if (this.status.id === id) {
	let rect = this.$el.getBoundingClientRect()
	if (rect.top < 100) {
	// Post is above screen, match its top to screen top
	window.scrollBy(0, rect.top - 100)
	} else if (rect.height >= (window.innerHeight - 50)) {
	// Post we want to see is taller than screen so match its top to screen top
	window.scrollBy(0, rect.top - 100)
	} else if (rect.bottom > window.innerHeight - 50) {
	// Post is below screen, match its bottom to screen bottom
	window.scrollBy(0, rect.bottom - window.innerHeight + 50)
	}
	}
	},
	'status.repeat_num': function (num) {
	// refetch repeats when repeat_num is changed in any way
	if (this.isFocused && this.statusFromGlobalRepository.rebloggedBy && this.statusFromGlobalRepository.rebloggedBy.length !== num) {
	this.$store.dispatch('fetchRepeats', this.status.id)
	}
	},
	'status.fave_num': function (num) {
	// refetch favs when fave_num is changed in any way
	if (this.isFocused && this.statusFromGlobalRepository.favoritedBy && this.statusFromGlobalRepository.favoritedBy.length !== num) {
	this.$store.dispatch('fetchFavs', this.status.id)
	}
	}
	},
	filters: {
	capitalize: function (str) {
	return str.charAt(0).toUpperCase() + str.slice(1)
	}
	}
	}

	export default Status
	diff --git a/src/components/status/status.vue b/src/components/status/status.vue
	index 65778b2e5d..d291e762b2 100644
	--- a/src/components/status/status.vue
	+++ b/src/components/status/status.vue
	@@ -1,904 +1,905 @@
	<template>
	<!-- eslint-disable vue/no-v-html -->
	<div
	v-if="!hideStatus"
	class="status-el"
	:class="[{ 'status-el_focused': isFocused }, { 'status-conversation': inlineExpanded }]"
	>
	<div
	v-if="error"
	class="alert error"
	>
	{{ error }}
	<i
	class="button-icon icon-cancel"
	@click="clearError"
	/>
	</div>
	<template v-if="muted && !isPreview">
	<div class="media status container muted">
	<small>
	<router-link :to="userProfileLink">
	{{ status.user.screen_name }}
	</router-link>
	</small>
	<small class="muteWords">{{ muteWordHits.join(', ') }}</small>
	<a
	href="#"
	class="unmute"
	@click.prevent="toggleMute"
	><i class="button-icon icon-eye-off" /></a>
	</div>
	</template>
	<template v-else>
	<div
	v-if="showPinned"
	class="status-pin"
	>
	<i class="fa icon-pin faint" />
	<span class="faint">{{ $t('status.pinned') }}</span>
	</div>
	<div
	v-if="retweet && !noHeading && !inConversation"
	:class="[repeaterClass, { highlighted: repeaterStyle }]"
	:style="[repeaterStyle]"
	class="media container retweet-info"
	>
	<UserAvatar
	v-if="retweet"
	class="media-left"
	:better-shadow="betterShadow"
	:user="statusoid.user"
	/>
	<div class="media-body faint">
	<span class="user-name">
	<router-link
	v-if="retweeterHtml"
	:to="retweeterProfileLink"
	v-html="retweeterHtml"
	/>
	<router-link
	v-else
	:to="retweeterProfileLink"
	>{{ retweeter }}</router-link>
	</span>
	<i
	class="fa icon-retweet retweeted"
	:title="$t('tool_tip.repeat')"
	/>
	{{ $t('timeline.repeated') }}
	</div>
	</div>

	<div
	:class="[userClass, { highlighted: userStyle, 'is-retweet': retweet && !inConversation }]"
	:style="[ userStyle ]"
	class="media status"
	:data-tags="tags"
	>
	<div
	v-if="!noHeading"
	class="media-left"
	>
	<router-link
	:to="userProfileLink"
	@click.stop.prevent.capture.native="toggleUserExpanded"
	>
	<UserAvatar
	:compact="compact"
	:better-shadow="betterShadow"
	:user="status.user"
	/>
	</router-link>
	</div>
	<div class="status-body">
	<UserCard
	v-if="userExpanded"
	:user="status.user"
	:rounded="true"
	:bordered="true"
	class="status-usercard"
	/>
	<div
	v-if="!noHeading"
	class="media-heading"
	>
	<div class="heading-name-row">
	<div class="name-and-account-name">
	<h4
	v-if="status.user.name_html"
	class="user-name"
	v-html="status.user.name_html"
	/>
	<h4
	v-else
	class="user-name"
	>
	{{ status.user.name }}
	</h4>
	<router-link
	class="account-name"
	:to="userProfileLink"
	>
	{{ status.user.screen_name }}
	</router-link>
	</div>

	<span class="heading-right">
	<router-link
	class="timeago faint-link"
	:to="{ name: 'conversation', params: { id: status.id } }"
	>
	<Timeago
	:time="status.created_at"
	:auto-update="60"
	/>
	</router-link>
	<div
	v-if="status.visibility"
	class="button-icon visibility-icon"
	>
	<i
	:class="visibilityIcon(status.visibility)"
	:title="status.visibility \| capitalize"
	/>
	</div>
	<a
	v-if="!status.is_local && !isPreview"
	:href="status.external_url"
	target="_blank"
	class="source_url"
	title="Source"
	>
	<i class="button-icon icon-link-ext-alt" />
	</a>
	<template v-if="expandable && !isPreview">
	<a
	href="#"
	title="Expand"
	@click.prevent="toggleExpanded"
	>
	<i class="button-icon icon-plus-squared" />
	</a>
	</template>
	<a
	v-if="unmuted"
	href="#"
	@click.prevent="toggleMute"
	><i class="button-icon icon-eye-off" /></a>
	</span>
	</div>

	<div class="heading-reply-row">
	<div
	v-if="isReply"
	class="reply-to-and-accountname"
	>
	<StatusPopover
	v-if="!isPreview"
	:status-id="status.in_reply_to_status_id"
	>
	<a
	class="reply-to"
	href="#"
	:aria-label="$t('tool_tip.reply')"
	@click.prevent="gotoOriginal(status.in_reply_to_status_id)"
	>
	<i class="button-icon icon-reply" />
	<span class="faint-link reply-to-text">{{ $t('status.reply_to') }}</span>
	</a>
	</StatusPopover>
	<span
	v-else
	class="reply-to"
	>
	<span class="reply-to-text">{{ $t('status.reply_to') }}</span>
	</span>
	<router-link :to="replyProfileLink">
	{{ replyToName }}
	</router-link>
	<span
	v-if="replies && replies.length"
	class="faint replies-separator"
	>
	-
	</span>
	</div>
	<div
	v-if="inConversation && !isPreview && replies && replies.length"
	class="replies"
	>
	<span class="faint">{{ $t('status.replies_list') }}</span>
	<StatusPopover
	v-for="reply in replies"
	:key="reply.id"
	:status-id="reply.id"
	>
	<a
	href="#"
	class="reply-link"
	@click.prevent="gotoOriginal(reply.id)"
	>{{ reply.name }}</a>
	</StatusPopover>
	</div>
	</div>
	</div>

	<div
	v-if="longSubject"
	class="status-content-wrapper"
	:class="{ 'tall-status': !showingLongSubject }"
	>
	<a
	v-if="!showingLongSubject"
	class="tall-status-hider"
	:class="{ 'tall-status-hider_focused': isFocused }"
	href="#"
	@click.prevent="showingLongSubject=true"
	>{{ $t("general.show_more") }}</a>
	<div
	class="status-content media-body"
	@click.prevent="linkClicked"
	v-html="contentHtml"
	/>
	<a
	v-if="showingLongSubject"
	href="#"
	class="status-unhider"
	@click.prevent="showingLongSubject=false"
	>{{ $t("general.show_less") }}</a>
	</div>
	<div
	v-else
	:class="{'tall-status': hideTallStatus}"
	class="status-content-wrapper"
	>
	<a
	v-if="hideTallStatus"
	class="tall-status-hider"
	:class="{ 'tall-status-hider_focused': isFocused }"
	href="#"
	@click.prevent="toggleShowMore"
	>{{ $t("general.show_more") }}</a>
	<div
	v-if="!hideSubjectStatus"
	class="status-content media-body"
	@click.prevent="linkClicked"
	v-html="contentHtml"
	/>
	<div
	v-else
	class="status-content media-body"
	@click.prevent="linkClicked"
	v-html="status.summary_html"
	/>
	<a
	v-if="hideSubjectStatus"
	href="#"
	class="cw-status-hider"
	@click.prevent="toggleShowMore"
	>{{ $t("general.show_more") }}</a>
	<a
	v-if="showingMore"
	href="#"
	class="status-unhider"
	@click.prevent="toggleShowMore"
	>{{ $t("general.show_less") }}</a>
	</div>

	<div v-if="status.poll && status.poll.options">
	<poll :base-poll="status.poll" />
	</div>

	<div
	v-if="status.attachments && (!hideSubjectStatus \|\| showingLongSubject)"
	class="attachments media-body"
	>
	<attachment
	v-for="attachment in nonGalleryAttachments"
	:key="attachment.id"
	class="non-gallery"
	:size="attachmentSize"
	:nsfw="nsfwClickthrough"
	:attachment="attachment"
	:allow-play="true"
	:set-media="setMedia()"
	/>
	<gallery
	v-if="galleryAttachments.length > 0"
	:nsfw="nsfwClickthrough"
	:attachments="galleryAttachments"
	:set-media="setMedia()"
	/>
	</div>

	<div
	v-if="status.card && !hideSubjectStatus && !noHeading"
	class="link-preview media-body"
	>
	<link-preview
	:card="status.card"
	:size="attachmentSize"
	:nsfw="nsfwClickthrough"
	/>
	</div>

	<transition name="fade">
	<div
	v-if="!hidePostStats && isFocused && combinedFavsAndRepeatsUsers.length > 0"
	class="favs-repeated-users"
	>
	<div class="stats">
	<div
	v-if="statusFromGlobalRepository.rebloggedBy && statusFromGlobalRepository.rebloggedBy.length > 0"
	class="stat-count"
	>
	<a class="stat-title">{{ $t('status.repeats') }}</a>
	<div class="stat-number">
	{{ statusFromGlobalRepository.rebloggedBy.length }}
	</div>
	</div>
	<div
	v-if="statusFromGlobalRepository.favoritedBy && statusFromGlobalRepository.favoritedBy.length > 0"
	class="stat-count"
	>
	<a class="stat-title">{{ $t('status.favorites') }}</a>
	<div class="stat-number">
	{{ statusFromGlobalRepository.favoritedBy.length }}
	</div>
	</div>
	<div class="avatar-row">
	<AvatarList :users="combinedFavsAndRepeatsUsers" />
	</div>
	</div>
	</div>
	</transition>

	<div
	v-if="!noHeading && !isPreview"
	class="status-actions media-body"
	>
	<div>
	<i
	v-if="loggedIn"
	class="button-icon icon-reply"
	:title="$t('tool_tip.reply')"
	:class="{'button-icon-active': replying}"
	@click.prevent="toggleReplying"
	/>
	<i
	v-else
	class="button-icon button-icon-disabled icon-reply"
	:title="$t('tool_tip.reply')"
	/>
	<span v-if="status.replies_count > 0">{{ status.replies_count }}</span>
	</div>
	<retweet-button
	:visibility="status.visibility"
	:logged-in="loggedIn"
	:status="status"
	/>
	<favorite-button
	:logged-in="loggedIn"
	:status="status"
	/>
	<extra-buttons
	:status="status"
	@onError="showError"
	@onSuccess="clearError"
	/>
	</div>
	</div>
	</div>
	<div
	v-if="replying"
	class="container"
	>
	<PostStatusForm
	class="reply-body"
	:reply-to="status.id"
	:attentions="status.attentions"
	:replied-user="status.user"
	:copy-message-scope="status.visibility"
	:subject="replySubject"
	@posted="toggleReplying"
	/>
	</div>
	</template>
	</div>
	<!-- eslint-enable vue/no-v-html -->
	</template>

	<script src="./status.js" ></script>
	<style lang="scss">
	@import '../../_variables.scss';

	$status-margin: 0.75em;

	.status-body {
	flex: 1;
	min-width: 0;
	}

	.status-pin {
	padding: $status-margin $status-margin 0;
	display: flex;
	align-items: center;
	justify-content: flex-end;
	}

	.media-left {
	margin-right: $status-margin;
	}

	.status-el {
	overflow-wrap: break-word;
	word-wrap: break-word;
	word-break: break-word;
	border-left-width: 0px;
	min-width: 0;
	border-color: $fallback--border;
	border-color: var(--border, $fallback--border);

	border-left: 4px $fallback--cRed;
	border-left: 4px var(--cRed, $fallback--cRed);

	&_focused {
	background-color: $fallback--lightBg;
	background-color: var(--lightBg, $fallback--lightBg);
	}

	.timeline & {
	border-bottom-width: 1px;
	border-bottom-style: solid;
	}

	.media-body {
	flex: 1;
	padding: 0;
	}

	.status-usercard {
	margin-bottom: $status-margin;
	}

	.user-name {
	white-space: nowrap;
	font-size: 14px;
	overflow: hidden;
	flex-shrink: 0;
	max-width: 85%;
	font-weight: bold;

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

	.media-heading {
	padding: 0;
	vertical-align: bottom;
	flex-basis: 100%;
	margin-bottom: 0.5em;

	small {
	font-weight: lighter;
	}

	.heading-name-row {
	padding: 0;
	display: flex;
	justify-content: space-between;
	line-height: 18px;

	a {
	display: inline-block;
	word-break: break-all;
	}

	.name-and-account-name {
	display: flex;
	min-width: 0;
	}

	.user-name {
	flex-shrink: 1;
	margin-right: 0.4em;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	.account-name {
	min-width: 1.6em;
	margin-right: 0.4em;
	white-space: nowrap;
	overflow: hidden;
	text-overflow: ellipsis;
	flex: 1 1 0;
	}
	}

	.heading-right {
	display: flex;
	flex-shrink: 0;
	}

	.timeago {
	margin-right: 0.2em;
	}

	.heading-reply-row {
	position: relative;
	align-content: baseline;
	font-size: 12px;
	line-height: 18px;
	max-width: 100%;
	display: flex;
	flex-wrap: wrap;
	align-items: stretch;

	> .reply-to-and-accountname > a {
	max-width: 100%;
	text-overflow: ellipsis;
	overflow: hidden;
	white-space: nowrap;
	display: inline-block;
	word-break: break-all;
	}
	}

	.reply-to-and-accountname {
	display: flex;
	height: 18px;
	margin-right: 0.5em;
	overflow: hidden;
	max-width: 100%;
	.icon-reply {
	transform: scaleX(-1);
	}
	}

	.reply-info {
	display: flex;
	}

	.reply-to {
	display: flex;
	}

	.reply-to-text {
	overflow: hidden;
	text-overflow: ellipsis;
	margin: 0 0.4em 0 0.2em;
	color: $fallback--faint;
	color: var(--faint, $fallback--faint);
	}

	.replies-separator {
	margin-left: 0.4em;
	}

	.replies {
	line-height: 18px;
	font-size: 12px;
	display: flex;
	flex-wrap: wrap;
	& > * {
	margin-right: 0.4em;
	}
	}

	.reply-link {
	height: 17px;
	}
	}

	.tall-status {
	position: relative;
	height: 220px;
	overflow-x: hidden;
	overflow-y: hidden;
	z-index: 1;
	.status-content {
	height: 100%;
	mask: linear-gradient(to top, white, transparent) bottom/100% 70px no-repeat,
	linear-gradient(to top, white, white);
	- // Autoprefixed seem to ignore this one, and also syntax is different
	+ /* Autoprefixed seem to ignore this one, and also syntax is different */
	-webkit-mask-composite: xor;
	mask-composite: exclude;
	}
	}

	.tall-status-hider {
	display: inline-block;
	word-break: break-all;
	position: absolute;
	height: 70px;
	margin-top: 150px;
	width: 100%;
	text-align: center;
	line-height: 110px;
	z-index: 2;
	}

	.status-unhider, .cw-status-hider {
	width: 100%;
	text-align: center;
	display: inline-block;
	word-break: break-all;
	}

	.status-content {
	font-family: var(--postFont, sans-serif);
	line-height: 1.4em;
	white-space: pre-wrap;

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

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

	blockquote {
	margin: 0.2em 0 0.2em 2em;
	font-style: italic;
	}

	pre {
	overflow: auto;
	}

	code, samp, kbd, var, pre {
	font-family: var(--postCodeFont, monospace);
	}

	p {
	margin: 0 0 1em 0;
	}

	p:last-child {
	margin: 0 0 0 0;
	}

	h1 {
	font-size: 1.1em;
	line-height: 1.2em;
	margin: 1.4em 0;
	}

	h2 {
	font-size: 1.1em;
	margin: 1.0em 0;
	}

	h3 {
	font-size: 1em;
	margin: 1.2em 0;
	}

	h4 {
	margin: 1.1em 0;
	}
	}

	.retweet-info {
	padding: 0.4em $status-margin;
	margin: 0;

	.avatar.still-image {
	border-radius: $fallback--avatarAltRadius;
	border-radius: var(--avatarAltRadius, $fallback--avatarAltRadius);
	margin-left: 28px;
	width: 20px;
	height: 20px;
	}

	.media-body {
	font-size: 1em;
	line-height: 22px;

	display: flex;
	align-content: center;
	flex-wrap: wrap;

	.user-name {
	font-weight: bold;
	overflow: hidden;
	text-overflow: ellipsis;

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

	i {
	padding: 0 0.2em;
	}

	a {
	max-width: 100%;
	overflow: hidden;
	text-overflow: ellipsis;
	white-space: nowrap;
	}
	}
	}
	}

	.status-fadein {
	animation-duration: 0.4s;
	animation-name: fadein;
	}

	@keyframes fadein {
	from {
	opacity: 0;
	}
	to {
	opacity: 1;
	}
	}

	.greentext {
	- color: green;
	+ color: $fallback--cGreen;
	+ color: var(--cGreen, $fallback--cGreen);
	}

	.status-conversation {
	border-left-style: solid;
	}

	.status-actions {
	position: relative;
	width: 100%;
	display: flex;
	margin-top: $status-margin;

	> * {
	max-width: 4em;
	flex: 1;
	}
	}

	.button-icon.icon-reply {
	&:not(.button-icon-disabled):hover,
	&.button-icon-active {
	color: $fallback--cBlue;
	color: var(--cBlue, $fallback--cBlue);
	}
	}

	.button-icon.icon-reply {
	&:not(.button-icon-disabled) {
	cursor: pointer;
	}
	}

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

	.status {
	display: flex;
	padding: $status-margin;
	&.is-retweet {
	padding-top: 0;
	}
	}

	.status-conversation:last-child {
	border-bottom: none;
	}

	.muted {
	padding: 0.25em 0.5em;
	button {
	margin-left: auto;
	}

	.muteWords {
	margin-left: 10px;
	}
	}

	a.unmute {
	display: block;
	margin-left: auto;
	}

	.reply-body {
	flex: 1;
	}

	.timeline :not(.panel-disabled) > {
	.status-el:last-child {
	border-radius: 0 0 $fallback--panelRadius $fallback--panelRadius;
	border-radius: 0 0 var(--panelRadius, $fallback--panelRadius) var(--panelRadius, $fallback--panelRadius);
	border-bottom: none;
	}
	}

	.favs-repeated-users {
	margin-top: $status-margin;

	.stats {
	width: 100%;
	display: flex;
	line-height: 1em;

	.stat-count {
	margin-right: $status-margin;

	.stat-title {
	color: var(--faint, $fallback--faint);
	font-size: 12px;
	text-transform: uppercase;
	position: relative;
	}

	.stat-number {
	font-weight: bolder;
	font-size: 16px;
	line-height: 1em;
	}
	}

	.avatar-row {
	flex: 1;
	overflow: hidden;
	position: relative;
	display: flex;
	align-items: center;

	&::before {
	content: '';
	position: absolute;
	height: 100%;
	width: 1px;
	left: 0;
	background-color: var(--faint, $fallback--faint);
	}
	}
	}
	}

	@media all and (max-width: 800px) {
	.status-el {
	.retweet-info {
	.avatar.still-image {
	margin-left: 20px;
	}
	}
	}
	.status {
	max-width: 100%;
	}

	.status .avatar.still-image {
	width: 40px;
	height: 40px;

	&.avatar-compact {
	width: 32px;
	height: 32px;
	}
	}
	}

	</style>
	diff --git a/src/i18n/en.json b/src/i18n/en.json
	index ad3e671d81..85146ef577 100644
	--- a/src/i18n/en.json
	+++ b/src/i18n/en.json
	@@ -1,671 +1,673 @@
	{
	"about": {
	"staff": "Staff",
	"federation": "Federation",
	"mrf_policies": "Enabled MRF Policies",
	"mrf_policies_desc": "MRF policies manipulate the federation behaviour of the instance. The following policies are enabled:",
	"mrf_policy_simple": "Instance-specific Policies",
	"mrf_policy_simple_accept": "Accept",
	"mrf_policy_simple_accept_desc": "This instance only accepts messages from the following instances:",
	"mrf_policy_simple_reject": "Reject",
	"mrf_policy_simple_reject_desc": "This instance will not accept messages from the following instances:",
	"mrf_policy_simple_quarantine": "Quarantine",
	"mrf_policy_simple_quarantine_desc": "This instance will send only public posts to the following instances:",
	"mrf_policy_simple_ftl_removal": "Removal from \"The Whole Known Network\" Timeline",
	"mrf_policy_simple_ftl_removal_desc": "This instance removes these instances from \"The Whole Known Network\" timeline:",
	"mrf_policy_simple_media_removal": "Media Removal",
	"mrf_policy_simple_media_removal_desc": "This instance removes media from posts on the following instances:",
	"mrf_policy_simple_media_nsfw": "Media Force-set As Sensitive",
	"mrf_policy_simple_media_nsfw_desc": "This instance forces media to be set sensitive in posts on the following instances:"
	},
	"chat": {
	"title": "Chat"
	},
	"exporter": {
	"export": "Export",
	"processing": "Processing, you'll soon be asked to download your file"
	},
	"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",
	"show_more": "Show more",
	"show_less": "Show less",
	"cancel": "Cancel",
	"disable": "Disable",
	"enable": "Enable",
	"confirm": "Confirm",
	"verify": "Verify"
	},
	"image_cropper": {
	"crop_picture": "Crop picture",
	"save": "Save",
	"save_without_cropping": "Save without cropping",
	"cancel": "Cancel"
	},
	"importer": {
	"submit": "Submit",
	"success": "Imported successfully.",
	"error": "An error occured while importing this file."
	},
	"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",
	"authentication_code": "Authentication code",
	"enter_recovery_code": "Enter a recovery code",
	"enter_two_factor_code": "Enter a two-factor code",
	"recovery_code": "Recovery code",
	"heading" : {
	"totp" : "Two-factor authentication",
	"recovery" : "Two-factor recovery"
	}
	},
	"media_modal": {
	"previous": "Previous",
	"next": "Next"
	},
	"nav": {
	"about": "About",
	"administration": "Administration",
	"back": "Back",
	"chat": "Local Chat",
	"friend_requests": "Follow Requests",
	"mentions": "Mentions",
	"interactions": "Interactions",
	"dms": "Direct Messages",
	"public_tl": "Public Timeline",
	"timeline": "Timeline",
	"twkn": "The Whole Known Network",
	"user_search": "User Search",
	"search": "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"
	},
	"polls": {
	"add_poll": "Add Poll",
	"add_option": "Add Option",
	"option": "Option",
	"votes": "votes",
	"vote": "Vote",
	"type": "Poll type",
	"single_choice": "Single choice",
	"multiple_choices": "Multiple choices",
	"expiry": "Poll age",
	"expires_in": "Poll ends in {0}",
	"expired": "Poll ended {0} ago",
	"not_enough_options": "Too few unique options in poll"
	},
	"emoji": {
	"stickers": "Stickers",
	"emoji": "Emoji",
	"keep_open": "Keep picker open",
	"search_emoji": "Search for an emoji",
	"add_emoji": "Insert emoji",
	"custom": "Custom emoji",
	"unicode": "Unicode emoji",
	"load_all_hint": "Loaded first {saneAmount} emoji, loading all emoji may cause performance issues.",
	"load_all": "Loading all {emojiAmount} emoji"
	},
	"interactions": {
	"favs_repeats": "Repeats and Favorites",
	"follows": "New follows",
	"load_older": "Load older interactions"
	},
	"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",
	"text/bbcode": "BBCode"
	},
	"content_warning": "Subject (optional)",
	"default": "Just landed in L.A.",
	"direct_warning_to_all": "This post will be visible to all the mentioned users.",
	"direct_warning_to_first_only": "This post will only be visible to the mentioned users at the beginning of the message.",
	"posting": "Posting",
	"scope_notice": {
	"public": "This post will be visible to everyone",
	"private": "This post will be visible to your followers only",
	"unlisted": "This post will not be visible in Public Timeline and The Whole Known Network"
	},
	"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"
	}
	},
	"remote_user_resolver": {
	"remote_user_resolver": "Remote user resolver",
	"searching_for": "Searching for",
	"error": "Not found."
	},
	"selectable_list": {
	"select_all": "Select all"
	},
	"settings": {
	"app_name": "App name",
	"security": "Security",
	"enter_current_password_to_confirm": "Enter your current password to confirm your identity",
	"mfa": {
	"otp" : "OTP",
	"setup_otp" : "Setup OTP",
	"wait_pre_setup_otp" : "presetting OTP",
	"confirm_and_enable" : "Confirm & enable OTP",
	"title": "Two-factor Authentication",
	"generate_new_recovery_codes" : "Generate new recovery codes",
	"warning_of_generate_new_codes" : "When you generate new recovery codes, your old codes won’t work anymore.",
	"recovery_codes" : "Recovery codes.",
	"waiting_a_recovery_codes": "Receiving backup codes...",
	"recovery_codes_warning" : "Write the codes down or save them somewhere secure - otherwise you won't see them again. If you lose access to your 2FA app and recovery codes you'll be locked out of your account.",
	"authentication_methods" : "Authentication methods",
	"scan": {
	"title": "Scan",
	"desc": "Using your two-factor app, scan this QR code or enter text key:",
	"secret_code": "Key"
	},
	"verify": {
	"desc": "To enable two-factor authentication, enter the code from your two-factor app:"
	}
	},
	"attachmentRadius": "Attachments",
	"attachments": "Attachments",
	"autoload": "Enable automatic loading when scrolled to the bottom",
	"avatar": "Avatar",
	"avatarAltRadius": "Avatars (Notifications)",
	"avatarRadius": "Avatars",
	"background": "Background",
	"bio": "Bio",
	"block_export": "Block export",
	"block_export_button": "Export your blocks to a csv file",
	"block_import": "Block import",
	"block_import_error": "Error importing blocks",
	"blocks_imported": "Blocks imported! Processing them will take a while.",
	"blocks_tab": "Blocks",
	"btnRadius": "Buttons",
	"cBlue": "Blue (Reply, follow)",
	"cGreen": "Green (Retweet)",
	"cOrange": "Orange (Favorite)",
	"cRed": "Red (Cancel)",
	"change_email": "Change Email",
	"change_email_error": "There was an issue changing your email.",
	"changed_email": "Email changed successfully!",
	"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.",
	"discoverable": "Allow discovery of this account in search results and other services",
	"avatar_size_instruction": "The recommended minimum size for avatar images is 150x150 pixels.",
	"pad_emoji": "Pad emoji with spaces when adding from picker",
	"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_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",
	"hide_muted_posts": "Hide posts of muted users",
	"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_blocks_from_a_csv_file": "Import blocks from a csv file",
	"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 in a popup frame",
	"use_contain_fit": "Don't crop the attachment in thumbnails",
	"name": "Name",
	"name_bio": "Name & Bio",
	"new_email": "New Email",
	"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",
	"hide_follows_count_description": "Don't show follow count",
	"hide_followers_count_description": "Don't show follower count",
	"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",
	"autohide_floating_post_button": "Automatically hide New Post button (mobile)",
	"saving_err": "Error saving settings",
	"saving_ok": "Settings saved",
	"search_user_to_block": "Search whom you want to block",
	"search_user_to_mute": "Search whom you want to mute",
	"security_tab": "Security",
	"scope_copy": "Copy scope when replying (DMs are always copied)",
	"minimal_scopes_mode": "Minimize post scope selection options",
	"set_new_avatar": "Set new avatar",
	"set_new_profile_background": "Set new profile background",
	"set_new_profile_banner": "Set new profile banner",
	"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"
	},
	+ "fun": "Fun",
	+ "greentext": "Meme arrows",
	"notifications": "Notifications",
	"notification_setting": "Receive notifications from:",
	"notification_setting_follows": "Users you follow",
	"notification_setting_non_follows": "Users you do not follow",
	"notification_setting_followers": "Users who follow you",
	"notification_setting_non_followers": "Users who do not follow you",
	"notification_mutes": "To stop receiving notifications from a specific user, use a mute.",
	"notification_blocks": "Blocking a user stops all notifications as well as unsubscribes them.",
	"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",
	"alert_warning": "Warning",
	"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"
	}
	},
	"time": {
	"day": "{0} day",
	"days": "{0} days",
	"day_short": "{0}d",
	"days_short": "{0}d",
	"hour": "{0} hour",
	"hours": "{0} hours",
	"hour_short": "{0}h",
	"hours_short": "{0}h",
	"in_future": "in {0}",
	"in_past": "{0} ago",
	"minute": "{0} minute",
	"minutes": "{0} minutes",
	"minute_short": "{0}min",
	"minutes_short": "{0}min",
	"month": "{0} month",
	"months": "{0} months",
	"month_short": "{0}mo",
	"months_short": "{0}mo",
	"now": "just now",
	"now_short": "now",
	"second": "{0} second",
	"seconds": "{0} seconds",
	"second_short": "{0}s",
	"seconds_short": "{0}s",
	"week": "{0} week",
	"weeks": "{0} weeks",
	"week_short": "{0}w",
	"weeks_short": "{0}w",
	"year": "{0} year",
	"years": "{0} years",
	"year_short": "{0}y",
	"years_short": "{0}y"
	},
	"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": {
	"favorites": "Favorites",
	"repeats": "Repeats",
	"delete": "Delete status",
	"pin": "Pin on profile",
	"unpin": "Unpin from profile",
	"pinned": "Pinned",
	"delete_confirm": "Do you really want to delete this status?",
	"reply_to": "Reply to",
	"replies_list": "Replies:",
	"mute_conversation": "Mute conversation",
	"unmute_conversation": "Unmute conversation"
	},
	"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!",
	"hidden": "Hidden",
	"its_you": "It's you!",
	"media": "Media",
	"mention": "Mention",
	"mute": "Mute",
	"muted": "Muted",
	"per_day": "per day",
	"remote_follow": "Remote follow",
	"report": "Report",
	"statuses": "Statuses",
	"subscribe": "Subscribe",
	"unsubscribe": "Unsubscribe",
	"unblock": "Unblock",
	"unblock_progress": "Unblocking...",
	"block_progress": "Blocking...",
	"unmute": "Unmute",
	"unmute_progress": "Unmuting...",
	"mute_progress": "Muting...",
	"hide_repeats": "Hide repeats",
	"show_repeats": "Show repeats",
	"admin_menu": {
	"moderation": "Moderation",
	"grant_admin": "Grant Admin",
	"revoke_admin": "Revoke Admin",
	"grant_moderator": "Grant Moderator",
	"revoke_moderator": "Revoke Moderator",
	"activate_account": "Activate account",
	"deactivate_account": "Deactivate account",
	"delete_account": "Delete account",
	"force_nsfw": "Mark all posts as NSFW",
	"strip_media": "Remove media from posts",
	"force_unlisted": "Force posts to be unlisted",
	"sandbox": "Force posts to be followers-only",
	"disable_remote_subscription": "Disallow following user from remote instances",
	"disable_any_subscription": "Disallow following user at all",
	"quarantine": "Disallow user posts from federating",
	"delete_user": "Delete user",
	"delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
	}
	},
	"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."
	},
	"user_reporting": {
	"title": "Reporting {0}",
	"add_comment_description": "The report will be sent to your instance moderators. You can provide an explanation of why you are reporting this account below:",
	"additional_comments": "Additional comments",
	"forward_description": "The account is from another server. Send a copy of the report there as well?",
	"forward_to": "Forward to {0}",
	"submit": "Submit",
	"generic_error": "An error occurred while processing your request."
	},
	"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"
	}
	},
	"search": {
	"people": "People",
	"hashtags": "Hashtags",
	"person_talking": "{count} person talking",
	"people_talking": "{count} people talking",
	"no_results": "No results"
	},
	"password_reset": {
	"forgot_password": "Forgot password?",
	"password_reset": "Password reset",
	"instruction": "Enter your email address or username. We will send you a link to reset your password.",
	"placeholder": "Your email or username",
	"check_email": "Check your email for a link to reset your password.",
	"return_home": "Return to the home page",
	"not_found": "We couldn't find that email or username.",
	"too_many_requests": "You have reached the limit of attempts, try again later.",
	"password_reset_disabled": "Password reset is disabled. Please contact your instance administrator.",
	"password_reset_required": "You must reset your password to log in.",
	"password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator."
	}
	}
	diff --git a/src/i18n/ja.json b/src/i18n/ja_pedantic.json
	similarity index 100%
	rename from src/i18n/ja.json
	rename to src/i18n/ja_pedantic.json
	diff --git a/src/i18n/messages.js b/src/i18n/messages.js
	index 774a48e0bb..c56ae205aa 100644
	--- a/src/i18n/messages.js
	+++ b/src/i18n/messages.js
	@@ -1,40 +1,40 @@
	// When contributing, please sort JSON before committing so it would be easier to see what's missing and what's being added compared to English and other languages. It's not obligatory, but just an advice.
	// To sort json use jq https://stedolan.github.io/jq and invoke it like `jq -S . xx.json > xx.sorted.json`, AFAIK, there's no inplace edit option like in sed
	// Also, when adding a new language to "messages" variable, please do it alphabetically by language code so that users can search or check their custom language easily.

	// For anyone contributing to old huge messages.js and in need to quickly convert it to JSON
	// sed command for converting currently formatted JS to JSON:
	// sed -i -e "s/'//gm" -e 's/"/\\"/gm' -re 's/^( +)(.+?): ((.+?))?(,?)(\{?)$/\1"\2": "\4"/gm' -e 's/\"\{\"/{/g' -e 's/,"$/",/g' file.json
	// There's only problem that apostrophe character ' gets replaced by \\ so you have to fix it manually, sorry.

	const messages = {
	ar: require('./ar.json'),
	ca: require('./ca.json'),
	cs: require('./cs.json'),
	de: require('./de.json'),
	en: require('./en.json'),
	eo: require('./eo.json'),
	es: require('./es.json'),
	et: require('./et.json'),
	eu: require('./eu.json'),
	fi: require('./fi.json'),
	fr: require('./fr.json'),
	ga: require('./ga.json'),
	he: require('./he.json'),
	hu: require('./hu.json'),
	it: require('./it.json'),
	- ja: require('./ja.json'),
	+ ja: require('./ja_pedantic.json'),
	ja_easy: require('./ja_easy.json'),
	ko: require('./ko.json'),
	nb: require('./nb.json'),
	nl: require('./nl.json'),
	oc: require('./oc.json'),
	pl: require('./pl.json'),
	pt: require('./pt.json'),
	ro: require('./ro.json'),
	ru: require('./ru.json'),
	te: require('./te.json'),
	zh: require('./zh.json')
	}

	export default messages
	diff --git a/src/i18n/ru.json b/src/i18n/ru.json
	index f8bcd9969f..19e10f1e96 100644
	--- a/src/i18n/ru.json
	+++ b/src/i18n/ru.json
	@@ -1,410 +1,412 @@
	{
	"chat": {
	"title": "Чат"
	},
	"finder": {
	"error_fetching_user": "Пользователь не найден",
	"find_user": "Найти пользователя"
	},
	"general": {
	"apply": "Применить",
	"submit": "Отправить",
	"cancel": "Отмена",
	"disable": "Оключить",
	"enable": "Включить",
	"confirm": "Подтвердить",
	"verify": "Проверить"
	},
	"login": {
	"login": "Войти",
	"logout": "Выйти",
	"password": "Пароль",
	"placeholder": "e.c. lain",
	"register": "Зарегистрироваться",
	"username": "Имя пользователя",
	"authentication_code": "Код аутентификации",
	"enter_recovery_code": "Ввести код восстановления",
	"enter_two_factor_code": "Ввести код аутентификации",
	"recovery_code": "Код восстановления",
	"heading" : {
	"TotpForm" : "Двухфакторная аутентификация",
	"RecoveryForm" : "Two-factor recovery"
	}
	},
	"nav": {
	"back": "Назад",
	"chat": "Локальный чат",
	"mentions": "Упоминания",
	"interactions": "Взаимодействия",
	"public_tl": "Публичная лента",
	"timeline": "Лента",
	"twkn": "Федеративная лента",
	"search": "Поиск"
	},
	"notifications": {
	"broken_favorite": "Неизвестный статус, ищем...",
	"favorited_you": "нравится ваш статус",
	"followed_you": "начал(а) читать вас",
	"load_older": "Загрузить старые уведомления",
	"notifications": "Уведомления",
	"read": "Прочесть",
	"repeated_you": "повторил(а) ваш статус"
	},
	"interactions": {
	"favs_repeats": "Повторы и фавориты",
	"follows": "Новые подписки",
	"load_older": "Загрузить старые взаимодействия"
	},
	"post_status": {
	"account_not_locked_warning": "Ваш аккаунт не {0}. Кто угодно может зафоловить вас чтобы прочитать посты только для подписчиков",
	"account_not_locked_warning_link": "залочен",
	"attachments_sensitive": "Вложения содержат чувствительный контент",
	"content_warning": "Тема (не обязательно)",
	"default": "Что нового?",
	"direct_warning": "Этот пост будет виден только упомянутым пользователям",
	"posting": "Отправляется",
	"scope_notice": {
	"public": "Этот пост будет виден всем",
	"private": "Этот пост будет виден только вашим подписчикам",
	"unlisted": "Этот пост не будет виден в публичной и федеративной ленте"
	},
	"scope": {
	"direct": "Личное - этот пост видят только те кто в нём упомянут",
	"private": "Для подписчиков - этот пост видят только подписчики",
	"public": "Публичный - этот пост виден всем",
	"unlisted": "Непубличный - этот пост не виден на публичных лентах"
	}
	},
	"registration": {
	"bio": "Описание",
	"email": "Email",
	"fullname": "Отображаемое имя",
	"password_confirm": "Подтверждение пароля",
	"registration": "Регистрация",
	"token": "Код приглашения",
	"validations": {
	"username_required": "не должно быть пустым",
	"fullname_required": "не должно быть пустым",
	"email_required": "не должен быть пустым",
	"password_required": "не должен быть пустым",
	"password_confirmation_required": "не должно быть пустым",
	"password_confirmation_match": "должно совпадать с паролем"
	}
	},
	"settings": {
	"enter_current_password_to_confirm": "Введите свой текущий пароль",
	"mfa": {
	"otp" : "OTP",
	"setup_otp" : "Настройка OTP",
	"wait_pre_setup_otp" : "предварительная настройка OTP",
	"confirm_and_enable" : "Подтвердить и включить OTP",
	"title": "Двухфакторная аутентификация",
	"generate_new_recovery_codes" : "Получить новые коды востановления",
	"warning_of_generate_new_codes" : "После получения новых кодов восстановления, старые больше не будут работать.",
	"recovery_codes" : "Коды восстановления.",
	"waiting_a_recovery_codes": "Получение кодов восстановления ...",
	"recovery_codes_warning" : "Запишите эти коды и держите в безопасном месте - иначе вы их больше не увидите. Если вы потеряете доступ к OTP приложению - без резервных кодов вы больше не сможете залогиниться.",
	"authentication_methods" : "Методы аутентификации",
	"scan": {
	"title": "Сканирование",
	"desc": "Используйте приложение для двухэтапной аутентификации для сканирования этого QR-код или введите текстовый ключ:",
	"secret_code": "Ключ"
	},
	"verify": {
	"desc": "Чтобы включить двухэтапную аутентификации, введите код из вашего приложение для двухэтапной аутентификации:"
	}
	},
	"attachmentRadius": "Прикреплённые файлы",
	"attachments": "Вложения",
	"autoload": "Включить автоматическую загрузку при прокрутке вниз",
	"avatar": "Аватар",
	"avatarAltRadius": "Аватары в уведомлениях",
	"avatarRadius": "Аватары",
	"background": "Фон",
	"bio": "Описание",
	"btnRadius": "Кнопки",
	"cBlue": "Ответить, читать",
	"cGreen": "Повторить",
	"cOrange": "Нравится",
	"cRed": "Отменить",
	"change_email": "Сменить email",
	"change_email_error": "Произошла ошибка при попытке изменить email.",
	"changed_email": "Email изменён успешно.",
	"change_password": "Сменить пароль",
	"change_password_error": "Произошла ошибка при попытке изменить пароль.",
	"changed_password": "Пароль изменён успешно.",
	"collapse_subject": "Сворачивать посты с темой",
	"confirm_new_password": "Подтверждение нового пароля",
	"current_avatar": "Текущий аватар",
	"current_password": "Текущий пароль",
	"current_profile_banner": "Текущий баннер профиля",
	"data_import_export_tab": "Импорт / Экспорт данных",
	"delete_account": "Удалить аккаунт",
	"delete_account_description": "Удалить ваш аккаунт и все ваши сообщения.",
	"delete_account_error": "Возникла ошибка в процессе удаления вашего аккаунта. Если это повторяется, свяжитесь с администратором вашего сервера.",
	"delete_account_instructions": "Введите ваш пароль в поле ниже для подтверждения удаления.",
	"export_theme": "Сохранить Тему",
	"filtering": "Фильтрация",
	"filtering_explanation": "Все статусы, содержащие данные слова, будут игнорироваться, по одному в строке",
	"follow_export": "Экспортировать читаемых",
	"follow_export_button": "Экспортировать читаемых в файл .csv",
	"follow_export_processing": "Ведётся обработка, скоро вам будет предложено загрузить файл",
	"follow_import": "Импортировать читаемых",
	"follow_import_error": "Ошибка при импортировании читаемых.",
	"follows_imported": "Список читаемых импортирован. Обработка займёт некоторое время..",
	"foreground": "Передний план",
	"general": "Общие",
	"hide_attachments_in_convo": "Прятать вложения в разговорах",
	"hide_attachments_in_tl": "Прятать вложения в ленте",
	"hide_isp": "Скрыть серверную панель",
	"import_followers_from_a_csv_file": "Импортировать читаемых из файла .csv",
	"import_theme": "Загрузить Тему",
	"inputRadius": "Поля ввода",
	"checkboxRadius": "Чекбоксы",
	"instance_default": "(по умолчанию: {value})",
	"instance_default_simple": "(по умолчанию)",
	"interface": "Интерфейс",
	"interfaceLanguage": "Язык интерфейса",
	"limited_availability": "Не доступно в вашем браузере",
	"links": "Ссылки",
	"lock_account_description": "Аккаунт доступен только подтверждённым подписчикам",
	"loop_video": "Зациливать видео",
	"loop_video_silent_only": "Зацикливать только беззвучные видео (т.е. \"гифки\" с Mastodon)",
	"name": "Имя",
	"name_bio": "Имя и описание",
	"new_email": "Новый email",
	"new_password": "Новый пароль",
	+ "fun": "Потешное",
	+ "greentext": "Мемные стрелочки",
	"notification_visibility": "Показывать уведомления",
	"notification_visibility_follows": "Подписки",
	"notification_visibility_likes": "Лайки",
	"notification_visibility_mentions": "Упоминания",
	"notification_visibility_repeats": "Повторы",
	"no_rich_text_description": "Убрать форматирование из всех постов",
	"hide_follows_description": "Не показывать кого я читаю",
	"hide_followers_description": "Не показывать кто читает меня",
	"hide_follows_count_description": "Не показывать число читаемых пользователей",
	"hide_followers_count_description": "Не показывать число моих подписчиков",
	"show_admin_badge": "Показывать значок администратора в моем профиле",
	"show_moderator_badge": "Показывать значок модератора в моем профиле",
	"nsfw_clickthrough": "Включить скрытие NSFW вложений",
	"oauth_tokens": "OAuth токены",
	"token": "Токен",
	"refresh_token": "Рефреш токен",
	"valid_until": "Годен до",
	"revoke_token": "Удалить",
	"panelRadius": "Панели",
	"pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе",
	"presets": "Пресеты",
	"profile_background": "Фон профиля",
	"profile_banner": "Баннер профиля",
	"profile_tab": "Профиль",
	"radii_help": "Скругление углов элементов интерфейса (в пикселях)",
	"replies_in_timeline": "Ответы в ленте",
	"reply_link_preview": "Включить предварительный просмотр ответа при наведении мыши",
	"reply_visibility_all": "Показывать все ответы",
	"reply_visibility_following": "Показывать только ответы мне и тех на кого я подписан",
	"reply_visibility_self": "Показывать только ответы мне",
	"autohide_floating_post_button": "Автоматически скрывать кнопку постинга (в мобильной версии)",
	"saving_err": "Не удалось сохранить настройки",
	"saving_ok": "Сохранено",
	"security_tab": "Безопасность",
	"scope_copy": "Копировать видимость поста при ответе (всегда включено для Личных Сообщений)",
	"minimal_scopes_mode": "Минимизировать набор опций видимости поста",
	"set_new_avatar": "Загрузить новый аватар",
	"set_new_profile_background": "Загрузить новый фон профиля",
	"set_new_profile_banner": "Загрузить новый баннер профиля",
	"settings": "Настройки",
	"subject_input_always_show": "Всегда показывать поле ввода темы",
	"stop_gifs": "Проигрывать GIF анимации только при наведении",
	"streaming": "Включить автоматическую загрузку новых сообщений при прокрутке вверх",
	"text": "Текст",
	"theme": "Тема",
	"theme_help": "Используйте шестнадцатеричные коды цветов (#rrggbb) для настройки темы.",
	"theme_help_v2_1": "Вы так же можете перепоределить цвета определенных компонентов нажав соотв. галочку. Используйте кнопку \"Очистить всё\" чтобы снять все переопределения",
	"theme_help_v2_2": "Под некоторыми полями ввода это идикаторы контрастности, наведите на них мышью чтобы узнать больше. Приспользовании прозрачности контраст расчитывается для наихудшего варианта.",
	"tooltipRadius": "Всплывающие подсказки/уведомления",
	"user_settings": "Настройки пользователя",
	"values": {
	"false": "нет",
	"true": "да"
	},
	"style": {
	"switcher": {
	"keep_color": "Оставить цвета",
	"keep_shadows": "Оставить тени",
	"keep_opacity": "Оставить прозрачность",
	"keep_roundness": "Оставить скругление",
	"keep_fonts": "Оставить шрифты",
	"save_load_hint": "Опции \"оставить...\" позволяют сохранить текущие настройки при выборе другой темы или импорта её из файла. Так же они влияют на то какие компоненты будут сохранены при экспорте темы. Когда все галочки сняты все компоненты будут экспортированы.",
	"reset": "Сбросить",
	"clear_all": "Очистить всё",
	"clear_opacity": "Очистить прозрачность"
	},
	"common": {
	"color": "Цвет",
	"opacity": "Прозрачность",
	"contrast": {
	"hint": "Уровень контраста: {ratio}, что {level} {context}",
	"level": {
	"aa": "соответствует гайдлайну Level AA (минимальный)",
	"aaa": "соответствует гайдлайну Level AAA (рекомендуемый)",
	"bad": "не соответствует каким либо гайдлайнам"
	},
	"context": {
	"18pt": "для крупного (18pt+) текста",
	"text": "для текста"
	}
	}
	},
	"common_colors": {
	"_tab_label": "Общие",
	"main": "Общие цвета",
	"foreground_hint": "См. вкладку \"Дополнительно\" для более детального контроля",
	"rgbo": "Иконки, акценты, ярылки"
	},
	"advanced_colors": {
	"_tab_label": "Дополнительно",
	"alert": "Фон уведомлений",
	"alert_error": "Ошибки",
	"badge": "Фон значков",
	"badge_notification": "Уведомления",
	"panel_header": "Заголовок панели",
	"top_bar": "Верняя полоска",
	"borders": "Границы",
	"buttons": "Кнопки",
	"inputs": "Поля ввода",
	"faint_text": "Маловажный текст"
	},
	"radii": {
	"_tab_label": "Скругление"
	},
	"shadows": {
	"_tab_label": "Светотень",
	"component": "Компонент",
	"override": "Переопределить",
	"shadow_id": "Тень №{value}",
	"blur": "Размытие",
	"spread": "Разброс",
	"inset": "Внутренняя",
	"hint": "Для теней вы так же можете использовать --variable в качестве цвета чтобы использовать CSS3-переменные. В таком случае прозрачность работать не будет.",
	"filter_hint": {
	"always_drop_shadow": "Внимание, эта тень всегда использует {0} когда браузер поддерживает это",
	"drop_shadow_syntax": "{0} не поддерживает параметр {1} и ключевое слово {2}",
	"avatar_inset": "Одновременное использование внутренних и внешних теней на (прозрачных) аватарках может дать не те результаты что вы ожидаете",
	"spread_zero": "Тени с разбросом > 0 будут выглядеть как если бы разброс установлен в 0",
	"inset_classic": "Внутренние тени будут использовать {0}"
	},
	"components": {
	"panel": "Панель",
	"panelHeader": "Заголовок панели",
	"topBar": "Верхняя полоска",
	"avatar": "Аватарка (профиль)",
	"avatarStatus": "Аватарка (в ленте)",
	"popup": "Всплывающие подсказки",
	"button": "Кнопки",
	"buttonHover": "Кнопки (наведен курсор)",
	"buttonPressed": "Кнопки (нажата)",
	"buttonPressedHover": "Кнопки (нажата+наведен курсор)",
	"input": "Поля ввода"
	}
	},
	"fonts": {
	"_tab_label": "Шрифты",
	"help": "Выберите тип шрифта для использования в интерфейсе. При выборе варианта \"другой\" надо ввести название шрифта в точности как он называется в системе.",
	"components": {
	"interface": "Интерфейс",
	"input": "Поля ввода",
	"post": "Текст постов",
	"postCode": "Моноширинный текст в посте (форматирование)"
	},
	"family": "Шрифт",
	"size": "Размер (в пикселях)",
	"weight": "Ширина",
	"custom": "Другой"
	},
	"preview": {
	"header": "Пример",
	"content": "Контент",
	"error": "Ошибка стоп 000",
	"button": "Кнопка",
	"text": "Еще немного {0} и масенькая {1}",
	"mono": "контента",
	"input": "Что нового?",
	"faint_link": "Его придется убрать",
	"fine_print": "Если проблемы остались — ваш гуртовщик мыши плохо стоит. {0}.",
	"header_faint": "Все идет по плану",
	"checkbox": "Я подтверждаю что не было ни единого разрыва",
	"link": "ссылка"
	}
	}
	},
	"timeline": {
	"collapse": "Свернуть",
	"conversation": "Разговор",
	"error_fetching": "Ошибка при обновлении",
	"load_older": "Загрузить старые статусы",
	"no_retweet_hint": "Пост помечен как \"только для подписчиков\" или \"личное\" и поэтому не может быть повторён",
	"repeated": "повторил(а)",
	"show_new": "Показать новые",
	"up_to_date": "Обновлено"
	},
	"user_card": {
	"block": "Заблокировать",
	"blocked": "Заблокирован",
	"favorites": "Понравившиеся",
	"follow": "Читать",
	"follow_sent": "Запрос отправлен!",
	"follow_progress": "Запрашиваем…",
	"follow_again": "Запросить еще заново?",
	"follow_unfollow": "Перестать читать",
	"followees": "Читаемые",
	"followers": "Читатели",
	"following": "Читаю",
	"follows_you": "Читает вас",
	"mute": "Игнорировать",
	"muted": "Игнорирую",
	"per_day": "в день",
	"remote_follow": "Читать удалённо",
	"statuses": "Статусы",
	"admin_menu": {
	"moderation": "Опции модератора",
	"grant_admin": "Сделать администратором",
	"revoke_admin": "Забрать права администратора",
	"grant_moderator": "Сделать модератором",
	"revoke_moderator": "Забрать права модератора",
	"activate_account": "Активировать аккаунт",
	"deactivate_account": "Деактивировать аккаунт",
	"delete_account": "Удалить аккаунт",
	"force_nsfw": "Отмечать посты пользователя как NSFW",
	"strip_media": "Убирать вложения из постов пользователя",
	"force_unlisted": "Не добавлять посты в публичные ленты",
	"sandbox": "Посты доступны только для подписчиков",
	"disable_remote_subscription": "Запретить подписываться с удаленных серверов",
	"disable_any_subscription": "Запретить подписываться на пользователя",
	"quarantine": "Не федерировать посты пользователя",
	"delete_user": "Удалить пользователя",
	"delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
	}
	},
	"user_profile": {
	"timeline_title": "Лента пользователя"
	},
	"search": {
	"people": "Люди",
	"hashtags": "Хэштэги",
	"person_talking": "Популярно у {count} человека",
	"people_talking": "Популярно у {count} человек",
	"no_results": "Ничего не найдено"
	},
	"password_reset": {
	"forgot_password": "Забыли пароль?",
	"password_reset": "Сброс пароля",
	"instruction": "Введите ваш email или имя пользователя, и мы отправим вам ссылку для сброса пароля.",
	"placeholder": "Ваш email или имя пользователя",
	"check_email": "Проверьте ваш email и перейдите по ссылке для сброса пароля.",
	"return_home": "Вернуться на главную страницу",
	"not_found": "Мы не смогли найти аккаунт с таким email-ом или именем пользователя.",
	"too_many_requests": "Вы исчерпали допустимое количество попыток, попробуйте позже.",
	"password_reset_disabled": "Сброс пароля отключен. Cвяжитесь с администратором вашего сервера."
	}
	}
	diff --git a/src/modules/api.js b/src/modules/api.js
	index eb6a798093..1293e3c841 100644
	--- a/src/modules/api.js
	+++ b/src/modules/api.js
	@@ -1,76 +1,83 @@
	import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
	import { Socket } from 'phoenix'

	const api = {
	state: {
	backendInteractor: backendInteractorService(),
	fetchers: {},
	socket: null,
	followRequests: []
	},
	mutations: {
	setBackendInteractor (state, backendInteractor) {
	state.backendInteractor = backendInteractor
	},
	addFetcher (state, { fetcherName, fetcher }) {
	state.fetchers[fetcherName] = fetcher
	},
	removeFetcher (state, { fetcherName }) {
	delete state.fetchers[fetcherName]
	},
	setWsToken (state, token) {
	state.wsToken = token
	},
	setSocket (state, socket) {
	state.socket = socket
	},
	setFollowRequests (state, value) {
	state.followRequests = value
	}
	},
	actions: {
	startFetchingTimeline (store, { timeline = 'friends', tag = false, userId = false }) {
	// Don't start fetching if we already are.
	if (store.state.fetchers[timeline]) return

	const fetcher = store.state.backendInteractor.startFetchingTimeline({ timeline, store, userId, tag })
	store.commit('addFetcher', { fetcherName: timeline, fetcher })
	},
	startFetchingNotifications (store) {
	// Don't start fetching if we already are.
	if (store.state.fetchers['notifications']) return

	const fetcher = store.state.backendInteractor.startFetchingNotifications({ store })
	store.commit('addFetcher', { fetcherName: 'notifications', fetcher })
	},
	+ startFetchingFollowRequest (store) {
	+ // Don't start fetching if we already are.
	+ if (store.state.fetchers['followRequest']) return
	+
	+ const fetcher = store.state.backendInteractor.startFetchingFollowRequest({ store })
	+ store.commit('addFetcher', { fetcherName: 'followRequest', fetcher })
	+ },
	stopFetching (store, fetcherName) {
	const fetcher = store.state.fetchers[fetcherName]
	window.clearInterval(fetcher)
	store.commit('removeFetcher', { fetcherName })
	},
	setWsToken (store, token) {
	store.commit('setWsToken', token)
	},
	initializeSocket ({ dispatch, commit, state, rootState }) {
	// Set up websocket connection
	const token = state.wsToken
	if (rootState.instance.chatAvailable && typeof token !== 'undefined' && state.socket === null) {
	const socket = new Socket('/socket', { params: { token } })
	socket.connect()

	commit('setSocket', socket)
	dispatch('initializeChat', socket)
	}
	},
	disconnectFromSocket ({ commit, state }) {
	state.socket && state.socket.disconnect()
	commit('setSocket', null)
	},
	removeFollowRequest (store, request) {
	let requests = store.state.followRequests.filter((it) => it !== request)
	store.commit('setFollowRequests', requests)
	}
	}
	}

	export default api
	diff --git a/src/modules/config.js b/src/modules/config.js
	index d4819ee8ba..329b4091cb 100644
	--- a/src/modules/config.js
	+++ b/src/modules/config.js
	@@ -1,103 +1,104 @@
	import { set, delete as del } from 'vue'
	import { setPreset, applyTheme } from '../services/style_setter/style_setter.js'

	const browserLocale = (window.navigator.language \|\| 'en').split('-')[0]

	export const defaultState = {
	colors: {},
	hideISP: false,
	// bad name: actually hides posts of muted USERS
	hideMutedPosts: undefined, // instance default
	collapseMessageWithSubject: undefined, // instance default
	padEmoji: true,
	hideAttachments: false,
	hideAttachmentsInConv: false,
	maxThumbnails: 16,
	hideNsfw: true,
	preloadImage: true,
	loopVideo: true,
	loopVideoSilentOnly: true,
	autoLoad: true,
	streaming: false,
	hoverPreview: true,
	autohideFloatingPostButton: false,
	pauseOnUnfocused: true,
	stopGifs: false,
	replyVisibility: 'all',
	notificationVisibility: {
	follows: true,
	mentions: true,
	likes: true,
	repeats: true
	},
	webPushNotifications: false,
	muteWords: [],
	highlight: {},
	interfaceLanguage: browserLocale,
	hideScopeNotice: false,
	scopeCopy: undefined, // instance default
	subjectLineBehavior: undefined, // instance default
	alwaysShowSubjectInput: undefined, // instance default
	postContentType: undefined, // instance default
	minimalScopesMode: undefined, // instance default
	// This hides statuses filtered via a word filter
	hideFilteredStatuses: undefined, // instance default
	playVideosInModal: false,
	useOneClickNsfw: false,
	useContainFit: false,
	+ greentext: undefined, // instance default
	hidePostStats: undefined, // instance default
	hideUserStats: undefined // instance default
	}

	// caching the instance default properties
	export const instanceDefaultProperties = Object.entries(defaultState)
	.filter(([key, value]) => value === undefined)
	.map(([key, value]) => key)

	const config = {
	state: defaultState,
	getters: {
	mergedConfig (state, getters, rootState, rootGetters) {
	const { instance } = rootState
	return {
	...state,
	...instanceDefaultProperties
	.map(key => [key, state[key] === undefined
	? instance[key]
	: state[key]
	])
	.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
	}
	}
	},
	mutations: {
	setOption (state, { name, value }) {
	set(state, name, value)
	},
	setHighlight (state, { user, color, type }) {
	const data = this.state.config.highlight[user]
	if (color \|\| type) {
	set(state.highlight, user, { color: color \|\| data.color, type: type \|\| data.type })
	} else {
	del(state.highlight, user)
	}
	}
	},
	actions: {
	setHighlight ({ commit, dispatch }, { user, color, type }) {
	commit('setHighlight', { user, color, type })
	},
	setOption ({ commit, dispatch }, { name, value }) {
	commit('setOption', { name, value })
	switch (name) {
	case 'theme':
	setPreset(value, commit)
	break
	case 'customTheme':
	applyTheme(value, commit)
	}
	}
	}
	}

	export default config
	diff --git a/src/modules/instance.js b/src/modules/instance.js
	index 7b0e0da4da..96f14ed5da 100644
	--- a/src/modules/instance.js
	+++ b/src/modules/instance.js
	@@ -1,165 +1,166 @@
	import { set } from 'vue'
	import { setPreset } from '../services/style_setter/style_setter.js'
	import { instanceDefaultProperties } from './config.js'

	const defaultState = {
	// Stuff from static/config.json and apiConfig
	name: 'Pleroma FE',
	registrationOpen: true,
	safeDM: 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,
	alwaysShowSubjectInput: true,
	hideMutedPosts: false,
	collapseMessageWithSubject: false,
	hidePostStats: false,
	hideUserStats: false,
	hideFilteredStatuses: false,
	disableChat: false,
	scopeCopy: true,
	subjectLineBehavior: 'email',
	postContentType: 'text/plain',
	nsfwCensorImage: undefined,
	vapidPublicKey: undefined,
	noAttachmentLinks: false,
	showFeaturesPanel: true,
	minimalScopesMode: false,
	+ greentext: false,

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

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

	// Html stuff
	instanceSpecificPanelContent: '',
	tos: '',

	// Version Information
	backendVersion: '',
	frontendVersion: '',

	pollsAvailable: false,
	pollLimits: {
	max_options: 4,
	max_option_chars: 255,
	min_expiration: 60,
	max_expiration: 60 * 60 * 24
	}
	}

	const instance = {
	state: defaultState,
	mutations: {
	setInstanceOption (state, { name, value }) {
	if (typeof value !== 'undefined') {
	set(state, name, value)
	}
	}
	},
	getters: {
	instanceDefaultConfig (state) {
	return instanceDefaultProperties
	.map(key => [key, state[key]])
	.reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {})
	}
	},
	actions: {
	setInstanceOption ({ commit, dispatch }, { name, value }) {
	commit('setInstanceOption', { name, value })
	switch (name) {
	case 'name':
	dispatch('setPageTitle')
	break
	case 'chatAvailable':
	if (value) {
	dispatch('initializeSocket')
	}
	break
	}
	},
	async getStaticEmoji ({ commit }) {
	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 {
	displayText: key,
	imageUrl: false,
	replacement: values[key]
	}
	}).sort((a, b) => a.displayText - b.displayText)
	commit('setInstanceOption', { name: 'emoji', value: emoji })
	} else {
	throw (res)
	}
	} catch (e) {
	console.warn("Can't load static emoji")
	console.warn(e)
	}
	},

	async getCustomEmoji ({ commit, state }) {
	try {
	const res = await window.fetch('/api/pleroma/emoji.json')
	if (res.ok) {
	const result = await res.json()
	const values = Array.isArray(result) ? Object.assign({}, ...result) : result
	const emoji = Object.entries(values).map(([key, value]) => {
	const imageUrl = value.image_url
	return {
	displayText: key,
	imageUrl: imageUrl ? state.server + imageUrl : value,
	tags: imageUrl ? value.tags.sort((a, b) => a > b ? 1 : 0) : ['utf'],
	replacement: `:${key}: `
	}
	// Technically could use tags but those are kinda useless right now,
	// should have been "pack" field, that would be more useful
	}).sort((a, b) => a.displayText.toLowerCase() > b.displayText.toLowerCase() ? 1 : 0)
	commit('setInstanceOption', { name: 'customEmoji', value: emoji })
	} else {
	throw (res)
	}
	} catch (e) {
	console.warn("Can't load custom emojis")
	console.warn(e)
	}
	},

	setTheme ({ commit }, themeName) {
	commit('setInstanceOption', { name: 'theme', value: themeName })
	return setPreset(themeName, commit)
	},
	fetchEmoji ({ dispatch, state }) {
	if (!state.customEmojiFetched) {
	state.customEmojiFetched = true
	dispatch('getCustomEmoji')
	}
	if (!state.emojiFetched) {
	state.emojiFetched = true
	dispatch('getStaticEmoji')
	}
	}
	}
	}

	export default instance
	diff --git a/src/modules/users.js b/src/modules/users.js
	index 1c9ff5e879..14b2d8b53d 100644
	--- a/src/modules/users.js
	+++ b/src/modules/users.js
	@@ -1,506 +1,507 @@
	import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
	import oauthApi from '../services/new_api/oauth.js'
	import { compact, map, each, merge, last, concat, uniq } from 'lodash'
	import { set } from 'vue'
	import { registerPushNotifications, unregisterPushNotifications } from '../services/push/push.js'

	// TODO: Unify with mergeOrAdd in statuses.js
	export const mergeOrAdd = (arr, obj, item) => {
	if (!item) { return false }
	const oldItem = obj[item.id]
	if (oldItem) {
	// We already have this, so only merge the new info.
	merge(oldItem, item)
	return { item: oldItem, new: false }
	} else {
	// This is a new item, prepare it
	arr.push(item)
	set(obj, item.id, item)
	if (item.screen_name && !item.screen_name.includes('@')) {
	set(obj, item.screen_name.toLowerCase(), item)
	}
	return { item, new: true }
	}
	}

	const getNotificationPermission = () => {
	const Notification = window.Notification

	if (!Notification) return Promise.resolve(null)
	if (Notification.permission === 'default') return Notification.requestPermission()
	return Promise.resolve(Notification.permission)
	}

	const blockUser = (store, id) => {
	return store.rootState.api.backendInteractor.blockUser(id)
	.then((relationship) => {
	store.commit('updateUserRelationship', [relationship])
	store.commit('addBlockId', id)
	store.commit('removeStatus', { timeline: 'friends', userId: id })
	store.commit('removeStatus', { timeline: 'public', userId: id })
	store.commit('removeStatus', { timeline: 'publicAndExternal', userId: id })
	})
	}

	const unblockUser = (store, id) => {
	return store.rootState.api.backendInteractor.unblockUser(id)
	.then((relationship) => store.commit('updateUserRelationship', [relationship]))
	}

	const muteUser = (store, id) => {
	return store.rootState.api.backendInteractor.muteUser(id)
	.then((relationship) => {
	store.commit('updateUserRelationship', [relationship])
	store.commit('addMuteId', id)
	})
	}

	const unmuteUser = (store, id) => {
	return store.rootState.api.backendInteractor.unmuteUser(id)
	.then((relationship) => store.commit('updateUserRelationship', [relationship]))
	}

	const hideReblogs = (store, userId) => {
	return store.rootState.api.backendInteractor.followUser({ id: userId, reblogs: false })
	.then((relationship) => {
	store.commit('updateUserRelationship', [relationship])
	})
	}

	const showReblogs = (store, userId) => {
	return store.rootState.api.backendInteractor.followUser({ id: userId, reblogs: true })
	.then((relationship) => store.commit('updateUserRelationship', [relationship]))
	}

	export const mutations = {
	setMuted (state, { user: { id }, muted }) {
	const user = state.usersObject[id]
	set(user, 'muted', muted)
	},
	tagUser (state, { user: { id }, tag }) {
	const user = state.usersObject[id]
	const tags = user.tags \|\| []
	const newTags = tags.concat([tag])
	set(user, 'tags', newTags)
	},
	untagUser (state, { user: { id }, tag }) {
	const user = state.usersObject[id]
	const tags = user.tags \|\| []
	const newTags = tags.filter(t => t !== tag)
	set(user, 'tags', newTags)
	},
	updateRight (state, { user: { id }, right, value }) {
	const user = state.usersObject[id]
	let newRights = user.rights
	newRights[right] = value
	set(user, 'rights', newRights)
	},
	updateActivationStatus (state, { user: { id }, status }) {
	const user = state.usersObject[id]
	set(user, 'deactivated', !status)
	},
	setCurrentUser (state, user) {
	state.lastLoginName = user.screen_name
	state.currentUser = merge(state.currentUser \|\| {}, user)
	},
	clearCurrentUser (state) {
	state.currentUser = false
	state.lastLoginName = false
	},
	beginLogin (state) {
	state.loggingIn = true
	},
	endLogin (state) {
	state.loggingIn = false
	},
	saveFriendIds (state, { id, friendIds }) {
	const user = state.usersObject[id]
	user.friendIds = uniq(concat(user.friendIds, friendIds))
	},
	saveFollowerIds (state, { id, followerIds }) {
	const user = state.usersObject[id]
	user.followerIds = uniq(concat(user.followerIds, followerIds))
	},
	// Because frontend doesn't have a reason to keep these stuff in memory
	// outside of viewing someones user profile.
	clearFriends (state, userId) {
	const user = state.usersObject[userId]
	if (user) {
	set(user, 'friendIds', [])
	}
	},
	clearFollowers (state, userId) {
	const user = state.usersObject[userId]
	if (user) {
	set(user, 'followerIds', [])
	}
	},
	addNewUsers (state, users) {
	each(users, (user) => mergeOrAdd(state.users, state.usersObject, user))
	},
	updateUserRelationship (state, relationships) {
	relationships.forEach((relationship) => {
	const user = state.usersObject[relationship.id]
	if (user) {
	user.follows_you = relationship.followed_by
	user.following = relationship.following
	user.muted = relationship.muting
	user.statusnet_blocking = relationship.blocking
	user.subscribed = relationship.subscribing
	user.showing_reblogs = relationship.showing_reblogs
	}
	})
	},
	updateBlocks (state, blockedUsers) {
	// Reset statusnet_blocking of all fetched users
	each(state.users, (user) => { user.statusnet_blocking = false })
	each(blockedUsers, (user) => mergeOrAdd(state.users, state.usersObject, user))
	},
	saveBlockIds (state, blockIds) {
	state.currentUser.blockIds = blockIds
	},
	addBlockId (state, blockId) {
	if (state.currentUser.blockIds.indexOf(blockId) === -1) {
	state.currentUser.blockIds.push(blockId)
	}
	},
	updateMutes (state, mutedUsers) {
	// Reset muted of all fetched users
	each(state.users, (user) => { user.muted = false })
	each(mutedUsers, (user) => mergeOrAdd(state.users, state.usersObject, user))
	},
	saveMuteIds (state, muteIds) {
	state.currentUser.muteIds = muteIds
	},
	addMuteId (state, muteId) {
	if (state.currentUser.muteIds.indexOf(muteId) === -1) {
	state.currentUser.muteIds.push(muteId)
	}
	},
	setPinnedToUser (state, status) {
	const user = state.usersObject[status.user.id]
	const index = user.pinnedStatusIds.indexOf(status.id)
	if (status.pinned && index === -1) {
	user.pinnedStatusIds.push(status.id)
	} else if (!status.pinned && index !== -1) {
	user.pinnedStatusIds.splice(index, 1)
	}
	},
	setUserForStatus (state, status) {
	status.user = state.usersObject[status.user.id]
	},
	setUserForNotification (state, notification) {
	if (notification.type !== 'follow') {
	notification.action.user = state.usersObject[notification.action.user.id]
	}
	notification.from_profile = state.usersObject[notification.from_profile.id]
	},
	setColor (state, { user: { id }, highlighted }) {
	const user = state.usersObject[id]
	set(user, 'highlight', highlighted)
	},
	signUpPending (state) {
	state.signUpPending = true
	state.signUpErrors = []
	},
	signUpSuccess (state) {
	state.signUpPending = false
	},
	signUpFailure (state, errors) {
	state.signUpPending = false
	state.signUpErrors = errors
	}
	}

	export const getters = {
	findUser: state => query => {
	const result = state.usersObject[query]
	// In case it's a screen_name, we can try searching case-insensitive
	if (!result && typeof query === 'string') {
	return state.usersObject[query.toLowerCase()]
	}
	return result
	}
	}

	export const defaultState = {
	loggingIn: false,
	lastLoginName: false,
	currentUser: false,
	users: [],
	usersObject: {},
	signUpPending: false,
	signUpErrors: []
	}

	const users = {
	state: defaultState,
	mutations,
	getters,
	actions: {
	fetchUser (store, id) {
	return store.rootState.api.backendInteractor.fetchUser({ id })
	.then((user) => {
	store.commit('addNewUsers', [user])
	return user
	})
	},
	fetchUserRelationship (store, id) {
	if (store.state.currentUser) {
	store.rootState.api.backendInteractor.fetchUserRelationship({ id })
	.then((relationships) => store.commit('updateUserRelationship', relationships))
	}
	},
	fetchBlocks (store) {
	return store.rootState.api.backendInteractor.fetchBlocks()
	.then((blocks) => {
	store.commit('saveBlockIds', map(blocks, 'id'))
	store.commit('updateBlocks', blocks)
	return blocks
	})
	},
	blockUser (store, id) {
	return blockUser(store, id)
	},
	unblockUser (store, id) {
	return unblockUser(store, id)
	},
	blockUsers (store, ids = []) {
	return Promise.all(ids.map(id => blockUser(store, id)))
	},
	unblockUsers (store, ids = []) {
	return Promise.all(ids.map(id => unblockUser(store, id)))
	},
	fetchMutes (store) {
	return store.rootState.api.backendInteractor.fetchMutes()
	.then((mutes) => {
	store.commit('updateMutes', mutes)
	store.commit('saveMuteIds', map(mutes, 'id'))
	return mutes
	})
	},
	muteUser (store, id) {
	return muteUser(store, id)
	},
	unmuteUser (store, id) {
	return unmuteUser(store, id)
	},
	hideReblogs (store, id) {
	return hideReblogs(store, id)
	},
	showReblogs (store, id) {
	return showReblogs(store, id)
	},
	muteUsers (store, ids = []) {
	return Promise.all(ids.map(id => muteUser(store, id)))
	},
	unmuteUsers (store, ids = []) {
	return Promise.all(ids.map(id => unmuteUser(store, id)))
	},
	fetchFriends ({ rootState, commit }, id) {
	const user = rootState.users.usersObject[id]
	const maxId = last(user.friendIds)
	return rootState.api.backendInteractor.fetchFriends({ id, maxId })
	.then((friends) => {
	commit('addNewUsers', friends)
	commit('saveFriendIds', { id, friendIds: map(friends, 'id') })
	return friends
	})
	},
	fetchFollowers ({ rootState, commit }, id) {
	const user = rootState.users.usersObject[id]
	const maxId = last(user.followerIds)
	return rootState.api.backendInteractor.fetchFollowers({ id, maxId })
	.then((followers) => {
	commit('addNewUsers', followers)
	commit('saveFollowerIds', { id, followerIds: map(followers, 'id') })
	return followers
	})
	},
	clearFriends ({ commit }, userId) {
	commit('clearFriends', userId)
	},
	clearFollowers ({ commit }, userId) {
	commit('clearFollowers', userId)
	},
	subscribeUser ({ rootState, commit }, id) {
	return rootState.api.backendInteractor.subscribeUser(id)
	.then((relationship) => commit('updateUserRelationship', [relationship]))
	},
	unsubscribeUser ({ rootState, commit }, id) {
	return rootState.api.backendInteractor.unsubscribeUser(id)
	.then((relationship) => commit('updateUserRelationship', [relationship]))
	},
	registerPushNotifications (store) {
	const token = store.state.currentUser.credentials
	const vapidPublicKey = store.rootState.instance.vapidPublicKey
	const isEnabled = store.rootState.config.webPushNotifications
	const notificationVisibility = store.rootState.config.notificationVisibility

	registerPushNotifications(isEnabled, vapidPublicKey, token, notificationVisibility)
	},
	unregisterPushNotifications (store) {
	const token = store.state.currentUser.credentials

	unregisterPushNotifications(token)
	},
	addNewUsers ({ commit }, users) {
	commit('addNewUsers', users)
	},
	addNewStatuses (store, { statuses }) {
	const users = map(statuses, 'user')
	const retweetedUsers = compact(map(statuses, 'retweeted_status.user'))
	store.commit('addNewUsers', users)
	store.commit('addNewUsers', retweetedUsers)

	each(statuses, (status) => {
	// Reconnect users to statuses
	store.commit('setUserForStatus', status)
	// Set pinned statuses to user
	store.commit('setPinnedToUser', status)
	})
	each(compact(map(statuses, 'retweeted_status')), (status) => {
	// Reconnect users to retweets
	store.commit('setUserForStatus', status)
	// Set pinned retweets to user
	store.commit('setPinnedToUser', status)
	})
	},
	addNewNotifications (store, { notifications }) {
	const users = map(notifications, 'from_profile')
	const notificationIds = notifications.map(_ => _.id)
	store.commit('addNewUsers', users)

	const notificationsObject = store.rootState.statuses.notifications.idStore
	const relevantNotifications = Object.entries(notificationsObject)
	.filter(([k, val]) => notificationIds.includes(k))
	.map(([k, val]) => val)

	// Reconnect users to notifications
	each(relevantNotifications, (notification) => {
	store.commit('setUserForNotification', notification)
	})
	},
	searchUsers (store, query) {
	return store.rootState.api.backendInteractor.searchUsers(query)
	.then((users) => {
	store.commit('addNewUsers', users)
	return users
	})
	},
	async signUp (store, userInfo) {
	store.commit('signUpPending')

	let rootState = store.rootState

	try {
	let data = await rootState.api.backendInteractor.register(userInfo)
	store.commit('signUpSuccess')
	store.commit('setToken', data.access_token)
	store.dispatch('loginUser', data.access_token)
	} catch (e) {
	let errors = e.message
	store.commit('signUpFailure', errors)
	throw e
	}
	},
	async getCaptcha (store) {
	return store.rootState.api.backendInteractor.getCaptcha()
	},

	logout (store) {
	const { oauth, instance } = store.rootState

	const data = {
	...oauth,
	commit: store.commit,
	instance: instance.server
	}

	return oauthApi.getOrCreateApp(data)
	.then((app) => {
	const params = {
	app,
	instance: data.instance,
	token: oauth.userToken
	}

	return oauthApi.revokeToken(params)
	})
	.then(() => {
	store.commit('clearCurrentUser')
	store.dispatch('disconnectFromSocket')
	store.commit('clearToken')
	store.dispatch('stopFetching', 'friends')
	store.commit('setBackendInteractor', backendInteractorService(store.getters.getToken()))
	store.dispatch('stopFetching', 'notifications')
	+ store.dispatch('stopFetching', 'followRequest')
	store.commit('clearNotifications')
	store.commit('resetStatuses')
	})
	},
	loginUser (store, accessToken) {
	return new Promise((resolve, reject) => {
	const commit = store.commit
	commit('beginLogin')
	store.rootState.api.backendInteractor.verifyCredentials(accessToken)
	.then((data) => {
	if (!data.error) {
	const user = data
	// user.credentials = userCredentials
	user.credentials = accessToken
	user.blockIds = []
	user.muteIds = []
	commit('setCurrentUser', user)
	commit('addNewUsers', [user])

	store.dispatch('fetchEmoji')

	getNotificationPermission()
	.then(permission => commit('setNotificationPermission', permission))

	// Set our new backend interactor
	commit('setBackendInteractor', backendInteractorService(accessToken))

	if (user.token) {
	store.dispatch('setWsToken', user.token)

	// Initialize the chat socket.
	store.dispatch('initializeSocket')
	}

	// Start getting fresh posts.
	store.dispatch('startFetchingTimeline', { timeline: 'friends' })

	// Start fetching notifications
	store.dispatch('startFetchingNotifications')

	// Get user mutes
	store.dispatch('fetchMutes')

	// Fetch our friends
	store.rootState.api.backendInteractor.fetchFriends({ id: user.id })
	.then((friends) => commit('addNewUsers', friends))
	} else {
	const response = data.error
	// Authentication failed
	commit('endLogin')
	if (response.status === 401) {
	reject(new Error('Wrong username or password'))
	} else {
	reject(new Error('An error occurred, please try again'))
	}
	}
	commit('endLogin')
	resolve()
	})
	.catch((error) => {
	console.log(error)
	commit('endLogin')
	reject(new Error('Failed to connect to server, try again'))
	})
	})
	}
	}
	}

	export default users
	diff --git a/src/services/backend_interactor_service/backend_interactor_service.js b/src/services/backend_interactor_service/backend_interactor_service.js
	index d6617276d9..c16bd1f1aa 100644
	--- a/src/services/backend_interactor_service/backend_interactor_service.js
	+++ b/src/services/backend_interactor_service/backend_interactor_service.js
	@@ -1,226 +1,230 @@
	import apiService from '../api/api.service.js'
	import timelineFetcherService from '../timeline_fetcher/timeline_fetcher.service.js'
	import notificationsFetcher from '../notifications_fetcher/notifications_fetcher.service.js'
	+import followRequestFetcher from '../../services/follow_request_fetcher/follow_request_fetcher.service'

	const backendInteractorService = credentials => {
	const fetchStatus = ({ id }) => {
	return apiService.fetchStatus({ id, credentials })
	}

	const fetchConversation = ({ id }) => {
	return apiService.fetchConversation({ id, credentials })
	}

	const fetchFriends = ({ id, maxId, sinceId, limit }) => {
	return apiService.fetchFriends({ id, maxId, sinceId, limit, credentials })
	}

	const exportFriends = ({ id }) => {
	return apiService.exportFriends({ id, credentials })
	}

	const fetchFollowers = ({ id, maxId, sinceId, limit }) => {
	return apiService.fetchFollowers({ id, maxId, sinceId, limit, credentials })
	}

	const fetchUser = ({ id }) => {
	return apiService.fetchUser({ id, credentials })
	}

	const fetchUserRelationship = ({ id }) => {
	return apiService.fetchUserRelationship({ id, credentials })
	}

	const followUser = ({ id, reblogs }) => {
	return apiService.followUser({ credentials, id, reblogs })
	}

	const unfollowUser = (id) => {
	return apiService.unfollowUser({ credentials, id })
	}

	const blockUser = (id) => {
	return apiService.blockUser({ credentials, id })
	}

	const unblockUser = (id) => {
	return apiService.unblockUser({ credentials, id })
	}

	const approveUser = (id) => {
	return apiService.approveUser({ credentials, id })
	}

	const denyUser = (id) => {
	return apiService.denyUser({ credentials, id })
	}

	const startFetchingTimeline = ({ timeline, store, userId = false, tag }) => {
	return timelineFetcherService.startFetching({ timeline, store, credentials, userId, tag })
	}

	const startFetchingNotifications = ({ store }) => {
	return notificationsFetcher.startFetching({ store, credentials })
	}

	+ const startFetchingFollowRequest = ({ store }) => {
	+ return followRequestFetcher.startFetching({ store, credentials })
	+ }
	+
	// eslint-disable-next-line camelcase
	const tagUser = ({ screen_name }, tag) => {
	return apiService.tagUser({ screen_name, tag, credentials })
	}

	// eslint-disable-next-line camelcase
	const untagUser = ({ screen_name }, tag) => {
	return apiService.untagUser({ screen_name, tag, credentials })
	}

	// eslint-disable-next-line camelcase
	const addRight = ({ screen_name }, right) => {
	return apiService.addRight({ screen_name, right, credentials })
	}

	// eslint-disable-next-line camelcase
	const deleteRight = ({ screen_name }, right) => {
	return apiService.deleteRight({ screen_name, right, credentials })
	}

	// eslint-disable-next-line camelcase
	const setActivationStatus = ({ screen_name }, status) => {
	return apiService.setActivationStatus({ screen_name, status, credentials })
	}

	// eslint-disable-next-line camelcase
	const deleteUser = ({ screen_name }) => {
	return apiService.deleteUser({ screen_name, credentials })
	}

	const vote = (pollId, choices) => {
	return apiService.vote({ credentials, pollId, choices })
	}

	const fetchPoll = (pollId) => {
	return apiService.fetchPoll({ credentials, pollId })
	}

	const updateNotificationSettings = ({ settings }) => {
	return apiService.updateNotificationSettings({ credentials, settings })
	}

	const fetchMutes = () => apiService.fetchMutes({ credentials })
	const muteUser = (id) => apiService.muteUser({ credentials, id })
	const unmuteUser = (id) => apiService.unmuteUser({ credentials, id })
	const subscribeUser = (id) => apiService.subscribeUser({ credentials, id })
	const unsubscribeUser = (id) => apiService.unsubscribeUser({ credentials, id })
	const fetchBlocks = () => apiService.fetchBlocks({ credentials })
	- const fetchFollowRequests = () => apiService.fetchFollowRequests({ credentials })
	const fetchOAuthTokens = () => apiService.fetchOAuthTokens({ credentials })
	const revokeOAuthToken = (id) => apiService.revokeOAuthToken({ id, credentials })
	const fetchPinnedStatuses = (id) => apiService.fetchPinnedStatuses({ credentials, id })
	const pinOwnStatus = (id) => apiService.pinOwnStatus({ credentials, id })
	const unpinOwnStatus = (id) => apiService.unpinOwnStatus({ credentials, id })
	const muteConversation = (id) => apiService.muteConversation({ credentials, id })
	const unmuteConversation = (id) => apiService.unmuteConversation({ credentials, id })

	const getCaptcha = () => apiService.getCaptcha()
	const register = (params) => apiService.register({ credentials, params })
	const updateAvatar = ({ avatar }) => apiService.updateAvatar({ credentials, avatar })
	const updateBg = ({ background }) => apiService.updateBg({ credentials, background })
	const updateBanner = ({ banner }) => apiService.updateBanner({ credentials, banner })
	const updateProfile = ({ params }) => apiService.updateProfile({ credentials, params })

	const importBlocks = (file) => apiService.importBlocks({ file, credentials })
	const importFollows = (file) => apiService.importFollows({ file, credentials })

	const deleteAccount = ({ password }) => apiService.deleteAccount({ credentials, password })
	const changeEmail = ({ email, password }) => apiService.changeEmail({ credentials, email, password })
	const changePassword = ({ password, newPassword, newPasswordConfirmation }) =>
	apiService.changePassword({ credentials, password, newPassword, newPasswordConfirmation })

	const fetchSettingsMFA = () => apiService.settingsMFA({ credentials })
	const generateMfaBackupCodes = () => apiService.generateMfaBackupCodes({ credentials })
	const mfaSetupOTP = () => apiService.mfaSetupOTP({ credentials })
	const mfaConfirmOTP = ({ password, token }) => apiService.mfaConfirmOTP({ credentials, password, token })
	const mfaDisableOTP = ({ password }) => apiService.mfaDisableOTP({ credentials, password })

	const fetchFavoritedByUsers = (id) => apiService.fetchFavoritedByUsers({ id })
	const fetchRebloggedByUsers = (id) => apiService.fetchRebloggedByUsers({ id })
	const reportUser = (params) => apiService.reportUser({ credentials, ...params })

	const favorite = (id) => apiService.favorite({ id, credentials })
	const unfavorite = (id) => apiService.unfavorite({ id, credentials })
	const retweet = (id) => apiService.retweet({ id, credentials })
	const unretweet = (id) => apiService.unretweet({ id, credentials })
	const search2 = ({ q, resolve, limit, offset, following }) =>
	apiService.search2({ credentials, q, resolve, limit, offset, following })
	const searchUsers = (query) => apiService.searchUsers({ query, credentials })

	const backendInteractorServiceInstance = {
	fetchStatus,
	fetchConversation,
	fetchFriends,
	exportFriends,
	fetchFollowers,
	followUser,
	unfollowUser,
	blockUser,
	unblockUser,
	fetchUser,
	fetchUserRelationship,
	verifyCredentials: apiService.verifyCredentials,
	startFetchingTimeline,
	startFetchingNotifications,
	+ startFetchingFollowRequest,
	fetchMutes,
	muteUser,
	unmuteUser,
	subscribeUser,
	unsubscribeUser,
	fetchBlocks,
	fetchOAuthTokens,
	revokeOAuthToken,
	fetchPinnedStatuses,
	pinOwnStatus,
	unpinOwnStatus,
	muteConversation,
	unmuteConversation,
	tagUser,
	untagUser,
	addRight,
	deleteRight,
	deleteUser,
	setActivationStatus,
	register,
	getCaptcha,
	updateAvatar,
	updateBg,
	updateBanner,
	updateProfile,
	importBlocks,
	importFollows,
	deleteAccount,
	changeEmail,
	changePassword,
	fetchSettingsMFA,
	generateMfaBackupCodes,
	mfaSetupOTP,
	mfaConfirmOTP,
	mfaDisableOTP,
	- fetchFollowRequests,
	approveUser,
	denyUser,
	vote,
	fetchPoll,
	fetchFavoritedByUsers,
	fetchRebloggedByUsers,
	reportUser,
	favorite,
	unfavorite,
	retweet,
	unretweet,
	updateNotificationSettings,
	search2,
	searchUsers
	}

	return backendInteractorServiceInstance
	}

	export default backendInteractorService
	diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
	index 5f45660d6b..ca79df6f6f 100644
	--- a/src/services/entity_normalizer/entity_normalizer.service.js
	+++ b/src/services/entity_normalizer/entity_normalizer.service.js
	@@ -1,360 +1,369 @@
	const qvitterStatusType = (status) => {
	if (status.is_post_verb) {
	return 'status'
	}

	if (status.retweeted_status) {
	return 'retweet'
	}

	if ((typeof status.uri === 'string' && status.uri.match(/(fave\|objectType=Favourite)/)) \|\|
	(typeof status.text === 'string' && status.text.match(/favorited/))) {
	return 'favorite'
	}

	if (status.text.match(/deleted notice {{tag/) \|\| status.qvitter_delete_notice) {
	return 'deletion'
	}

	if (status.text.match(/started following/) \|\| status.activity_type === 'follow') {
	return 'follow'
	}

	return 'unknown'
	}

	export const parseUser = (data) => {
	const output = {}
	const masto = data.hasOwnProperty('acct')
	// case for users in "mentions" property for statuses in MastoAPI
	const mastoShort = masto && !data.hasOwnProperty('avatar')

	output.id = String(data.id)

	if (masto) {
	output.screen_name = data.acct
	output.statusnet_profile_url = data.url

	// There's nothing else to get
	if (mastoShort) {
	return output
	}

	output.name = data.display_name
	output.name_html = addEmojis(data.display_name, data.emojis)

	output.description = data.note
	output.description_html = addEmojis(data.note, data.emojis)

	+ output.fields = data.fields
	+ output.fields_html = data.fields.map(field => {
	+ return {
	+ name: addEmojis(field.name, data.emojis),
	+ value: addEmojis(field.value, data.emojis)
	+ }
	+ })
	+
	// Utilize avatar_static for gif avatars?
	output.profile_image_url = data.avatar
	output.profile_image_url_original = data.avatar

	// Same, utilize header_static?
	output.cover_photo = data.header

	output.friends_count = data.following_count

	output.bot = data.bot

	if (data.pleroma) {
	const relationship = data.pleroma.relationship

	output.background_image = data.pleroma.background_image
	output.token = data.pleroma.chat_token

	if (relationship) {
	output.follows_you = relationship.followed_by
	output.requested = relationship.requested
	output.following = relationship.following
	output.statusnet_blocking = relationship.blocking
	output.muted = relationship.muting
	output.showing_reblogs = relationship.showing_reblogs
	output.subscribed = relationship.subscribing
	}

	output.hide_follows = data.pleroma.hide_follows
	output.hide_followers = data.pleroma.hide_followers
	output.hide_follows_count = data.pleroma.hide_follows_count
	output.hide_followers_count = data.pleroma.hide_followers_count

	output.rights = {
	moderator: data.pleroma.is_moderator,
	admin: data.pleroma.is_admin
	}
	// TODO: Clean up in UI? This is duplication from what BE does for qvitterapi
	if (output.rights.admin) {
	output.role = 'admin'
	} else if (output.rights.moderator) {
	output.role = 'moderator'
	} else {
	output.role = 'member'
	}
	}

	if (data.source) {
	output.description = data.source.note
	output.default_scope = data.source.privacy
	+ output.fields = data.source.fields
	if (data.source.pleroma) {
	output.no_rich_text = data.source.pleroma.no_rich_text
	output.show_role = data.source.pleroma.show_role
	output.discoverable = data.source.pleroma.discoverable
	}
	}

	// TODO: handle is_local
	output.is_local = !output.screen_name.includes('@')
	} else {
	output.screen_name = data.screen_name

	output.name = data.name
	output.name_html = data.name_html

	output.description = data.description
	output.description_html = data.description_html

	output.profile_image_url = data.profile_image_url
	output.profile_image_url_original = data.profile_image_url_original

	output.cover_photo = data.cover_photo

	output.friends_count = data.friends_count

	// output.bot = ??? missing

	output.statusnet_profile_url = data.statusnet_profile_url

	output.statusnet_blocking = data.statusnet_blocking

	output.is_local = data.is_local
	output.role = data.role
	output.show_role = data.show_role

	output.follows_you = data.follows_you

	output.muted = data.muted

	if (data.rights) {
	output.rights = {
	moderator: data.rights.delete_others_notice,
	admin: data.rights.admin
	}
	}
	output.no_rich_text = data.no_rich_text
	output.default_scope = data.default_scope
	output.hide_follows = data.hide_follows
	output.hide_followers = data.hide_followers
	output.hide_follows_count = data.hide_follows_count
	output.hide_followers_count = data.hide_followers_count
	output.background_image = data.background_image
	// on mastoapi this info is contained in a "relationship"
	output.following = data.following
	// Websocket token
	output.token = data.token
	}

	output.created_at = new Date(data.created_at)
	output.locked = data.locked
	output.followers_count = data.followers_count
	output.statuses_count = data.statuses_count
	output.friendIds = []
	output.followerIds = []
	output.pinnedStatusIds = []

	if (data.pleroma) {
	output.follow_request_count = data.pleroma.follow_request_count

	output.tags = data.pleroma.tags
	output.deactivated = data.pleroma.deactivated

	output.notification_settings = data.pleroma.notification_settings
	}

	output.tags = output.tags \|\| []
	output.rights = output.rights \|\| {}
	output.notification_settings = output.notification_settings \|\| {}

	return output
	}

	export const parseAttachment = (data) => {
	const output = {}
	const masto = !data.hasOwnProperty('oembed')

	if (masto) {
	// Not exactly same...
	output.mimetype = data.pleroma ? data.pleroma.mime_type : data.type
	output.meta = data.meta // not present in BE yet
	output.id = data.id
	} else {
	output.mimetype = data.mimetype
	// output.meta = ??? missing
	}

	output.url = data.url
	output.description = data.description

	return output
	}
	export const addEmojis = (string, emojis) => {
	const matchOperatorsRegex = /[\|\\{}()[\]^$+*?.-]/g
	return emojis.reduce((acc, emoji) => {
	const regexSafeShortCode = emoji.shortcode.replace(matchOperatorsRegex, '\\$&')
	return acc.replace(
	new RegExp(`:${regexSafeShortCode}:`, 'g'),
	`<img src='${emoji.url}' alt='${emoji.shortcode}' title='${emoji.shortcode}' class='emoji' />`
	)
	}, string)
	}

	export const parseStatus = (data) => {
	const output = {}
	const masto = data.hasOwnProperty('account')

	if (masto) {
	output.favorited = data.favourited
	output.fave_num = data.favourites_count

	output.repeated = data.reblogged
	output.repeat_num = data.reblogs_count

	output.type = data.reblog ? 'retweet' : 'status'
	output.nsfw = data.sensitive

	output.statusnet_html = addEmojis(data.content, data.emojis)

	output.tags = data.tags

	if (data.pleroma) {
	const { pleroma } = data
	output.text = pleroma.content ? data.pleroma.content['text/plain'] : data.content
	output.summary = pleroma.spoiler_text ? data.pleroma.spoiler_text['text/plain'] : data.spoiler_text
	output.statusnet_conversation_id = data.pleroma.conversation_id
	output.is_local = pleroma.local
	output.in_reply_to_screen_name = data.pleroma.in_reply_to_account_acct
	output.thread_muted = pleroma.thread_muted
	} else {
	output.text = data.content
	output.summary = data.spoiler_text
	}

	output.in_reply_to_status_id = data.in_reply_to_id
	output.in_reply_to_user_id = data.in_reply_to_account_id
	output.replies_count = data.replies_count

	if (output.type === 'retweet') {
	output.retweeted_status = parseStatus(data.reblog)
	}

	output.summary_html = addEmojis(data.spoiler_text, data.emojis)
	output.external_url = data.url
	output.poll = data.poll
	output.pinned = data.pinned
	output.muted = data.muted
	} else {
	output.favorited = data.favorited
	output.fave_num = data.fave_num

	output.repeated = data.repeated
	output.repeat_num = data.repeat_num

	// catchall, temporary
	// Object.assign(output, data)

	output.type = qvitterStatusType(data)

	if (data.nsfw === undefined) {
	output.nsfw = isNsfw(data)
	if (data.retweeted_status) {
	output.nsfw = data.retweeted_status.nsfw
	}
	} else {
	output.nsfw = data.nsfw
	}

	output.statusnet_html = data.statusnet_html
	output.text = data.text

	output.in_reply_to_status_id = data.in_reply_to_status_id
	output.in_reply_to_user_id = data.in_reply_to_user_id
	output.in_reply_to_screen_name = data.in_reply_to_screen_name
	output.statusnet_conversation_id = data.statusnet_conversation_id

	if (output.type === 'retweet') {
	output.retweeted_status = parseStatus(data.retweeted_status)
	}

	output.summary = data.summary
	output.summary_html = data.summary_html
	output.external_url = data.external_url
	output.is_local = data.is_local
	}

	output.id = String(data.id)
	output.visibility = data.visibility
	output.card = data.card
	output.created_at = new Date(data.created_at)

	// Converting to string, the right way.
	output.in_reply_to_status_id = output.in_reply_to_status_id
	? String(output.in_reply_to_status_id)
	: null
	output.in_reply_to_user_id = output.in_reply_to_user_id
	? String(output.in_reply_to_user_id)
	: null

	output.user = parseUser(masto ? data.account : data.user)

	output.attentions = ((masto ? data.mentions : data.attentions) \|\| []).map(parseUser)

	output.attachments = ((masto ? data.media_attachments : data.attachments) \|\| [])
	.map(parseAttachment)

	const retweetedStatus = masto ? data.reblog : data.retweeted_status
	if (retweetedStatus) {
	output.retweeted_status = parseStatus(retweetedStatus)
	}

	output.favoritedBy = []
	output.rebloggedBy = []

	return output
	}

	export const parseNotification = (data) => {
	const mastoDict = {
	'favourite': 'like',
	'reblog': 'repeat'
	}
	const masto = !data.hasOwnProperty('ntype')
	const output = {}

	if (masto) {
	output.type = mastoDict[data.type] \|\| data.type
	output.seen = data.pleroma.is_seen
	output.status = output.type === 'follow'
	? null
	: parseStatus(data.status)
	output.action = output.status // TODO: Refactor, this is unneeded
	output.from_profile = parseUser(data.account)
	} else {
	const parsedNotice = parseStatus(data.notice)
	output.type = data.ntype
	output.seen = Boolean(data.is_seen)
	output.status = output.type === 'like'
	? parseStatus(data.notice.favorited_status)
	: parsedNotice
	output.action = parsedNotice
	output.from_profile = parseUser(data.from_profile)
	}

	output.created_at = new Date(data.created_at)
	output.id = parseInt(data.id)

	return output
	}

	const isNsfw = (status) => {
	const nsfwRegex = /#nsfw/i
	return (status.tags \|\| []).includes('nsfw') \|\| !!(status.text \|\| '').match(nsfwRegex)
	}
	diff --git a/src/services/tiny_post_html_processor/tiny_post_html_processor.service.js b/src/services/tiny_post_html_processor/tiny_post_html_processor.service.js
	new file mode 100644
	index 0000000000..de6f20ef0b
	--- /dev/null
	+++ b/src/services/tiny_post_html_processor/tiny_post_html_processor.service.js
	@@ -0,0 +1,94 @@
	+/**
	+ * This is a tiny purpose-built HTML parser/processor. This basically detects any type of visual newline and
	+ * allows it to be processed, useful for greentexting, mostly
	+ *
	+ * known issue: doesn't handle CDATA so nested CDATA might not work well
	+ *
	+ * @param {Object} input - input data
	+ * @param {(string) => string} processor - function that will be called on every line
	+ * @return {string} processed html
	+ */
	+export const processHtml = (html, processor) => {
	+ const handledTags = new Set(['p', 'br', 'div'])
	+ const openCloseTags = new Set(['p', 'div'])
	+
	+ let buffer = '' // Current output buffer
	+ const level = [] // How deep we are in tags and which tags were there
	+ let textBuffer = '' // Current line content
	+ let tagBuffer = null // Current tag buffer, if null = we are not currently reading a tag
	+
	+ // Extracts tag name from tag, i.e. <span a="b"> => span
	+ const getTagName = (tag) => {
	+ const result = /(?:<\/(\w+)>\|<(\w+)\s?[^/]*?\/?>)/gi.exec(tag)
	+ return result && (result[1] \|\| result[2])
	+ }
	+
	+ const flush = () => { // Processes current line buffer, adds it to output buffer and clears line buffer
	+ if (textBuffer.trim().length > 0) {
	+ buffer += processor(textBuffer)
	+ } else {
	+ buffer += textBuffer
	+ }
	+ textBuffer = ''
	+ }
	+
	+ const handleBr = (tag) => { // handles single newlines/linebreaks/selfclosing
	+ flush()
	+ buffer += tag
	+ }
	+
	+ const handleOpen = (tag) => { // handles opening tags
	+ flush()
	+ buffer += tag
	+ level.push(tag)
	+ }
	+
	+ const handleClose = (tag) => { // handles closing tags
	+ flush()
	+ buffer += tag
	+ if (level[level.length - 1] === tag) {
	+ level.pop()
	+ }
	+ }
	+
	+ for (let i = 0; i < html.length; i++) {
	+ const char = html[i]
	+ if (char === '<' && tagBuffer === null) {
	+ tagBuffer = char
	+ } else if (char !== '>' && tagBuffer !== null) {
	+ tagBuffer += char
	+ } else if (char === '>' && tagBuffer !== null) {
	+ tagBuffer += char
	+ const tagFull = tagBuffer
	+ tagBuffer = null
	+ const tagName = getTagName(tagFull)
	+ if (handledTags.has(tagName)) {
	+ if (tagName === 'br') {
	+ handleBr(tagFull)
	+ } else if (openCloseTags.has(tagName)) {
	+ if (tagFull[1] === '/') {
	+ handleClose(tagFull)
	+ } else if (tagFull[tagFull.length - 2] === '/') {
	+ // self-closing
	+ handleBr(tagFull)
	+ } else {
	+ handleOpen(tagFull)
	+ }
	+ }
	+ } else {
	+ textBuffer += tagFull
	+ }
	+ } else if (char === '\n') {
	+ handleBr(char)
	+ } else {
	+ textBuffer += char
	+ }
	+ }
	+ if (tagBuffer) {
	+ textBuffer += tagBuffer
	+ }
	+
	+ flush()
	+
	+ return buffer
	+}
	diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
	index 49f378e2bd..cfb380bafc 100644
	--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
	+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
	@@ -1,360 +1,373 @@
	import { parseStatus, parseUser, parseNotification, addEmojis } from '../../../../../src/services/entity_normalizer/entity_normalizer.service.js'
	import mastoapidata from '../../../../fixtures/mastoapi.json'
	import qvitterapidata from '../../../../fixtures/statuses.json'

	const makeMockStatusQvitter = (overrides = {}) => {
	return Object.assign({
	activity_type: 'post',
	attachments: [],
	attentions: [],
	created_at: 'Tue Jan 15 13:57:56 +0000 2019',
	external_url: 'https://ap.example/whatever',
	fave_num: 1,
	favorited: false,
	id: '10335970',
	in_reply_to_ostatus_uri: null,
	in_reply_to_profileurl: null,
	in_reply_to_screen_name: null,
	in_reply_to_status_id: null,
	in_reply_to_user_id: null,
	is_local: false,
	is_post_verb: true,
	possibly_sensitive: false,
	repeat_num: 0,
	repeated: false,
	statusnet_conversation_id: '16300488',
	statusnet_html: '<p>haha benis</p>',
	summary: null,
	tags: [],
	text: 'haha benis',
	uri: 'https://ap.example/whatever',
	user: makeMockUserQvitter(),
	visibility: 'public'
	}, overrides)
	}

	const makeMockUserQvitter = (overrides = {}) => {
	return Object.assign({
	background_image: null,
	cover_photo: '',
	created_at: 'Mon Jan 14 13:56:51 +0000 2019',
	default_scope: 'public',
	description: 'ebin',
	description_html: '<p>ebin</p>',
	favourites_count: 0,
	fields: [],
	followers_count: 1,
	following: true,
	follows_you: true,
	friends_count: 1,
	id: '60717',
	is_local: false,
	locked: false,
	name: 'Spurdo :ebin:',
	name_html: 'Spurdo <img src="whatever">',
	no_rich_text: false,
	pleroma: { confirmation_pending: false, tags: [] },
	profile_image_url: 'https://ap.example/whatever',
	profile_image_url_https: 'https://ap.example/whatever',
	profile_image_url_original: 'https://ap.example/whatever',
	profile_image_url_profile_size: 'https://ap.example/whatever',
	rights: { delete_others_notice: false },
	screen_name: 'spurdo@ap.example',
	statuses_count: 46,
	statusnet_blocking: false,
	statusnet_profile_url: ''
	}, overrides)
	}

	const makeMockUserMasto = (overrides = {}) => {
	return Object.assign({
	acct: 'hj',
	avatar:
	'https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png',
	avatar_static:
	'https://shigusegubu.club/media/1657b945-8d5b-4ce6-aafb-4c3fc5772120/8ce851029af84d55de9164e30cc7f46d60cbf12eee7e96c5c0d35d9038ddade1.png',
	bot: false,
	created_at: '2017-12-17T21:54:14.000Z',
	display_name: 'whatever whatever whatever witch',
	emojis: [],
	fields: [],
	followers_count: 705,
	following_count: 326,
	header:
	'https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png',
	header_static:
	'https://shigusegubu.club/media/7ab024d9-2a8a-4fbc-9ce8-da06756ae2db/6aadefe4e264133bc377ab450e6b045b6f5458542a5c59e6c741f86107f0388b.png',
	id: '1',
	locked: false,
	note:
	'Volatile Internet Weirdo. Name pronounced as Hee Jay. JS and Java dark arts mage, Elixir trainee. I love sampo and lain. Matrix is <span><a data-user="1" href="https://shigusegubu.club/users/hj">@<span>hj</span></a></span>:matrix.heldscal.la Pronouns are whatever. Do not DM me unless it\'s truly private matter and you\'re instance\'s admin or you risk your DM to be reposted publicly.Wish i was Finnish girl.',
	pleroma: { confirmation_pending: false, tags: null },
	source: { note: '', privacy: 'public', sensitive: false },
	statuses_count: 41775,
	url: 'https://shigusegubu.club/users/hj',
	username: 'hj'
	}, overrides)
	}

	const makeMockStatusMasto = (overrides = {}) => {
	return Object.assign({
	account: makeMockUserMasto(),
	application: { name: 'Web', website: null },
	content:
	'<span><a data-user="14660" href="https://pleroma.soykaf.com/users/sampo">@<span>sampo</span></a></span> god i wish i was there',
	created_at: '2019-01-17T16:29:23.000Z',
	emojis: [],
	favourited: false,
	favourites_count: 1,
	id: '10423476',
	in_reply_to_account_id: '14660',
	in_reply_to_id: '10423197',
	language: null,
	media_attachments: [],
	mentions: [
	{
	acct: 'sampo@pleroma.soykaf.com',
	id: '14660',
	url: 'https://pleroma.soykaf.com/users/sampo',
	username: 'sampo'
	}
	],
	muted: false,
	reblog: null,
	reblogged: false,
	reblogs_count: 0,
	replies_count: 0,
	sensitive: false,
	spoiler_text: '',
	tags: [],
	uri: 'https://shigusegubu.club/objects/16033fbb-97c0-4f0e-b834-7abb92fb8639',
	url: 'https://shigusegubu.club/objects/16033fbb-97c0-4f0e-b834-7abb92fb8639',
	visibility: 'public',
	pleroma: {
	local: true
	}
	}, overrides)
	}

	const makeMockNotificationQvitter = (overrides = {}) => {
	return Object.assign({
	notice: makeMockStatusQvitter(),
	ntype: 'follow',
	from_profile: makeMockUserQvitter(),
	is_seen: 0,
	id: 123
	}, overrides)
	}

	const makeMockEmojiMasto = (overrides = [{}]) => {
	return [
	Object.assign({
	shortcode: 'image',
	static_url: 'https://example.com/image.png',
	url: 'https://example.com/image.png',
	visible_in_picker: false
	}, overrides[0]),
	Object.assign({
	shortcode: 'thinking',
	static_url: 'https://example.com/think.png',
	url: 'https://example.com/think.png',
	visible_in_picker: false
	}, overrides[1])
	]
	}

	describe('API Entities normalizer', () => {
	describe('parseStatus', () => {
	describe('QVitter preprocessing', () => {
	it('doesn\'t blow up', () => {
	const parsed = qvitterapidata.map(parseStatus)
	expect(parsed.length).to.eq(qvitterapidata.length)
	})

	it('identifies favorites', () => {
	const fav = {
	uri: 'tag:soykaf.com,2016-08-21:fave:2558:note:339495:2016-08-21T16:54:04+00:00',
	is_post_verb: false
	}

	const mastoFav = {
	uri: 'tag:mastodon.social,2016-11-27:objectId=73903:objectType=Favourite',
	is_post_verb: false
	}

	expect(parseStatus(makeMockStatusQvitter(fav))).to.have.property('type', 'favorite')
	expect(parseStatus(makeMockStatusQvitter(mastoFav))).to.have.property('type', 'favorite')
	})

	it('processes repeats correctly', () => {
	const post = makeMockStatusQvitter({ retweeted_status: null, id: 'deadbeef' })
	const repeat = makeMockStatusQvitter({ retweeted_status: post, is_post_verb: false, id: 'foobar' })

	const parsedPost = parseStatus(post)
	const parsedRepeat = parseStatus(repeat)

	expect(parsedPost).to.have.property('type', 'status')
	expect(parsedRepeat).to.have.property('type', 'retweet')
	expect(parsedRepeat).to.have.property('retweeted_status')
	expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
	})

	it('sets nsfw for statuses with the #nsfw tag', () => {
	const safe = makeMockStatusQvitter({ id: '1', text: 'Hello oniichan' })
	const nsfw = makeMockStatusQvitter({ id: '1', text: 'Hello oniichan #nsfw' })

	expect(parseStatus(safe).nsfw).to.eq(false)
	expect(parseStatus(nsfw).nsfw).to.eq(true)
	})

	it('leaves existing nsfw settings alone', () => {
	const nsfw = makeMockStatusQvitter({ id: '1', text: 'Hello oniichan #nsfw', nsfw: false })

	expect(parseStatus(nsfw).nsfw).to.eq(false)
	})
	})

	describe('Mastoapi preprocessing and converting', () => {
	it('doesn\'t blow up', () => {
	const parsed = mastoapidata.map(parseStatus)
	expect(parsed.length).to.eq(mastoapidata.length)
	})

	it('processes repeats correctly', () => {
	const post = makeMockStatusMasto({ reblog: null, id: 'deadbeef' })
	const repeat = makeMockStatusMasto({ reblog: post, id: 'foobar' })

	const parsedPost = parseStatus(post)
	const parsedRepeat = parseStatus(repeat)

	expect(parsedPost).to.have.property('type', 'status')
	expect(parsedRepeat).to.have.property('type', 'retweet')
	expect(parsedRepeat).to.have.property('retweeted_status')
	expect(parsedRepeat).to.have.deep.property('retweeted_status.id', 'deadbeef')
	})

	it('adds emojis to post content', () => {
	const post = makeMockStatusMasto({ emojis: makeMockEmojiMasto(), content: 'Makes you think :thinking:' })

	const parsedPost = parseStatus(post)

	expect(parsedPost).to.have.property('statusnet_html').that.contains('<img')
	})

	it('adds emojis to subject line', () => {
	const post = makeMockStatusMasto({ emojis: makeMockEmojiMasto(), spoiler_text: 'CW: 300 IQ :thinking:' })

	const parsedPost = parseStatus(post)

	expect(parsedPost).to.have.property('summary_html').that.contains('<img')
	})
	})
	})

	// Statuses generally already contain some info regarding users and there's nearly 1:1 mapping, so very little to test
	describe('parseUsers (MastoAPI)', () => {
	it('sets correct is_local for users depending on their screen_name', () => {
	const local = makeMockUserMasto({ acct: 'foo' })
	const remote = makeMockUserMasto({ acct: 'foo@bar.baz' })

	expect(parseUser(local)).to.have.property('is_local', true)
	expect(parseUser(remote)).to.have.property('is_local', false)
	})

	it('adds emojis to user name', () => {
	const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), display_name: 'The :thinking: thinker' })

	const parsedUser = parseUser(user)

	expect(parsedUser).to.have.property('name_html').that.contains('<img')
	})

	it('adds emojis to user bio', () => {
	const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), note: 'Hello i like to :thinking: a lot' })

	const parsedUser = parseUser(user)

	expect(parsedUser).to.have.property('description_html').that.contains('<img')
	})

	+ it('adds emojis to user profile fields', () => {
	+ const user = makeMockUserMasto({ emojis: makeMockEmojiMasto(), fields: [{ name: ':thinking:', value: ':image:' }] })
	+
	+ const parsedUser = parseUser(user)
	+
	+ expect(parsedUser).to.have.property('fields_html').to.be.an('array')
	+
	+ const field = parsedUser.fields_html[0]
	+
	+ expect(field).to.have.property('name').that.contains('<img')
	+ expect(field).to.have.property('value').that.contains('<img')
	+ })
	+
	it('adds hide_follows and hide_followers user settings', () => {
	const user = makeMockUserMasto({ pleroma: { hide_followers: true, hide_follows: false, hide_followers_count: false, hide_follows_count: true } })

	expect(parseUser(user)).to.have.property('hide_followers', true)
	expect(parseUser(user)).to.have.property('hide_follows', false)
	expect(parseUser(user)).to.have.property('hide_followers_count', false)
	expect(parseUser(user)).to.have.property('hide_follows_count', true)
	})
	})

	// We currently use QvitterAPI notifications only, and especially due to MastoAPI lacking is_seen, support for MastoAPI
	// is more of an afterthought
	describe('parseNotifications (QvitterAPI)', () => {
	it('correctly normalizes data to FE\'s format', () => {
	const notif = makeMockNotificationQvitter({
	id: 123,
	notice: makeMockStatusQvitter({ id: 444 }),
	from_profile: makeMockUserQvitter({ id: 'spurdo' })
	})
	expect(parseNotification(notif)).to.have.property('id', 123)
	expect(parseNotification(notif)).to.have.property('seen', false)
	expect(parseNotification(notif)).to.have.deep.property('status.id', '444')
	expect(parseNotification(notif)).to.have.deep.property('action.id', '444')
	expect(parseNotification(notif)).to.have.deep.property('from_profile.id', 'spurdo')
	})

	it('correctly normalizes favorite notifications', () => {
	const notif = makeMockNotificationQvitter({
	id: 123,
	ntype: 'like',
	notice: makeMockStatusQvitter({
	id: 444,
	favorited_status: makeMockStatusQvitter({ id: 4412 })
	}),
	is_seen: 1,
	from_profile: makeMockUserQvitter({ id: 'spurdo' })
	})
	expect(parseNotification(notif)).to.have.property('id', 123)
	expect(parseNotification(notif)).to.have.property('type', 'like')
	expect(parseNotification(notif)).to.have.property('seen', true)
	expect(parseNotification(notif)).to.have.deep.property('status.id', '4412')
	expect(parseNotification(notif)).to.have.deep.property('action.id', '444')
	expect(parseNotification(notif)).to.have.deep.property('from_profile.id', 'spurdo')
	})
	})

	describe('MastoAPI emoji adder', () => {
	const emojis = makeMockEmojiMasto()
	const imageHtml = '<img src="https://example.com/image.png" alt="image" title="image" class="emoji" />'
	.replace(/"/g, '\'')
	const thinkHtml = '<img src="https://example.com/think.png" alt="thinking" title="thinking" class="emoji" />'
	.replace(/"/g, '\'')

	it('correctly replaces shortcodes in supplied string', () => {
	const result = addEmojis('This post has :image: emoji and :thinking: emoji', emojis)
	expect(result).to.include(thinkHtml)
	expect(result).to.include(imageHtml)
	})

	it('handles consecutive emojis correctly', () => {
	const result = addEmojis('Lelel emoji spam :thinking::thinking::thinking::thinking:', emojis)
	expect(result).to.include(thinkHtml + thinkHtml + thinkHtml + thinkHtml)
	})

	it('Doesn\'t replace nonexistent emojis', () => {
	const result = addEmojis('Admin add the :tenshi: emoji', emojis)
	expect(result).to.equal('Admin add the :tenshi: emoji')
	})

	it('Doesn\'t blow up on regex special characters', () => {
	const emojis = makeMockEmojiMasto([{
	shortcode: 'c++'
	}, {
	shortcode: '[a-z] {\|}*'
	}])
	const result = addEmojis('This post has :c++: emoji and :[a-z] {\|}*: emoji', emojis)
	expect(result).to.include('title=\'c++\'')
	expect(result).to.include('title=\'[a-z] {\|}*\'')
	})
	})
	})
	diff --git a/test/unit/specs/services/tiny_post_html_processor/tiny_post_html_processor.spec.js b/test/unit/specs/services/tiny_post_html_processor/tiny_post_html_processor.spec.js
	new file mode 100644
	index 0000000000..f301429d06
	--- /dev/null
	+++ b/test/unit/specs/services/tiny_post_html_processor/tiny_post_html_processor.spec.js
	@@ -0,0 +1,96 @@
	+import { processHtml } from 'src/services/tiny_post_html_processor/tiny_post_html_processor.service.js'
	+
	+describe('TinyPostHTMLProcessor', () => {
	+ describe('with processor that keeps original line should not make any changes to HTML when', () => {
	+ const processorKeep = (line) => line
	+ it('fed with regular HTML with newlines', () => {
	+ const inputOutput = '1<br/>2<p class="lol">3 4</p> 5 \n 6 <p > 7 <br> 8 </p> <br>\n<br/>'
	+ expect(processHtml(inputOutput, processorKeep)).to.eql(inputOutput)
	+ })
	+
	+ it('fed with possibly broken HTML with invalid tags/composition', () => {
	+ const inputOutput = '<feeee dwdwddddddw> <i>ayy<b>lm</i>ao</b> </section>'
	+ expect(processHtml(inputOutput, processorKeep)).to.eql(inputOutput)
	+ })
	+
	+ it('fed with very broken HTML with broken composition', () => {
	+ const inputOutput = '</p> lmao what </div> whats going on <div> wha <p>'
	+ expect(processHtml(inputOutput, processorKeep)).to.eql(inputOutput)
	+ })
	+
	+ it('fed with sorta valid HTML but tags aren\'t closed', () => {
	+ const inputOutput = 'just leaving a <div> hanging'
	+ expect(processHtml(inputOutput, processorKeep)).to.eql(inputOutput)
	+ })
	+
	+ it('fed with not really HTML at this point... tags that aren\'t finished', () => {
	+ const inputOutput = 'do you expect me to finish this <div class='
	+ expect(processHtml(inputOutput, processorKeep)).to.eql(inputOutput)
	+ })
	+
	+ it('fed with dubiously valid HTML (p within p and also div inside p)', () => {
	+ const inputOutput = 'look ma <p> p \nwithin <p> p! </p> and a <br/><div>div!</div></p>'
	+ expect(processHtml(inputOutput, processorKeep)).to.eql(inputOutput)
	+ })
	+
	+ it('fed with maybe valid HTML? self-closing divs and ps', () => {
	+ const inputOutput = 'a <div class="what"/> what now <p aria-label="wtf"/> ?'
	+ expect(processHtml(inputOutput, processorKeep)).to.eql(inputOutput)
	+ })
	+
	+ it('fed with valid XHTML containing a CDATA', () => {
	+ const inputOutput = 'Yes, it is me, <![CDATA[DIO]]>'
	+ expect(processHtml(inputOutput, processorKeep)).to.eql(inputOutput)
	+ })
	+ })
	+ describe('with processor that replaces lines with word "_" should match expected line when', () => {
	+ const processorReplace = (line) => '_'
	+ it('fed with regular HTML with newlines', () => {
	+ const input = '1<br/>2<p class="lol">3 4</p> 5 \n 6 <p > 7 <br> 8 </p> <br>\n<br/>'
	+ const output = '_<br/>_<p class="lol">_</p>_\n_<p >_<br>_</p> <br>\n<br/>'
	+ expect(processHtml(input, processorReplace)).to.eql(output)
	+ })
	+
	+ it('fed with possibly broken HTML with invalid tags/composition', () => {
	+ const input = '<feeee dwdwddddddw> <i>ayy<b>lm</i>ao</b> </section>'
	+ const output = '_'
	+ expect(processHtml(input, processorReplace)).to.eql(output)
	+ })
	+
	+ it('fed with very broken HTML with broken composition', () => {
	+ const input = '</p> lmao what </div> whats going on <div> wha <p>'
	+ const output = '</p>_</div>_<div>_<p>'
	+ expect(processHtml(input, processorReplace)).to.eql(output)
	+ })
	+
	+ it('fed with sorta valid HTML but tags aren\'t closed', () => {
	+ const input = 'just leaving a <div> hanging'
	+ const output = '_<div>_'
	+ expect(processHtml(input, processorReplace)).to.eql(output)
	+ })
	+
	+ it('fed with not really HTML at this point... tags that aren\'t finished', () => {
	+ const input = 'do you expect me to finish this <div class='
	+ const output = '_'
	+ expect(processHtml(input, processorReplace)).to.eql(output)
	+ })
	+
	+ it('fed with dubiously valid HTML (p within p and also div inside p)', () => {
	+ const input = 'look ma <p> p \nwithin <p> p! </p> and a <br/><div>div!</div></p>'
	+ const output = '_<p>_\n_<p>_</p>_<br/><div>_</div></p>'
	+ expect(processHtml(input, processorReplace)).to.eql(output)
	+ })
	+
	+ it('fed with maybe valid HTML? self-closing divs and ps', () => {
	+ const input = 'a <div class="what"/> what now <p aria-label="wtf"/> ?'
	+ const output = '_<div class="what"/>_<p aria-label="wtf"/>_'
	+ expect(processHtml(input, processorReplace)).to.eql(output)
	+ })
	+
	+ it('fed with valid XHTML containing a CDATA', () => {
	+ const input = 'Yes, it is me, <![CDATA[DIO]]>'
	+ const output = '_'
	+ expect(processHtml(input, processorReplace)).to.eql(output)
	+ })
	+ })
	+})

File Metadata

Mime Type: text/x-diff
Expires: Sun, Nov 1, 2:23 PM (10 h, 20 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1803103
Default Alt Text: (184 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions