1 files changed, 4 insertions, 114 deletions

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 939c0ff9c..34790a5ea 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -19,6 +19,8 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
+require_once INSTALL_DIR . '/lib/noticelist.php';
+
 class NewnoticeAction extends Action {
 
 	function handle($args) {
@@ -145,120 +147,8 @@ class NewnoticeAction extends Action {
 	}
 
 	function show_notice($notice) {
-		global $config;
-		$profile = $notice->getProfile();
-		$user = common_current_user();
-
-		# XXX: RDFa
-		common_element_start('li', array('class' => 'notice_single',
-										  'id' => 'notice-' . $notice->id));
-		if ($user) {
-			if ($user->hasFave($notice)) {
-				common_disfavor_form($notice);
-			} else {
-				common_favor_form($notice);
-			}
-		}
-
-		$returnto = $this->trimmed('returnto');
-
-		# If this is the personal stream, we don't want avatars
-		if ($returnto != 'showstream') {
-
-			$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',
-										'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'),
-						   $profile->nickname);
-		}
-
-		# FIXME: URL, image, video, audio
-		common_element_start('p', array('class' => 'content'));
-
-		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('a', array('class' => 'permalink',
-								  'href' => $noticeurl,
-								  'title' => common_exact_date($notice->created)),
-					   common_date_string($notice->created));
-		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(html_entity_decode('→', ENT_NOQUOTES, 'utf-8'));
-		
-		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(html_entity_decode('×', ENT_NOQUOTES, 'utf-8'));
-			common_element_end('a');
-		}
-		common_element_end('p');
-		common_element_end('li');
+        $nli = new NoticeListItem($notice);
+        $nli->show();
 	}
 
-	function source_link($source) {
-		$source_name = _($source);
-		switch ($source) {
-		 case 'web':
-		 case 'xmpp':
-		 case 'mail':
-		 case 'omb':
-		 case 'api':
-			common_element('span', 'noticesource', $source_name);
-			break;
-		 default:
-			$ns = Notice_source::staticGet($source);
-			if ($ns) {
-				common_element('a', array('href' => $ns->url),
-							   $ns->name);
-			} else {
-				common_element('span', 'noticesource', $source_name);
-			}
-			break;
-		}
-		return;
-	}
-
-
 }