Merge branch 'develop' into bugfix/hidden-poll-results-light-theme

app/javascript/gabsocial/components/icon_with_badge.js

@@ -1,14 +1,17 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Icon from 'gabsocial/components/icon';
+import { shortNumberFormat } from 'gabsocial/utils/numbers';
 
-const formatNumber = num => num > 40 ? '40+' : num;
+const IconWithBadge = ({ id, count, className }) => {
+	if (count < 1) return null;
 
-const IconWithBadge = ({ id, count, className }) => (
-	<i className='icon-with-badge'>
-		{count > 0 && <i className='icon-with-badge__badge'>{formatNumber(count)}</i>}
-	</i>
-);
+	return (
+		<i className='icon-with-badge'>
+			{count > 0 && <i className='icon-with-badge__badge'>{shortNumberFormat(count)}</i>}
+		</i>
+	)
+};
 
 IconWithBadge.propTypes = {
 	id: PropTypes.string.isRequired,
@@ -16,4 +19,4 @@ IconWithBadge.propTypes = {
 	className: PropTypes.string,
 };
 
-export default IconWithBadge;
+export default IconWithBadge;

app/javascript/gabsocial/components/status.js

@@ -179,7 +179,11 @@ class Status extends ImmutablePureComponent {
       }
 
       const { status } = this.props;
-      this.context.router.history.push(`/${status.getIn(['account', 'acct'])}/posts/${status.getIn(['reblog', 'id'], status.get('id'))}`);
+
+      const isReblog = !!status.getIn(['reblog', 'id']);
+      const originalPosterUsername = isReblog ? status.getIn(['reblog', 'account', 'acct']) : status.getIn(['account', 'acct']);
+
+      this.context.router.history.push(`/${originalPosterUsername}/posts/${status.getIn(['reblog', 'id'], status.get('id'))}`);
     }
   }
 

app/javascript/gabsocial/features/reblogs/index.js

@@ -4,16 +4,28 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import LoadingIndicator from '../../components/loading_indicator';
+import MissingIndicator from '../../components/missing_indicator';
 import { fetchReblogs } from '../../actions/interactions';
+import { fetchStatus } from '../../actions/statuses';
 import { FormattedMessage } from 'react-intl';
 import AccountContainer from '../../containers/account_container';
 import Column from '../ui/components/column';
 import ColumnBackButton from '../../components/column_back_button';
 import ScrollableList from '../../components/scrollable_list';
+import { makeGetStatus } from '../../selectors';
 
-const mapStateToProps = (state, props) => ({
-  accountIds: state.getIn(['user_lists', 'reblogged_by', props.params.statusId]),
-});
+const mapStateToProps = (state, props) => {
+  const getStatus = makeGetStatus();
+  const status = getStatus(state, {
+    id: props.params.statusId,
+    username: props.params.username
+  });
+
+  return {
+    status,
+    accountIds: state.getIn(['user_lists', 'reblogged_by', props.params.statusId]),
+  }
+};
 
 export default @connect(mapStateToProps)
 class Reblogs extends ImmutablePureComponent {
@@ -22,20 +34,23 @@ class Reblogs extends ImmutablePureComponent {
     params: PropTypes.object.isRequired,
     dispatch: PropTypes.func.isRequired,
     accountIds: ImmutablePropTypes.list,
+    status: ImmutablePropTypes.map,
   };
 
   componentWillMount () {
     this.props.dispatch(fetchReblogs(this.props.params.statusId));
+    this.props.dispatch(fetchStatus(this.props.params.statusId));
   }
 
   componentWillReceiveProps(nextProps) {
     if (nextProps.params.statusId !== this.props.params.statusId && nextProps.params.statusId) {
       this.props.dispatch(fetchReblogs(nextProps.params.statusId));
+      this.props.dispatch(fetchStatus(nextProps.params.statusId));
     }
   }
 
   render () {
-    const { accountIds } = this.props;
+    const { accountIds, status } = this.props;
 
     if (!accountIds) {
       return (
@@ -45,6 +60,14 @@ class Reblogs extends ImmutablePureComponent {
       );
     }
 
+    if (!status) {
+      return (
+        <Column>
+          <MissingIndicator />
+        </Column>
+      );
+    }
+
     const emptyMessage = <FormattedMessage id='status.reblogs.empty' defaultMessage='No one has reposted this gab yet. When someone does, they will show up here.' />;
 
     return (

app/javascript/gabsocial/features/status/index.js

@@ -63,7 +63,11 @@ const makeMapStateToProps = () => {
   const getStatus = makeGetStatus();
 
   const mapStateToProps = (state, props) => {
-    const status = getStatus(state, { id: props.params.statusId });
+    const status = getStatus(state, {
+      id: props.params.statusId,
+      username: props.params.username
+    });
+
     let ancestorsIds = Immutable.List();
     let descendantsIds = Immutable.List();
 

app/javascript/gabsocial/selectors/index.js

@@ -70,14 +70,21 @@ export const makeGetStatus = () => {
       (state, { id }) => state.getIn(['statuses', state.getIn(['statuses', id, 'reblog'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', id, 'account'])]),
       (state, { id }) => state.getIn(['accounts', state.getIn(['statuses', state.getIn(['statuses', id, 'reblog']), 'account'])]),
+      (state, { username }) => username,
       getFilters,
     ],
 
-    (statusBase, statusReblog, accountBase, accountReblog, filters) => {
+    (statusBase, statusReblog, accountBase, accountReblog, username, filters) => {
       if (!statusBase) {
         return null;
       }
 
+      const accountUsername = accountBase.get('acct');
+      //Must be owner of status if username exists
+      if (accountUsername !== username && username !== undefined) {
+        return null;
+      }
+
       if (statusReblog) {
         statusReblog = statusReblog.set('account', accountReblog);
       } else {