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

BookmarkListItem removed in favor of event-driven rendering

This commit is contained in:
Mikael Nordfeldth 2014-10-26 22:07:16 +01:00
parent 9f8761f709
commit 636ad44f0b
4 changed files with 104 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/activityhandlerplugin.php
View File

@ -600,6 +600,26 @@ abstract class ActivityHandlerPlugin extends Plugin
$nli->showNoticeOptions();
}
public function onStartShowNoticeItemNotice(NoticeListItem $nli)
{
if (!$this->isMyNotice($nli->notice)) {
return true;
}
$this->showNoticeItemNotice($nli);
Event::handle('EndShowNoticeItemNotice', array($nli));
return false;
}
protected function showNoticeItemNotice(NoticeListItem $nli)
{
$nli->showNoticeTitle();
$nli->showAuthor();
$nli->showAddressees();
$nli->showContent();
}
public function onStartShowNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null)
{
if (!$this->isMyNotice($stored)) {

2
lib/noticelistitem.php
View File

@ -118,7 +118,7 @@ class NoticeListItem extends Widget
$this->showAuthor();
$this->showAddressees();
$this->showContent();
Event::handle('EndShowNoticeItemNotice', array($this-));
Event::handle('EndShowNoticeItemNotice', array($this));
}
}

96
plugins/Bookmark/BookmarkPlugin.php
View File

@ -440,19 +440,6 @@ class BookmarkPlugin extends MicroAppPlugin
return $object;
}
/**
* Given a notice list item, returns an adapter specific
* to this plugin.
*
* @param NoticeListItem $nli item to adapt
*
* @return NoticeListItemAdapter adapter or null
*/
function adaptNoticeListItem($nli)
{
return new BookmarkListItem($nli);
}
function entryForm($out)
{
return new InitialBookmarkForm($out);
@ -505,4 +492,87 @@ class BookmarkPlugin extends MicroAppPlugin
return true;
}
protected function showNoticeItemNotice(NoticeListItem $nli)
{
$nli->out->elementStart('div', 'entry-title');
$nli->showAuthor();
$nli->showContent();
$nli->out->elementEnd('div');
}
protected function showNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null)
{
$nb = Bookmark::getByNotice($stored);
if (empty($nb)) {
common_log(LOG_ERR, "No bookmark for notice {$stored->id}");
parent::showContent();
return;
} else if (empty($nb->url)) {
common_log(LOG_ERR, "No url for bookmark {$nb->id} for notice {$stored->id}");
parent::showContent();
return;
}
$profile = $stored->getProfile();
// Whether to nofollow
$attrs = array('href' => $nb->url, 'class' => 'bookmark-title');
$nf = common_config('nofollow', 'external');
if ($nf == 'never' || ($nf == 'sometimes' and $out instanceof ShowstreamAction)) {
$attrs['rel'] = 'external';
} else {
$attrs['rel'] = 'nofollow external';
}
$out->elementStart('h3');
$out->element('a', $attrs, $nb->title);
$out->elementEnd('h3');
// Replies look like "for:" tags
$replies = $stored->getReplies();
$tags = $stored->getTags();
if (!empty($replies) || !empty($tags)) {
$out->elementStart('ul', array('class' => 'bookmark-tags'));
foreach ($replies as $reply) {
$other = Profile::getKV('id', $reply);
if (!empty($other)) {
$out->elementStart('li');
$out->element('a', array('rel' => 'tag',
'href' => $other->profileurl,
'title' => $other->getBestName()),
sprintf('for:%s', $other->nickname));
$out->elementEnd('li');
$out->text(' ');
}
}
foreach ($tags as $tag) {
$tag = trim($tag);
if (!empty($tag)) {
$out->elementStart('li');
$out->element('a',
array('rel' => 'tag',
'href' => Notice_tag::url($tag)),
$tag);
$out->elementEnd('li');
$out->text(' ');
}
}
$out->elementEnd('ul');
}
if (!empty($nb->description)) {
$out->element('p',
array('class' => 'bookmark-description'),
$nb->description);
}
}
}

144
plugins/Bookmark/lib/bookmarklistitem.php
View File

@ -1,144 +0,0 @@
<?php
/**
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 2011, StatusNet, Inc.
*
* Adapter to show bookmarks in a nicer way
*
* PHP version 5
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Bookmark
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
if (!defined('STATUSNET')) {
// This check helps protect against security problems;
// your code file can't be executed directly from the web.
exit(1);
}
/**
* An adapter to show bookmarks in a nicer way
*
* @category Bookmark
* @package StatusNet
* @author Evan Prodromou <evan@status.net>
* @copyright 2011 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
* @link http://status.net/
*/
class BookmarkListItem extends NoticeListItemAdapter
{
function showNotice()
{
$this->nli->out->elementStart('div', 'entry-title');
$this->nli->showAuthor();
$this->showContent();
$this->nli->out->elementEnd('div');
}
function showContent()
{
$notice = $this->nli->notice;
$out = $this->nli->out;
$nb = Bookmark::getByNotice($notice);
if (empty($nb)) {
common_log(LOG_ERR, "No bookmark for notice {$notice->id}");
parent::showContent();
return;
} else if (empty($nb->url)) {
common_log(LOG_ERR, "No url for bookmark {$nb->id} for notice {$notice->id}");
parent::showContent();
return;
}
$profile = $notice->getProfile();
$out->elementStart('div', array('class' => 'e-content'));
// Whether to nofollow
$attrs = array('href' => $nb->url,
'class' => 'bookmark-title');
$nf = common_config('nofollow', 'external');
if ($nf == 'never' || ($nf == 'sometimes' and $out instanceof ShowstreamAction)) {
$attrs['rel'] = 'external';
} else {
$attrs['rel'] = 'nofollow external';
}
$out->elementStart('h3');
$out->element('a',
$attrs,
$nb->title);
$out->elementEnd('h3');
// Replies look like "for:" tags
$replies = $notice->getReplies();
$tags = $notice->getTags();
if (!empty($replies) || !empty($tags)) {
$out->elementStart('ul', array('class' => 'bookmark-tags'));
foreach ($replies as $reply) {
$other = Profile::getKV('id', $reply);
if (!empty($other)) {
$out->elementStart('li');
$out->element('a', array('rel' => 'tag',
'href' => $other->profileurl,
'title' => $other->getBestName()),
sprintf('for:%s', $other->nickname));
$out->elementEnd('li');
$out->text(' ');
}
}
foreach ($tags as $tag) {
$tag = trim($tag);
if (!empty($tag)) {
$out->elementStart('li');
$out->element('a',
array('rel' => 'tag',
'href' => Notice_tag::url($tag)),
$tag);
$out->elementEnd('li');
$out->text(' ');
}
}
$out->elementEnd('ul');
}
if (!empty($nb->description)) {
$out->element('p',
array('class' => 'bookmark-description'),
$nb->description);
}
$out->elementEnd('div');
}
}