X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fconversation.php;h=b1cb50abacdde4b179e5b0c9f6b5c5a35e1a9a07;hb=7d524307d247d15687065be75f4524bc9e638a2b;hp=8d11df37bc52ac637cbf91fc46b06efa0ec5f6c3;hpb=62dfdb34a613f61e8f546b60468e1a73ee18d7e0;p=quix0rs-gnu-social.git diff --git a/actions/conversation.php b/actions/conversation.php index 8d11df37bc..b1cb50abac 100644 --- a/actions/conversation.php +++ b/actions/conversation.php @@ -7,6 +7,7 @@ * @category Action * @package StatusNet * @author Evan Prodromou + * @author Mikael Nordfeldth * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ * @@ -27,28 +28,26 @@ * along with this program. If not, see . */ -if (!defined('STATUSNET') && !defined('LACONICA')) { - exit(1); -} - -// XXX: not sure how to do paging yet, -// so set a 60-notice limit - -require_once INSTALLDIR.'/lib/noticelist.php'; +if (!defined('GNUSOCIAL')) { exit(1); } /** * Conversation tree in the browser * + * Will always try to show the entire conversation, since that's how our + * ConversationNoticeStream works. + * * @category Action * @package StatusNet * @author Evan Prodromou + * @author Mikael Nordfeldth * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 * @link http://status.net/ */ -class ConversationAction extends Action +class ConversationAction extends ManagedAction { - var $id = null; - var $page = null; + var $conv = null; + var $page = null; + var $notices = null; /** * Initialization. @@ -57,32 +56,17 @@ class ConversationAction extends Action * * @return boolean false if id not passed in */ - function prepare($args) + protected function prepare(array $args=array()) { parent::prepare($args); - $this->id = $this->trimmed('id'); - if (empty($this->id)) { - return false; - } - $this->id = $this->id+0; - $this->page = $this->trimmed('page'); - if (empty($this->page)) { - $this->page = 1; + $convId = $this->int('id'); + + $this->conv = Conversation::getKV('id', $convId); + if (!$this->conv instanceof Conversation) { + throw new ClientException('Could not find specified conversation'); } - return true; - } - /** - * Handle the action - * - * @param array $args Web and URL arguments - * - * @return void - */ - function handle($args) - { - parent::handle($args); - $this->showPage(); + return true; } /** @@ -99,192 +83,52 @@ class ConversationAction extends Action /** * Show content. * - * Display a hierarchical unordered list in the content area. - * Uses ConversationTree to do most of the heavy lifting. + * NoticeList extended classes do most heavy lifting. Plugins can override. * * @return void */ function showContent() { - $notices = Notice::conversationStream($this->id, null, null); - - $ct = new ConversationTree($notices, $this); - - $cnt = $ct->show(); - } - - function isReadOnly() - { - return true; - } -} - -/** - * Conversation tree - * - * The widget class for displaying a hierarchical list of notices. - * - * @category Widget - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://status.net/ - */ -class ConversationTree extends NoticeList -{ - var $tree = null; - var $table = null; - - /** - * Show the tree of notices - * - * @return void - */ - function show() - { - $cnt = $this->_buildTree(); - - $this->out->elementStart('div', array('id' =>'notices_primary')); - // TRANS: Header on conversation page. Hidden by default (h2). - $this->out->element('h2', null, _('Notices')); - $this->out->elementStart('ol', array('class' => 'notices xoxo')); - - if (array_key_exists('root', $this->tree)) { - $rootid = $this->tree['root'][0]; - $this->showNoticePlus($rootid); + if (Event::handle('StartShowConversation', array($this, $this->conv, $this->scoped))) { + $notices = $this->conv->getNotices(); + $nl = new FullThreadedNoticeList($notices, $this, $this->scoped); + $cnt = $nl->show(); } - - $this->out->elementEnd('ol'); - $this->out->elementEnd('div'); - - return $cnt; + Event::handle('EndShowConversation', array($this, $this->conv, $this->scoped)); } - function _buildTree() + function isReadOnly($args) { - $cnt = 0; - - $this->tree = array(); - $this->table = array(); - - while ($this->notice->fetch()) { - - $cnt++; - - $id = $this->notice->id; - $notice = clone($this->notice); - - $this->table[$id] = $notice; - - if (is_null($notice->reply_to)) { - $this->tree['root'] = array($notice->id); - } else if (array_key_exists($notice->reply_to, $this->tree)) { - $this->tree[$notice->reply_to][] = $notice->id; - } else { - $this->tree[$notice->reply_to] = array($notice->id); - } - } - - return $cnt; - } - - /** - * Shows a notice plus its list of children. - * - * @param integer $id ID of the notice to show - * - * @return void - */ - function showNoticePlus($id) - { - $notice = $this->table[$id]; - - // We take responsibility for doing the li - - $this->out->elementStart('li', array('class' => 'hentry notice', - 'id' => 'notice-' . $id)); - - $item = $this->newListItem($notice); - $item->show(); - - if (array_key_exists($id, $this->tree)) { - $children = $this->tree[$id]; - - $this->out->elementStart('ol', array('class' => 'notices')); - - sort($children); - - foreach ($children as $child) { - $this->showNoticePlus($child); - } - - $this->out->elementEnd('ol'); - } - - $this->out->elementEnd('li'); + return true; } - - /** - * Override parent class to return our preferred item. - * - * @param Notice $notice Notice to display - * - * @return NoticeListItem a list item to show - */ - function newListItem($notice) + + function getFeeds() { - return new ConversationTreeItem($notice, $this->out); + + return array(new Feed(Feed::JSON, + common_local_url('apiconversation', + array( + 'id' => $this->conv->id, + 'format' => 'as')), + // TRANS: Title for link to notice feed. + // TRANS: %s is a user nickname. + _('Conversation feed (Activity Streams JSON)')), + new Feed(Feed::RSS2, + common_local_url('apiconversation', + array( + 'id' => $this->conv->id, + 'format' => 'rss')), + // TRANS: Title for link to notice feed. + // TRANS: %s is a user nickname. + _('Conversation feed (RSS 2.0)')), + new Feed(Feed::ATOM, + common_local_url('apiconversation', + array( + 'id' => $this->conv->id, + 'format' => 'atom')), + // TRANS: Title for link to notice feed. + // TRANS: %s is a user nickname. + _('Conversation feed (Atom)'))); } } -/** - * Conversation tree list item - * - * Special class of NoticeListItem for use inside conversation trees. - * - * @category Widget - * @package StatusNet - * @author Evan Prodromou - * @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3 - * @link http://status.net/ - */ -class ConversationTreeItem extends NoticeListItem -{ - /** - * start a single notice. - * - * The default creates the
  • ; we skip, since the ConversationTree - * takes care of that. - * - * @return void - */ - function showStart() - { - return; - } - - /** - * finish the notice - * - * The default closes the
  • ; we skip, since the ConversationTree - * takes care of that. - * - * @return void - */ - function showEnd() - { - return; - } - - /** - * show link to notice conversation page - * - * Since we're only used on the conversation page, we skip this - * - * @return void - */ - function showContext() - { - return; - } -}