/g, '\n\n');
- const emojiMap = makeEmojiMap(normalStatus);
-
- normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent;
- normalStatus.contentHtml = stripCompatibilityFeatures(emojify(normalStatus.content, emojiMap));
- normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(spoilerText), emojiMap);
- normalStatus.hidden = expandSpoilers ? false : spoilerText.length > 0 || normalStatus.sensitive;
- }
-
- return normalStatus;
-}
-
export function normalizePoll(poll) {
const normalPoll = { ...poll };
diff --git a/app/soapbox/actions/soapbox.js b/app/soapbox/actions/soapbox.js
index d85bd0f0f..03814cf7c 100644
--- a/app/soapbox/actions/soapbox.js
+++ b/app/soapbox/actions/soapbox.js
@@ -40,6 +40,7 @@ export const makeDefaultConfig = features => {
logo: '',
banner: '',
brandColor: '', // Empty
+ accentColor: '',
customCss: ImmutableList(),
promoPanel: ImmutableMap({
items: ImmutableList(),
@@ -59,6 +60,8 @@ export const makeDefaultConfig = features => {
}),
aboutPages: ImmutableMap(),
authenticatedProfile: true,
+ singleUserMode: false,
+ singleUserModeProfile: '',
});
};
diff --git a/app/soapbox/components/error_boundary.js b/app/soapbox/components/error_boundary.js
index b73944575..2e7c3f717 100644
--- a/app/soapbox/components/error_boundary.js
+++ b/app/soapbox/components/error_boundary.js
@@ -4,6 +4,7 @@ import { FormattedMessage } from 'react-intl';
import Icon from 'soapbox/components/icon';
import { captureException } from 'soapbox/monitoring';
+import sourceCode from 'soapbox/utils/code';
export default class ErrorBoundary extends React.PureComponent {
@@ -72,7 +73,7 @@ export default class ErrorBoundary extends React.PureComponent {
{browser.getBrowserName()} {browser.getBrowserVersion()}
} +{sourceCode.displayName} {sourceCode.version}
'), /* eslint-disable-line no-control-regex */ created_at: params.get('scheduled_at'), - emojis: [], - favourited: false, - favourites_count: 0, id: scheduledStatus.get('id'), - in_reply_to_account_id: null, in_reply_to_id: params.get('in_reply_to_id'), - language: null, media_attachments: scheduledStatus.get('media_attachments'), - mentions: [], - muted: false, - pinned: false, poll: params.get('poll'), - reblog: null, - reblogged: false, - reblogs_count: 0, - replies_count: 0, sensitive: params.get('sensitive'), - spoiler_text: '', - tags: [], - text: null, uri: `/scheduled_statuses/${scheduledStatus.get('id')}`, url: `/scheduled_statuses/${scheduledStatus.get('id')}`, visibility: params.get('visibility'), }); - return fromJS(status).set('account', account); + return calculateStatus(normalizeStatus(status)); }; diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status.js b/app/soapbox/features/scheduled_statuses/components/scheduled_status.js index b47e2b6d0..c79de8af1 100644 --- a/app/soapbox/features/scheduled_statuses/components/scheduled_status.js +++ b/app/soapbox/features/scheduled_statuses/components/scheduled_status.js @@ -9,6 +9,7 @@ import Avatar from 'soapbox/components/avatar'; import DisplayName from 'soapbox/components/display_name'; import RelativeTimestamp from 'soapbox/components/relative_timestamp'; import StatusContent from 'soapbox/components/status_content'; +import StatusReplyMentions from 'soapbox/components/status_reply_mentions'; import PollPreview from 'soapbox/features/ui/components/poll_preview'; import { getDomain } from 'soapbox/utils/accounts'; @@ -63,6 +64,8 @@ class ScheduledStatus extends ImmutablePureComponent { +
'), /* eslint-disable-line no-control-regex */ - created_at: new Date(), - emojis: [], - favourited: false, - favourites_count: 0, id: `末pending-${idempotencyKey}`, - in_reply_to_account_id: null, - in_reply_to_id: pendingStatus.get('in_reply_to_id'), - language: null, - media_attachments: pendingStatus.get('media_ids').map(id => ({ id })), - mentions, - muted: false, - pinned: false, - poll: pendingStatus.get('poll', null), + 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 })), + mentions: buildMentions(pendingStatus), + poll: buildPoll(pendingStatus), quote: pendingStatus.get('quote_id', null), - reblog: null, - reblogged: false, - reblogs_count: 0, - replies_count: 0, sensitive: pendingStatus.get('sensitive', false), - spoiler_text: '', - tags: [], - text: null, - uri: '', - url: '', visibility: pendingStatus.get('visibility', 'public'), }); - return fromJS(status).set('account', account); + return calculateStatus(normalizeStatus(status)); }; diff --git a/app/soapbox/locales/pl.json b/app/soapbox/locales/pl.json index 470bac41b..d26164d62 100644 --- a/app/soapbox/locales/pl.json +++ b/app/soapbox/locales/pl.json @@ -856,6 +856,7 @@ "soapbox_config.crypto_donate_panel_limit.meta_fields.limit_placeholder": "Liczba elementów do wyświetlenia w widżecie krypto na stronie głównej", "soapbox_config.custom_css.meta_fields.url_placeholder": "Adres URL", "soapbox_config.display_fqn_label": "Wyświetlaj domenę (np. @użytkownik@domena) dla lokalnych kont.", + "soapbox_config.fields.accent_color_label": "Kolor akcentu", "soapbox_config.fields.brand_color_label": "Kolor marki", "soapbox_config.fields.crypto_address.add": "Dodaj nowy adres krypto", "soapbox_config.fields.crypto_addresses_label": "Adresy kryptowalut", diff --git a/app/soapbox/locales/uk.json b/app/soapbox/locales/uk.json index 47b914491..1ab59de14 100644 --- a/app/soapbox/locales/uk.json +++ b/app/soapbox/locales/uk.json @@ -844,6 +844,7 @@ "soapbox_config.crypto_donate_panel_limit.meta_fields.limit_placeholder": "Number of items to display in the crypto homepage widget", "soapbox_config.custom_css.meta_fields.url_placeholder": "URL", "soapbox_config.display_fqn_label": "Display domain (eg @user@domain) for local accounts.", + "soapbox_config.fields.accent_color_label": "Акцентний колір", "soapbox_config.fields.brand_color_label": "Brand color", "soapbox_config.fields.crypto_address.add": "Add new crypto address", "soapbox_config.fields.crypto_addresses_label": "Cryptocurrency addresses", diff --git a/app/soapbox/normalizers/__tests__/instance-test.js b/app/soapbox/normalizers/__tests__/instance-test.js index 28eea3191..8f992bb84 100644 --- a/app/soapbox/normalizers/__tests__/instance-test.js +++ b/app/soapbox/normalizers/__tests__/instance-test.js @@ -98,4 +98,50 @@ describe('normalizeInstance()', () => { const result = normalizeInstance(instance); expect(result.toJS()).toMatchObject(expected); }); + + it('normalizes Fedibird instance', () => { + const instance = fromJS(require('soapbox/__fixtures__/fedibird-instance.json')); + const result = normalizeInstance(instance); + + // Sets description_limit + expect(result.get('description_limit')).toEqual(1500); + + // But otherwise, it's the same + expect(result.delete('description_limit')).toEqual(instance); + }); + + it('normalizes Mitra instance', () => { + const instance = fromJS(require('soapbox/__fixtures__/mitra-instance.json')); + const result = normalizeInstance(instance); + + // Adds configuration and description_limit + expect(result.get('configuration') instanceof ImmutableMap).toBe(true); + expect(result.get('description_limit')).toBe(1500); + }); + + it('normalizes GoToSocial instance', () => { + const instance = fromJS(require('soapbox/__fixtures__/gotosocial-instance.json')); + const result = normalizeInstance(instance); + + // Normalizes max_toot_chars + expect(result.getIn(['configuration', 'statuses', 'max_characters'])).toEqual(5000); + expect(result.has('max_toot_chars')).toBe(false); + + // Adds configuration and description_limit + expect(result.get('configuration') instanceof ImmutableMap).toBe(true); + expect(result.get('description_limit')).toBe(1500); + }); + + it('normalizes Friendica instance', () => { + const instance = fromJS(require('soapbox/__fixtures__/friendica-instance.json')); + const result = normalizeInstance(instance); + + // Normalizes max_toot_chars + expect(result.getIn(['configuration', 'statuses', 'max_characters'])).toEqual(200000); + expect(result.has('max_toot_chars')).toBe(false); + + // Adds configuration and description_limit + expect(result.get('configuration') instanceof ImmutableMap).toBe(true); + expect(result.get('description_limit')).toBe(1500); + }); }); diff --git a/app/soapbox/normalizers/__tests__/status-test.js b/app/soapbox/normalizers/__tests__/status-test.js new file mode 100644 index 000000000..26428e3ba --- /dev/null +++ b/app/soapbox/normalizers/__tests__/status-test.js @@ -0,0 +1,154 @@ +import { fromJS } from 'immutable'; + +import { normalizeStatus } from '../status'; + +describe('normalizeStatus', () => { + it('adds base fields', () => { + const status = fromJS({}); + const result = normalizeStatus(status); + + expect(result.get('emojis')).toEqual(fromJS([])); + expect(result.get('favourites_count')).toBe(0); + expect(result.get('mentions')).toEqual(fromJS([])); + expect(result.get('reblog')).toBe(null); + expect(result.get('uri')).toBe(''); + expect(result.get('visibility')).toBe('public'); + }); + + it('fixes the order of mentions', () => { + const status = fromJS(require('soapbox/__fixtures__/status-unordered-mentions.json')); + + const expected = ['NEETzsche', 'alex', 'Lumeinshin', 'sneeden']; + + const result = normalizeStatus(status) + .get('mentions') + .map(mention => mention.get('username')) + .toJS(); + + expect(result).toEqual(expected); + }); + + it('adds mention to self in self-reply on Mastodon', () => { + const status = fromJS(require('soapbox/__fixtures__/mastodon-reply-to-self.json')); + + const expected = fromJS([{ + id: '106801667066418367', + username: 'benis911', + acct: 'benis911', + url: 'https://mastodon.social/@benis911', + }]); + + const result = normalizeStatus(status).get('mentions'); + + expect(result).toEqual(expected); + }); + + it('normalizes mentions with only acct', () => { + const status = fromJS({ mentions: [{ acct: 'alex@gleasonator.com' }] }); + + const expected = fromJS([{ + acct: 'alex@gleasonator.com', + username: 'alex', + url: '', + }]); + + const result = normalizeStatus(status).get('mentions'); + + expect(result).toEqual(expected); + }); + + it('normalizes Mitra attachments', () => { + const status = fromJS(require('soapbox/__fixtures__/mitra-status-with-attachments.json')); + + const expected = fromJS([{ + id: '017eeb0e-e5df-30a4-77a7-a929145cb836', + type: 'image', + url: 'https://mitra.social/media/8e04e6091bbbac79641b5812508683ce72c38693661c18d16040553f2371e18d.png', + preview_url: 'https://mitra.social/media/8e04e6091bbbac79641b5812508683ce72c38693661c18d16040553f2371e18d.png', + remote_url: 'https://mitra.social/media/8e04e6091bbbac79641b5812508683ce72c38693661c18d16040553f2371e18d.png', + }, { + id: '017eeb0e-e5e4-2a48-2889-afdebf368a54', + type: 'unknown', + url: 'https://mitra.social/media/8f72dc2e98572eb4ba7c3a902bca5f69c448fc4391837e5f8f0d4556280440ac', + preview_url: 'https://mitra.social/media/8f72dc2e98572eb4ba7c3a902bca5f69c448fc4391837e5f8f0d4556280440ac', + remote_url: 'https://mitra.social/media/8f72dc2e98572eb4ba7c3a902bca5f69c448fc4391837e5f8f0d4556280440ac', + }, { + id: '017eeb0e-e5e5-79fd-6054-8b6869b1db49', + type: 'unknown', + url: 'https://mitra.social/media/55a81a090247cc4fc127e5716bcf7964f6e0df9b584f85f4696c0b994747a4d0.oga', + preview_url: 'https://mitra.social/media/55a81a090247cc4fc127e5716bcf7964f6e0df9b584f85f4696c0b994747a4d0.oga', + remote_url: 'https://mitra.social/media/55a81a090247cc4fc127e5716bcf7964f6e0df9b584f85f4696c0b994747a4d0.oga', + }, { + id: '017eeb0e-e5e6-c416-a444-21e560c47839', + type: 'unknown', + url: 'https://mitra.social/media/0d96a4ff68ad6d4b6f1f30f713b18d5184912ba8dd389f86aa7710db079abcb0', + preview_url: 'https://mitra.social/media/0d96a4ff68ad6d4b6f1f30f713b18d5184912ba8dd389f86aa7710db079abcb0', + remote_url: 'https://mitra.social/media/0d96a4ff68ad6d4b6f1f30f713b18d5184912ba8dd389f86aa7710db079abcb0', + }]); + + const result = normalizeStatus(status); + + expect(result.get('media_attachments')).toEqual(expected); + }); + + it('leaves Pleroma attachments alone', () => { + const status = fromJS(require('soapbox/__fixtures__/pleroma-status-with-attachments.json')); + const result = normalizeStatus(status); + + expect(status.get('media_attachments')).toEqual(result.get('media_attachments')); + }); + + it('normalizes Pleroma quote post', () => { + const status = fromJS(require('soapbox/__fixtures__/pleroma-quote-post.json')); + const result = normalizeStatus(status); + + expect(result.get('quote')).toEqual(status.getIn(['pleroma', 'quote'])); + expect(result.getIn(['pleroma', 'quote'])).toBe(undefined); + }); + + it('normalizes GoToSocial status', () => { + const status = fromJS(require('soapbox/__fixtures__/gotosocial-status.json')); + const result = normalizeStatus(status); + + // Adds missing fields + const missing = { + in_reply_to_account_id: null, + in_reply_to_id: null, + reblog: null, + pinned: false, + quote: null, + }; + + expect(result.toJS()).toMatchObject(missing); + }); + + it('normalizes Friendica status', () => { + const status = fromJS(require('soapbox/__fixtures__/friendica-status.json')); + const result = normalizeStatus(status); + + // Adds missing fields + const missing = { + pinned: false, + quote: null, + }; + + expect(result.toJS()).toMatchObject(missing); + }); + + it('normalizes poll and poll options', () => { + const status = fromJS({ poll: { options: [{ title: 'Apples' }] } }); + const result = normalizeStatus(status); + + const expected = { + options: [{ title: 'Apples', votes_count: 0 }], + emojis: [], + expired: false, + multiple: false, + voters_count: 0, + votes_count: 0, + }; + + expect(result.get('poll').toJS()).toMatchObject(expected); + expect(result.getIn(['poll', 'expires_at']) instanceof Date).toBe(true); + }); +}); diff --git a/app/soapbox/normalizers/status.js b/app/soapbox/normalizers/status.js new file mode 100644 index 000000000..8927546e8 --- /dev/null +++ b/app/soapbox/normalizers/status.js @@ -0,0 +1,161 @@ +import { Map as ImmutableMap, List as ImmutableList } from 'immutable'; + +import { accountToMention } from 'soapbox/utils/accounts'; + +// Some backends can return null, or omit these required fields +const baseStatus = ImmutableMap({ + application: null, + bookmarked: false, + card: null, + created_at: new Date(), + emojis: ImmutableList(), + favourited: false, + favourites_count: 0, + in_reply_to_account_id: null, + in_reply_to_id: null, + language: null, + mentions: ImmutableList(), + muted: false, + pinned: false, + reblog: null, + reblogged: false, + reblogs_count: 0, + replies_count: 0, + spoiler_text: '', + tags: ImmutableList(), + uri: '', + url: '', + visibility: 'public', +}); + +const basePollOption = ImmutableMap({ title: '', votes_count: 0 }); + +const basePoll = ImmutableMap({ + emojis: ImmutableList(), + expired: false, + expires_at: new Date(Date.now() + 1000 * (60 * 5)), // 5 minutes + multiple: false, + options: ImmutableList(), + voters_count: 0, + votes_count: 0, +}); + +// Merger function for only overriding undefined values +const mergeDefined = (oldVal, newVal) => oldVal === undefined ? newVal : oldVal; + +// Merge base status +const mergeBase = status => { + return status.mergeDeepWith(mergeDefined, baseStatus); +}; + +// Ensure attachments have required fields +// https://docs.joinmastodon.org/entities/attachment/ +const normalizeAttachment = attachment => { + const url = [ + attachment.get('url'), + attachment.get('preview_url'), + attachment.get('remote_url'), + ].find(url => url) || ''; + + const base = ImmutableMap({ + url, + preview_url: url, + remote_url: url, + }); + + return attachment.mergeWith(mergeDefined, base); +}; + +const normalizeAttachments = status => { + return status.update('media_attachments', ImmutableList(), attachments => { + return attachments.map(normalizeAttachment); + }); +}; + +// Normalize mentions +const normalizeMention = mention => { + const base = ImmutableMap({ + acct: '', + username: (mention.get('acct') || '').split('@')[0], + url: '', + }); + + return mention.mergeWith(mergeDefined, base); +}; + +const normalizeMentions = status => { + return status.update('mentions', ImmutableList(), mentions => { + return mentions.map(normalizeMention); + }); +}; + +// Normalize poll option +const normalizePollOption = option => { + return option.mergeWith(mergeDefined, basePollOption); +}; + +// Normalize poll +const normalizePoll = status => { + if (status.hasIn(['poll', 'options'])) { + return status.update('poll', ImmutableMap(), poll => { + return poll.mergeWith(mergeDefined, basePoll).update('options', options => { + return options.map(normalizePollOption); + }); + }); + } else { + return status.set('poll', null); + } +}; +// Fix order of mentions +const fixMentionsOrder = status => { + const mentions = status.get('mentions', ImmutableList()); + const inReplyToAccountId = status.get('in_reply_to_account_id'); + + // Sort the replied-to mention to the top + const sorted = mentions.sort((a, b) => { + if (a.get('id') === inReplyToAccountId) { + return -1; + } else { + return 0; + } + }); + + return status.set('mentions', sorted); +}; + +// Add self to mentions if it's a reply to self +const addSelfMention = status => { + const accountId = status.getIn(['account', 'id']); + + const isSelfReply = accountId === status.get('in_reply_to_account_id'); + const hasSelfMention = accountId === status.getIn(['mentions', 0, 'id']); + + if (isSelfReply && !hasSelfMention) { + const mention = accountToMention(status.get('account')); + return status.update('mentions', ImmutableList(), mentions => ( + ImmutableList([mention]).concat(mentions) + )); + } else { + return status; + } +}; + +// Move the quote to the top-level +const fixQuote = status => { + return status.withMutations(status => { + status.update('quote', quote => quote || status.getIn(['pleroma', 'quote']) || null); + status.deleteIn(['pleroma', 'quote']); + }); +}; + +export const normalizeStatus = status => { + return status.withMutations(status => { + mergeBase(status); + normalizeAttachments(status); + normalizeMentions(status); + normalizePoll(status); + fixMentionsOrder(status); + addSelfMention(status); + fixQuote(status); + }); +}; diff --git a/app/soapbox/reducers/__tests__/statuses-test.js b/app/soapbox/reducers/__tests__/statuses-test.js index 926c9a867..3a81f2004 100644 --- a/app/soapbox/reducers/__tests__/statuses-test.js +++ b/app/soapbox/reducers/__tests__/statuses-test.js @@ -1,7 +1,6 @@ import { Map as ImmutableMap, fromJS } from 'immutable'; import { STATUS_IMPORT } from 'soapbox/actions/importer'; -import { normalizeStatus } from 'soapbox/actions/importer/normalizer'; import { STATUS_CREATE_REQUEST, STATUS_CREATE_FAIL, @@ -34,8 +33,8 @@ describe('statuses reducer', () => { const quotedQuotePost = require('soapbox/__fixtures__/pleroma-quote-of-quote-post.json'); let state = undefined; - state = reducer(state, { type: STATUS_IMPORT, status: normalizeStatus(quotePost) }); - state = reducer(state, { type: STATUS_IMPORT, status: normalizeStatus(quotedQuotePost.pleroma.quote) }); + state = reducer(state, { type: STATUS_IMPORT, status: quotePost }); + state = reducer(state, { type: STATUS_IMPORT, status: quotedQuotePost.pleroma.quote }); expect(state.getIn(['AFmFMSpITT9xcOJKcK', 'quote'])).toEqual('AFmFLcd6XYVdjWCrOS'); }); @@ -43,7 +42,7 @@ describe('statuses reducer', () => { it('normalizes Mitra attachments', () => { 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([{ id: '017eeb0e-e5df-30a4-77a7-a929145cb836', @@ -76,12 +75,52 @@ describe('statuses reducer', () => { it('leaves Pleroma attachments alone', () => { 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 expected = fromJS(status.media_attachments); expect(state.getIn(['AGNkA21auFR5lnEAHw', 'media_attachments'])).toEqual(expected); }); + + it('hides CWs', () => { + const status = require('soapbox/__fixtures__/status-cw.json'); + const action = { type: STATUS_IMPORT, status }; + + const hidden = reducer(undefined, action).getIn(['107831528995252317', 'hidden']); + expect(hidden).toBe(true); + }); + + it('expands CWs when expandSpoilers is enabled', () => { + const status = require('soapbox/__fixtures__/status-cw.json'); + const action = { type: STATUS_IMPORT, status, expandSpoilers: true }; + + const hidden = reducer(undefined, action).getIn(['107831528995252317', 'hidden']); + expect(hidden).toBe(false); + }); + + it('parses custom emojis', () => { + const status = require('soapbox/__fixtures__/status-custom-emoji.json'); + const action = { type: STATUS_IMPORT, status }; + + const expected = 'Hello
world 
test 
';
+
+ const result = reducer(undefined, action).getIn(['AGm7uC9DaAIGUa4KYK', 'contentHtml']);
+ expect(result).toBe(expected);
+ });
+
+ it('builds search_index', () => {
+ const status = require('soapbox/__fixtures__/status-with-poll.json');
+ const action = { type: STATUS_IMPORT, status };
+
+ const expected = `What is tolerance?
+
+Banning, censoring, and deplatforming anyone you disagree with
+
+Promoting free speech, even for people and ideas you dislike`;
+
+ const result = reducer(undefined, action).getIn(['103874034847713213', 'search_index']);
+ expect(result).toEqual(expected);
+ });
});
describe('STATUS_CREATE_REQUEST', () => {
diff --git a/app/soapbox/reducers/account_notes.js b/app/soapbox/reducers/account_notes.js
new file mode 100644
index 000000000..67cd83e1d
--- /dev/null
+++ b/app/soapbox/reducers/account_notes.js
@@ -0,0 +1,37 @@
+import { Map as ImmutableMap } from 'immutable';
+
+import {
+ ACCOUNT_NOTE_INIT_MODAL,
+ ACCOUNT_NOTE_CHANGE_COMMENT,
+ ACCOUNT_NOTE_SUBMIT_REQUEST,
+ ACCOUNT_NOTE_SUBMIT_FAIL,
+ ACCOUNT_NOTE_SUBMIT_SUCCESS,
+} from '../actions/account_notes';
+
+const initialState = ImmutableMap({
+ edit: ImmutableMap({
+ isSubmitting: false,
+ account: null,
+ comment: null,
+ }),
+});
+
+export default function account_notes(state = initialState, action) {
+ switch (action.type) {
+ case ACCOUNT_NOTE_INIT_MODAL:
+ return state.withMutations((state) => {
+ state.setIn(['edit', 'isSubmitting'], false);
+ state.setIn(['edit', 'account_id'], action.account.get('id'));
+ state.setIn(['edit', 'comment'], action.comment);
+ });
+ case ACCOUNT_NOTE_CHANGE_COMMENT:
+ return state.setIn(['edit', 'comment'], action.comment);
+ case ACCOUNT_NOTE_SUBMIT_REQUEST:
+ return state.setIn(['edit', 'isSubmitting'], true);
+ case ACCOUNT_NOTE_SUBMIT_FAIL:
+ case ACCOUNT_NOTE_SUBMIT_SUCCESS:
+ return state.setIn(['edit', 'isSubmitting'], false);
+ default:
+ return state;
+ }
+}
\ No newline at end of file
diff --git a/app/soapbox/reducers/index.js b/app/soapbox/reducers/index.js
index a5c178b3c..c7b48cc22 100644
--- a/app/soapbox/reducers/index.js
+++ b/app/soapbox/reducers/index.js
@@ -3,6 +3,7 @@ import { combineReducers } from 'redux-immutable';
import { AUTH_LOGGED_OUT } from 'soapbox/actions/auth';
+import account_notes from './account_notes';
import accounts from './accounts';
import accounts_counters from './accounts_counters';
import accounts_meta from './accounts_meta';
@@ -66,6 +67,7 @@ const appReducer = combineReducers({
user_lists,
domain_lists,
status_lists,
+ account_notes,
accounts,
accounts_counters,
statuses,
diff --git a/app/soapbox/reducers/relationships.js b/app/soapbox/reducers/relationships.js
index 29276c5c3..129040d99 100644
--- a/app/soapbox/reducers/relationships.js
+++ b/app/soapbox/reducers/relationships.js
@@ -3,6 +3,7 @@ import { get } from 'lodash';
import { STREAMING_FOLLOW_RELATIONSHIPS_UPDATE } from 'soapbox/actions/streaming';
+import { ACCOUNT_NOTE_SUBMIT_SUCCESS } from '../actions/account_notes';
import {
ACCOUNT_FOLLOW_SUCCESS,
ACCOUNT_FOLLOW_REQUEST,
@@ -106,6 +107,7 @@ export default function relationships(state = initialState, action) {
case ACCOUNT_UNSUBSCRIBE_SUCCESS:
case ACCOUNT_PIN_SUCCESS:
case ACCOUNT_UNPIN_SUCCESS:
+ case ACCOUNT_NOTE_SUBMIT_SUCCESS:
return normalizeRelationship(state, action.relationship);
case RELATIONSHIPS_FETCH_SUCCESS:
return normalizeRelationships(state, action.relationships);
diff --git a/app/soapbox/reducers/statuses.js b/app/soapbox/reducers/statuses.js
index 70c62244c..2f2b0ac7f 100644
--- a/app/soapbox/reducers/statuses.js
+++ b/app/soapbox/reducers/statuses.js
@@ -1,6 +1,10 @@
+import escapeTextContentForBrowser from 'escape-html';
import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+import emojify from 'soapbox/features/emoji/emoji';
+import { normalizeStatus } from 'soapbox/normalizers/status';
import { simulateEmojiReact, simulateUnEmojiReact } from 'soapbox/utils/emoji_reacts';
+import { stripCompatibilityFeatures } from 'soapbox/utils/html';
import {
EMOJI_REACT_REQUEST,
@@ -26,55 +30,53 @@ import {
} from '../actions/statuses';
import { TIMELINE_DELETE } from '../actions/timelines';
-// Ensure attachments have required fields
-// https://docs.joinmastodon.org/entities/attachment/
-const normalizeAttachment = attachment => {
- const url = [
- attachment.get('url'),
- attachment.get('preview_url'),
- attachment.get('remote_url'),
- ].find(url => url) || '';
+const domParser = new DOMParser();
- const base = ImmutableMap({
- url,
- preview_url: url,
- remote_url: url,
- });
+const makeEmojiMap = record => record.get('emojis').reduce((obj, emoji) => {
+ obj[`:${emoji.get('shortcode')}:`] = emoji.toJS();
+ return obj;
+}, {});
- return attachment.mergeWith((o, n) => o || n, base);
-};
-
-const normalizeAttachments = status => {
- return status.update('media_attachments', ImmutableList(), attachments => {
- return attachments.map(normalizeAttachment);
+const minifyStatus = status => {
+ return status.mergeWith((o, n) => n || o, {
+ account: status.getIn(['account', 'id']),
+ reblog: status.getIn(['reblog', 'id']),
+ poll: status.getIn(['poll', 'id']),
+ quote: status.getIn(['quote', 'id']),
});
};
-// Fix order of mentions
-const fixMentions = status => {
- const mentions = status.get('mentions');
- const inReplyToAccountId = status.get('in_reply_to_account_id');
+// Only calculate these values when status first encountered
+// Otherwise keep the ones already in the reducer
+export const calculateStatus = (status, oldStatus, expandSpoilers = false) => {
+ if (oldStatus) {
+ return status.merge({
+ search_index: oldStatus.get('search_index'),
+ contentHtml: oldStatus.get('contentHtml'),
+ spoilerHtml: oldStatus.get('spoilerHtml'),
+ hidden: oldStatus.get('hidden'),
+ });
+ } else {
+ const spoilerText = status.get('spoiler_text') || '';
+ const searchContent = (ImmutableList([spoilerText, status.get('content')]).concat(status.getIn(['poll', 'options'], ImmutableList()).map(option => option.get('title')))).join('\n\n').replace(//g, '\n\n');
+ const emojiMap = makeEmojiMap(status);
- // Sort the replied-to mention to the top
- const sorted = mentions.sort((a, b) => {
- if (a.get('id') === inReplyToAccountId) {
- return -1;
- } else {
- return 0;
- }
- });
-
- return status.set('mentions', sorted);
+ return status.merge({
+ search_index: domParser.parseFromString(searchContent, 'text/html').documentElement.textContent,
+ contentHtml: stripCompatibilityFeatures(emojify(status.get('content'), emojiMap)),
+ spoilerHtml: emojify(escapeTextContentForBrowser(spoilerText), emojiMap),
+ hidden: expandSpoilers ? false : spoilerText.length > 0 || status.get('sensitive'),
+ });
+ }
};
+// Check whether a status is a quote by secondary characteristics
const isQuote = status => {
return Boolean(status.get('quote_id') || status.getIn(['pleroma', 'quote_url']));
};
// Preserve quote if an existing status already has it
-const fixQuote = (state, status) => {
- const oldStatus = state.get(status.get('id'));
-
+const fixQuote = (status, oldStatus) => {
if (oldStatus && !status.get('quote') && isQuote(status)) {
return status
.set('quote', oldStatus.get('quote'))
@@ -84,18 +86,22 @@ const fixQuote = (state, status) => {
}
};
-const normalizeStatus = (state, status) => {
+const fixStatus = (state, status, expandSpoilers) => {
+ const oldStatus = state.get(status.get('id'));
+
return status.withMutations(status => {
- fixMentions(status);
- fixQuote(state, status);
- normalizeAttachments(status);
+ normalizeStatus(status);
+ fixQuote(status, oldStatus);
+ calculateStatus(status, oldStatus, expandSpoilers);
+ minifyStatus(status);
});
};
-const importStatus = (state, status) => state.set(status.id, normalizeStatus(state, fromJS(status)));
+const importStatus = (state, status, expandSpoilers) =>
+ state.set(status.id, fixStatus(state, fromJS(status), expandSpoilers));
-const importStatuses = (state, statuses) =>
- state.withMutations(mutable => statuses.forEach(status => importStatus(mutable, status)));
+const importStatuses = (state, statuses, expandSpoilers) =>
+ state.withMutations(mutable => statuses.forEach(status => importStatus(mutable, status, expandSpoilers)));
const deleteStatus = (state, id, references) => {
references.forEach(ref => {
@@ -126,9 +132,9 @@ const initialState = ImmutableMap();
export default function statuses(state = initialState, action) {
switch(action.type) {
case STATUS_IMPORT:
- return importStatus(state, action.status);
+ return importStatus(state, action.status, action.expandSpoilers);
case STATUSES_IMPORT:
- return importStatuses(state, action.statuses);
+ return importStatuses(state, action.statuses, action.expandSpoilers);
case STATUS_CREATE_REQUEST:
return importPendingStatus(state, action.params);
case STATUS_CREATE_FAIL:
diff --git a/app/soapbox/utils/__tests__/accounts-test.js b/app/soapbox/utils/__tests__/accounts-test.js
index 15a42ec57..d3fd6f9ba 100644
--- a/app/soapbox/utils/__tests__/accounts-test.js
+++ b/app/soapbox/utils/__tests__/accounts-test.js
@@ -6,6 +6,7 @@ import {
isStaff,
isAdmin,
isModerator,
+ accountToMention,
} from '../accounts';
describe('getDomain', () => {
@@ -115,3 +116,19 @@ describe('isModerator', () => {
});
});
});
+
+describe('accountToMention', () => {
+ it('converts the account to a mention', () => {
+ const account = fromJS(require('soapbox/__fixtures__/alex.json'));
+
+ const expected = fromJS({
+ id: '9v5bmRalQvjOy0ECcC',
+ username: 'alex',
+ acct: 'alex',
+ url: 'https://gleasonator.com/users/alex',
+ });
+
+ const result = accountToMention(account);
+ expect(result).toEqual(expected);
+ });
+});
diff --git a/app/soapbox/utils/accounts.ts b/app/soapbox/utils/accounts.ts
index 361ecbc25..a6d418968 100644
--- a/app/soapbox/utils/accounts.ts
+++ b/app/soapbox/utils/accounts.ts
@@ -71,3 +71,12 @@ export const isVerified = (account: ImmutableMap