matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix getReactForStatus(), upgrade immutable.js

Browse Source
This commit is contained in:
Alex Gleason
2020-05-22 17:45:18 -05:00
parent bf1f744b99
commit c0fe85ca29
4 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/gabsocial/utils/__tests__/emoji_reacts-test.js
View File

@@ -53,38 +53,39 @@ describe('sortEmoji', () => {
describe('mergeEmojiFavourites', () => {
const favouritesCount = 12;
const favourited = true;
describe('with existing 👍 reacts', () => {
const emojiReacts = fromJS([
{ 'count': 20, 'me': true, 'name': '👍' },
{ 'count': 15, 'me': true, 'name': '❤' },
{ 'count': 7, 'me': true, 'name': '😯' },
{ 'count': 20, 'me': false, 'name': '👍' },
{ 'count': 15, 'me': false, 'name': '❤' },
{ 'count': 7, 'me': false, 'name': '😯' },
]);
it('combines 👍 reacts with favourites', () => {
expect(mergeEmojiFavourites(emojiReacts, favouritesCount)).toEqual(fromJS([
{ 'count': 32, 'me': true, 'name': '👍' },
{ 'count': 15, 'me': true, 'name': '❤' },
{ 'count': 7, 'me': true, 'name': '😯' },
expect(mergeEmojiFavourites(emojiReacts, favouritesCount, favourited)).toEqual(fromJS([
{ 'count': 32, 'me': true, 'name': '👍' },
{ 'count': 15, 'me': false, 'name': '❤' },
{ 'count': 7, 'me': false, 'name': '😯' },
]));
});
});
describe('without existing 👍 reacts', () => {
const emojiReacts = fromJS([
{ 'count': 15, 'me': true, 'name': '❤' },
{ 'count': 7, 'me': true, 'name': '😯' },
{ 'count': 15, 'me': false, 'name': '❤' },
{ 'count': 7, 'me': false, 'name': '😯' },
]);
it('adds 👍 reacts to the map equaling favourite count', () => {
expect(mergeEmojiFavourites(emojiReacts, favouritesCount)).toEqual(fromJS([
{ 'count': 15, 'me': true, 'name': '❤' },
{ 'count': 7, 'me': true, 'name': '😯' },
{ 'count': 12, 'me': false, 'name': '👍' },
expect(mergeEmojiFavourites(emojiReacts, favouritesCount, favourited)).toEqual(fromJS([
{ 'count': 15, 'me': false, 'name': '❤' },
{ 'count': 7, 'me': false, 'name': '😯' },
{ 'count': 12, 'me': true, 'name': '👍' },
]));
});
it('does not add 👍 reacts when there are no favourites', () => {
expect(mergeEmojiFavourites(emojiReacts, 0)).toEqual(fromJS([
{ 'count': 15, 'me': true, 'name': '❤' },
{ 'count': 7, 'me': true, 'name': '😯' },
expect(mergeEmojiFavourites(emojiReacts, 0, false)).toEqual(fromJS([
{ 'count': 15, 'me': false, 'name': '❤' },
{ 'count': 7, 'me': false, 'name': '😯' },
]));
});
});
@@ -105,7 +106,7 @@ describe('reduceEmoji', () => {
{ 'count': 1, 'me': false, 'name': '🍩' },
]);
it('sorts, filters, and combines emoji and favourites', () => {
expect(reduceEmoji(emojiReacts, 7, '1')).toEqual(fromJS([
expect(reduceEmoji(emojiReacts, 7, true)).toEqual(fromJS([
{ 'count': 27, 'me': true, 'name': '👍' },
{ 'count': 15, 'me': true, 'name': '❤' },
{ 'count': 7, 'me': true, 'name': '😯' },
@@ -150,7 +151,7 @@ describe('getReactForStatus', () => {
});
it('returns a thumbs-up for a favourite', () => {
const status = fromJS({ favourited: true });
const status = fromJS({ favourites_count: 1, favourited: true });
expect(getReactForStatus(status)).toEqual('👍');
});
});

30
app/gabsocial/utils/emoji_reacts.js
View File

@@ -21,15 +21,17 @@ export const mergeEmoji = emojiReacts => (
emojiReacts // TODO: Merge similar emoji
);
export const mergeEmojiFavourites = (emojiReacts, favouritesCount) => {
export const mergeEmojiFavourites = (emojiReacts, favouritesCount, favourited) => {
if (!favouritesCount) return emojiReacts;
const likeIndex = emojiReacts.findIndex(emojiReact =>
emojiReact.get('name') === '👍');
const likeIndex = emojiReacts.findIndex(emojiReact => emojiReact.get('name') === '👍');
if (likeIndex > -1) {
const likeCount = emojiReacts.getIn([likeIndex, 'count']);
return emojiReacts.setIn([likeIndex, 'count'], likeCount + favouritesCount);
favourited = favourited || emojiReacts.getIn([likeIndex, 'me'], false);
return emojiReacts
.setIn([likeIndex, 'count'], likeCount + favouritesCount)
.setIn([likeIndex, 'me'], favourited);
} else {
return emojiReacts.push(ImmutableMap({ count: favouritesCount, me: false, name: '👍' }));
return emojiReacts.push(ImmutableMap({ count: favouritesCount, me: favourited, name: '👍' }));
}
};
@@ -67,17 +69,17 @@ export const filterEmoji = emojiReacts => (
ALLOWED_EMOJI.includes(emojiReact.get('name'))
)));
export const reduceEmoji = (emojiReacts, favouritesCount, me) => (
export const reduceEmoji = (emojiReacts, favouritesCount, favourited) => (
filterEmoji(sortEmoji(mergeEmoji(mergeEmojiFavourites(
emojiReacts, favouritesCount
emojiReacts, favouritesCount, favourited
)))));
export const getReactForStatus = status => {
const emojiReacts = status.getIn(['pleroma', 'emoji_reactions'], ImmutableList());
const emojiReact = emojiReacts.reduce((acc, cur) => {
if (acc) return acc;
if (cur.get('me') === true) return cur.get('name');
return acc;
}, undefined);
return emojiReact ? emojiReact : status.get('favourited') && '👍';
return reduceEmoji(
status.getIn(['pleroma', 'emoji_reactions'], ImmutableList()),
status.get('favourites_count'),
status.get('favourited')
).filter(e => e.get('me'))
.first(ImmutableMap())
.get('name');
};