Merge branch 'main' into glitch-soc/merge-upstream

2023-02-10 22:49:59 +01:00
parent 4ceadc65b0 61c5dfb929
commit 87419f9307
57 changed files with 841 additions and 206 deletions
--- a/app/javascript/mastodon/features/compose/components/upload.js
+++ b/app/javascript/mastodon/features/compose/components/upload.js
@ -31,6 +31,11 @@ export default class Upload extends ImmutablePureComponent {

  render () {
    const { media } = this.props;
+
+    if (!media) {
+      return null;
+    }
+
    const focusX = media.getIn(['meta', 'focus', 'x']);
    const focusY = media.getIn(['meta', 'focus', 'y']);
    const x = ((focusX /  2) + .5) * 100;