From 8dcce13297dce70d993956c2e05f2b91f3c19c46 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 11 Dec 2008 18:12:52 -0500 Subject: make a new NoticeList widget and call it from StreamAction I made a new notice-list widget (like the profile list) and call it from StreamAction. This cleans up some of the mess in the various notice-stream-showing classes. I also changed show-stream so it uses a subclass of NoticeList that doesn't show author info (which is unnecessary). darcs-hash:20081211231252-5ed1f-ee6e551ed5a029406748120f12e2ff57c4a86493.gz --- lib/noticelist.php | 206 +++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/stream.php | 91 ++--------------------- 2 files changed, 211 insertions(+), 86 deletions(-) create mode 100644 lib/noticelist.php (limited to 'lib') diff --git a/lib/noticelist.php b/lib/noticelist.php new file mode 100644 index 000000000..1ffa802e9 --- /dev/null +++ b/lib/noticelist.php @@ -0,0 +1,206 @@ +. + */ + +if (!defined('LACONICA')) { exit(1); } + +class NoticeList { + + var $notice = NULL; + + function __construct($notice) { + $this->notice = $notice; + } + + function show() { + + common_element_start('ul', array('id' => 'notices')); + + $cnt = 0; + + while ($this->notice->fetch() && $cnt <= NOTICES_PER_PAGE) { + $cnt++; + + if ($cnt > NOTICES_PER_PAGE) { + break; + } + + $item = $this->new_list_item($this->notice); + $item->show(); + } + + common_element_end('ul'); + + return $cnt; + } + + function new_list_item($notice) { + return new NoticeListItem($notice); + } +} + +class NoticeListItem { + + var $notice = NULL; + var $profile = NULL; + + function __construct($notice) { + $this->notice = $notice; + $this->profile = $notice->getProfile(); + } + + function show($notice) { + $this->show_start(); + $this->show_fave_form(); + $this->show_author(); + $this->show_content(); + $this->show_start_time_section(); + $this->show_notice_link(); + $this->show_notice_source(); + $this->show_reply_to(); + $this->show_reply_link(); + $this->show_delete_link(); + $this->show_end_time_section(); + $this->show_end(); + } + + function show_start() { + # XXX: RDFa + common_element_start('li', array('class' => 'notice_single hentry', + 'id' => 'notice-' . $this->notice->id)); + } + + function show_fave_form() { + $user = common_current_user(); + if ($user) { + if ($user->hasFave($this->notice)) { + common_disfavor_form($this->notice); + } else { + common_favor_form($this->notice); + } + } + } + + function show_author() { + common_element_start('span', 'vcard author'); + $this->avatar(); + $this->nickname(); + common_element_end('span'); + } + + function show_avatar() { + $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); + common_element_start('a', array('href' => $profile->profileurl)); + common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE), + 'class' => 'avatar stream photo', + 'width' => AVATAR_STREAM_SIZE, + 'height' => AVATAR_STREAM_SIZE, + 'alt' => + ($profile->fullname) ? $profile->fullname : + $profile->nickname)); + common_element_end('a'); + } + + function show_nickname() { + common_element('a', array('href' => $profile->profileurl, + 'class' => 'nickname fn url'), + $profile->nickname); + } + + function show_content() { + # FIXME: URL, image, video, audio + common_element_start('p', array('class' => 'content entry-title')); + if ($this->notice->rendered) { + common_raw($this->notice->rendered); + } else { + # XXX: may be some uncooked notices in the DB, + # we cook them right now. This should probably disappear in future + # versions (>> 0.4.x) + common_raw(common_render_content($this->notice->content, $this->notice)); + } + common_element_end('p'); + } + + function show_start_time_section() { + common_element_start('p', 'time'); + } + + function show_notice_link() { + $noticeurl = common_local_url('shownotice', array('notice' => $this->notice->id)); + # XXX: we need to figure this out better. Is this right? + if (strcmp($this->notice->uri, $this->noticeurl) != 0 && preg_match('/^http/', $this->notice->uri)) { + $noticeurl = $this->notice->uri; + } + common_element_start('a', array('class' => 'permalink', + 'rel' => 'bookmark', + 'href' => $noticeurl)); + common_element('abbr', array('class' => 'published', + 'title' => common_date_iso8601($this->notice->created)), + common_date_string($this->notice->created)); + common_element_end('a'); + } + + function show_notice_source() { + if ($this->notice->source) { + common_text(_(' from ')); + $this->source_link($this->notice->source); + } + } + + function show_reply_to() { + if ($this->notice->reply_to) { + $replyurl = common_local_url('shownotice', array('notice' => $this->notice->reply_to)); + common_text(' ('); + common_element('a', array('class' => 'inreplyto', + 'href' => $replyurl), + _('in reply to...')); + common_text(')'); + } + } + + function show_reply_link() { + common_element_start('a', + array('href' => common_local_url('newnotice', + array('replyto' => $profile->nickname)), + 'onclick' => 'return doreply("'.$profile->nickname.'", '.$this->notice->id.');', + 'title' => _('reply'), + 'class' => 'replybutton')); + common_raw('→'); + common_element_end('a'); + } + + function show_delete_link() { + $user = common_current_user(); + if ($user && $this->notice->profile_id == $user->id) { + $deleteurl = common_local_url('deletenotice', array('notice' => $this->notice->id)); + common_element_start('a', array('class' => 'deletenotice', + 'href' => $deleteurl, + 'title' => _('delete'))); + common_raw('×'); + common_element_end('a'); + } + } + + function show_end_time_section() { + common_element_end('p'); + } + + function show_end() { + common_element_end('li'); + } +} diff --git a/lib/stream.php b/lib/stream.php index 1eec1496a..4569f3929 100644 --- a/lib/stream.php +++ b/lib/stream.php @@ -20,6 +20,7 @@ if (!defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/personal.php'); +require_once(INSTALLDIR.'/lib/noticelist.php'); class StreamAction extends PersonalAction { @@ -47,90 +48,8 @@ class StreamAction extends PersonalAction { } - function show_notice($notice) { - global $config; - $profile = $notice->getProfile(); - $user = common_current_user(); - - # XXX: RDFa - common_element_start('li', array('class' => 'notice_single hentry', - 'id' => 'notice-' . $notice->id)); - if ($user) { - if ($user->hasFave($notice)) { - common_disfavor_form($notice); - } else { - common_favor_form($notice); - } - } - common_element_start('span', 'vcard author'); - $avatar = $profile->getAvatar(AVATAR_STREAM_SIZE); - common_element_start('a', array('href' => $profile->profileurl)); - common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE), - 'class' => 'avatar stream photo', - 'width' => AVATAR_STREAM_SIZE, - 'height' => AVATAR_STREAM_SIZE, - 'alt' => - ($profile->fullname) ? $profile->fullname : - $profile->nickname)); - common_element_end('a'); - common_element('a', array('href' => $profile->profileurl, - 'class' => 'nickname fn url'), - $profile->nickname); - common_element_end('span'); - # FIXME: URL, image, video, audio - common_element_start('p', array('class' => 'content entry-title')); - if ($notice->rendered) { - common_raw($notice->rendered); - } else { - # XXX: may be some uncooked notices in the DB, - # we cook them right now. This should probably disappear in future - # versions (>> 0.4.x) - common_raw(common_render_content($notice->content, $notice)); - } - common_element_end('p'); - $noticeurl = common_local_url('shownotice', array('notice' => $notice->id)); - # XXX: we need to figure this out better. Is this right? - if (strcmp($notice->uri, $noticeurl) != 0 && preg_match('/^http/', $notice->uri)) { - $noticeurl = $notice->uri; - } - common_element_start('p', 'time'); - common_element_start('a', array('class' => 'permalink', - 'rel' => 'bookmark', - 'href' => $noticeurl)); - common_element('abbr', array('class' => 'published', - 'title' => common_date_iso8601($notice->created)), - common_date_string($notice->created)); - common_element_end('a'); - - if ($notice->source) { - common_text(_(' from ')); - $this->source_link($notice->source); - } - if ($notice->reply_to) { - $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to)); - common_text(' ('); - common_element('a', array('class' => 'inreplyto', - 'href' => $replyurl), - _('in reply to...')); - common_text(')'); - } - common_element_start('a', - array('href' => common_local_url('newnotice', - array('replyto' => $profile->nickname)), - 'onclick' => 'return doreply("'.$profile->nickname.'", '.$notice->id.');', - 'title' => _('reply'), - 'class' => 'replybutton')); - common_raw('→'); - common_element_end('a'); - if ($user && $notice->profile_id == $user->id) { - $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id)); - common_element_start('a', array('class' => 'deletenotice', - 'href' => $deleteurl, - 'title' => _('delete'))); - common_raw('×'); - common_element_end('a'); - } - common_element_end('p'); - common_element_end('li'); - } + function show_notice_list($notice) { + $nl = new NoticeList($notice); + return $nl->show(); + } } -- cgit v1.2.3-54-g00ecf