mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Beginning works of remote follow based on Pleroma FE version~

fix/tabs-bar-issues
Sean King 2020-08-11 11:49:15 -06:00
rodzic 81f42b60b1
commit aa494560ae
2 zmienionych plików z 17 dodań i 17 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
app/soapbox/features/account/components/header.js
Wyświetl plik

@ -286,22 +286,19 @@ class Header extends ImmutablePureComponent {
</div> </div>
} }
{ <div className='account__header__extra__buttons'>
me && <ActionButton account={account} />
<div className='account__header__extra__buttons'> {(me && account.get('id') !== me) &&
<ActionButton account={account} /> <Button className='button button-alternative-2' onClick={this.props.onDirect}>
{account.get('id') !== me && <FormattedMessage
<Button className='button button-alternative-2' onClick={this.props.onDirect}> id='account.message' defaultMessage='Message' values={{
<FormattedMessage name: account.get('acct'),
id='account.message' defaultMessage='Message' values={{ }}
name: account.get('acct'), />
}} </Button>
/> }
</Button> { me && <DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' /> }
} </div>
<DropdownMenuContainer items={menu} icon='ellipsis-v' size={24} direction='right' />
</div>
}
</div> </div>
</div> </div>

5
app/soapbox/features/ui/components/action_button.js
Wyświetl plik

@ -16,6 +16,7 @@ import {
const messages = defineMessages({ const messages = defineMessages({
unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' },
follow: { id: 'account.follow', defaultMessage: 'Follow' }, follow: { id: 'account.follow', defaultMessage: 'Follow' },
remote_follow: { id: 'account.remote_follow', defaultMessage: 'Remote follow' },
requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' }, requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' },
requested_small: { id: 'account.requested_small', defaultMessage: 'Awaiting approval' }, requested_small: { id: 'account.requested_small', defaultMessage: 'Awaiting approval' },
unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' },
@ -83,7 +84,9 @@ class ActionButton extends ImmutablePureComponent {
const { account, intl, me, small } = this.props; const { account, intl, me, small } = this.props;
let actionBtn = null; let actionBtn = null;
if (!account || !me) return actionBtn; if (!me) {
actionBtn = <form method='POST' action='/main/ostatus'><input type='hidden' name='nickname' value={account.get('username')} /><input type='hidden' name='profile' value='' /><Button className='logo-button' text={intl.formatMessage(messages.remote_follow)} click='submit' /></form>;
}
if (me !== account.get('id')) { if (me !== account.get('id')) {
if (!account.get('relationship')) { // Wait until the relationship is loaded if (!account.get('relationship')) { // Wait until the relationship is loaded