mirror of
https://github.com/whippyshou/mastodon
synced 2024-12-02 00:38:27 +09:00
6cc5b822f5
* Fix audio and video items in account gallery in web UI - Fix audio items not using thumbnails - Fix video items not using custom thumbnails - Fix video items autoplaying like GIFs * Change audio and video items in account gallery to autoplay when opened in web UI * Fix code style issue
92 lines
2.7 KiB
JavaScript
92 lines
2.7 KiB
JavaScript
import React from 'react';
|
|
import ImmutablePropTypes from 'react-immutable-proptypes';
|
|
import PropTypes from 'prop-types';
|
|
import Audio from 'mastodon/features/audio';
|
|
import { connect } from 'react-redux';
|
|
import ImmutablePureComponent from 'react-immutable-pure-component';
|
|
import { FormattedMessage } from 'react-intl';
|
|
import { previewState } from './video_modal';
|
|
import classNames from 'classnames';
|
|
import Icon from 'mastodon/components/icon';
|
|
|
|
const mapStateToProps = (state, { status }) => ({
|
|
account: state.getIn(['accounts', status.get('account')]),
|
|
});
|
|
|
|
export default @connect(mapStateToProps)
|
|
class AudioModal extends ImmutablePureComponent {
|
|
|
|
static propTypes = {
|
|
media: ImmutablePropTypes.map.isRequired,
|
|
status: ImmutablePropTypes.map,
|
|
options: PropTypes.shape({
|
|
autoPlay: PropTypes.bool,
|
|
}),
|
|
account: ImmutablePropTypes.map,
|
|
onClose: PropTypes.func.isRequired,
|
|
};
|
|
|
|
static contextTypes = {
|
|
router: PropTypes.object,
|
|
};
|
|
|
|
componentDidMount () {
|
|
if (this.context.router) {
|
|
const history = this.context.router.history;
|
|
|
|
history.push(history.location.pathname, previewState);
|
|
|
|
this.unlistenHistory = history.listen(() => {
|
|
this.props.onClose();
|
|
});
|
|
}
|
|
}
|
|
|
|
componentWillUnmount () {
|
|
if (this.context.router) {
|
|
this.unlistenHistory();
|
|
|
|
if (this.context.router.history.location.state === previewState) {
|
|
this.context.router.history.goBack();
|
|
}
|
|
}
|
|
}
|
|
|
|
handleStatusClick = e => {
|
|
if (e.button === 0 && !(e.ctrlKey || e.metaKey)) {
|
|
e.preventDefault();
|
|
this.context.router.history.push(`/statuses/${this.props.status.get('id')}`);
|
|
}
|
|
}
|
|
|
|
render () {
|
|
const { media, status, account } = this.props;
|
|
const options = this.props.options || {};
|
|
|
|
return (
|
|
<div className='modal-root__modal audio-modal'>
|
|
<div className='audio-modal__container'>
|
|
<Audio
|
|
src={media.get('url')}
|
|
alt={media.get('description')}
|
|
duration={media.getIn(['meta', 'original', 'duration'], 0)}
|
|
height={150}
|
|
poster={media.get('preview_url') || account.get('avatar_static')}
|
|
backgroundColor={media.getIn(['meta', 'colors', 'background'])}
|
|
foregroundColor={media.getIn(['meta', 'colors', 'foreground'])}
|
|
accentColor={media.getIn(['meta', 'colors', 'accent'])}
|
|
autoPlay={options.autoPlay}
|
|
/>
|
|
</div>
|
|
|
|
{status && (
|
|
<div className={classNames('media-modal__meta')}>
|
|
<a href={status.get('url')} onClick={this.handleStatusClick}><Icon id='comments' /> <FormattedMessage id='lightbox.view_context' defaultMessage='View context' /></a>
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
}
|