mirror/whippy-edition
1
0
Fork 0
mirror of https://github.com/whippyshou/mastodon synced 2024-12-01 16:28:29 +09:00
Code

Merge branch 'rmhasan-fix_626'

Browse Source
This commit is contained in:
Eugen Rochko 2017-02-26 23:07:14 +01:00
commit 1b8d3375c8
7 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/components/actions/accounts.jsx
View File

@ -138,7 +138,8 @@ export function fetchAccountFail(id, error) {
return { return {
type: ACCOUNT_FETCH_FAIL, type: ACCOUNT_FETCH_FAIL,
id, id,
error error,
skipAlert: true
}; };
}; };
@ -231,7 +232,8 @@ export function fetchAccountTimelineFail(id, error, skipLoading) {
type: ACCOUNT_TIMELINE_FETCH_FAIL, type: ACCOUNT_TIMELINE_FETCH_FAIL,
id, id,
error, error,
skipLoading skipLoading,
skipAlert: error.response.status === 404
}; };
}; };

3
app/assets/javascripts/components/actions/cards.jsx
View File

@ -46,6 +46,7 @@ export function fetchStatusCardFail(id, error) {
type: STATUS_CARD_FETCH_FAIL, type: STATUS_CARD_FETCH_FAIL,
id, id,
error, error,
skipLoading: true skipLoading: true,
skipAlert: true
}; };
}; };

11
app/assets/javascripts/components/actions/statuses.jsx
View File

@ -57,7 +57,8 @@ export function fetchStatusFail(id, error, skipLoading) {
type: STATUS_FETCH_FAIL, type: STATUS_FETCH_FAIL,
id, id,
error, error,
skipLoading skipLoading,
skipAlert: true
}; };
}; };
@ -102,7 +103,12 @@ export function fetchContext(id) {
api(getState).get(`/api/v1/statuses/${id}/context`).then(response => { api(getState).get(`/api/v1/statuses/${id}/context`).then(response => {
dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants)); dispatch(fetchContextSuccess(id, response.data.ancestors, response.data.descendants));
}).catch(error => { }).catch(error => {
if (error.response.status === 404) {
dispatch(deleteFromTimelines(id));
}
dispatch(fetchContextFail(id, error)); dispatch(fetchContextFail(id, error));
}); });
}; };
@ -129,6 +135,7 @@ export function fetchContextFail(id, error) {
return { return {
type: CONTEXT_FETCH_FAIL, type: CONTEXT_FETCH_FAIL,
id, id,
error error,
skipAlert: true
}; };
}; };

7
app/assets/javascripts/components/features/account_timeline/components/header.jsx
View File

@ -2,6 +2,7 @@ import PureRenderMixin from 'react-addons-pure-render-mixin';
import ImmutablePropTypes from 'react-immutable-proptypes'; import ImmutablePropTypes from 'react-immutable-proptypes';
import InnerHeader from '../../account/components/header'; import InnerHeader from '../../account/components/header';
import ActionBar from '../../account/components/action_bar'; import ActionBar from '../../account/components/action_bar';
import MissingIndicator from '../../../components/missing_indicator';
const Header = React.createClass({ const Header = React.createClass({
contextTypes: { contextTypes: {
@ -9,7 +10,7 @@ const Header = React.createClass({
}, },
propTypes: { propTypes: {
account: ImmutablePropTypes.map.isRequired, account: ImmutablePropTypes.map,
me: React.PropTypes.number.isRequired, me: React.PropTypes.number.isRequired,
onFollow: React.PropTypes.func.isRequired, onFollow: React.PropTypes.func.isRequired,
onBlock: React.PropTypes.func.isRequired, onBlock: React.PropTypes.func.isRequired,
@ -39,8 +40,8 @@ const Header = React.createClass({
render () { render () {
const { account, me } = this.props; const { account, me } = this.props;
if (!account) { if (account === null) {
return null; return <MissingIndicator />;
} }
return ( return (

5
app/assets/javascripts/components/features/status/index.jsx
View File

@ -4,7 +4,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { fetchStatus } from '../../actions/statuses'; import { fetchStatus } from '../../actions/statuses';
import Immutable from 'immutable'; import Immutable from 'immutable';
import EmbeddedStatus from '../../components/status'; import EmbeddedStatus from '../../components/status';
import LoadingIndicator from '../../components/loading_indicator'; import MissingIndicator from '../../components/missing_indicator';
import DetailedStatus from './components/detailed_status'; import DetailedStatus from './components/detailed_status';
import ActionBar from './components/action_bar'; import ActionBar from './components/action_bar';
import Column from '../ui/components/column'; import Column from '../ui/components/column';
@ -117,7 +117,8 @@ const Status = React.createClass({
if (status === null) { if (status === null) {
return ( return (
<Column> <Column>
<LoadingIndicator /> <ColumnBackButton />
<MissingIndicator />
</Column> </Column>
); );
} }

2
app/assets/javascripts/components/middleware/errors.jsx
View File

@ -5,7 +5,7 @@ const defaultFailSuffix = 'FAIL';
export default function errorsMiddleware() { export default function errorsMiddleware() {
return ({ dispatch }) => next => action => { return ({ dispatch }) => next => action => {
if (action.type) { if (action.type && !action.skipAlert) {
const isFail = new RegExp(`${defaultFailSuffix}$`, 'g'); const isFail = new RegExp(`${defaultFailSuffix}$`, 'g');
const isSuccess = new RegExp(`${defaultSuccessSuffix}$`, 'g'); const isSuccess = new RegExp(`${defaultSuccessSuffix}$`, 'g');

7
app/assets/javascripts/components/reducers/statuses.jsx
View File

@ -39,14 +39,15 @@ const normalizeStatus = (state, status) => {
return state; return state;
} }
status.account = status.account.id; const normalStatus = { ...status };
normalStatus.account = status.account.id;
if (status.reblog && status.reblog.id) { if (status.reblog && status.reblog.id) {
state = normalizeStatus(state, status.reblog); state = normalizeStatus(state, status.reblog);
status.reblog = status.reblog.id; normalStatus.reblog = status.reblog.id;
} }
return state.update(status.id, Immutable.Map(), map => map.mergeDeep(Immutable.fromJS(status))); return state.update(status.id, Immutable.Map(), map => map.mergeDeep(Immutable.fromJS(normalStatus)));
}; };
const normalizeStatuses = (state, statuses) => { const normalizeStatuses = (state, statuses) => {