From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 22 Mar 2020 15:10:44 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=9abb227250bd2b377d96626122d431ba30c5f5e0;p=mastodon.git

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

Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
---

9abb227250bd2b377d96626122d431ba30c5f5e0
diff --cc app/javascript/core/admin.js
index e4d683dd0,061287f89..09da9efd3
--- a/app/javascript/core/admin.js
+++ b/app/javascript/core/admin.js
@@@ -1,6 -1,4 +1,6 @@@
 +//  This file will be loaded on admin pages, regardless of theme.
 +
- import { delegate } from 'rails-ujs';
+ import { delegate } from '@rails/ujs';
  import ready from '../mastodon/ready';
  
  const batchCheckboxClassName = '.batch-checkbox input[type="checkbox"]';
diff --cc app/javascript/core/public.js
index 0f4222139,000000000..344c05181
mode 100644,000000..100644
--- a/app/javascript/core/public.js
+++ b/app/javascript/core/public.js
@@@ -1,66 -1,0 +1,66 @@@
 +//  This file will be loaded on public pages, regardless of theme.
 +
 +import createHistory from 'history/createBrowserHistory';
 +import ready from '../mastodon/ready';
 +
- const { delegate } = require('rails-ujs');
++const { delegate } = require('@rails/ujs');
 +const { length } = require('stringz');
 +
 +delegate(document, '.webapp-btn', 'click', ({ target, button }) => {
 +  if (button !== 0) {
 +    return true;
 +  }
 +  window.location.href = target.href;
 +  return false;
 +});
 +
 +delegate(document, '.status__content__spoiler-link', 'click', function() {
 +  const contentEl = this.parentNode.parentNode.querySelector('.e-content');
 +
 +  if (contentEl.style.display === 'block') {
 +    contentEl.style.display = 'none';
 +    this.parentNode.style.marginBottom = 0;
 +  } else {
 +    contentEl.style.display = 'block';
 +    this.parentNode.style.marginBottom = null;
 +  }
 +
 +  return false;
 +});
 +
 +delegate(document, '.modal-button', 'click', e => {
 +  e.preventDefault();
 +
 +  let href;
 +
 +  if (e.target.nodeName !== 'A') {
 +    href = e.target.parentNode.href;
 +  } else {
 +    href = e.target.href;
 +  }
 +
 +  window.open(href, 'mastodon-intent', 'width=445,height=600,resizable=no,menubar=no,status=no,scrollbars=yes');
 +});
 +
 +const getProfileAvatarAnimationHandler = (swapTo) => {
 +  //animate avatar gifs on the profile page when moused over
 +  return ({ target }) => {
 +    const swapSrc = target.getAttribute(swapTo);
 +    //only change the img source if autoplay is off and the image src is actually different
 +    if(target.getAttribute('data-autoplay') !== 'true' && target.src !== swapSrc) {
 +      target.src = swapSrc;
 +    }
 +  };
 +};
 +
 +delegate(document, 'img#profile_page_avatar', 'mouseover', getProfileAvatarAnimationHandler('data-original'));
 +
 +delegate(document, 'img#profile_page_avatar', 'mouseout', getProfileAvatarAnimationHandler('data-static'));
 +
 +delegate(document, '#account_header', 'change', ({ target }) => {
 +  const header = document.querySelector('.card .card__img img');
 +  const [file] = target.files || [];
 +  const url = file ? URL.createObjectURL(file) : header.dataset.originalSrc;
 +
 +  header.src = url;
 +});
diff --cc app/javascript/core/settings.js
index e0cb944e0,000000000..e02c91cc7
mode 100644,000000..100644
--- a/app/javascript/core/settings.js
+++ b/app/javascript/core/settings.js
@@@ -1,74 -1,0 +1,74 @@@
 +//  This file will be loaded on settings pages, regardless of theme.
 +
 +import escapeTextContentForBrowser from 'escape-html';
- const { delegate } = require('rails-ujs');
++const { delegate } = require('@rails/ujs');
 +import emojify from '../mastodon/features/emoji/emoji';
 +
 +delegate(document, '#account_display_name', 'input', ({ target }) => {
 +  const name = document.querySelector('.card .display-name strong');
 +  if (name) {
 +    if (target.value) {
 +      name.innerHTML = emojify(escapeTextContentForBrowser(target.value));
 +    } else {
 +      name.textContent = document.querySelector('#default_account_display_name').textContent;
 +    }
 +  }
 +});
 +
 +delegate(document, '#account_avatar', 'change', ({ target }) => {
 +  const avatar = document.querySelector('.card .avatar img');
 +  const [file] = target.files || [];
 +  const url = file ? URL.createObjectURL(file) : avatar.dataset.originalSrc;
 +
 +  avatar.src = url;
 +});
 +
 +delegate(document, '#account_header', 'change', ({ target }) => {
 +  const header = document.querySelector('.card .card__img img');
 +  const [file] = target.files || [];
 +  const url = file ? URL.createObjectURL(file) : header.dataset.originalSrc;
 +
 +  header.src = url;
 +});
 +
 +delegate(document, '#account_locked', 'change', ({ target }) => {
 +  const lock = document.querySelector('.card .display-name i');
 +
 +  if (target.checked) {
 +    lock.style.display = 'inline';
 +  } else {
 +    lock.style.display = 'none';
 +  }
 +});
 +
 +delegate(document, '.input-copy input', 'click', ({ target }) => {
 +  target.focus();
 +  target.select();
 +  target.setSelectionRange(0, target.value.length);
 +});
 +
 +delegate(document, '.input-copy button', 'click', ({ target }) => {
 +  const input = target.parentNode.querySelector('.input-copy__wrapper input');
 +
 +  const oldReadOnly = input.readonly;
 +
 +  input.readonly = false;
 +  input.focus();
 +  input.select();
 +  input.setSelectionRange(0, input.value.length);
 +
 +  try {
 +    if (document.execCommand('copy')) {
 +      input.blur();
 +      target.parentNode.classList.add('copied');
 +
 +    setTimeout(() => {
 +        target.parentNode.classList.remove('copied');
 +      }, 700);
 +    }
 +  } catch (err) {
 +    console.error(err);
 +  }
 +
 +  input.readonly = oldReadOnly;
 +});
diff --cc app/javascript/flavours/glitch/packs/common.js
index 94a4e6ee4,000000000..1fedc890a
mode 100644,000000..100644
--- a/app/javascript/flavours/glitch/packs/common.js
+++ b/app/javascript/flavours/glitch/packs/common.js
@@@ -1,8 -1,0 +1,8 @@@
- import { start } from 'rails-ujs';
++import { start } from '@rails/ujs';
 +
 +start();
 +
 +import 'flavours/glitch/styles/index.scss';
 +
 +//  This ensures that webpack compiles our images.
 +require.context('../images', true);
diff --cc app/javascript/flavours/glitch/packs/public.js
index d8a97704f,000000000..066479fa6
mode 100644,000000..100644
--- a/app/javascript/flavours/glitch/packs/public.js
+++ b/app/javascript/flavours/glitch/packs/public.js
@@@ -1,118 -1,0 +1,118 @@@
 +import loadPolyfills from 'flavours/glitch/util/load_polyfills';
 +import ready from 'flavours/glitch/util/ready';
 +import loadKeyboardExtensions from 'flavours/glitch/util/load_keyboard_extensions';
 +
 +function main() {
 +  const IntlMessageFormat = require('intl-messageformat').default;
 +  const { timeAgoString } = require('flavours/glitch/components/relative_timestamp');
-   const { delegate } = require('rails-ujs');
++  const { delegate } = require('@rails/ujs');
 +  const emojify = require('flavours/glitch/util/emoji').default;
 +  const { getLocale } = require('locales');
 +  const { messages } = getLocale();
 +  const React = require('react');
 +  const ReactDOM = require('react-dom');
 +  const Rellax = require('rellax');
 +  const { createBrowserHistory } = require('history');
 +
 +  const scrollToDetailedStatus = () => {
 +    const history = createBrowserHistory();
 +    const detailedStatuses = document.querySelectorAll('.public-layout .detailed-status');
 +    const location = history.location;
 +
 +    if (detailedStatuses.length === 1 && (!location.state || !location.state.scrolledToDetailedStatus)) {
 +      detailedStatuses[0].scrollIntoView();
 +      history.replace(location.pathname, { ...location.state, scrolledToDetailedStatus: true });
 +    }
 +  };
 +
 +  const getEmojiAnimationHandler = (swapTo) => {
 +    return ({ target }) => {
 +      target.src = target.getAttribute(swapTo);
 +    };
 +  };
 +
 +  ready(() => {
 +    const locale = document.documentElement.lang;
 +
 +    const dateTimeFormat = new Intl.DateTimeFormat(locale, {
 +      year: 'numeric',
 +      month: 'long',
 +      day: 'numeric',
 +      hour: 'numeric',
 +      minute: 'numeric',
 +    });
 +
 +    [].forEach.call(document.querySelectorAll('.emojify'), (content) => {
 +      content.innerHTML = emojify(content.innerHTML);
 +    });
 +
 +    [].forEach.call(document.querySelectorAll('time.formatted'), (content) => {
 +      const datetime = new Date(content.getAttribute('datetime'));
 +      const formattedDate = dateTimeFormat.format(datetime);
 +
 +      content.title = formattedDate;
 +      content.textContent = formattedDate;
 +    });
 +
 +    [].forEach.call(document.querySelectorAll('time.time-ago'), (content) => {
 +      const datetime = new Date(content.getAttribute('datetime'));
 +      const now      = new Date();
 +
 +      content.title = dateTimeFormat.format(datetime);
 +      content.textContent = timeAgoString({
 +        formatMessage: ({ id, defaultMessage }, values) => (new IntlMessageFormat(messages[id] || defaultMessage, locale)).format(values),
 +        formatDate: (date, options) => (new Intl.DateTimeFormat(locale, options)).format(date),
 +      }, datetime, now, now.getFullYear(), content.getAttribute('datetime').includes('T'));
 +    });
 +
 +    const reactComponents = document.querySelectorAll('[data-component]');
 +    if (reactComponents.length > 0) {
 +      import(/* webpackChunkName: "containers/media_container" */ 'flavours/glitch/containers/media_container')
 +        .then(({ default: MediaContainer }) => {
 +          [].forEach.call(reactComponents, (component) => {
 +            [].forEach.call(component.children, (child) => {
 +              component.removeChild(child);
 +            });
 +          });
 +
 +          const content = document.createElement('div');
 +
 +          ReactDOM.render(<MediaContainer locale={locale} components={reactComponents} />, content);
 +          document.body.appendChild(content);
 +          scrollToDetailedStatus();
 +        })
 +        .catch(error => {
 +          console.error(error);
 +          scrollToDetailedStatus();
 +        });
 +    } else {
 +      scrollToDetailedStatus();
 +    }
 +
 +    const parallaxComponents = document.querySelectorAll('.parallax');
 +
 +    if (parallaxComponents.length > 0 ) {
 +      new Rellax('.parallax', { speed: -1 });
 +    }
 +
 +    delegate(document, '.custom-emoji', 'mouseover', getEmojiAnimationHandler('data-original'));
 +    delegate(document, '.custom-emoji', 'mouseout', getEmojiAnimationHandler('data-static'));
 +  });
 +
 +  delegate(document, '.sidebar__toggle__icon', 'click', () => {
 +    const target = document.querySelector('.sidebar ul');
 +
 +    if (target.style.display === 'block') {
 +      target.style.display = 'none';
 +    } else {
 +      target.style.display = 'block';
 +    }
 +  });
 +}
 +
 +loadPolyfills()
 +  .then(main)
 +  .then(loadKeyboardExtensions)
 +  .catch(error => {
 +    console.error(error);
 +  });
diff --cc app/javascript/flavours/glitch/packs/settings.js
index edf1b82e0,000000000..8a9f23505
mode 100644,000000..100644
--- a/app/javascript/flavours/glitch/packs/settings.js
+++ b/app/javascript/flavours/glitch/packs/settings.js
@@@ -1,24 -1,0 +1,24 @@@
 +import loadPolyfills from 'flavours/glitch/util/load_polyfills';
 +import ready from 'flavours/glitch/util/ready';
 +import loadKeyboardExtensions from 'flavours/glitch/util/load_keyboard_extensions';
 +
 +function main() {
-   const { delegate } = require('rails-ujs');
++  const { delegate } = require('@rails/ujs');
 +
 +  delegate(document, '.sidebar__toggle__icon', 'click', () => {
 +    const target = document.querySelector('.sidebar ul');
 +
 +    if (target.style.display === 'block') {
 +      target.style.display = 'none';
 +    } else {
 +      target.style.display = 'block';
 +    }
 +  });
 +}
 +
 +loadPolyfills()
 +  .then(main)
 +  .then(loadKeyboardExtensions)
 +  .catch(error => {
 +    console.error(error);
 +  });
