X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fshownotice.php;h=23386868ddbc1b042b3151b29340b952c86cf35c;hb=c95f74018d8e997fabc07a42afb75e39c769531f;hp=b72f39513ed8e11db4c463e5e0ca928bd5b97948;hpb=132be9950662ce0d5a1e859a766232cd7fdcb0e1;p=quix0rs-gnu-social.git diff --git a/actions/shownotice.php b/actions/shownotice.php index b72f39513e..23386868dd 100644 --- a/actions/shownotice.php +++ b/actions/shownotice.php @@ -27,13 +27,9 @@ * @link http://status.net/ */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} +if (!defined('GNUSOCIAL')) { exit(1); } -require_once INSTALLDIR.'/lib/personalgroupnav.php'; require_once INSTALLDIR.'/lib/noticelist.php'; -require_once INSTALLDIR.'/lib/feedlist.php'; /** * Show a single notice @@ -44,7 +40,7 @@ require_once INSTALLDIR.'/lib/feedlist.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ -class ShownoticeAction extends Action +class ShownoticeAction extends ManagedAction { /** * Notice object to show @@ -74,32 +70,29 @@ class ShownoticeAction extends Action { parent::prepare($args); if ($this->boolean('ajax')) { - StatusNet::setApi(true); + GNUsocial::setApi(true); } $this->notice = $this->getNotice(); - $cur = common_current_user(); - - if (!empty($cur)) { - $curProfile = $cur->getProfile(); - } else { - $curProfile = null; - } - - if (!$this->notice->inScope($curProfile)) { + if (!$this->notice->inScope($this->scoped)) { // TRANS: Client exception thrown when trying a view a notice the user has no access to. - throw new ClientException(_('Not available.'), 403); + throw new ClientException(_('Access restricted.'), 403); } $this->profile = $this->notice->getProfile(); - if (empty($this->profile)) { + if (!$this->profile instanceof Profile) { // TRANS: Server error displayed trying to show a notice without a connected profile. $this->serverError(_('Notice has no profile.'), 500); } - $this->user = User::getKV('id', $this->profile->id); + try { + $this->user = $this->profile->getUser(); + } catch (NoSuchUserException $e) { + // FIXME: deprecate $this->user stuff in extended classes + $this->user = null; + } try { $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE); @@ -121,20 +114,19 @@ class ShownoticeAction extends Action $id = $this->arg('notice'); $notice = Notice::getKV('id', $id); + if ($notice instanceof Notice) { + // Alright, got it! + return $notice; + } - if (!$notice instanceof Notice) { - // Did we used to have it, and it got deleted? - $deleted = Deleted_notice::getKV($id); - if ($deleted instanceof Deleted_notice) { - // TRANS: Client error displayed trying to show a deleted notice. - $this->clientError(_('Notice deleted.'), 410); - } else { - // TRANS: Client error displayed trying to show a non-existing notice. - $this->clientError(_('No such notice.'), 404); - } - return false; + // Did we use to have it, and it got deleted? + $deleted = Deleted_notice::getKV('id', $id); + if ($deleted instanceof Deleted_notice) { + // TRANS: Client error displayed trying to show a deleted notice. + $this->clientError(_('Notice deleted.'), 410); } - return $notice; + // TRANS: Client error displayed trying to show a non-existing notice. + $this->clientError(_('No such notice.'), 404); } /** @@ -192,43 +184,7 @@ class ShownoticeAction extends Action */ function title() { - $base = $this->profile->getFancyName(); - - // TRANS: Title of the page that shows a notice. - // TRANS: %1$s is a user name, %2$s is the notice creation date/time. - return sprintf(_('%1$s\'s status on %2$s'), - $base, - common_exact_date($this->notice->created)); - } - - /** - * Handle input - * - * Only handles get, so just show the page. - * - * @param array $args $_REQUEST data (unused) - * - * @return void - */ - protected function handle() - { - parent::handle(); - - if ($this->boolean('ajax')) { - $this->showAjax(); - } else { - if ($this->notice->is_local == Notice::REMOTE) { - try { - $target = $this->notice->getUrl() - if ($target != $this->selfUrl()) { - common_redirect($target, 301); - } - } catch (InvalidUrlException $e) { - common_debug('ShownoticeAction could not redirect to remote notice with id='.$this->notice->id . '. Falling back to showPage().'); - } - } - $this->showPage(); - } + return $this->notice->getTitle(); } /** @@ -241,23 +197,9 @@ class ShownoticeAction extends Action function showContent() { $this->elementStart('ol', array('class' => 'notices xoxo')); - $nli = new SingleNoticeItem($this->notice, $this); - $nli->show(); - $this->elementEnd('ol'); - } - - function showAjax() - { - $this->startHTML('text/xml;charset=utf-8'); - $this->elementStart('head'); - // TRANS: Title for page that shows a notice. - $this->element('title', null, _m('TITLE','Notice')); - $this->elementEnd('head'); - $this->elementStart('body'); $nli = new NoticeListItem($this->notice, $this); $nli->show(); - $this->elementEnd('body'); - $this->endHTML(); + $this->elementEnd('ol'); } /** @@ -280,40 +222,12 @@ class ShownoticeAction extends Action /** * Extra content * - * We show the microid(s) for the author, if any. + * Facebook OpenGraph metadata. * * @return void */ function extraHead() { - $user = User::getKV($this->profile->id); - - if (!$user) { - return; - } - - if ($user->emailmicroid && $user->email && $this->notice->uri) { - $id = new Microid('mailto:'. $user->email, - $this->notice->uri); - $this->element('meta', array('name' => 'microid', - 'content' => $id->toString())); - } - - $this->element('link',array('rel'=>'alternate', - 'type'=>'application/json+oembed', - 'href'=>common_local_url( - 'oembed', - array(), - array('format'=>'json','url'=>$this->notice->uri)), - 'title'=>'oEmbed'),null); - $this->element('link',array('rel'=>'alternate', - 'type'=>'text/xml+oembed', - 'href'=>common_local_url( - 'oembed', - array(), - array('format'=>'xml','url'=>$this->notice->uri)), - 'title'=>'oEmbed'),null); - // Extras to aid in sharing notices to Facebook $avatarUrl = $this->profile->avatarUrl(AVATAR_PROFILE_SIZE); $this->element('meta', array('property' => 'og:image', @@ -322,12 +236,3 @@ class ShownoticeAction extends Action 'content' => $this->notice->content)); } } - -// @todo FIXME: Class documentation missing. -class SingleNoticeItem extends DoFollowListItem -{ - function avatarSize() - { - return AVATAR_STREAM_SIZE; - } -}