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

Simplify pending status builder

This commit is contained in:
Alex Gleason 2022-02-23 20:37:38 -05:00
parent 6c0c66eab1
commit cd6d575ae9
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/soapbox/features/ui/util/pending_status_builder.js
View File

@ -1,44 +1,35 @@
import { fromJS } from 'immutable'; import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
import {
OrderedSet as ImmutableOrderedSet,
Map as ImmutableMap,
List as ImmutableList,
} from 'immutable';
import { normalizeStatus } from 'soapbox/normalizers/status'; import { normalizeStatus } from 'soapbox/normalizers/status';
import { calculateStatus } from 'soapbox/reducers/statuses'; import { calculateStatus } from 'soapbox/reducers/statuses';
import { makeGetAccount, makeGetStatus } from 'soapbox/selectors'; import { makeGetAccount } from 'soapbox/selectors';
export const buildStatus = (state, pendingStatus, idempotencyKey) => { const getAccount = makeGetAccount();
const getAccount = makeGetAccount();
const getStatus = makeGetStatus();
const me = state.get('me'); const getMentions = pendingStatus => {
const account = getAccount(state, me);
let mentions;
if (pendingStatus.get('in_reply_to_id')) { if (pendingStatus.get('in_reply_to_id')) {
const inReplyTo = getStatus(state, { id: pendingStatus.get('in_reply_to_id') }); return ImmutableList(pendingStatus.get('to') || []).map(mention => ImmutableMap({
if (inReplyTo.getIn(['account', 'id']) === me) {
mentions = ImmutableOrderedSet([account.get('acct')]).union(pendingStatus.get('to') || []);
} else {
mentions = pendingStatus.get('to', []);
}
mentions = mentions.toList().map(mention => ImmutableMap({
username: mention.split('@')[0], username: mention.split('@')[0],
acct: mention, acct: mention,
})); }));
} else {
return ImmutableList();
} }
};
export const buildStatus = (state, pendingStatus, idempotencyKey) => {
const me = state.get('me');
const account = getAccount(state, me);
const inReplyToId = pendingStatus.get('in_reply_to_id');
const status = { const status = {
account, account,
content: pendingStatus.get('status', '').replace(new RegExp('\n', 'g'), '<br>'), /* eslint-disable-line no-control-regex */ content: pendingStatus.get('status', '').replace(new RegExp('\n', 'g'), '<br>'), /* eslint-disable-line no-control-regex */
id: `末pending-${idempotencyKey}`, id: `末pending-${idempotencyKey}`,
in_reply_to_id: pendingStatus.get('in_reply_to_id'), in_reply_to_account_id: state.getIn(['statuses', inReplyToId, 'account'], null),
in_reply_to_id: inReplyToId,
media_attachments: pendingStatus.get('media_ids', ImmutableList()).map(id => ImmutableMap({ id })), media_attachments: pendingStatus.get('media_ids', ImmutableList()).map(id => ImmutableMap({ id })),
mentions, mentions: getMentions(pendingStatus),
poll: pendingStatus.get('poll', null), poll: pendingStatus.get('poll', null),
quote: pendingStatus.get('quote_id', null), quote: pendingStatus.get('quote_id', null),
sensitive: pendingStatus.get('sensitive', false), sensitive: pendingStatus.get('sensitive', false),