bigbuffet/pleroma
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Statuses reducer: refactor search_index

Browse source
This commit is contained in:
Alex Gleason 2022-03-19 15:04:28 -05:00
parent 9d79b60134
commit 47653546de
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/soapbox/reducers/statuses.ts
View file

@ -3,9 +3,9 @@ import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
import { AnyAction } from 'redux'; import { AnyAction } from 'redux';
import emojify from 'soapbox/features/emoji/emoji'; import emojify from 'soapbox/features/emoji/emoji';
import { normalizeStatus } from 'soapbox/normalizers/status'; import { normalizeStatus } from 'soapbox/normalizers';
import { simulateEmojiReact, simulateUnEmojiReact } from 'soapbox/utils/emoji_reacts'; import { simulateEmojiReact, simulateUnEmojiReact } from 'soapbox/utils/emoji_reacts';
import { stripCompatibilityFeatures } from 'soapbox/utils/html'; import { stripCompatibilityFeatures, unescapeHTML } from 'soapbox/utils/html';
import { makeEmojiMap } from 'soapbox/utils/normalizers'; import { makeEmojiMap } from 'soapbox/utils/normalizers';
import { import {
@ -49,9 +49,26 @@ const minifyStatus = (status: StatusRecord): StatusRecord => {
}); });
}; };
// Gets titles of poll options from status
const getPollOptionTitles = (status: StatusRecord): Array<string> => {
return status.poll?.options.map(({ title }: { title: string }) => title);
};
// Creates search text from the status
const buildSearchContent = (status: StatusRecord): string => {
const pollOptionTitles = getPollOptionTitles(status);
const fields = ImmutableList([
status.spoiler_text,
status.content,
]).concat(pollOptionTitles);
return unescapeHTML(fields.join('\n\n'));
};
// Only calculate these values when status first encountered // Only calculate these values when status first encountered
// Otherwise keep the ones already in the reducer // Otherwise keep the ones already in the reducer
export const calculateStatus = ( const calculateStatus = (
status: StatusRecord, status: StatusRecord,
oldStatus: StatusRecord, oldStatus: StatusRecord,
expandSpoilers: boolean = false, expandSpoilers: boolean = false,
@ -65,7 +82,7 @@ export const calculateStatus = (
}); });
} else { } else {
const spoilerText = status.spoiler_text; const spoilerText = status.spoiler_text;
const searchContent = (ImmutableList([spoilerText, status.content]).concat(status.poll?.options).map(option => option.title)).join('\n\n').replace(/<br\s*\/?>/g, '\n').replace(/<\/p><p>/g, '\n\n'); const searchContent = buildSearchContent(status);
const emojiMap = makeEmojiMap(status.emojis); const emojiMap = makeEmojiMap(status.emojis);
return status.merge({ return status.merge({