autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor initial state: "me" (#5563)

Browse Source 
* Refactor initial state: "me"

* remove "me" from reducers/meta.js
This commit is contained in:
Nolan Lawson
2017-10-30 19:27:48 -07:00
committed by Yamagishi Kazutoshi
parent 29609fbb6a
commit b254e6ca5f
24 changed files with 44 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/javascript/mastodon/features/account_timeline/components/header.js
View File

@ -10,7 +10,6 @@ export default class Header extends ImmutablePureComponent {
static propTypes = {
account: ImmutablePropTypes.map,
me: PropTypes.string.isRequired,
onFollow: PropTypes.func.isRequired,
onBlock: PropTypes.func.isRequired,
onMention: PropTypes.func.isRequired,
@ -61,7 +60,7 @@ export default class Header extends ImmutablePureComponent {
}
render () {
const { account, me } = this.props;
const { account } = this.props;
if (account === null) {
return <MissingIndicator />;
@ -71,13 +70,11 @@ export default class Header extends ImmutablePureComponent {
<div className='account-timeline__header'>
<InnerHeader
account={account}
me={me}
onFollow={this.handleFollow}
/>
<ActionBar
account={account}
me={me}
onBlock={this.handleBlock}
onMention={this.handleMention}
onReport={this.handleReport}

1
app/javascript/mastodon/features/account_timeline/containers/header_container.js
View File

@ -29,7 +29,6 @@ const makeMapStateToProps = () => {
const mapStateToProps = (state, { accountId }) => ({
account: getAccount(state, accountId),
me: state.getIn(['meta', 'me']),
});
return mapStateToProps;

5
app/javascript/mastodon/features/account_timeline/index.js
View File

@ -16,7 +16,6 @@ const mapStateToProps = (state, props) => ({
statusIds: state.getIn(['timelines', `account:${props.params.accountId}`, 'items'], ImmutableList()),
isLoading: state.getIn(['timelines', `account:${props.params.accountId}`, 'isLoading']),
hasMore: !!state.getIn(['timelines', `account:${props.params.accountId}`, 'next']),
me: state.getIn(['meta', 'me']),
});
@connect(mapStateToProps)
@ -28,7 +27,6 @@ export default class AccountTimeline extends ImmutablePureComponent {
statusIds: ImmutablePropTypes.list,
isLoading: PropTypes.bool,
hasMore: PropTypes.bool,
me: PropTypes.string.isRequired,
};
componentWillMount () {
@ -50,7 +48,7 @@ export default class AccountTimeline extends ImmutablePureComponent {
}
render () {
const { statusIds, isLoading, hasMore, me } = this.props;
const { statusIds, isLoading, hasMore } = this.props;
if (!statusIds && isLoading) {
return (
@ -70,7 +68,6 @@ export default class AccountTimeline extends ImmutablePureComponent {
statusIds={statusIds}
isLoading={isLoading}
hasMore={hasMore}
me={me}
onScrollToBottom={this.handleScrollToBottom}
/>
</Column>