OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Allow diplayed reaction values to contain anything 

Part of https://github.com/vector-im/riot-web/issues/10256
pull/21833/head
J. Ryan Stinnett 2019-07-05 15:18:53 +01:00
parent 27c79b9504
commit 2a8f9a81f7
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/HtmlUtils.js
View File

@ -66,19 +66,10 @@ const VARIATION_SELECTOR = String.fromCharCode(0xFE0F);
* need emojification. * need emojification.
* unicodeToImage uses this function. * unicodeToImage uses this function.
*/ */
export function mightContainEmoji(str) { function mightContainEmoji(str) {
return SURROGATE_PAIR_PATTERN.test(str) || SYMBOL_PATTERN.test(str); return SURROGATE_PAIR_PATTERN.test(str) || SYMBOL_PATTERN.test(str);
} }
/**
* Returns true if the string definitely contains a single emoji.
* @param {String} str String to test
* @return {Boolean}
*/
export function isSingleEmoji(str) {
return mightContainEmoji(str) && SINGLE_EMOJI_REGEX.test(str);
}
/** /**
* Returns the shortcode for an emoji character. * Returns the shortcode for an emoji character.
* *

4
src/components/views/messages/ReactionsRow.js
View File

@ -20,7 +20,6 @@ import PropTypes from 'prop-types';
import sdk from '../../../index'; import sdk from '../../../index';
import { _t } from '../../../languageHandler'; import { _t } from '../../../languageHandler';
import { isContentActionable } from '../../../utils/EventUtils'; import { isContentActionable } from '../../../utils/EventUtils';
import { isSingleEmoji } from '../../../HtmlUtils';
import MatrixClientPeg from '../../../MatrixClientPeg'; import MatrixClientPeg from '../../../MatrixClientPeg';
// The maximum number of reactions to initially show on a message. // The maximum number of reactions to initially show on a message.
@ -115,9 +114,6 @@ export default class ReactionsRow extends React.PureComponent {
const ReactionsRowButton = sdk.getComponent('messages.ReactionsRowButton'); const ReactionsRowButton = sdk.getComponent('messages.ReactionsRowButton');
let items = reactions.getSortedAnnotationsByKey().map(([content, events]) => { let items = reactions.getSortedAnnotationsByKey().map(([content, events]) => {
if (!isSingleEmoji(content)) {
return null;
}
const count = events.size; const count = events.size;
if (!count) { if (!count) {
return null; return null;