moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

normalizeStatus: fix tests, fixQuote fix

This commit is contained in:
Alex Gleason 2022-02-20 03:38:22 -05:00
parent f7f18fac79
commit f1f784f751
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/soapbox/reducers/__tests__/statuses-test.js
View File

@ -1,7 +1,6 @@
import { Map as ImmutableMap, fromJS } from 'immutable'; import { Map as ImmutableMap, fromJS } from 'immutable';
import { STATUS_IMPORT } from 'soapbox/actions/importer'; import { STATUS_IMPORT } from 'soapbox/actions/importer';
import { normalizeStatus } from 'soapbox/actions/importer/normalizer';
import { import {
STATUS_CREATE_REQUEST, STATUS_CREATE_REQUEST,
STATUS_CREATE_FAIL, STATUS_CREATE_FAIL,
@ -34,8 +33,8 @@ describe('statuses reducer', () => {
const quotedQuotePost = require('soapbox/__fixtures__/pleroma-quote-of-quote-post.json'); const quotedQuotePost = require('soapbox/__fixtures__/pleroma-quote-of-quote-post.json');
let state = undefined; let state = undefined;
state = reducer(state, { type: STATUS_IMPORT, status: normalizeStatus(quotePost) }); state = reducer(state, { type: STATUS_IMPORT, status: quotePost });
state = reducer(state, { type: STATUS_IMPORT, status: normalizeStatus(quotedQuotePost.pleroma.quote) }); state = reducer(state, { type: STATUS_IMPORT, status: quotedQuotePost.pleroma.quote });
expect(state.getIn(['AFmFMSpITT9xcOJKcK', 'quote'])).toEqual('AFmFLcd6XYVdjWCrOS'); expect(state.getIn(['AFmFMSpITT9xcOJKcK', 'quote'])).toEqual('AFmFLcd6XYVdjWCrOS');
}); });
@ -43,7 +42,7 @@ describe('statuses reducer', () => {
it('normalizes Mitra attachments', () => { it('normalizes Mitra attachments', () => {
const status = require('soapbox/__fixtures__/mitra-status-with-attachments.json'); const status = require('soapbox/__fixtures__/mitra-status-with-attachments.json');
const state = reducer(undefined, { type: STATUS_IMPORT, status: normalizeStatus(status) }); const state = reducer(undefined, { type: STATUS_IMPORT, status });
const expected = fromJS([{ const expected = fromJS([{
id: '017eeb0e-e5df-30a4-77a7-a929145cb836', id: '017eeb0e-e5df-30a4-77a7-a929145cb836',
@ -76,7 +75,7 @@ describe('statuses reducer', () => {
it('leaves Pleroma attachments alone', () => { it('leaves Pleroma attachments alone', () => {
const status = require('soapbox/__fixtures__/pleroma-status-with-attachments.json'); const status = require('soapbox/__fixtures__/pleroma-status-with-attachments.json');
const action = { type: STATUS_IMPORT, status: normalizeStatus(status) }; const action = { type: STATUS_IMPORT, status };
const state = reducer(undefined, action); const state = reducer(undefined, action);
const expected = fromJS(status.media_attachments); const expected = fromJS(status.media_attachments);

16
app/soapbox/reducers/statuses.js
View File

@ -38,11 +38,11 @@ const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
}, {}); }, {});
const minifyStatus = status => { const minifyStatus = status => {
return status.merge({ return status.mergeWith((o, n) => n || o, {
account: status.getIn(['account', 'id'], null), account: status.getIn(['account', 'id']),
reblog: status.getIn(['reblog', 'id'], null), reblog: status.getIn(['reblog', 'id']),
poll: status.getIn(['poll', 'id'], null), poll: status.getIn(['poll', 'id']),
quote: status.getIn(['quote', 'id']) || status.getIn(['pleroma', 'quote', 'id']) || null, quote: status.getIn(['quote', 'id']) || status.getIn(['pleroma', 'quote', 'id']),
}); });
}; };
@ -75,9 +75,7 @@ const isQuote = status => {
}; };
// Preserve quote if an existing status already has it // Preserve quote if an existing status already has it
const fixQuote = (state, status) => { const fixQuote = (status, oldStatus) => {
const oldStatus = state.get(status.get('id'));
if (oldStatus && !status.get('quote') && isQuote(status)) { if (oldStatus && !status.get('quote') && isQuote(status)) {
return status return status
.set('quote', oldStatus.get('quote')) .set('quote', oldStatus.get('quote'))
@ -92,7 +90,7 @@ const fixStatus = (state, status) => {
return status.withMutations(status => { return status.withMutations(status => {
normalizeStatus(status); normalizeStatus(status);
fixQuote(state, status); fixQuote(status, oldStatus);
calculateStatus(status, oldStatus); calculateStatus(status, oldStatus);
minifyStatus(status); minifyStatus(status);
}); });