X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Fstream.php;h=0cb9e0bf4f749002ca8e8003ee50ec7980f90168;hb=6658e2a2ee9517bebd59cf69d7483e6eda691b4e;hp=6bba0eace3bca74a623b0dfc574f10109f356dac;hpb=0b21ac3dd79d2bf39341a4f0ff3566def8282eae;p=quix0rs-gnu-social.git

diff --git a/lib/stream.php b/lib/stream.php
index 6bba0eace3..0cb9e0bf4f 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -10,120 +10,23 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
  * GNU Affero General Public License for more details.
  *
  * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('NOTICES_PER_PAGE', 20);
-define('REPLIES_PER_PAGE', 20);
+require_once(INSTALLDIR.'/lib/personal.php');
+require_once(INSTALLDIR.'/lib/noticelist.php');
 
-class StreamAction extends Action {
-
-	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'),  
-						 ($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) {
-		global $config;
-		$profile = $notice->getProfile();
-		# XXX: RDFa
-		common_element_start('li', array('class' => 'notice_single',
-										  'id' => 'notice-' . $notice->id));
-		$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'));
-		common_raw(common_render_content($notice->content, $notice));
-		common_element_end('p');
-		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
-		common_element_start('p', 'time');
-		common_element('a', array('class' => 'notice',
-								  'href' => $noticeurl,
-								  'title' => common_exact_date($notice->created)),
-					   common_date_string($notice->created));
-		common_element_end('p');
-		common_element_end('li');
-	}
-
-	function show_reply($notice, $replied_id) {
-		global $config;
-		$profile = $notice->getProfile();
-		# XXX: RDFa
-		common_element_start('li', array('class' => 'notice_single',
-										  'id' => 'notice-' . $notice->id));
-		$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
-		common_element_start('a', array('href' => $profile->profileurl));
-		common_element('img', array('src' => ($avatar) ? $avatar->url : 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'));
-		common_raw(common_render_content($notice->content, $notice));
-		common_element_end('p');
-		$replyurl = common_local_url('shownotice', array('notice' => $replied_id));
-		$noticeurl = common_local_url('shownotice', array('notice' => $notice->id));
-		common_element_start('p', 'time');
-		common_element('a', array('class' => 'notice',
-								  'href' => $noticeurl),
-					   common_date_string($notice->created));
-		common_element('a', array('class' => 'notice',
-								  'href' => $replyurl),
-					   " in reply to ".$profile->nickname );
-		common_element_end('p');
-		common_element_end('li');
-	}
+class StreamAction extends PersonalAction
+{
+    function show_notice_list($notice)
+    {
+        $nl = new NoticeList($notice);
+        return $nl->show();
+    }
 }