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

Merge tag 'v2.6.0rc1' into instance_only_statuses

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2018-10-23 08:32:55 +02:00
parent d42a06fc74 f468bfb830
commit fde9668bae
570 changed files with 11506 additions and 5693 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/javascript/mastodon/actions/compose.js
View File

@ -57,7 +57,7 @@ export function changeCompose(text) {
};
};
export function replyCompose(status, router) {
export function replyCompose(status, routerHistory) {
return (dispatch, getState) => {
dispatch({
type: COMPOSE_REPLY,
@ -65,7 +65,7 @@ export function replyCompose(status, router) {
});
if (!getState().getIn(['compose', 'mounted'])) {
router.push('/statuses/new');
routerHistory.push('/statuses/new');
}
};
};
@ -82,7 +82,7 @@ export function resetCompose() {
};
};
export function mentionCompose(account, router) {
export function mentionCompose(account, routerHistory) {
return (dispatch, getState) => {
dispatch({
type: COMPOSE_MENTION,
@ -90,12 +90,12 @@ export function mentionCompose(account, router) {
});
if (!getState().getIn(['compose', 'mounted'])) {
router.push('/statuses/new');
routerHistory.push('/statuses/new');
}
};
};
export function directCompose(account, router) {
export function directCompose(account, routerHistory) {
return (dispatch, getState) => {
dispatch({
type: COMPOSE_DIRECT,
@ -103,12 +103,12 @@ export function directCompose(account, router) {
});
if (!getState().getIn(['compose', 'mounted'])) {
router.push('/statuses/new');
routerHistory.push('/statuses/new');
}
};
};
export function submitCompose() {
export function submitCompose(routerHistory) {
return function (dispatch, getState) {
const status = getState().getIn(['compose', 'text'], '');
const media = getState().getIn(['compose', 'media_attachments']);
@ -135,21 +135,22 @@ export function submitCompose() {
dispatch(insertIntoTagHistory(response.data.tags, status));
dispatch(submitComposeSuccess({ ...response.data }));
// To make the app more responsive, immediately get the status into the columns
// To make the app more responsive, immediately push the status
// into the columns
const insertIfOnline = (timelineId) => {
const insertIfOnline = timelineId => {
if (getState().getIn(['timelines', timelineId, 'items', 0]) !== null) {
dispatch(updateTimeline(timelineId, { ...response.data }));
}
};
insertIfOnline('home');
if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0) {
routerHistory.push('/timelines/direct');
} else if (response.data.visibility !== 'direct') {
insertIfOnline('home');
} else if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
insertIfOnline('community');
insertIfOnline('public');
} else if (response.data.visibility === 'direct') {
insertIfOnline('direct');
}
}).catch(function (error) {
dispatch(submitComposeFail(error));