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

9 files changed, 35 insertions, 169 deletions

diff --git a/actions/all.php b/actions/all.php
index 729b8dd16..2a26e48d4 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -82,23 +82,10 @@ class AllAction extends StreamAction {
 		if (!$page) {
 			$page = 1;
 		}
-		
+
 		$notice = $user->noticesWithFriends(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-											
-		common_element_start('ul', array('id' => 'notices'));
-		
-		$cnt = 0;
-		
-		while ($notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
-			$cnt++;
-			
-			if ($cnt > NOTICES_PER_PAGE) {
-				break;
-			}
-			
-			$this->show_notice($notice);
-		}
-		common_element_end('ul');
+
+        $cnt = $this->show_notice_list($notice);
 
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'all', array('nickname' => $user->nickname));
diff --git a/actions/deleteprofile.php b/actions/deleteprofile.php
index 99e65ceb7..9823900c5 100644
--- a/actions/deleteprofile.php
+++ b/actions/deleteprofile.php
@@ -103,8 +103,7 @@ class DeleteprofileAction extends Action {
 		common_hidden('token', common_session_token());
         common_element('p', null, "Last chance to copy your notices and contacts by saving the two links below before deleting your account. Be careful, this operation cannot be undone.");
 
-
-		$this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('limit' => $notice_count, 'nickname' => $user->nickname)), 
+		$this->show_feeds_list(array(0=>array('href'=>common_local_url('userrss', array('limit' => $notice_count, 'nickname' => $user->nickname)),
 											  'type' => 'rss',
 											  'version' => 'RSS 1.0',
 											  'item' => 'notices'),
@@ -146,7 +145,7 @@ class DeleteprofileAction extends Action {
 
         $fave = new Fave;
         $fave->user_id = $user->id;
-        $n_faves_deleted = $fave->delete(); 
+        $n_faves_deleted = $fave->delete();
 
         $confirmation = new Confirm_address;
         $confirmation->user_id = $user->id;
@@ -177,7 +176,7 @@ class DeleteprofileAction extends Action {
         $profile_tagged = new Profile_tag;
         $profile_tagged->tagged = $user->id;
         $n_profiles_tagged_deleted = $profile_tagged->delete();
-               
+
         $remember_me = new Remember_me;
         $remember_me->user_id = $user->id;
         $n_remember_mes_deleted = $remember_me->delete();
@@ -257,7 +256,7 @@ class DeleteprofileAction extends Action {
 				'othersettings' =>
 				array(_('Other'),
 					  _('Other options')));
-		
+
         $action = $this->trimmed('action');
         common_element_start('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
diff --git a/actions/favorited.php b/actions/favorited.php
index 16bd8f226..13962b42e 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -88,19 +88,7 @@ class FavoritedAction extends StreamAction {
 		$notice->query(sprintf('SELECT * FROM notice WHERE id in (%s)',
 			implode(',', $notice_list)));
 
-		$cnt = 0;
-
-		if ($notice) {
-			common_element_start('ul', array('id' => 'notices'));
-			while ($notice->fetch()) {
-				$cnt++;
-				if ($cnt > NOTICES_PER_PAGE) {
-					break;
-				}
-				$this->show_notice($notice);
-			}
-			common_element_end('ul');
-		}
+        $cnt = $this->show_notice_list($notice);
 
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'favorited');
diff --git a/actions/public.php b/actions/public.php
index 8a41dcd56..218f80194 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -54,7 +54,6 @@ class PublicAction extends StreamAction {
 
 		$this->public_views_menu();
 
-
 		$this->show_feeds_list(array(0=>array('href'=>common_local_url('publicrss'),
 											  'type' => 'rss',
 											  'version' => 'RSS 1.0',
@@ -87,18 +86,13 @@ class PublicAction extends StreamAction {
 		$notice = Notice::publicStream(($page-1)*NOTICES_PER_PAGE,
 									   NOTICES_PER_PAGE + 1);
 
-		if ($notice) {
-			common_element_start('ul', array('id' => 'notices'));
-			while ($notice->fetch()) {
-				$cnt++;
-				if ($cnt > NOTICES_PER_PAGE) {
-					break;
-				}
-				$this->show_notice($notice);
-			}
-			common_element_end('ul');
+		if (!$notice) {
+            $this->server_error(_('Could not retrieve public stream.'));
+            return;
 		}
 
+        $cnt = $this->show_notice_list($notice);
+
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'public');
 	}
diff --git a/actions/replies.php b/actions/replies.php
index 529ce7e98..835871ffc 100644
--- a/actions/replies.php
+++ b/actions/replies.php
@@ -85,20 +85,8 @@ class RepliesAction extends StreamAction {
 		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
 		$notice = $user->getReplies(($page-1) * NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
-		
-		$cnt = 0;
-		
-		if ($notice) {
-			common_element_start('ul', array('id' => 'notices'));
-			while ($notice->fetch()) {
-				$cnt++;
-				if ($cnt > NOTICES_PER_PAGE) {
-					break;
-				}
-				$this->show_notice($notice);
-			}
-			common_element_end('ul');
-		}
+
+		$cnt = $this->show_notice_list($notice);
 
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'replies', array('nickname' => $user->nickname));
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index c18c73a7a..4de4b1271 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -89,20 +89,7 @@ class ShowfavoritesAction extends StreamAction {
 			return;
 		}
 
-		common_element_start('ul', array('id' => 'notices'));
-
-		$cnt = 0;
-
-		while ($notice->fetch() && $cnt <= NOTICES_PER_PAGE) {
-			$cnt++;
-
-			if ($cnt > NOTICES_PER_PAGE) {
-				break;
-			}
-
-			$this->show_notice($notice);
-		}
-		common_element_end('ul');
+        $cnt = $this->show_notice_list($notice);
 
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'showfavorites', array('nickname' => $user->nickname));
diff --git a/actions/shownotice.php b/actions/shownotice.php
index b60b6f5a7..6dea6d7bb 100644
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -77,7 +77,8 @@ class ShownoticeAction extends StreamAction {
 						   array($this, 'show_top'));
 
 		common_element_start('ul', array('id' => 'notices'));
-		$this->show_notice($this->notice);
+        $nli = new NoticeListItem($this->notice);
+        $nli->show();
 		common_element_end('ul');
 
 		common_show_footer();
diff --git a/actions/showstream.php b/actions/showstream.php
index 2919a154f..633b11abc 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -406,22 +406,8 @@ class ShowstreamAction extends StreamAction {
 
 		$notice = $user->getNotices(($page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
 
-		$cnt = 0;
-
-		if ($notice) {
-
-			common_element_start('ul', array('id' => 'notices'));
-
-			while ($notice->fetch()) {
-				$cnt++;
-				if ($cnt > NOTICES_PER_PAGE) {
-					break;
-				}
-				$this->show_notice($notice);
-			}
-
-			common_element_end('ul');
-		}
+        $pnl = new ProfileNoticeList($notice);
+        $cnt = $pnl->show();
 
 		common_pagination($page>1, $cnt>NOTICES_PER_PAGE, $page,
 						  'showstream', array('nickname' => $user->nickname));
@@ -447,72 +433,18 @@ class ShowstreamAction extends StreamAction {
 			common_element_end('p');
 		}
 	}
+}
 
-	function show_notice($notice) {
-		$profile = $notice->getProfile();
-		$user = common_current_user();
+# We don't show the author for a profile, since we already know who it is!
 
-		# 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);
-			}
-		}
-		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
-		# FIXME: URL, image, video, audio
-		common_element_start('p', '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 can probably disappear in future
-			# versions (>> 0.4.x)
-			common_raw(common_render_content($notice->content, $notice));
-		}
-		common_element_end('p');
-		common_element_start('p', array('class' => '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' => 'doreply("'.$profile->nickname.'"); return false',
-								   'title' => _('reply'),
-								   'class' => 'replybutton'));
-		common_raw('&rarr;');
-		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('&times;');
-			common_element_end('a');
-		}
+class ProfileNoticeList extends NoticeList {
+    function new_list_item($notice) {
+        return new ProfileNoticeListItem($notice);
+    }
+}
 
-		common_element_end('p');
-		common_element_end('li');
-	}
+class ProfileNoticeListItem extends NoticeListItem {
+    function show_author() {
+        return;
+    }
 }
diff --git a/actions/tag.php b/actions/tag.php
index 50b76dbcd..25cc853c4 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -106,7 +106,7 @@ class TagAction extends StreamAction {
 
 		if ($cnt > 0) {
 			common_element_start('p', 'tagcloud');
-			
+
 			$tw = array();
 			$sum = 0;
 			while ($tags->fetch()) {
@@ -115,7 +115,7 @@ class TagAction extends StreamAction {
 			}
 
 			ksort($tw);
-			
+
 			foreach ($tw as $tag => $weight) {
 				$this->show_tag($tag, $weight, $weight/$sum);
 			}
@@ -152,22 +152,12 @@ class TagAction extends StreamAction {
 	function show_notices($tag) {
 
 		$cnt = 0;
-		
+
 		$page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
 		$notice = Notice_tag::getStream($tag, (($page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1);
 
-		if ($notice) {
-			common_element_start('ul', array('id' => 'notices'));
-			while ($notice->fetch()) {
-				$cnt++;
-				if ($cnt > NOTICES_PER_PAGE) {
-					break;
-				}
-				$this->show_notice($notice);
-			}
-			common_element_end('ul');
-		}
+        $cnt = $this->show_notice_list($notice);
 
 		common_pagination($page > 1, $cnt > NOTICES_PER_PAGE,
 						  $page, 'tag', array('tag' => $tag));