diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2022-03-09 21:15:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-09 21:15:24 +0100 |
commit | 9f2791eb64d5d19418561270f79071c185876d20 (patch) | |
tree | ebf96dada0dd70f7589b0b3cadac778a3df8aacd /app/javascript/mastodon/features/report/components/status_check_box.js | |
parent | 2a56a890dabb7cffd1dc14cf8a7aea9cccc7ab09 (diff) |
Add polls and media attachments to edit comparison modal in web UI (#17727)
Diffstat (limited to 'app/javascript/mastodon/features/report/components/status_check_box.js')
-rw-r--r-- | app/javascript/mastodon/features/report/components/status_check_box.js | 52 |
1 files changed, 5 insertions, 47 deletions
diff --git a/app/javascript/mastodon/features/report/components/status_check_box.js b/app/javascript/mastodon/features/report/components/status_check_box.js index a2eb3d6f5..373c60e21 100644 --- a/app/javascript/mastodon/features/report/components/status_check_box.js +++ b/app/javascript/mastodon/features/report/components/status_check_box.js @@ -1,14 +1,12 @@ import React from 'react'; import PropTypes from 'prop-types'; import ImmutablePropTypes from 'react-immutable-proptypes'; -import noop from 'lodash/noop'; import StatusContent from 'mastodon/components/status_content'; -import { MediaGallery, Video } from 'mastodon/features/ui/util/async-components'; -import Bundle from 'mastodon/features/ui/components/bundle'; import Avatar from 'mastodon/components/avatar'; import DisplayName from 'mastodon/components/display_name'; import RelativeTimestamp from 'mastodon/components/relative_timestamp'; import Option from './option'; +import MediaAttachments from 'mastodon/components/media_attachments'; export default class StatusCheckBox extends React.PureComponent { @@ -27,51 +25,10 @@ export default class StatusCheckBox extends React.PureComponent { render () { const { status, checked } = this.props; - let media = null; - if (status.get('reblog')) { return null; } - if (status.get('media_attachments').size > 0) { - if (status.get('media_attachments').some(item => item.get('type') === 'unknown')) { - - } else if (status.getIn(['media_attachments', 0, 'type']) === 'video') { - const video = status.getIn(['media_attachments', 0]); - - media = ( - <Bundle fetchComponent={Video} loading={this.renderLoadingVideoPlayer} > - {Component => ( - <Component - preview={video.get('preview_url')} - blurhash={video.get('blurhash')} - src={video.get('url')} - alt={video.get('description')} - width={239} - height={110} - inline - sensitive={status.get('sensitive')} - onOpenVideo={noop} - /> - )} - </Bundle> - ); - } else { - media = ( - <Bundle fetchComponent={MediaGallery} loading={this.renderLoadingMediaGallery} > - {Component => ( - <Component - media={status.get('media_attachments')} - sensitive={status.get('sensitive')} - height={110} - onOpenMedia={noop} - /> - )} - </Bundle> - ); - } - } - const labelComponent = ( <div className='status-check-box__status poll__option__text'> <div className='detailed-status__display-name'> @@ -79,12 +36,13 @@ export default class StatusCheckBox extends React.PureComponent { <Avatar account={status.get('account')} size={46} /> </div> - <div><DisplayName account={status.get('account')} /> · <RelativeTimestamp timestamp={status.get('created_at')} /></div> + <div> + <DisplayName account={status.get('account')} /> · <RelativeTimestamp timestamp={status.get('created_at')} /> + </div> </div> <StatusContent status={status} /> - - {media} + <MediaAttachments status={status} /> </div> ); |