matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'soapbox/develop' into lexical

Browse Source
This commit is contained in:
marcin mikołajczak
2023-07-17 23:42:50 +02:00
parent cc65ec387a 36083fe1b8
commit fdcdd8d4d7
96 changed files with 491 additions and 665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/soapbox/normalizers/status.ts
View File

@@ -14,6 +14,7 @@ import { normalizeAttachment } from 'soapbox/normalizers/attachment';
import { normalizeEmoji } from 'soapbox/normalizers/emoji';
import { normalizeMention } from 'soapbox/normalizers/mention';
import { accountSchema, cardSchema, groupSchema, pollSchema, tombstoneSchema } from 'soapbox/schemas';
import { maybeFromJS } from 'soapbox/utils/normalizers';
import type { Account, Attachment, Card, Emoji, Group, Mention, Poll, EmbeddedEntity } from 'soapbox/types/entities';
@@ -245,7 +246,7 @@ const normalizeDislikes = (status: ImmutableMap<string, any>) => {
const parseAccount = (status: ImmutableMap<string, any>) => {
try {
const account = accountSchema.parse(status.get('account').toJS());
const account = accountSchema.parse(maybeFromJS(status.get('account')));
return status.set('account', account);
} catch (_e) {
return status.set('account', null);