~cytrogen/masto-fe

a98b5c22467c0cd8c1012e2d3cff5f62c49e44e2 — Claire 2 years ago d9adda1
[Glitch] Fix embed dropdown menu item for unauthenticated users

Port 41f65edb213dc34e723e5bcc7d3ea920752941ef to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
M app/javascript/flavours/glitch/containers/status_container.js => app/javascript/flavours/glitch/containers/status_container.js +1 -1
@@ 177,7 177,7 @@ const mapDispatchToProps = (dispatch, { intl, contextType }) => ({
    dispatch(openModal({
      modalType: 'EMBED',
      modalProps: {
        url: status.get('url'),
        id: status.get('id'),
        onError: error => dispatch(showAlertForError(error)),
      },
    }));

M app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js => app/javascript/flavours/glitch/features/status/containers/detailed_status_container.js +1 -1
@@ 108,7 108,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({
    dispatch(openModal({
      modalType: 'EMBED',
      modalProps: {
        url: status.get('url'),
        id: status.get('id'),
        onError: error => dispatch(showAlertForError(error)),
      },
    }));

M app/javascript/flavours/glitch/features/status/index.jsx => app/javascript/flavours/glitch/features/status/index.jsx +1 -1
@@ 500,7 500,7 @@ class Status extends ImmutablePureComponent {
  handleEmbed = (status) => {
    this.props.dispatch(openModal({
      modalType: 'EMBED',
      modalProps: { url: status.get('url') },
      modalProps: { id: status.get('id') },
    }));
  };


M app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx => app/javascript/flavours/glitch/features/ui/components/embed_modal.jsx +3 -3
@@ 14,7 14,7 @@ const messages = defineMessages({
class EmbedModal extends ImmutablePureComponent {

  static propTypes = {
    url: PropTypes.string.isRequired,
    id: PropTypes.string.isRequired,
    onClose: PropTypes.func.isRequired,
    onError: PropTypes.func.isRequired,
    intl: PropTypes.object.isRequired,


@@ 26,11 26,11 @@ class EmbedModal extends ImmutablePureComponent {
  };

  componentDidMount () {
    const { url } = this.props;
    const { id } = this.props;

    this.setState({ loading: true });

    api().post('/api/web/embed', { url }).then(res => {
    api().get(`/api/web/embeds/${id}`).then(res => {
      this.setState({ loading: false, oembed: res.data });

      const iframeDocument = this.iframe.contentWindow.document;