moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: dispatch openModal() 'MEDIA' with raw objects

This commit is contained in:
P. Reis 2024-12-10 22:37:38 -03:00
parent 10ff18e76f
commit 60489cb123
11 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/status.tsx
View File

@ -151,7 +151,7 @@ const Status: React.FC<IStatus> = (props) => {
if (firstAttachment.type === 'video') {
dispatch(openModal('VIDEO', { status, media: firstAttachment, time: 0 }));
} else {
dispatch(openModal('MEDIA', { status, media: status.media_attachments, index: 0 }));
dispatch(openModal('MEDIA', { status: status.toJS(), media: status.media_attachments.toJS(), index: 0 }));
}
}
};

2
src/components/upload.tsx
View File

@ -140,7 +140,7 @@ const Upload: React.FC<IUpload> = ({
};
const handleOpenModal = () => {
dispatch(openModal('MEDIA', { media: ImmutableList.of(media), index: 0 }));
dispatch(openModal('MEDIA', { media: ImmutableList.of(media).toJS(), index: 0 }));
};
const active = hovered || focused;

2
src/features/account-gallery/index.tsx
View File

@ -74,7 +74,7 @@ const AccountGallery = () => {
const media = (attachment.status as Status).media_attachments;
const index = media.findIndex((x) => x.id === attachment.id);
dispatch(openModal('MEDIA', { media, index, status: attachment.status }));
dispatch(openModal('MEDIA', { media: media.toJS(), index, status: attachment?.status?.toJS() ?? attachment.status }));
}
};

4
src/features/account/components/header.tsx
View File

@ -266,7 +266,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
type: 'image',
url: account.avatar,
});
dispatch(openModal('MEDIA', { media: ImmutableList.of(avatar), index: 0 }));
dispatch(openModal('MEDIA', { media: ImmutableList.of(avatar).toJS(), index: 0 }));
};
const handleAvatarClick: React.MouseEventHandler = (e) => {
@ -281,7 +281,7 @@ const Header: React.FC<IHeader> = ({ account }) => {
type: 'image',
url: account.header,
});
dispatch(openModal('MEDIA', { media: ImmutableList.of(header), index: 0 }));
dispatch(openModal('MEDIA', { media: ImmutableList.of(header).toJS(), index: 0 }));
};
const handleHeaderClick: React.MouseEventHandler = (e) => {

2
src/features/chats/components/chat-upload.tsx
View File

@ -22,7 +22,7 @@ const ChatUpload: React.FC<IChatUpload> = ({ attachment, onDelete }) => {
const clickable = attachment.type !== 'unknown';
const handleOpenModal = () => {
dispatch(openModal('MEDIA', { media: ImmutableList.of(attachment), index: 0 }));
dispatch(openModal('MEDIA', { media: ImmutableList.of(attachment).toJS(), index: 0 }));
};
return (

2
src/features/event/components/event-header.tsx
View File

@ -128,7 +128,7 @@ const EventHeader: React.FC<IEventHeader> = ({ status }) => {
e.preventDefault();
e.stopPropagation();
dispatch(openModal('MEDIA', { media: ImmutableList([event.banner]) }));
dispatch(openModal('MEDIA', { media: ImmutableList([event.banner]).toJS() }));
};
const handleExportClick = () => {

4
src/features/group/components/group-header.tsx
View File

@ -63,7 +63,7 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
type: 'image',
url: group.avatar,
});
dispatch(openModal('MEDIA', { media: ImmutableList.of(avatar), index: 0 }));
dispatch(openModal('MEDIA', { media: ImmutableList.of(avatar).toJS(), index: 0 }));
};
const handleAvatarClick: React.MouseEventHandler = (e) => {
@ -78,7 +78,7 @@ const GroupHeader: React.FC<IGroupHeader> = ({ group }) => {
type: 'image',
url: group.header,
});
dispatch(openModal('MEDIA', { media: ImmutableList.of(header), index: 0 }));
dispatch(openModal('MEDIA', { media: ImmutableList.of(header).toJS(), index: 0 }));
};
const handleHeaderClick: React.MouseEventHandler = (e) => {

2
src/features/group/group-gallery.tsx
View File

@ -43,7 +43,7 @@ const GroupGallery: React.FC<IGroupGallery> = (props) => {
const media = (attachment.status as Status).media_attachments;
const index = media.findIndex((x) => x.id === attachment.id);
dispatch(openModal('MEDIA', { media, index, status: attachment.status }));
dispatch(openModal('MEDIA', { media: media.toJS(), index, status: attachment?.status?.toJS() ?? attachment.status }));
}
};

2
src/features/status/components/thread.tsx
View File

@ -179,7 +179,7 @@ const Thread = (props: IThread) => {
if (media.size === 1 && firstAttachment.type === 'video') {
dispatch(openModal('VIDEO', { media: firstAttachment, status: status }));
} else {
dispatch(openModal('MEDIA', { media, index: 0, status: status }));
dispatch(openModal('MEDIA', { media: media.toJS(), index: 0, status: status.toJS() }));
}
}
};

2
src/features/ui/components/group-media-panel.tsx
View File

@ -36,7 +36,7 @@ const GroupMediaPanel: React.FC<IGroupMediaPanel> = ({ group }) => {
const media = attachment.getIn(['status', 'media_attachments']) as ImmutableList<Attachment>;
const index = media.findIndex(x => x.id === attachment.id);
dispatch(openModal('MEDIA', { media, index, status: attachment.status, account: attachment.account }));
dispatch(openModal('MEDIA', { media: media.toJS(), index, status: attachment?.status?.toJS() ?? attachment.status, account: attachment.account })); // NOTE: why 'account' field is here? it doesn't exist in MediaModal component
}
};

2
src/features/ui/components/profile-media-panel.tsx
View File

@ -34,7 +34,7 @@ const ProfileMediaPanel: React.FC<IProfileMediaPanel> = ({ account }) => {
const media = attachment.getIn(['status', 'media_attachments']) as ImmutableList<Attachment>;
const index = media.findIndex(x => x.id === attachment.id);
dispatch(openModal('MEDIA', { media, index, status: attachment.status }));
dispatch(openModal('MEDIA', { media: media.toJS(), index, status: attachment?.status?.toJS() ?? attachment.status }));
}
};