From 8ad81a6aa32e69257d3402200910600ed6616360 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Fri, 5 Jun 2015 21:24:41 +0200 Subject: [PATCH] Allow showing profiles with UserbyidAction (/user/:id) --- actions/showstream.php | 54 ++++++++++++++++++++++++++---------- actions/userbyid.php | 63 +++++++++++++----------------------------- lib/nickname.php | 8 ++++++ lib/profileaction.php | 57 ++++++-------------------------------- 4 files changed, 75 insertions(+), 107 deletions(-) diff --git a/actions/showstream.php b/actions/showstream.php index 64d85e63be..ee9891092c 100644 --- a/actions/showstream.php +++ b/actions/showstream.php @@ -49,6 +49,35 @@ class ShowstreamAction extends ProfileAction { var $notice; + protected function doPreparation() + { + // showstream requires a nickname + $nickname_arg = $this->arg('nickname'); + $nickname = common_canonical_nickname($nickname_arg); + + // Permanent redirect on non-canonical nickname + + if ($nickname_arg != $nickname) { + $args = array('nickname' => $nickname); + if ($this->arg('page') && $this->arg('page') != 1) { + $args['page'] = $this->arg['page']; + } + common_redirect(common_local_url($this->getActionName(), $args), 301); + } + $this->user = User::getKV('nickname', $nickname); + + if (!$this->user) { + $group = Local_group::getKV('nickname', $nickname); + if ($group instanceof Local_group) { + common_redirect($group->getProfile()->getUrl()); + } + // TRANS: Client error displayed when calling a profile action without specifying a user. + $this->clientError(_('No such user.'), 404); + } + + $this->target = $this->user->getProfile(); + } + protected function profileActionPreparation() { if (empty($this->tag)) { @@ -58,8 +87,6 @@ class ShowstreamAction extends ProfileAction } $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - - return true; } @@ -121,7 +148,7 @@ class ShowstreamAction extends ProfileAction return array(new Feed(Feed::JSON, common_local_url('ApiTimelineUser', array( - 'id' => $this->user->id, + 'id' => $this->target->getID(), 'format' => 'as')), // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. @@ -137,7 +164,7 @@ class ShowstreamAction extends ProfileAction new Feed(Feed::RSS2, common_local_url('ApiTimelineUser', array( - 'id' => $this->user->id, + 'id' => $this->target->getID(), 'format' => 'rss')), // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. @@ -146,7 +173,7 @@ class ShowstreamAction extends ProfileAction new Feed(Feed::ATOM, common_local_url('ApiTimelineUser', array( - 'id' => $this->user->id, + 'id' => $this->target->getID(), 'format' => 'atom')), // TRANS: Title for link to notice feed. // TRANS: %s is a user nickname. @@ -197,23 +224,22 @@ class ShowstreamAction extends ProfileAction function showEmptyListMessage() { // TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname. - $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->target->nickname) . ' '; + $message = sprintf(_('This is the timeline for %1$s, but %1$s hasn\'t posted anything yet.'), $this->target->getNickname()) . ' '; - if (common_logged_in()) { - $current_user = common_current_user(); - if ($this->user->id === $current_user->id) { + if ($this->scoped instanceof Profile) { + if ($this->target->getID() === $this->scoped->getID()) { // TRANS: Second sentence of empty list message for a stream for the user themselves. $message .= _('Seen anything interesting recently? You haven\'t posted any notices yet, now would be a good time to start :)'); } else { // TRANS: Second sentence of empty list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL. // TRANS: This message contains a Markdown link. Keep "](" together. - $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->target->nickname, '@' . $this->target->nickname); + $message .= sprintf(_('You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%%?status_textarea=%2$s).'), $this->target->getNickname(), '@' . $this->target->getNickname()); } } else { // TRANS: Second sentence of empty message for anonymous users. %s is a user nickname. // TRANS: This message contains a Markdown link. Keep "](" together. - $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->target->nickname); + $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to them.'), $this->target->getNickname()); } $this->elementStart('div', 'guide'); @@ -229,7 +255,7 @@ class ShowstreamAction extends ProfileAction $this->showEmptyListMessage(); } - $args = array('nickname' => $this->target->nickname); + $args = array('nickname' => $this->target->getNickname()); if (!empty($this->tag)) { $args['tag'] = $this->tag; @@ -246,13 +272,13 @@ class ShowstreamAction extends ProfileAction $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [StatusNet](http://status.net/) tool. ' . '[Join now](%%%%action.register%%%%) to follow **%s**\'s notices and many more! ([Read more](%%%%doc.help%%%%))'), - $this->target->nickname, $this->target->nickname); + $this->target->getNickname(), $this->target->getNickname()); } else { // TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only. // TRANS: This message contains a Markdown link. Keep "](" together. $m = sprintf(_('**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . 'based on the Free Software [StatusNet](http://status.net/) tool.'), - $this->target->nickname, $this->target->nickname); + $this->target->getNickname(), $this->target->getNickname()); } $this->elementStart('div', array('id' => 'anon_notice')); $this->raw(common_markup_to_html($m)); diff --git a/actions/userbyid.php b/actions/userbyid.php index 09fb4258d9..1e3c9d8519 100644 --- a/actions/userbyid.php +++ b/actions/userbyid.php @@ -28,9 +28,7 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} +if (!defined('GNUSOCIAL')) { exit(1); } /** * User by ID action class. @@ -42,50 +40,27 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ -class UserbyidAction extends Action +class UserbyidAction extends ShowstreamAction { - /** - * Is read only? - * - * @return boolean true - */ - function isReadOnly($args) + protected function doPreparation() { - return true; - } + // accessing by ID just requires an ID, not a nickname + $this->target = Profile::getByID($this->trimmed('id')); - /** - * Class handler. - * - * @param array $args array of arguments - * - * @return nothing - */ - protected function handle() - { - parent::handle(); - $id = $this->trimmed('id'); - if (!$id) { - // TRANS: Client error displayed trying to find a user by ID without providing an ID. - $this->clientError(_('No ID.')); + // For local users when accessed by id number, redirect with + // the nickname as argument instead of id. + if ($this->target->isLocal()) { + // Support redirecting to FOAF rdf/xml if the agent prefers it... + // Internet Explorer doesn't specify "text/html" and does list "*/*" + // at least through version 8. We need to list text/html up front to + // ensure that only user-agents who specifically ask for RDF get it. + $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2'; + $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null; + $type = common_negotiate_type(common_accept_to_prefs($httpaccept), + common_accept_to_prefs($page_prefs)); + $page = $type === 'application/rdf+xml' ? 'foaf' : 'showstream'; + $url = common_local_url($page, array('nickname' => $this->target->getNickname())); + common_redirect($url, 303); } - $user = User::getKV($id); - if (!$user) { - // TRANS: Client error displayed trying to find a user by ID for a non-existing ID. - $this->clientError(_('No such user.')); - } - - // Support redirecting to FOAF rdf/xml if the agent prefers it... - // Internet Explorer doesn't specify "text/html" and does list "*/*" - // at least through version 8. We need to list text/html up front to - // ensure that only user-agents who specifically ask for RDF get it. - $page_prefs = 'text/html,application/xhtml+xml,application/rdf+xml,application/xml;q=0.3,text/xml;q=0.2'; - $httpaccept = isset($_SERVER['HTTP_ACCEPT']) - ? $_SERVER['HTTP_ACCEPT'] : null; - $type = common_negotiate_type(common_accept_to_prefs($httpaccept), - common_accept_to_prefs($page_prefs)); - $page = $type == 'application/rdf+xml' ? 'foaf' : 'showstream'; - $url = common_local_url($page, array('nickname' => $user->nickname)); - common_redirect($url, 303); } } diff --git a/lib/nickname.php b/lib/nickname.php index 80be6239c5..1ed0abbe78 100644 --- a/lib/nickname.php +++ b/lib/nickname.php @@ -48,6 +48,14 @@ class Nickname */ const DISPLAY_FMT = '[0-9a-zA-Z_]{1,64}'; + /** + * Simplified regex fragment for acceptable full WebFinger ID of a user + * + * We could probably use an email regex here, but mainly we are interested + * in matching it in our URLs, like https://social.example/user@example.com + */ + const WEBFINGER_FMT = '[0-9a-zA-Z_]{1,64}\@[0-9a-zA-Z_-.]{3,255}'; + /** * Regex fragment for checking a canonical nickname. * diff --git a/lib/profileaction.php b/lib/profileaction.php index bd5bb5a148..4ed1e8ad83 100644 --- a/lib/profileaction.php +++ b/lib/profileaction.php @@ -48,52 +48,13 @@ abstract class ProfileAction extends ManagedAction protected $target = null; // Profile that we're showing - protected function doPreparation() + protected function prepare(array $args=array()) { - try { - $nickname_arg = $this->arg('nickname'); - $nickname = common_canonical_nickname($nickname_arg); + // this will call ->doPreparation() which lower classes can use + parent::prepare($args); - // Permanent redirect on non-canonical nickname - - if ($nickname_arg != $nickname) { - $args = array('nickname' => $nickname); - if ($this->arg('page') && $this->arg('page') != 1) { - $args['page'] = $this->arg['page']; - } - common_redirect(common_local_url($this->getActionName(), $args), 301); - } - $this->user = User::getKV('nickname', $nickname); - - if (!$this->user) { - $group = Local_group::getKV('nickname', $nickname); - if ($group instanceof Local_group) { - common_redirect($group->getProfile()->getUrl()); - } - // TRANS: Client error displayed when calling a profile action without specifying a user. - $this->clientError(_('No such user.'), 404); - } - - $this->target = $this->user->getProfile(); - } catch (NicknameException $e) { - $id = (int)$this->arg('id'); - $this->target = Profile::getKV('id', $id); - - if (!$this->target instanceof Profile) { - // TRANS: Error message displayed when referring to a user without a profile. - $this->serverError(_m('Profile ID does not exist.')); - } - - if ($this->target->isLocal()) { - // For local users when accessed by id number, redirect to - // the same action but using the nickname as argument. - common_redirect(common_local_url($this->getActionName(), - array('nickname'=>$user->getNickname()))); - } - } - - if ($this->target->hasRole(Profile_role::SILENCED) && - (empty($this->scoped) || !$this->scoped->hasRight(Right::SILENCEUSER))) { + if ($this->target->hasRole(Profile_role::SILENCED) + && (!$this->scoped instanceof Profile || !$this->scoped->hasRight(Right::SILENCEUSER))) { throw new ClientException(_('This profile has been silenced by site moderators'), 403); } @@ -104,12 +65,10 @@ abstract class ProfileAction extends ManagedAction $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; common_set_returnto($this->selfUrl()); - return $this->profileActionPreparation(); - } + // fetch the actual stream stuff + $this->profileActionPreparation(); - protected function profileActionPreparation() - { - // No-op by default. + return true; } function isReadOnly($args)