GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[RemoteFollow] Fix location display

Browse Source
This commit is contained in:
Alexei Sorokin 2020-07-22 19:49:24 +03:00
parent 9f72b6e2c0
commit ac94374f48
1 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
plugins/RemoteFollow/actions/remotefollowsub.php
View File

@ -68,7 +68,7 @@ class RemoteFollowSubAction extends Action
/** /**
* Handles the submission. * Handles the submission.
* *
* @return void * @return void
*/ */
protected function handle(): void protected function handle(): void
@ -84,7 +84,7 @@ class RemoteFollowSubAction extends Action
/** /**
* Show the initial form, when we haven't yet been given a valid * Show the initial form, when we haven't yet been given a valid
* remote profile. * remote profile.
* *
* @return void * @return void
*/ */
public function showInputForm(): void public function showInputForm(): void
@ -100,16 +100,18 @@ class RemoteFollowSubAction extends Action
$this->elementStart('ul', 'form_data'); $this->elementStart('ul', 'form_data');
$this->elementStart('li'); $this->elementStart('li');
$this->input('profile', $this->input(
// TRANS: Field label for a field that takes an user address. 'profile',
_m('Subscribe to'), // TRANS: Field label for a field that takes an user address.
$this->uri, _m('Subscribe to'),
// TRANS: Tooltip for field label "Subscribe to". $this->uri,
_m('User\'s address, like nickname@example.com or http://example.net/nickname.')); // TRANS: Tooltip for field label "Subscribe to".
_m('User\'s address, like nickname@example.com or http://example.net/nickname.')
);
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');
// TRANS: Button text. // TRANS: Button text.
$this->submit('validate', _m('BUTTON','Continue')); $this->submit('validate', _m('BUTTON', 'Continue'));
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
@ -119,7 +121,7 @@ class RemoteFollowSubAction extends Action
/** /**
* Show the preview-and-confirm form. We've got a valid remote * Show the preview-and-confirm form. We've got a valid remote
* profile and are ready to poke it! * profile and are ready to poke it!
* *
* @return void * @return void
*/ */
public function showPreviewForm(): void public function showPreviewForm(): void
@ -138,13 +140,15 @@ class RemoteFollowSubAction extends Action
$this->elementStart('fieldset'); $this->elementStart('fieldset');
$this->hidden('token', common_session_token()); $this->hidden('token', common_session_token());
$this->hidden('profile', $this->uri); $this->hidden('profile', $this->uri);
$this->submit('submit', $this->submit(
// TRANS: Button text. 'submit',
_m('BUTTON','Confirm'), // TRANS: Button text.
'submit', _m('BUTTON', 'Confirm'),
null, 'submit',
// TRANS: Tooltip for button "Confirm". null,
_m('Subscribe to this user')); // TRANS: Tooltip for button "Confirm".
_m('Subscribe to this user')
);
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
$this->elementEnd('form'); $this->elementEnd('form');
$this->elementEnd('li'); $this->elementEnd('li');
@ -154,16 +158,18 @@ class RemoteFollowSubAction extends Action
/** /**
* Show a preview for a remote user's profile. * Show a preview for a remote user's profile.
* *
* @return bool true if we're ok to try subscribing, false otherwise * @return bool true if we're ok to try subscribing, false otherwise
*/ */
public function preview(): bool public function preview(): bool
{ {
if ($this->scoped->isSubscribed($this->profile)) { if ($this->scoped->isSubscribed($this->profile)) {
$this->element('div', $this->element(
['class' => 'error'], 'div',
// TRANS: Extra paragraph in remote profile view when already subscribed. ['class' => 'error'],
_m('You are already subscribed to this user.')); // TRANS: Extra paragraph in remote profile view when already subscribed.
_m('You are already subscribed to this user.')
);
$ok = false; $ok = false;
} else { } else {
$ok = true; $ok = true;
@ -171,16 +177,18 @@ class RemoteFollowSubAction extends Action
$avatarUrl = $this->profile->avatarUrl(AVATAR_PROFILE_SIZE); $avatarUrl = $this->profile->avatarUrl(AVATAR_PROFILE_SIZE);
$this->showEntity($this->profile, $this->showEntity(
$this->profile->getUrl(), $this->profile,
$avatarUrl, $this->profile->getUrl(),
$this->profile->getDescription()); $avatarUrl,
$this->profile->getDescription()
);
return $ok; return $ok;
} }
/** /**
* Show someone's profile. * Show someone's profile.
* *
* @return void * @return void
*/ */
public function showEntity(Profile $entity, string $profile_url, string $avatar, ?string $note): void public function showEntity(Profile $entity, string $profile_url, string $avatar, ?string $note): void
@ -209,9 +217,10 @@ class RemoteFollowSubAction extends Action
$this->elementEnd('div'); $this->elementEnd('div');
} }
if (!is_null($location)) { $location_name = (is_null($location) ? null : $location->getName());
if (!is_null($location_name)) {
$this->elementStart('div', 'label entity_location'); $this->elementStart('div', 'label entity_location');
$this->text($location); $this->text($location_name);
$this->elementEnd('div'); $this->elementEnd('div');
} }
@ -232,7 +241,7 @@ class RemoteFollowSubAction extends Action
/** /**
* Redirect on successful remote follow * Redirect on successful remote follow
* *
* @return void * @return void
*/ */
public function success(): void public function success(): void
@ -285,7 +294,7 @@ class RemoteFollowSubAction extends Action
/** /**
* Show the appropriate form based on our input state. * Show the appropriate form based on our input state.
* *
* @return void * @return void
*/ */
public function showForm(?string $err = null): void public function showForm(?string $err = null): void
@ -333,7 +342,7 @@ class RemoteFollowSubAction extends Action
/** /**
* Show page notice. * Show page notice.
* *
* @return void * @return void
*/ */
public function showPageNotice(): void public function showPageNotice(): void
@ -370,10 +379,10 @@ class RemoteFollowSubAction extends Action
/** /**
* Return url for this action * Return url for this action
* *
* @return string * @return string
*/ */
function selfLink(): string public function selfLink(): string
{ {
return common_local_url('RemoteFollowSub'); return common_local_url('RemoteFollowSub');
} }
@ -391,4 +400,4 @@ class RemoteFollowSubAction extends Action
{ {
// nop // nop
} }
} }