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

Merge branch 'video-meta' into 'develop'

Browse source 
Ensure attachment meta is not null

See merge request soapbox-pub/soapbox-fe!1619
This commit is contained in:
marcin mikołajczak 2022-07-09 07:21:49 +00:00
commit 59cc913083
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/soapbox/normalizers/attachment.ts
View file

@ -46,8 +46,18 @@ const normalizeUrls = (attachment: ImmutableMap<string, any>) => {
return attachment.mergeWith(mergeDefined, base); return attachment.mergeWith(mergeDefined, base);
}; };
// Ensure meta is not null
const normalizeMeta = (attachment: ImmutableMap<string, any>) => {
const meta = ImmutableMap().merge(attachment.get('meta'));
return attachment.set('meta', meta);
};
export const normalizeAttachment = (attachment: Record<string, any>) => { export const normalizeAttachment = (attachment: Record<string, any>) => {
return AttachmentRecord( return AttachmentRecord(
normalizeUrls(ImmutableMap(fromJS(attachment))), ImmutableMap(fromJS(attachment)).withMutations((attachment: ImmutableMap<string, any>) => {
normalizeUrls(attachment);
normalizeMeta(attachment);
}),
); );
}; };