X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstream.php;h=ea452096cc937a42b0f14a862b977295b558b221;hb=a730ad708c0e036691e26687cc7ec41d57c6db40;hp=6bc263ed64e26f7a712f4a16a28e7ac1ed77c048;hpb=279cb255c8946f350475975f92a750bc8d220a5d;p=quix0rs-gnu-social.git

diff --git a/lib/stream.php b/lib/stream.php
index 6bc263ed64..ea452096cc 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -19,50 +19,25 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('NOTICES_PER_PAGE', 20);
+require_once(INSTALLDIR.'/lib/personal.php');
 
-class StreamAction extends Action {
+class StreamAction extends PersonalAction {
 
-	function handle($args) {
-		parent::handle($args);
-	}
-
-	function views_menu() {
-
-		$user = NULL;
-		$action = $this->trimmed('action');
-		$nickname = $this->trimmed('nickname');
-
-		if ($nickname) {
-			$user = User::staticGet('nickname', $nickname);
-		}
-
-		common_element_start('ul', array('id' => 'nav_views'));
-
-		common_menu_item(common_local_url('all', array('nickname' =>
-													   $nickname)),
-						 _t('Personal'),
-						 (($user && $user->fullname) ? $user->fullname : $nickname) . _t(' and friends'),
-						 $action == 'all');
-		common_menu_item(common_local_url('replies', array('nickname' =>
-															  $nickname)),
-						 _t('Replies'),  
-						 _t('Replies to ') . (($user && $user->fullname) ? $user->fullname : $nickname),
-						 $action == 'replies');
-		common_menu_item(common_local_url('showstream', array('nickname' =>
-															  $nickname)),
-						 _t('Profile'),
-						 ($user && $user->fullname) ? $user->fullname : $nickname,
-						 $action == 'showstream');
-		common_element_end('ul');
-	}
-
-	function show_notice($notice, $replied_id=NULL) {
+	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);
+			}
+		}
 		$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),
@@ -78,29 +53,53 @@ class StreamAction extends Action {
 					   $profile->nickname);
 		# FIXME: URL, image, video, audio
 		common_element_start('p', array('class' => 'content'));
-		common_raw(common_render_content($notice->content, $notice));
+		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 ($replied_id) {
-			$replyurl = common_local_url('shownotice', array('notice' => $replied_id));
-			common_text('(');
+		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),
-						   _t(' in reply to...'));
+						   _('in reply to...'));
 			common_text(')');
 		}
-		common_element('a', 
-					   array('href' => common_local_url('newnotice',
-                                                        array('replyto' => $profile->nickname)),
-							 'onclick' => 'doreply("'.$profile->nickname.'"); return false',
-                             'title' => _t('reply'),
-							 'class' => 'replybutton'),
-					   _t('↺'));
+		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');
 	}