{statusIds.map((statusId) => {
- return ;
+ return ;
})}
diff --git a/app/assets/javascripts/components/containers/status_container.jsx b/app/assets/javascripts/components/containers/status_container.jsx
index 5e0b489b3..2bcb7026c 100644
--- a/app/assets/javascripts/components/containers/status_container.jsx
+++ b/app/assets/javascripts/components/containers/status_container.jsx
@@ -13,13 +13,47 @@ import {
} from '../actions/interactions';
import { deleteStatus } from '../actions/statuses';
import { openMedia } from '../actions/modal';
+import { createSelector } from 'reselect'
-const makeMapStateToProps = () => {
- const getStatus = makeGetStatus();
+const mapStateToProps = (state, props) => ({
+ statusBase: state.getIn(['statuses', props.id]),
+ me: state.getIn(['meta', 'me'])
+});
+
+const makeMapStateToPropsInner = () => {
+ const getStatus = (() => {
+ return createSelector(
+ [
+ (_, base) => base,
+ (state, base) => (base ? state.getIn(['accounts', base.get('account')]) : null),
+ (state, base) => (base ? state.getIn(['statuses', base.get('reblog')], null) : null)
+ ],
+
+ (base, account, reblog) => (base ? base.set('account', account).set('reblog', reblog) : null)
+ );
+ })();
+
+ const mapStateToProps = (state, { statusBase }) => ({
+ status: getStatus(state, statusBase)
+ });
+
+ return mapStateToProps;
+};
+
+const makeMapStateToPropsLast = () => {
+ const getStatus = (() => {
+ return createSelector(
+ [
+ (_, status) => status,
+ (state, status) => (status ? state.getIn(['accounts', status.getIn(['reblog', 'account'])], null) : null)
+ ],
+
+ (status, reblogAccount) => (status && status.get('reblog') ? status.setIn(['reblog', 'account'], reblogAccount) : status)
+ );
+ })();
- const mapStateToProps = (state, props) => ({
- status: getStatus(state, props.id),
- me: state.getIn(['meta', 'me'])
+ const mapStateToProps = (state, { status }) => ({
+ status: getStatus(state, status)
});
return mapStateToProps;
@@ -61,4 +95,8 @@ const mapDispatchToProps = (dispatch) => ({
});
-export default connect(makeMapStateToProps, mapDispatchToProps)(Status);
+export default connect(mapStateToProps, mapDispatchToProps)(
+ connect(makeMapStateToPropsInner)(
+ connect(makeMapStateToPropsLast)(Status)
+ )
+);
diff --git a/app/assets/javascripts/components/reducers/user_lists.jsx b/app/assets/javascripts/components/reducers/user_lists.jsx
index 686179af2..4c201f927 100644
--- a/app/assets/javascripts/components/reducers/user_lists.jsx
+++ b/app/assets/javascripts/components/reducers/user_lists.jsx
@@ -3,13 +3,18 @@ import {
FOLLOWING_FETCH_SUCCESS
} from '../actions/accounts';
import { SUGGESTIONS_FETCH_SUCCESS } from '../actions/suggestions';
-import { REBLOGS_FETCH_SUCCESS } from '../actions/interactions';
+import {
+ REBLOGS_FETCH_SUCCESS,
+ FAVOURITES_FETCH_SUCCESS
+} from '../actions/interactions';
import Immutable from 'immutable';
const initialState = Immutable.Map({
followers: Immutable.Map(),
following: Immutable.Map(),
- suggestions: Immutable.List()
+ suggestions: Immutable.List(),
+ reblogged_by: Immutable.Map(),
+ favourited_by: Immutable.Map()
});
export default function userLists(state = initialState, action) {
@@ -22,6 +27,8 @@ export default function userLists(state = initialState, action) {
return state.set('suggestions', Immutable.List(action.accounts.map(item => item.id)));
case REBLOGS_FETCH_SUCCESS:
return state.setIn(['reblogged_by', action.id], Immutable.List(action.accounts.map(item => item.id)));
+ case FAVOURITES_FETCH_SUCCESS:
+ return state.setIn(['favourited_by', action.id], Immutable.List(action.accounts.map(item => item.id)));
default:
return state;
}