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

Merge tag 'v2.6.5' into instance_only_statuses

Browse Source
This commit is contained in:
Renato "Lond" Cerqueira
2018-12-07 15:27:23 +01:00
parent b9f0f794db 887f9de6dc
commit f5f9fc366d
298 changed files with 2754 additions and 1673 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,11 +144,13 @@ export function submitCompose(routerHistory) {
}
};
if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0) {
if (response.data.visibility === 'direct' && getState().getIn(['conversations', 'mounted']) <= 0 && routerHistory) {
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') {
}
if (response.data.in_reply_to_id === null && response.data.visibility === 'public') {
insertIfOnline('community');
insertIfOnline('public');
}