,
+ );
+ } else if (unqualified in unicodeMapping) {
+ clearStack();
+
+ const { unified, shortcode } = unicodeMapping[unqualified];
+
+ nodes.push(
+ ,
+ );
+ } else if (c === ':') {
+ if (!open) {
+ clearStack();
+ }
+
+ stack += ':';
+
+ // we see another : we convert it and clear the stack buffer
+ if (open) {
+ nodes.push(
{versions?.map((version) => {
const content = =
{version.spoiler_text?.length > 0 && (
<>
-
+
+
)} @@ -71,7 +73,9 @@ const CompareHistoryModal: React.FC =
role='radio'
/>
-
+
+ = ({ group }) => {
size='md'
className='mx-auto max-w-sm [&_a]:text-primary-600 [&_a]:hover:underline [&_a]:dark:text-accent-blue'
>
- ;
+ account: Pick;
limit: number;
}
@@ -36,7 +37,7 @@ const PinnedAccountsPanel: React.FC = ({ account, limit })
id='pinned_accounts.title'
defaultMessage='{name}’s choices'
values={{
- name: ,
+ name: ;
+ account: Pick;
}
/** Custom profile fields for sidebar. */
@@ -16,7 +16,7 @@ const ProfileFieldsPanel: React.FC = ({ account }) => (
{account.fields.map((field, i) => (
-
diff --git a/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx
index 8ffc01e9d..65805e1c5 100644
--- a/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx
+++ b/packages/pl-fe/src/features/ui/components/panels/profile-info-panel.tsx
@@ -10,6 +10,7 @@ import HStack from 'pl-fe/components/ui/hstack';
import Icon from 'pl-fe/components/ui/icon';
import Stack from 'pl-fe/components/ui/stack';
import Text from 'pl-fe/components/ui/text';
+import Emojify from 'pl-fe/features/emoji/emojify';
import { useAppSelector } from 'pl-fe/hooks/useAppSelector';
import { usePlFeConfig } from 'pl-fe/hooks/usePlFeConfig';
import { capitalize } from 'pl-fe/utils/strings';
@@ -122,8 +123,6 @@ const ProfileInfoPanel: React.FC = ({ account, username }) =>
);
}
- const deactivated = account.deactivated ?? false;
- const displayNameHtml = deactivated ? { __html: intl.formatMessage(messages.deactivated) } : { __html: account.display_name_html };
const memberSinceDate = intl.formatDate(account.created_at, { month: 'long', year: 'numeric' });
const badges = getBadges();
@@ -132,7 +131,11 @@ const ProfileInfoPanel: React.FC = ({ account, username }) =>
-
+ {account.deactivated
+ ?
{account.bot && = ({ account, username }) =>
-
)}
@@ -208,7 +211,7 @@ const ProfileInfoPanel: React.FC = ({ account, username }) =>
{account.fields.length > 0 && (
{account.fields.map((field, i) => (
-
)}
diff --git a/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx b/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx
index 6d4cb889d..27a30185c 100644
--- a/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx
+++ b/packages/pl-fe/src/features/ui/components/panels/user-panel.tsx
@@ -9,6 +9,7 @@ import HStack from 'pl-fe/components/ui/hstack';
import Stack from 'pl-fe/components/ui/stack';
import Text from 'pl-fe/components/ui/text';
import VerificationBadge from 'pl-fe/components/verification-badge';
+import Emojify from 'pl-fe/features/emoji/emojify';
import { useAppSelector } from 'pl-fe/hooks/useAppSelector';
import { useSettings } from 'pl-fe/hooks/useSettings';
import { getAcct } from 'pl-fe/utils/accounts';
@@ -29,7 +30,6 @@ const UserPanel: React.FC = ({ accountId, action, badges, domain })
const fqn = useAppSelector((state) => displayFqn(state));
if (!account) return null;
- const displayNameHtml = { __html: account.display_name_html };
const acct = !account.acct.includes('@') && domain ? `${account.acct}@${domain}` : account.acct;
const header = account.header;
const verified = account.verified;
@@ -67,7 +67,9 @@ const UserPanel: React.FC = ({ accountId, action, badges, domain })
-
+
{verified && = ({ account
-
+
{account.verified &&
diff --git a/packages/pl-fe/src/features/ui/components/profile-field.tsx b/packages/pl-fe/src/features/ui/components/profile-field.tsx
index 1e0cae751..18ea25f59 100644
--- a/packages/pl-fe/src/features/ui/components/profile-field.tsx
+++ b/packages/pl-fe/src/features/ui/components/profile-field.tsx
@@ -3,9 +3,12 @@ import React from 'react';
import { defineMessages, useIntl, FormatDateOptions } from 'react-intl';
import Markup from 'pl-fe/components/markup';
+import { ParsedContent } from 'pl-fe/components/parsed-content';
import HStack from 'pl-fe/components/ui/hstack';
import Icon from 'pl-fe/components/ui/icon';
+import Emojify from 'pl-fe/features/emoji/emojify';
import { CryptoAddress, LightningAddress } from 'pl-fe/features/ui/util/async-components';
+import { unescapeHTML } from 'pl-fe/utils/html';
import type { Account } from 'pl-fe/normalizers/account';
@@ -28,32 +31,35 @@ const dateFormatOptions: FormatDateOptions = {
interface IProfileField {
field: Account['fields'][number];
+ emojis?: Account['emojis'];
}
/** Renders a single profile field. */
-const ProfileField: React.FC = ({ field }) => {
+const ProfileField: React.FC = ({ field, emojis }) => {
const intl = useIntl();
if (isTicker(field.name)) {
return (
): string => {
@@ -34,8 +28,6 @@ const normalizeAccount = (account: BaseAccount) => {
const domain = fqn.split('@')[1] || '';
const note = account.note === '' ? '' : account.note;
- const emojiMap = makeEmojiMap(account.emojis);
-
return {
mute_expires_at: null,
...account,
@@ -46,15 +38,6 @@ const normalizeAccount = (account: BaseAccount) => {
fqn,
domain,
note,
- display_name_html: emojify(escapeTextContentForBrowser(account.display_name), emojiMap),
- note_emojified: emojify(account.note, emojiMap),
- note_plain: unescapeHTML(account.note),
- fields: account.fields.map(field => ({
- ...field,
- name_emojified: emojify(escapeTextContentForBrowser(field.name), emojiMap),
- value_emojified: emojify(field.value, emojiMap),
- value_plain: unescapeHTML(field.value),
- })),
};
};
diff --git a/packages/pl-fe/src/normalizers/announcement.ts b/packages/pl-fe/src/normalizers/announcement.ts
index ffb1ad4c8..9574a0827 100644
--- a/packages/pl-fe/src/normalizers/announcement.ts
+++ b/packages/pl-fe/src/normalizers/announcement.ts
@@ -1,10 +1,10 @@
import emojify from 'pl-fe/features/emoji';
-import { makeCustomEmojiMap } from 'pl-fe/schemas/utils';
+import { makeEmojiMap } from 'pl-fe/utils/normalizers';
import type { AdminAnnouncement as BaseAdminAnnouncement, Announcement as BaseAnnouncement } from 'pl-api';
const normalizeAnnouncement = (announcement: T) => {
- const emojiMap = makeCustomEmojiMap(announcement.emojis);
+ const emojiMap = makeEmojiMap(announcement.emojis);
const contentHtml = emojify(announcement.content, emojiMap);
diff --git a/packages/pl-fe/src/normalizers/group.ts b/packages/pl-fe/src/normalizers/group.ts
index 9d564e0c5..856cb33b8 100644
--- a/packages/pl-fe/src/normalizers/group.ts
+++ b/packages/pl-fe/src/normalizers/group.ts
@@ -1,9 +1,3 @@
-import escapeTextContentForBrowser from 'escape-html';
-
-import emojify from 'pl-fe/features/emoji';
-import { unescapeHTML } from 'pl-fe/utils/html';
-import { makeEmojiMap } from 'pl-fe/utils/normalizers';
-
import type { Group as BaseGroup } from 'pl-api';
const getDomainFromURL = (group: Pick): string => {
@@ -20,9 +14,6 @@ const normalizeGroup = (group: BaseGroup) => {
const missingHeader = require('pl-fe/assets/images/header-missing.png');
const domain = getDomainFromURL(group);
- const note = group.note === '' ? '' : group.note;
-
- const emojiMap = makeEmojiMap(group.emojis);
return {
...group,
@@ -31,10 +22,6 @@ const normalizeGroup = (group: BaseGroup) => {
header: group.header || group.header_static || missingHeader,
header_static: group.header_static || group.header || missingHeader,
domain,
- note,
- display_name_html: emojify(escapeTextContentForBrowser(group.display_name), emojiMap),
- note_emojified: emojify(group.note, emojiMap),
- note_plain: unescapeHTML(group.note),
};
};
diff --git a/packages/pl-fe/src/normalizers/status-edit.ts b/packages/pl-fe/src/normalizers/status-edit.ts
index 80809dc79..e5aa79149 100644
--- a/packages/pl-fe/src/normalizers/status-edit.ts
+++ b/packages/pl-fe/src/normalizers/status-edit.ts
@@ -6,18 +6,13 @@ import escapeTextContentForBrowser from 'escape-html';
import emojify from 'pl-fe/features/emoji';
import { makeEmojiMap } from 'pl-fe/utils/normalizers';
-import { normalizePollEdit } from './poll';
-
import type { StatusEdit as BaseStatusEdit } from 'pl-api';
const normalizeStatusEdit = (statusEdit: BaseStatusEdit) => {
const emojiMap = makeEmojiMap(statusEdit.emojis);
- const poll = statusEdit.poll ? normalizePollEdit(statusEdit.poll, statusEdit.emojis) : null;
-
return {
...statusEdit,
- poll,
contentHtml: emojify(statusEdit.content, emojiMap),
spoilerHtml: emojify(escapeTextContentForBrowser(statusEdit.spoiler_text), emojiMap),
};
diff --git a/packages/pl-fe/src/reducers/polls.ts b/packages/pl-fe/src/reducers/polls.ts
index 27102d118..f5015dc8d 100644
--- a/packages/pl-fe/src/reducers/polls.ts
+++ b/packages/pl-fe/src/reducers/polls.ts
@@ -1,16 +1,15 @@
import { Map as ImmutableMap } from 'immutable';
import { POLLS_IMPORT } from 'pl-fe/actions/importer';
-import { normalizePoll } from 'pl-fe/normalizers/poll';
-import type { Status } from 'pl-api';
+import type { Poll, Status } from 'pl-api';
import type { AnyAction } from 'redux';
-type State = ImmutableMap>;
+type State = ImmutableMap;
const importPolls = (state: State, polls: Array>) =>
state.withMutations(map =>
- polls.forEach(poll => map.set(poll.id, normalizePoll(poll))),
+ polls.forEach(poll => map.set(poll.id, poll)),
);
const initialState: State = ImmutableMap();
diff --git a/packages/pl-fe/src/schemas/utils.ts b/packages/pl-fe/src/schemas/utils.ts
index ed75567ee..1cc70c64e 100644
--- a/packages/pl-fe/src/schemas/utils.ts
+++ b/packages/pl-fe/src/schemas/utils.ts
@@ -1,7 +1,5 @@
import * as v from 'valibot';
-import type { CustomEmoji } from 'pl-api';
-
/** Validates individual items in an array, dropping any that aren't valid. */
const filteredArray = (schema: v.BaseSchema>) =>
v.pipe(
@@ -14,13 +12,6 @@ const filteredArray = (schema: v.BaseSchema>) =>
)),
);
-/** Map a list of CustomEmoji to their shortcodes. */
-const makeCustomEmojiMap = (customEmojis: CustomEmoji[]) =>
- customEmojis.reduce>((result, emoji) => {
- result[`:${emoji.shortcode}:`] = emoji;
- return result;
- }, {});
-
/** valibot schema to force the value into an object, if it isn't already. */
const coerceObject = (shape: T) =>
v.pipe(
@@ -29,4 +20,4 @@ const coerceObject = (shape: T) =>
v.object(shape),
);
-export { filteredArray, makeCustomEmojiMap, coerceObject };
+export { filteredArray, coerceObject };
)} @@ -71,7 +73,9 @@ const CompareHistoryModal: React.FC
-
-
+ + + -
{field.verified_at && ( @@ -62,7 +68,9 @@ const ProfileField: React.FC = ({ field }) => { )} - + + +