No OneTemporary
Actions

Size

22 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/components/rich_content/rich_content.jsx b/src/components/rich_content/rich_content.jsx
	index 0aae7a558e..e188763fb9 100644
	--- a/src/components/rich_content/rich_content.jsx
	+++ b/src/components/rich_content/rich_content.jsx
	@@ -1,342 +1,341 @@
	import Vue from 'vue'
	import { unescape, flattenDeep } from 'lodash'
	import { getTagName, processTextForEmoji, getAttrs } from 'src/services/html_converter/utility.service.js'
	import { convertHtmlToTree } from 'src/services/html_converter/html_tree_converter.service.js'
	import { convertHtmlToLines } from 'src/services/html_converter/html_line_converter.service.js'
	import StillImage from 'src/components/still-image/still-image.vue'
	import MentionLink from 'src/components/mention_link/mention_link.vue'

	import './rich_content.scss'

	/**
	* RichContent, The Über-powered component for rendering Post HTML.
	*
	* This takes post HTML and does multiple things to it:
	* - Converts mention links to <MentionLink>-s
	* - Removes mentions from beginning and end (hellthread style only)
	* - Replaces emoji shortcodes with <StillImage>'d images.
	*
	* Stuff like removing mentions from beginning and end is done so that they could
	* be either replaced by collapsible <MentionsLine> or moved to separate place.
	* There are two problems with this component's architecture:
	* 1. Parsing HTML and rendering are inseparable. Attempts to separate the two
	* proven to be a massive overcomplication due to amount of things done here.
	* 2. We need to output both render and some extra data, which seems to be imp-
	* possible in vue. Current solution is to emit 'parseReady' event when parsing
	* is done within render() function.
	*
	* Apart from that one small hiccup with emit in render this _should_ be vue3-ready
	*/
	export default Vue.component('RichContent', {
	name: 'RichContent',
	props: {
	// Original html content
	html: {
	required: true,
	type: String
	},
	// Emoji object, as in status.emojis, note the "s" at the end...
	emoji: {
	required: true,
	type: Array
	},
	// Whether to handle links or not (posts: yes, everything else: no)
	handleLinks: {
	required: false,
	type: Boolean,
	default: false
	},
	// Meme arrows
	greentext: {
	required: false,
	type: Boolean,
	default: false
	}
	},
	// NEVER EVER TOUCH DATA INSIDE RENDER
	render (h) {
	// Pre-process HTML
	const { newHtml: html, lastMentions } = preProcessPerLine(this.html, this.greentext, this.handleLinks)
	const firstMentions = [] // Mentions that appear in the beginning of post body
	const lastTags = [] // Tags that appear at the end of post body
	const writtenMentions = [] // All mentions that appear in post body
	const writtenTags = [] // All tags that appear in post body
	// unique index for vue "tag" property
	let mentionIndex = 0
	let tagsIndex = 0

	const renderImage = (tag) => {
	return <StillImage
	{...{ attrs: getAttrs(tag) }}
	class="img"
	/>
	}

	const renderHashtag = (attrs, children, encounteredTextReverse) => {
	const linkData = getLinkData(attrs, children, tagsIndex++)
	writtenTags.push(linkData)
	attrs.target = '_blank'
	if (!encounteredTextReverse) {
	lastTags.push(linkData)
	attrs['data-parser-last'] = true
	}
	return <a {...{ attrs }}>
	{ children.map(processItem) }
	</a>
	}

	const renderMention = (attrs, children, encounteredText) => {
	const linkData = getLinkData(attrs, children, mentionIndex++)
	writtenMentions.push(linkData)
	if (!encounteredText) {
	firstMentions.push(linkData)
	return ''
	} else {
	return <MentionLink
	url={attrs.href}
	content={flattenDeep(children).join('')}
	/>
	}
	}

	// We stop treating mentions as "first" ones when we encounter
	// non-whitespace text
	let encounteredText = false
	// Processor to use with html_tree_converter
	const processItem = (item, index, array, what) => {
	// Handle text nodes - just add emoji
	if (typeof item === 'string') {
	const emptyText = item.trim() === ''
	if (emptyText) {
	return encounteredText ? item : item.trim()
	}
	let unescapedItem = unescape(item)
	if (!encounteredText) {
	unescapedItem = unescapedItem.trimStart()
	encounteredText = true
	}
	if (item.includes(':')) {
	unescapedItem = processTextForEmoji(
	unescapedItem,
	this.emoji,
	({ shortcode, url }) => {
	return <StillImage
	class="emoji img"
	src={url}
	title={`:${shortcode}:`}
	alt={`:${shortcode}:`}
	/>
	}
	)
	}
	return unescapedItem
	}

	// Handle tag nodes
	if (Array.isArray(item)) {
	const [opener, children] = item
	const Tag = getTagName(opener)
	const attrs = getAttrs(opener)
	switch (Tag) {
	case 'span': // replace images with StillImage
	if (attrs['class'] && attrs['class'].includes('lastMentions')) {
	if (firstMentions.length > 1) {
	break
	} else {
	return ''
	}
	} else {
	break
	}
	case 'img': // replace images with StillImage
	return renderImage(opener)
	case 'a': // replace mentions with MentionLink
	if (!this.handleLinks) break
	if (attrs['class'] && attrs['class'].includes('mention')) {
	return renderMention(attrs, children, encounteredText)
	} else if (attrs['class'] && attrs['class'].includes('hashtag')) {
	encounteredText = true
	return item // We'll handle it later
	} else {
	attrs.target = '_blank'
	return <a {...{ attrs }}>
	{ children.map(processItem) }
	</a>
	}
	}

	// Render tag as is
	if (children !== undefined) {
	return <Tag {...{ attrs: getAttrs(opener) }}>
	{ children.map(processItem) }
	</Tag>
	} else {
	return <Tag/>
	}
	}
	}

	// Processor for back direction (for finding "last" stuff, just easier this way)
	let encounteredTextReverse = false
	const processItemReverse = (item, index, array, what) => {
	// Handle text nodes - just add emoji
	if (typeof item === 'string') {
	const emptyText = item.trim() === ''
	if (emptyText) return item
	if (!encounteredTextReverse) encounteredTextReverse = true
	return item
	} else if (Array.isArray(item)) {
	// Handle tag nodes
	const [opener, children] = item
	const Tag = getTagName(opener)
	switch (Tag) {
	case 'a': // replace mentions with MentionLink
	if (!this.handleLinks) break
	const attrs = getAttrs(opener)
	// should only be this
	if (attrs['class'] && attrs['class'].includes('hashtag')) {
	return renderHashtag(attrs, children, encounteredTextReverse)
	}
	}
	}
	return item
	}

	// DO NOT USE SLOTS they cause a re-render feedback loop here.
	// slots updated -> rerender -> emit -> update up the tree -> rerender -> ...
	// at least until vue3?
	const result = <span class="RichContent">
	{ convertHtmlToTree(html).map(processItem).reverse().map(processItemReverse).reverse() }
	</span>

	const event = {
	firstMentions,
	lastMentions,
	lastTags,
	writtenMentions,
	writtenTags
	}

	// DO NOT MOVE TO UPDATE. BAD IDEA.
	this.$emit('parseReady', event)

	return result
	}
	})

	const getLinkData = (attrs, children, index) => {
	return {
	index,
	url: attrs.href,
	hashtag: attrs['data-tag'],
	content: flattenDeep(children).join('')
	}
	}

	/** Pre-processing HTML
	*
	* Currently this does two things:
	* - add green/cyantexting
	* - wrap and mark last line containing only mentions as ".lastMentionsLine" for
	* more compact hellthreads.
	*
	* @param {String} html - raw HTML to process
	* @param {Boolean} greentext - whether to enable greentexting or not
	* @param {Boolean} handleLinks - whether to handle links or not
	*/
	export const preProcessPerLine = (html, greentext, handleLinks) => {
	const lastMentions = []

	- let nonEmptyIndex = 0
	+ let nonEmptyIndex = -1
	const newHtml = convertHtmlToLines(html).reverse().map((item, index, array) => {
	// Going over each line in reverse to detect last mentions,
	// keeping non-text stuff as-is
	if (!item.text) return item
	const string = item.text
	+ nonEmptyIndex += 1

	// Greentext stuff
	if (greentext && (string.includes('>') \|\| string.includes('<'))) {
	const cleanedString = string.replace(/<[^>]+?>/gi, '') // remove all tags
	.replace(/@\w+/gi, '') // remove mentions (even failed ones)
	.trim()
	if (cleanedString.startsWith('>')) {
	- nonEmptyIndex += 1
	return `<span class='greentext'>${string}</span>`
	} else if (cleanedString.startsWith('<')) {
	- nonEmptyIndex += 1
	return `<span class='cyantext'>${string}</span>`
	}
	}

	// Converting that line part into tree
	const tree = convertHtmlToTree(string)

	// If line has loose text, i.e. text outside a mention or a tag
	// we won't touch mentions.
	let hasLooseText = false
	let hasMentions = false
	const process = (item) => {
	if (Array.isArray(item)) {
	const [opener, children, closer] = item
	const tag = getTagName(opener)
	// If we have a link we probably have mentions
	if (tag === 'a') {
	if (!handleLinks) return [opener, children, closer]
	const attrs = getAttrs(opener)
	if (attrs['class'] && attrs['class'].includes('mention')) {
	// Got mentions
	hasMentions = true
	return [opener, children, closer]
	} else {
	// Not a mention? Means we have loose text or whatever
	hasLooseText = true
	return [opener, children, closer]
	}
	} else if (tag === 'span' \|\| tag === 'p') {
	// For span and p we need to go deeper
	return [opener, [...children].map(process), closer]
	} else {
	// Everything else equals to a loose text
	hasLooseText = true
	return [opener, children, closer]
	}
	}

	if (typeof item === 'string') {
	if (item.trim() !== '') {
	// only meaningful strings are loose text
	hasLooseText = true
	}
	return item
	}
	}

	// We now processed our tree, now we need to mark line as lastMentions
	const result = [...tree].map(process)

	// Only check last (first since list is reversed) line
	if (handleLinks && hasMentions && !hasLooseText && nonEmptyIndex++ === 0) {
	let mentionIndex = 0
	const process = (item) => {
	if (Array.isArray(item)) {
	const [opener, children] = item
	const tag = getTagName(opener)
	if (tag === 'a') {
	const attrs = getAttrs(opener)
	lastMentions.push(getLinkData(attrs, children, mentionIndex++))
	} else if (children) {
	children.forEach(process)
	}
	}
	}
	result.forEach(process)
	// we DO need mentions here so that we conditionally remove them if don't
	// have first mentions
	return ['<span class="lastMentions">', flattenDeep(result).join(''), '</span>'].join('')
	} else {
	return flattenDeep(result).join('')
	}
	}).reverse().join('')

	return { newHtml, lastMentions }
	}
	diff --git a/test/unit/specs/components/rich_content.spec.js b/test/unit/specs/components/rich_content.spec.js
	index 20322019ad..ff491a3aaa 100644
	--- a/test/unit/specs/components/rich_content.spec.js
	+++ b/test/unit/specs/components/rich_content.spec.js
	@@ -1,384 +1,419 @@
	import { shallowMount, createLocalVue } from '@vue/test-utils'
	import RichContent from 'src/components/rich_content/rich_content.jsx'

	const localVue = createLocalVue()

	const makeMention = (who) => `<span class="h-card"><a class="u-url mention" href="https://fake.tld/@${who}">@<span>${who}</span></a></span>`
	const stubMention = (who) => `<span class="h-card"><mentionlink-stub url="https://fake.tld/@${who}" content="@<span>${who}</span>"></mentionlink-stub></span>`
	const lastMentions = (...data) => `<span class="lastMentions">${data.join('')}</span>`
	const p = (...data) => `<p>${data.join('')}</p>`
	const compwrap = (...data) => `<span class="RichContent">${data.join('')}</span>`
	const removedMentionSpan = '<span class="h-card"></span>'

	describe('RichContent', () => {
	it('renders simple post without exploding', () => {
	const html = p('Hello world!')
	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: true,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(html))
	})

	it('removes mentions from the beginning of post', () => {
	const html = p(
	makeMention('John'),
	' how are you doing thoday?'
	)
	const expected = p(
	removedMentionSpan,
	'how are you doing thoday?'
	)
	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: true,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(expected))
	})

	it('removes mentions from the end of the hellpost (<p>)', () => {
	const html = [
	p('How are you doing today, fine gentlemen?'),
	p(
	makeMention('John'),
	makeMention('Josh'),
	makeMention('Jeremy')
	)
	].join('')
	const expected = [
	p(
	'How are you doing today, fine gentlemen?'
	),
	// TODO fix this extra line somehow?
	p()
	].join('')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: true,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(expected))
	})

	it('removes mentions from the end of the hellpost (<br>)', () => {
	const html = [
	'How are you doing today, fine gentlemen?',
	[
	makeMention('John'),
	makeMention('Josh'),
	makeMention('Jeremy')
	].join('')
	].join('<br>')
	const expected = [
	'How are you doing today, fine gentlemen?',
	// TODO fix this extra line somehow?
	'<br>'
	].join('')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: true,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(expected))
	})

	it('removes mentions from the end of the hellpost (\\n)', () => {
	const html = [
	'How are you doing today, fine gentlemen?',
	[
	makeMention('John'),
	makeMention('Josh'),
	makeMention('Jeremy')
	].join('')
	].join('\n')
	const expected = [
	'How are you doing today, fine gentlemen?',
	// TODO fix this extra line somehow?
	''
	].join('\n')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: true,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(expected))
	})

	it('Does not remove mentions in the middle or at the end of text string', () => {
	const html = [
	[
	makeMention('Jack'),
	'let\'s meet up with ',
	makeMention('Janet')
	].join(''),
	[
	'cc: ',
	makeMention('John'),
	makeMention('Josh'),
	makeMention('Jeremy')
	].join('')
	].join('\n')
	const expected = [
	[
	removedMentionSpan,
	'let\'s meet up with ',
	stubMention('Janet')
	].join(''),
	[
	'cc: ',
	stubMention('John'),
	stubMention('Josh'),
	stubMention('Jeremy')
	].join('')
	].join('\n')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: true,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(expected))
	})

	it('removes mentions from the end if there\'s only one first mention', () => {
	const html = [
	p(
	makeMention('Todd'),
	'so anyway you are wrong'
	),
	p(
	makeMention('Tom'),
	makeMention('Trace'),
	makeMention('Theodor')
	)
	].join('')
	const expected = [
	p(
	removedMentionSpan,
	'so anyway you are wrong'
	),
	// TODO fix this extra line somehow?
	p()
	].join('')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: true,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(expected))
	})

	it('does not remove mentions from the end if there\'s more than one first mention', () => {
	const html = [
	p(
	makeMention('Zacharie'),
	makeMention('Zinaide'),
	'you guys have cool names, and so do these guys: '
	),
	p(
	makeMention('Watson'),
	makeMention('Wallace'),
	makeMention('Wakamoto')
	)
	].join('')
	const expected = [
	p(
	removedMentionSpan,
	removedMentionSpan,
	'you guys have cool names, and so do these guys: '
	),
	p(
	lastMentions(
	stubMention('Watson'),
	stubMention('Wallace'),
	stubMention('Wakamoto')
	)
	)
	].join('')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: true,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(expected))
	})

	it('Does not touch links if link handling is disabled', () => {
	const html = [
	[
	makeMention('Jack'),
	'let\'s meet up with ',
	makeMention('Janet')
	].join(''),
	[
	makeMention('John'),
	makeMention('Josh'),
	makeMention('Jeremy')
	].join('')
	].join('\n')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: false,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(html))
	})

	it('Adds greentext and cyantext to the post', () => {
	const html = [
	'>preordering videogames',
	'>any year'
	].join('\n')
	const expected = [
	'<span class="greentext">>preordering videogames</span>',
	'<span class="greentext">>any year</span>'
	].join('\n')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: false,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(expected))
	})

	it('Does not add greentext and cyantext if setting is set to false', () => {
	const html = [
	'>preordering videogames',
	'>any year'
	].join('\n')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: false,
	greentext: false,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(html))
	})

	it('Adds emoji to post', () => {
	const html = p('Ebin :DDDD :spurdo:')
	const expected = p(
	'Ebin :DDDD ',
	'<anonymous-stub alt=":spurdo:" src="about:blank" title=":spurdo:" class="emoji img"></anonymous-stub>'
	)

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: false,
	greentext: false,
	emoji: [{ url: 'about:blank', shortcode: 'spurdo' }],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(expected))
	})

	it('Doesn\'t add nonexistent emoji to post', () => {
	const html = p('Lol :lol:')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: false,
	greentext: false,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(html))
	})

	it('Greentext + last mentions', () => {
	const html = [
	'>quote',
	makeMention('lol'),
	'>quote',
	'>quote'
	].join('\n')
	const expected = [
	'<span class="greentext">>quote</span>',
	stubMention('lol'),
	'<span class="greentext">>quote</span>',
	'<span class="greentext">>quote</span>'
	].join('\n')

	const wrapper = shallowMount(RichContent, {
	localVue,
	propsData: {
	handleLinks: true,
	greentext: true,
	emoji: [],
	html
	}
	})

	expect(wrapper.html()).to.eql(compwrap(expected))
	})
	+
	+ it('One buggy example', () => {
	+ const html = [
	+ 'Bruh',
	+ 'Bruh',
	+ [
	+ makeMention('foo'),
	+ makeMention('bar'),
	+ makeMention('baz')
	+ ].join(''),
	+ 'Bruh'
	+ ].join('<br>')
	+ const expected = [
	+ 'Bruh',
	+ 'Bruh',
	+ [
	+ stubMention('foo'),
	+ stubMention('bar'),
	+ stubMention('baz')
	+ ].join(''),
	+ 'Bruh'
	+ ].join('<br>')
	+
	+ const wrapper = shallowMount(RichContent, {
	+ localVue,
	+ propsData: {
	+ handleLinks: true,
	+ greentext: true,
	+ emoji: [],
	+ html
	+ }
	+ })
	+
	+ expect(wrapper.html()).to.eql(compwrap(expected))
	+ })
	})

File Metadata

Mime Type: text/x-diff
Expires: Sun, Aug 9, 1:16 PM (1 d, 12 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1724583
Default Alt Text: (22 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions