Merge pull request #216 from glitch-soc/merge-upstream-3023725

Merge upstream at commit 3023725

4 files changed, 5 insertions, 18 deletions

diff --git a/app/javascript/glitch/components/account/header.js b/app/javascript/glitch/components/account/header.js
index c94fb0851..7bc1a2189 100644
--- a/app/javascript/glitch/components/account/header.js
+++ b/app/javascript/glitch/components/account/header.js
@@ -51,6 +51,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import emojify from '../../../mastodon/features/emoji/emoji';
 import IconButton from '../../../mastodon/components/icon_button';
 import Avatar from '../../../mastodon/components/avatar';
+import { me } from '../../../mastodon/initial_state';
 
 //  Our imports  //
 import { processBio } from '../../util/bio_metadata';
@@ -88,7 +89,6 @@ export default class AccountHeader extends ImmutablePureComponent {
 
   static propTypes = {
     account  : ImmutablePropTypes.map,
-    me       : PropTypes.string.isRequired,
     onFollow : PropTypes.func.isRequired,
     intl     : PropTypes.object.isRequired,
   };
@@ -102,7 +102,7 @@ The `render()` function is used to render our component.
 */
 
   render () {
-    const { account, me, intl } = this.props;
+    const { account, intl } = this.props;
 
 /*
 
diff --git a/app/javascript/glitch/components/status/action_bar.js b/app/javascript/glitch/components/status/action_bar.js
index f4450d31b..34588b008 100644
--- a/app/javascript/glitch/components/status/action_bar.js
+++ b/app/javascript/glitch/components/status/action_bar.js
@@ -9,6 +9,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import RelativeTimestamp from '../../../mastodon/components/relative_timestamp';
 import IconButton from '../../../mastodon/components/icon_button';
 import DropdownMenuContainer from '../../../mastodon/containers/dropdown_menu_container';
+import { me } from '../../../mastodon/initial_state';
 
 const messages = defineMessages({
   delete: { id: 'status.delete', defaultMessage: 'Delete' },
@@ -50,7 +51,6 @@ export default class StatusActionBar extends ImmutablePureComponent {
     onEmbed: PropTypes.func,
     onMuteConversation: PropTypes.func,
     onPin: PropTypes.func,
-    me: PropTypes.string,
     withDismiss: PropTypes.bool,
     intl: PropTypes.object.isRequired,
   };
@@ -59,7 +59,6 @@ export default class StatusActionBar extends ImmutablePureComponent {
   // evaluate to false. See react-immutable-pure-component for usage.
   updateOnProps = [
     'status',
-    'me',
     'withDismiss',
   ]
 
@@ -119,7 +118,7 @@ export default class StatusActionBar extends ImmutablePureComponent {
   }
 
   render () {
-    const { status, me, intl, withDismiss } = this.props;
+    const { status, intl, withDismiss } = this.props;
 
     const mutingConversation = status.get('muted');
     const anonymousAccess = !me;
diff --git a/app/javascript/glitch/components/status/container.js b/app/javascript/glitch/components/status/container.js
index 24261e763..0054abd14 100644
--- a/app/javascript/glitch/components/status/container.js
+++ b/app/javascript/glitch/components/status/container.js
@@ -140,12 +140,10 @@ Here are the props we pass to `<Status>`.
     return {
       status      : status,
       account     : account || ownProps.account,
-      me          : state.getIn(['meta', 'me']),
       settings    : state.get('local_settings'),
       prepend     : prepend || ownProps.prepend,
       reblogModal : state.getIn(['meta', 'boost_modal']),
       deleteModal : state.getIn(['meta', 'delete_modal']),
-      autoPlayGif : state.getIn(['meta', 'auto_play_gif']),
     };
   };
 
diff --git a/app/javascript/glitch/components/status/index.js b/app/javascript/glitch/components/status/index.js
index 6bd95b051..33a9730e5 100644
--- a/app/javascript/glitch/components/status/index.js
+++ b/app/javascript/glitch/components/status/index.js
@@ -39,6 +39,7 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 
 //  Mastodon imports  //
 import scheduleIdleTask from '../../../mastodon/features/ui/util/schedule_idle_task';
+import { autoPlayGif } from '../../../mastodon/initial_state';
 
 //  Our imports  //
 import StatusPrepend from './prepend';
@@ -89,9 +90,6 @@ few parts:
     These are our local settings, fetched from our store. We need this
     to determine how best to collapse our statuses, among other things.
 
- -  __`me` (`PropTypes.number`) :__
-    This is the id of the currently-signed-in user.
-
  -  __`onFavourite`, `onReblog`, `onModalReblog`, `onDelete`,
     `onMention`, `onMute`, `onMuteConversation`, onBlock`, `onReport`,
     `onOpenMedia`, `onOpenVideo` (`PropTypes.func`) :__
@@ -103,9 +101,6 @@ few parts:
     reblogging and deleting statuses. They are used by the `onReblog`
     and `onDelete` functions, but we don't deal with them here.
 
- -  __`autoPlayGif` (`PropTypes.bool`) :__
-    This tells the frontend whether or not to autoplay gifs!
-
  -  __`muted` (`PropTypes.bool`) :__
     This has nothing to do with a user or conversation mute! "Muted" is
     what Mastodon internally calls the subdued look of statuses in the
@@ -160,7 +155,6 @@ export default class Status extends ImmutablePureComponent {
     account                     : ImmutablePropTypes.map,
     settings                    : ImmutablePropTypes.map,
     notification                : ImmutablePropTypes.map,
-    me                          : PropTypes.string,
     onFavourite                 : PropTypes.func,
     onReblog                    : PropTypes.func,
     onModalReblog               : PropTypes.func,
@@ -177,7 +171,6 @@ export default class Status extends ImmutablePureComponent {
     onOpenVideo                 : PropTypes.func,
     reblogModal                 : PropTypes.bool,
     deleteModal                 : PropTypes.bool,
-    autoPlayGif                 : PropTypes.bool,
     muted                       : PropTypes.bool,
     collapse                    : PropTypes.bool,
     prepend                     : PropTypes.string,
@@ -211,9 +204,7 @@ to remember to specify it here.
     'account',
     'settings',
     'prepend',
-    'me',
     'boostModal',
-    'autoPlayGif',
     'muted',
     'collapse',
     'notification',
@@ -560,7 +551,6 @@ this operation are further explained in the code below.
       intersectionObserverWrapper,
       onOpenVideo,
       onOpenMedia,
-      autoPlayGif,
       notification,
       ...other
     } = this.props;