Rewriting code for notice representation
Getting rid of NoticeListItemAdapter, putting more into ActivityHandlerPlugin and relying on plugins to handle rendering code of the content. This gives us a lot more structure and consistency in notice structure and allows activity plugins to stop rendering certain kinds of notices more easily. There should also be a property for an ActivityHandlerPlugin class to avoid rendering notices in the ordinary stream, so we don't have to overload stuff.
This commit is contained in:
@@ -31,6 +31,15 @@ if (!defined('GNUSOCIAL')) { exit(1); }
|
||||
*/
|
||||
abstract class ActivityHandlerPlugin extends Plugin
|
||||
{
|
||||
/**
|
||||
* Returns a key string which represents this activity in HTML classes,
|
||||
* ids etc, as when offering selection of what type of post to make.
|
||||
* In MicroAppPlugin, this is paired with the user-visible localizable appTitle().
|
||||
*
|
||||
* @return string (compatible with HTML classes)
|
||||
*/
|
||||
abstract function tag();
|
||||
|
||||
/**
|
||||
* Return a list of ActivityStreams object type IRIs
|
||||
* which this micro-app handles. Default implementations
|
||||
@@ -40,8 +49,6 @@ abstract class ActivityHandlerPlugin extends Plugin
|
||||
*
|
||||
* An empty list means any type is ok. (Favorite verb etc.)
|
||||
*
|
||||
* All micro-app classes must override this method.
|
||||
*
|
||||
* @return array of strings
|
||||
*/
|
||||
abstract function types();
|
||||
@@ -57,7 +64,7 @@ abstract class ActivityHandlerPlugin extends Plugin
|
||||
*
|
||||
* @return array of strings
|
||||
*/
|
||||
function verbs() {
|
||||
public function verbs() {
|
||||
return array(ActivityVerb::POST);
|
||||
}
|
||||
|
||||
@@ -496,4 +503,88 @@ abstract class ActivityHandlerPlugin extends Plugin
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public function onStartOpenNoticeListItemElement(NoticeListItem $nli)
|
||||
{
|
||||
if (!$this->isMyNotice($nli->notice)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$this->openNoticeListItemElement($nli);
|
||||
|
||||
Event::handle('EndOpenNoticeListItemElement', array($nli));
|
||||
return false;
|
||||
}
|
||||
|
||||
public function onStartCloseNoticeListItemElement(NoticeListItem $nli)
|
||||
{
|
||||
if (!$this->isMyNotice($nli->notice)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$this->closeNoticeListItemElement($nli);
|
||||
|
||||
Event::handle('EndCloseNoticeListItemElement', array($nli));
|
||||
return false;
|
||||
}
|
||||
|
||||
protected function openNoticeListItemElement(NoticeListItem $nli)
|
||||
{
|
||||
$id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id;
|
||||
$class = 'h-entry notice ' . $this->tag();
|
||||
if ($nli->notice->scope != 0 && $nli->notice->scope != 1) {
|
||||
$class .= ' limited-scope';
|
||||
}
|
||||
$nli->out->elementStart('li', array('class' => $class,
|
||||
'id' => 'notice-' . $id));
|
||||
}
|
||||
|
||||
protected function closeNoticeListItemElement(NoticeListItem $nli)
|
||||
{
|
||||
$nli->out->elementEnd('li');
|
||||
}
|
||||
|
||||
|
||||
// FIXME: This is overriden in MicroAppPlugin but shouldn't have to be
|
||||
public function onStartShowNoticeItem(NoticeListItem $nli)
|
||||
{
|
||||
if (!$this->isMyNotice($nli->notice)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
try {
|
||||
$this->showNoticeListItem($nli);
|
||||
} catch (Exception $e) {
|
||||
$nli->out->element('p', 'error', 'Error showing notice: '.htmlspecialchars($e->getMessage()));
|
||||
}
|
||||
|
||||
Event::handle('EndShowNoticeItem', array($nli));
|
||||
return false;
|
||||
}
|
||||
|
||||
protected function showNoticeListItem(NoticeListItem $nli)
|
||||
{
|
||||
$nli->showNotice();
|
||||
$nli->showNoticeAttachments();
|
||||
$nli->showNoticeInfo();
|
||||
$nli->showNoticeOptions();
|
||||
|
||||
$nli->showNoticeLink();
|
||||
$nli->showNoticeSource();
|
||||
$nli->showNoticeLocation();
|
||||
$nli->showContext();
|
||||
$nli->showRepeat();
|
||||
|
||||
$nli->showNoticeOptions();
|
||||
}
|
||||
|
||||
public function onStartShowNoticeContent(Notice $stored, HTMLOutputter $out, Profile $scoped=null)
|
||||
{
|
||||
if (!$this->isMyNotice($stored)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$out->text($stored->getContent());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user