diff --cc app/javascript/flavours/glitch/util/log_out.js
index 8e1659293,000000000..42dcee03e
mode 100644,000000..100644
--- a/app/javascript/flavours/glitch/util/log_out.js
+++ b/app/javascript/flavours/glitch/util/log_out.js
@@@ -1,34 -1,0 +1,34 @@@
- import Rails from 'rails-ujs';
++import Rails from '@rails/ujs';
 +import { signOutLink } from 'flavours/glitch/util/backend_links';
 +
 +export const logOut = () => {
 +  const form = document.createElement('form');
 +
 +  const methodInput = document.createElement('input');
 +  methodInput.setAttribute('name', '_method');
 +  methodInput.setAttribute('value', 'delete');
 +  methodInput.setAttribute('type', 'hidden');
 +  form.appendChild(methodInput);
 +
 +  const csrfToken = Rails.csrfToken();
 +  const csrfParam = Rails.csrfParam();
 +
 +  if (csrfParam && csrfToken) {
 +    const csrfInput = document.createElement('input');
 +    csrfInput.setAttribute('name', csrfParam);
 +    csrfInput.setAttribute('value', csrfToken);
 +    csrfInput.setAttribute('type', 'hidden');
 +    form.appendChild(csrfInput);
 +  }
 +
 +  const submitButton = document.createElement('input');
 +  submitButton.setAttribute('type', 'submit');
 +  form.appendChild(submitButton);
 +
 +  form.method = 'post';
 +  form.action = signOutLink;
 +  form.style.display = 'none';
 +
 +  document.body.appendChild(form);
 +  submitButton.click();
 +};
diff --cc app/models/media_attachment.rb
index 2813d9200,31aa918b7..59427a8cc
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@@ -121,9 -130,12 +130,12 @@@ class MediaAttachment < ApplicationReco
      original: VIDEO_FORMAT,
    }.freeze
  
 -  IMAGE_LIMIT = 10.megabytes
 -  VIDEO_LIMIT = 40.megabytes
 +  IMAGE_LIMIT = (ENV['MAX_IMAGE_SIZE'] || 10.megabytes).to_i
 +  VIDEO_LIMIT = (ENV['MAX_VIDEO_SIZE'] || 40.megabytes).to_i
  
+   MAX_VIDEO_MATRIX_LIMIT = 2_304_000 # 1920x1200px
+   MAX_VIDEO_FRAME_RATE   = 60
+ 
    belongs_to :account,          inverse_of: :media_attachments, optional: true
    belongs_to :status,           inverse_of: :media_attachments, optional: true
    belongs_to :scheduled_status, inverse_of: :media_attachments, optional: true
diff --cc config/routes.rb
index 103abc6c1,89d446d10..7530c5b1f
--- a/config/routes.rb
+++ b/config/routes.rb
@@@ -346,13 -343,9 +346,13 @@@ Rails.application.routes.draw d
          end
        end
  
-       resources :media,        only: [:create, :update]
+       resources :media,        only: [:create, :update, :show]
        resources :blocks,       only: [:index]
 -      resources :mutes,        only: [:index]
 +      resources :mutes,        only: [:index] do
 +        collection do
 +          get 'details'
 +        end
 +      end
        resources :favourites,   only: [:index]
        resources :bookmarks,    only: [:index]
        resources :reports,      only: [:create]
diff --cc package.json
index 9e221eefa,8ad05c64d..be4eb877f
--- a/package.json
+++ b/package.json
@@@ -95,8 -93,7 +95,8 @@@
      "escape-html": "^1.0.3",
      "exif-js": "^2.3.0",
      "express": "^4.17.1",
 +    "favico.js": "^0.3.10",
-     "file-loader": "^5.0.2",
+     "file-loader": "^5.1.0",
      "font-awesome": "^4.7.0",
      "glob": "^7.1.6",
      "history": "^4.10.1",