treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

[Glitch] Fix incorrect use of old WebUI paths 

Port 6b19e1e632 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Claire 2021-09-27 07:24:04 +02:00
parent 188d66c9a8
commit 345b64340b
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/javascript/flavours/glitch/features/direct_timeline/components/conversation.js
View File

@ -104,7 +104,7 @@ class Conversation extends ImmutablePureComponent {
markRead();
}
this.context.router.history.push(`/statuses/${lastStatus.get('id')}`);
this.context.router.history.push(`/@${lastStatus.getIn(['account', 'acct'])}/${lastStatus.get('id')}`);
}
handleMarkAsRead = () => {

2
app/javascript/flavours/glitch/features/follow_recommendations/components/account.js
View File

@ -66,7 +66,7 @@ class Account extends ImmutablePureComponent {
return (
<div className='account follow-recommendations-account'>
<div className='account__wrapper'>
<Permalink className='account__display-name account__display-name--with-note' title={account.get('acct')} href={account.get('url')} to={`/accounts/${account.get('id')}`}>
<Permalink className='account__display-name account__display-name--with-note' title={account.get('acct')} href={account.get('url')} to={`/@${account.get('acct')}`}>
<div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
<DisplayName account={account} />

2
app/javascript/flavours/glitch/features/follow_recommendations/index.js
View File

@ -68,7 +68,7 @@ class FollowRecommendations extends ImmutablePureComponent {
}
}));
router.history.push('/timelines/home');
router.history.push('/home');
}
render () {

2
app/javascript/flavours/glitch/features/ui/components/columns_area.js
View File

@ -47,7 +47,7 @@ const componentMap = {
'DIRECTORY': Directory,
};
const shouldHideFAB = path => path.match(/^\/statuses\/|^\/search|^\/getting-started|^\/start/);
const shouldHideFAB = path => path.match(/^\/statuses\/|^\/@[^/]+\/\d+|^\/publish|^\/search|^\/getting-started|^\/start/);
const messages = defineMessages({
publish: { id: 'compose_form.publish', defaultMessage: 'Toot' },