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

Make Profile->getFancyName() return including the acct URI

Browse Source
This commit is contained in:
Mikael Nordfeldth 2016-03-01 23:37:38 +01:00
parent 47f408ca7c
commit ddd60e7142
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
classes/Profile.php
View File

@ -225,11 +225,11 @@ class Profile extends Managed_DataObject
*/
function getFancyName()
{
if ($this->fullname) {
// TRANS: Full name of a profile or group (%1$s) followed by nickname (%2$s) in parentheses.
return sprintf(_m('FANCYNAME','%1$s (%2$s)'), $this->fullname, $this->nickname);
if ($this->getFullname()) {
// TRANS: Full name of a profile or group (%1$s) followed by acct URI (%2$s) in parentheses without acct:.
return sprintf(_m('FANCYNAME','%1$s (%2$s)'), $this->getFullname(), $this->getAcctUri());
} else {
return $this->nickname;
return $this->getAcctUri(false);
}
}
@ -1575,7 +1575,7 @@ class Profile extends Managed_DataObject
*
* @return string $uri
*/
public function getAcctUri()
public function getAcctUri($scheme=true)
{
$acct = null;
@ -1586,11 +1586,15 @@ class Profile extends Managed_DataObject
if ($acct === null) {
throw new ProfileNoAcctUriException($this);
}
return $acct;
if (parse_url($acct, PHP_URL_SCHEME) !== 'acct') {
throw new ServerException('Acct URI does not have acct: scheme');
}
function hasBlocked($other)
// if we don't return the scheme, just remove the 'acct:' in the beginning
return $scheme ? $acct : mb_substr($acct, 5);
}
function hasBlocked(Profile $other)
{
$block = Profile_block::exists($this, $other);
return !empty($block);