From: Friendika <info@friendika.com>
Date: Mon, 11 Apr 2011 04:21:16 +0000 (-0700)
Subject: "display list of status items" moved to include/conversation.php,
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a65c595b169eec63b9a9dddac14b72e88ba34a04;p=friendica.git

"display list of status items" moved to include/conversation.php,
currently network module has been updated to use it for display, other modules to follow
with whatever special case code they require.
---

diff --git a/include/conversation.php b/include/conversation.php
new file mode 100644
index 0000000000..a45befe5bd
--- /dev/null
+++ b/include/conversation.php
@@ -0,0 +1,350 @@
+<?php
+
+
+function conversation(&$a,$r, $mode, $update) {
+
+	require_once('bbcode.php');
+
+	// find all the authors involved in remote conversations
+	// We will use a local profile photo if they are one of our contacts
+	// otherwise we have to get the photo from the item owner's site
+
+	$author_contacts = extract_item_authors($r,local_user());
+
+
+	$cmnt_tpl    = load_view_file('view/comment_item.tpl');
+	$like_tpl    = load_view_file('view/like.tpl');
+	$noshare_tpl = load_view_file('view/like_noshare.tpl');
+	$tpl         = load_view_file('view/wall_item.tpl');
+	$wallwall    = load_view_file('view/wallwall_item.tpl');
+
+	$alike = array();
+	$dlike = array();
+	
+	if(count($r)) {
+
+		if($mode === 'network-new') {
+
+			// "New Item View" - just loop through the items and format them minimally for display
+
+			$tpl = load_view_file('view/search_item.tpl');
+			$droptpl = load_view_file('view/wall_fake_drop.tpl');
+
+			foreach($r as $item) {
+
+				$comment     = '';
+				$owner_url   = '';
+				$owner_photo = '';
+				$owner_name  = '';
+				$sparkle     = '';
+			
+				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
+				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+				$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
+
+				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+				if(strlen($item['author-link'])) {
+					if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
+						$profile_link = $redirect_url;
+						$sparkle = ' sparkle';
+					}
+					elseif(isset($author_contacts[$item['author-link']])) {
+						$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
+						$sparkle = ' sparkle';
+					}
+				}
+
+				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+				if($coord) {
+					if($location)
+						$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+					else
+						$location = '<span class="smalltext">' . $coord . '</span>';
+				}
+
+				$drop = replace_macros($droptpl,array('$id' => $item['id']));
+				$lock = '<div class="wall-item-lock"></div>';
+				
+				$o .= replace_macros($tpl,array(
+					'$id' => $item['item_id'],
+					'$linktitle' => sprintf( t('View %s\s profile'), $profile_name),
+					'$profile_url' => $profile_link,
+					'$item_photo_menu' => item_photo_menu($item),
+					'$name' => $profile_name,
+					'$sparkle' => $sparkle,
+					'$lock' => $lock,
+					'$thumb' => $profile_avatar,
+					'$title' => $item['title'],
+					'$body' => smilies(bbcode($item['body'])),
+					'$ago' => relative_date($item['created']),
+					'$location' => $location,
+					'$indent' => '',
+					'$owner_url' => $owner_url,
+					'$owner_photo' => $owner_photo,
+					'$owner_name' => $owner_name,
+					'$drop' => $drop,
+					'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $item['id'] . '">' . t('View in context') . '</a>'
+				));
+
+			}
+
+			return $o;
+		}
+
+
+
+
+		// Normal View
+
+
+		// Figure out how many comments each parent has
+		// (Comments all have gravity of 6)
+		// Store the result in the $comments array
+
+		$comments = array();
+		foreach($r as $rr) {
+			if(intval($rr['gravity']) == 6) {
+				if(! x($comments,$rr['parent']))
+					$comments[$rr['parent']] = 1;
+				else
+					$comments[$rr['parent']] += 1;
+			}
+		}
+
+		// map all the like/dislike activities for each parent item 
+		// Store these in the $alike and $dlike arrays
+
+		foreach($r as $item) {
+			like_puller($a,$item,$alike,'like');
+			like_puller($a,$item,$dlike,'dislike');
+		}
+
+		$comments_collapsed = false;
+		$blowhard = 0;
+		$blowhard_count = 0;
+
+		foreach($r as $item) {
+
+			$comment = '';
+			$template = $tpl;
+			$commentww = '';
+			$sparkle = '';
+			$owner_url = $owner_photo = $owner_name = '';
+
+
+			// We've already parsed out like/dislike for special treatment. We can ignore them now
+
+			if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
+				|| (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
+				&& ($item['id'] != $item['parent']))
+				continue;
+
+			// Take care of author collapsing and comment collapsing
+			// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
+			// If there are more than two comments, squash all but the last 2.
+
+			if($item['id'] == $item['parent']) {
+				if($blowhard == $item['cid'] && (! $item['self'])) {
+					$blowhard_count ++;
+					if($blowhard_count == 3) {
+						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' . $item['parent'] . '" style="display: none;" >';
+					}
+				}
+				else {
+					$blowhard = $item['cid'];					
+					if($blowhard_count >= 3)
+						$o .= '</div>';
+					$blowhard_count = 0;
+				}
+
+				$comments_seen = 0;
+				$comments_collapsed = false;
+			}
+			else
+				$comments_seen ++;
+
+
+			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
+				if(! $comments_collapsed) {
+					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
+					$o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
+					$comments_collapsed = true;
+				}
+			}
+			if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
+				$o .= '</div>';
+			}
+
+
+
+			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
+				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
+				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
+				: '<div class="wall-item-lock"></div>');
+
+
+			// Top-level wall post not written by the wall owner (wall-to-wall)
+			// First figure out who owns it. 
+
+			$osparkle = '';
+
+			if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
+
+				if($item['type'] === 'wall') {
+					// I do. Put me on the left of the wall-to-wall notice.
+					$owner_url = $a->contact['url'];
+					$owner_photo = $a->contact['thumb'];
+					$owner_name = $a->contact['name'];
+					$template = $wallwall;
+					$commentww = 'ww';	
+				}
+				if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
+					// Could be anybody. 
+					$owner_url = $item['owner-link'];
+					$owner_photo = $item['owner-avatar'];
+					$owner_name = $item['owner-name'];
+					$template = $wallwall;
+					$commentww = 'ww';
+					// If it is our contact, use a friendly redirect link
+					if((link_compare($item['owner-link'],$item['url'])) 
+						&& ($item['network'] === 'dfrn')) {
+						$owner_url = $redirect_url;
+						$osparkle = ' sparkle';
+					}
+				}
+			}
+
+			if($update)
+				$return_url = $_SESSION['return_url'];
+			else
+				$return_url = $_SESSION['return_url'] = $a->cmd;
+
+			$likebuttons = '';
+			if($item['id'] == $item['parent']) {
+				$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+					'$id' => $item['id'],
+					'$likethis' => t("I like this \x28toggle\x29"),
+					'$nolike' => t("I don't like this \x28toggle\x29"),
+					'$share' => t('Share'),
+					'$wait' => t('Please wait') 
+				));
+			}
+
+			if($item['last-child']) {
+				$comment = replace_macros($cmnt_tpl,array(
+					'$return_path' => '', 
+					'$jsreload' => '', // $_SESSION['return_url'],
+					'$type' => 'net-comment',
+					'$id' => $item['item_id'],
+					'$parent' => $item['parent'],
+					'$profile_uid' =>  $_SESSION['uid'],
+					'$mylink' => $a->contact['url'],
+					'$mytitle' => t('This is you'),
+					'$myphoto' => $a->contact['thumb'],
+					'$comment' => t('Comment'),
+					'$submit' => t('Submit'),
+					'$ww' => $commentww
+				));
+			}
+
+			$edpost = '';
+			if(($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
+				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
+			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+			$photo = $item['photo'];
+			$thumb = $item['thumb'];
+
+			// Post was remotely authored.
+
+			$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
+
+			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
+			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
+
+			if(strlen($item['author-link'])) {
+				$profile_link = $item['author-link'];
+				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
+					$profile_link = $redirect_url;
+					$sparkle = ' sparkle';
+				}
+				elseif(isset($author_contacts[$item['author-link']])) {
+					$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
+					$sparkle = ' sparkle';
+				}
+			}
+			else 
+				$profile_link = $item['url'];
+
+			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
+			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
+
+			$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
+			$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
+			if($coord) {
+				if($location)
+					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
+				else
+					$location = '<span class="smalltext">' . $coord . '</span>';
+			}
+
+			$indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
+
+			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
+				$indent .= ' shiny'; 
+
+
+
+			// Build the HTML
+
+			$tmp_item = replace_macros($template,array(
+				'$id' => $item['item_id'],
+				'$linktitle' => t('View $name\'s profile'),
+				'$olinktitle' => t('View $owner_name\'s profile'),
+				'$to' => t('to'),
+				'$wall' => t('Wall-to-Wall'),
+				'$vwall' => t('via Wall-To-Wall:'),
+				'$profile_url' => $profile_link,
+				'$item_photo_menu' => item_photo_menu($item),
+				'$name' => $profile_name,
+				'$thumb' => $profile_avatar,
+				'$osparkle' => $osparkle,
+				'$sparkle' => $sparkle,
+				'$title' => $item['title'],
+				'$body' => smilies(bbcode($item['body'])),
+				'$ago' => relative_date($item['created']),
+				'$lock' => $lock,
+				'$location' => $location,
+				'$indent' => $indent,
+				'$owner_url' => $owner_url,
+				'$owner_photo' => $owner_photo,
+				'$owner_name' => $owner_name,
+				'$plink' => get_plink($item),
+				'$edpost' => $edpost,
+				'$drop' => $drop,
+				'$vote' => $likebuttons,
+				'$like' => $like,
+				'$dislike' => $dislike,
+				'$comment' => $comment
+			));
+
+			$arr = array('item' => $item, 'output' => $tmp_item);
+			call_hooks('display_item', $arr);
+
+			$o .= $arr['output'];
+
+		}
+	}
+
+
+	// if author collapsing is in force but didn't get closed, close it off now.
+
+	if($blowhard_count >= 3)
+		$o .= '</div>';
+
+	return $o;
+} 
\ No newline at end of file
diff --git a/mod/network.php b/mod/network.php
index 678a41f0a4..5461aae3fe 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -32,8 +32,6 @@ function network_content(&$a, $update = 0) {
 
 	$o = '';
 
-	require_once("include/bbcode.php");
-
 	$contact_id = $a->cid;
 
 	$group = 0;
@@ -264,347 +262,14 @@ function network_content(&$a, $update = 0) {
 		}
 	}
 
-	// find all the authors involved in remote conversations
-	// We will use a local profile photo if they are one of our contacts
-	// otherwise we have to get the photo from the item owner's site
-
-	$author_contacts = extract_item_authors($r,local_user());
-
-	$cmnt_tpl = load_view_file('view/comment_item.tpl');
-	$like_tpl = load_view_file('view/like.tpl');
-	$noshare_tpl = load_view_file('view/like_noshare.tpl');
-	$tpl = load_view_file('view/wall_item.tpl');
-	$wallwall = load_view_file('view/wallwall_item.tpl');
-
-	$alike = array();
-	$dlike = array();
-	
-	if(count($r)) {
-
-		if($nouveau) {
-
-			// "New Item View" - just loop through the items and format them minimally for display
-
-			$tpl = load_view_file('view/search_item.tpl');
-			$droptpl = load_view_file('view/wall_fake_drop.tpl');
-
-			foreach($r as $item) {
-
-				$comment     = '';
-				$owner_url   = '';
-				$owner_photo = '';
-				$owner_name  = '';
-				$sparkle     = '';
-			
-				$profile_name   = ((strlen($item['author-name']))   ? $item['author-name']   : $item['name']);
-				$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
-				$profile_link   = ((strlen($item['author-link']))   ? $item['author-link']   : $item['url']);
-
-				$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
-				if(strlen($item['author-link'])) {
-					if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-						$profile_link = $redirect_url;
-						$sparkle = ' sparkle';
-					}
-					elseif(isset($author_contacts[$item['author-link']])) {
-						$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-						$sparkle = ' sparkle';
-					}
-				}
-
-				$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-				$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-				if($coord) {
-					if($location)
-						$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-					else
-						$location = '<span class="smalltext">' . $coord . '</span>';
-				}
-
-				$drop = replace_macros($droptpl,array('$id' => $item['id']));
-				$lock = '<div class="wall-item-lock"></div>';
-				
-				$o .= replace_macros($tpl,array(
-					'$id' => $item['item_id'],
-					'$linktitle' => t('View $name\'s profile'),
-					'$profile_url' => $profile_link,
-					'$item_photo_menu' => item_photo_menu($item),
-					'$name' => $profile_name,
-					'$sparkle' => $sparkle,
-					'$lock' => $lock,
-					'$thumb' => $profile_avatar,
-					'$title' => $item['title'],
-					'$body' => smilies(bbcode($item['body'])),
-					'$ago' => relative_date($item['created']),
-					'$location' => $location,
-					'$indent' => '',
-					'$owner_url' => $owner_url,
-					'$owner_photo' => $owner_photo,
-					'$owner_name' => $owner_name,
-					'$drop' => $drop,
-					'$conv' => '<a href="' . $a->get_baseurl() . '/display/' . $a->user['nickname'] . '/' . $item['id'] . '">' . t('View in context') . '</a>'
-				));
-
-			}
-			$o .= paginate($a);
-
-			return $o;
-
-		}
-
-		// Normal View
+	$mode = (($nouveau) ? 'network-new' : 'network');
 
+	require_once('include/conversation.php');
 
-		// Figure out how many comments each parent has
-		// (Comments all have gravity of 6)
-		// Store the result in the $comments array
-
-		$comments = array();
-		foreach($r as $rr) {
-			if(intval($rr['gravity']) == 6) {
-				if(! x($comments,$rr['parent']))
-					$comments[$rr['parent']] = 1;
-				else
-					$comments[$rr['parent']] += 1;
-			}
-		}
-
-		// map all the like/dislike activities for each parent item 
-		// Store these in the $alike and $dlike arrays
-
-		foreach($r as $item) {
-			like_puller($a,$item,$alike,'like');
-			like_puller($a,$item,$dlike,'dislike');
-		}
-
-		$comments_collapsed = false;
-		$blowhard = 0;
-		$blowhard_count = 0;
-
-		foreach($r as $item) {
-
-			$comment = '';
-			$template = $tpl;
-			$commentww = '';
-			$sparkle = '';
-			$owner_url = $owner_photo = $owner_name = '';
-
-
-			// We've already parsed out like/dislike for special treatment. We can ignore them now
-
-			if(((activity_match($item['verb'],ACTIVITY_LIKE)) 
-				|| (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-				&& ($item['id'] != $item['parent']))
-				continue;
-
-			// Take care of author collapsing and comment collapsing
-			// If a single author has more than 3 consecutive top-level posts, squash the remaining ones.
-			// If there are more than two comments, squash all but the last 2.
-
-			if($item['id'] == $item['parent']) {
-				if($blowhard == $item['cid'] && (! $item['self'])) {
-					$blowhard_count ++;
-					if($blowhard_count == 3) {
-						$o .= '<div class="icollapse-wrapper fakelink" id="icollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'icollapse-' . $item['parent'] . '\');" >' . t('See more posts like this') . '</div>' . '<div class="icollapse" id="icollapse-' . $item['parent'] . '" style="display: none;" >';
-					}
-				}
-				else {
-					$blowhard = $item['cid'];					
-					if($blowhard_count >= 3)
-						$o .= '</div>';
-					$blowhard_count = 0;
-				}
-
-				$comments_seen = 0;
-				$comments_collapsed = false;
-			}
-			else
-				$comments_seen ++;
-
-
-			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
-				if(! $comments_collapsed) {
-					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
-					$o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
-					$comments_collapsed = true;
-				}
-			}
-			if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-				$o .= '</div>';
-			}
-
-
-
-			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
-			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
-				: '<div class="wall-item-lock"></div>');
-
-
-			// Top-level wall post not written by the wall owner (wall-to-wall)
-			// First figure out who owns it. 
-
-			$osparkle = '';
-
-			if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
-
-				if($item['type'] === 'wall') {
-					// I do. Put me on the left of the wall-to-wall notice.
-					$owner_url = $a->contact['url'];
-					$owner_photo = $a->contact['thumb'];
-					$owner_name = $a->contact['name'];
-					$template = $wallwall;
-					$commentww = 'ww';	
-				}
-				if(($item['type'] === 'remote') && (strlen($item['owner-link'])) && ($item['owner-link'] != $item['author-link'])) {
-					// Could be anybody. 
-					$owner_url = $item['owner-link'];
-					$owner_photo = $item['owner-avatar'];
-					$owner_name = $item['owner-name'];
-					$template = $wallwall;
-					$commentww = 'ww';
-					// If it is our contact, use a friendly redirect link
-					if((link_compare($item['owner-link'],$item['url'])) 
-						&& ($item['network'] === 'dfrn')) {
-						$owner_url = $redirect_url;
-						$osparkle = ' sparkle';
-					}
-				}
-			}
-
-			if($update)
-				$return_url = $_SESSION['return_url'];
-			else
-				$return_url = $_SESSION['return_url'] = $a->cmd;
-
-			$likebuttons = '';
-			if($item['id'] == $item['parent']) {
-				$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
-					'$id' => $item['id'],
-					'$likethis' => t("I like this \x28toggle\x29"),
-					'$nolike' => t("I don't like this \x28toggle\x29"),
-					'$share' => t('Share'),
-					'$wait' => t('Please wait') 
-				));
-			}
-
-			if($item['last-child']) {
-				$comment = replace_macros($cmnt_tpl,array(
-					'$return_path' => '', 
-					'$jsreload' => '', // $_SESSION['return_url'],
-					'$type' => 'net-comment',
-					'$id' => $item['item_id'],
-					'$parent' => $item['parent'],
-					'$profile_uid' =>  $_SESSION['uid'],
-					'$mylink' => $a->contact['url'],
-					'$mytitle' => t('This is you'),
-					'$myphoto' => $a->contact['thumb'],
-					'$comment' => t('Comment'),
-					'$submit' => t('Submit'),
-					'$ww' => $commentww
-				));
-			}
-
-			$edpost = '';
-			if(($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
-				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
-			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
-
-			$photo = $item['photo'];
-			$thumb = $item['thumb'];
-
-			// Post was remotely authored.
-
-			$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-
-			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
-
-			if(strlen($item['author-link'])) {
-				$profile_link = $item['author-link'];
-				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
-					$profile_link = $redirect_url;
-					$sparkle = ' sparkle';
-				}
-				elseif(isset($author_contacts[$item['author-link']])) {
-					$profile_link = $a->get_baseurl() . '/redir/' . $author_contacts[$item['author-link']];
-					$sparkle = ' sparkle';
-				}
-			}
-			else 
-				$profile_link = $item['url'];
-
-			$like    = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
-			$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
-
-			$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-			$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-			if($coord) {
-				if($location)
-					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-				else
-					$location = '<span class="smalltext">' . $coord . '</span>';
-			}
-
-			$indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
-
-			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-				$indent .= ' shiny'; 
-
-
-
-			// Build the HTML
-
-			$tmp_item = replace_macros($template,array(
-				'$id' => $item['item_id'],
-				'$linktitle' => t('View $name\'s profile'),
-				'$olinktitle' => t('View $owner_name\'s profile'),
-				'$to' => t('to'),
-				'$wall' => t('Wall-to-Wall'),
-				'$vwall' => t('via Wall-To-Wall:'),
-				'$profile_url' => $profile_link,
-				'$item_photo_menu' => item_photo_menu($item),
-				'$name' => $profile_name,
-				'$thumb' => $profile_avatar,
-				'$osparkle' => $osparkle,
-				'$sparkle' => $sparkle,
-				'$title' => $item['title'],
-				'$body' => smilies(bbcode($item['body'])),
-				'$ago' => relative_date($item['created']),
-				'$lock' => $lock,
-				'$location' => $location,
-				'$indent' => $indent,
-				'$owner_url' => $owner_url,
-				'$owner_photo' => $owner_photo,
-				'$owner_name' => $owner_name,
-				'$plink' => get_plink($item),
-				'$edpost' => $edpost,
-				'$drop' => $drop,
-				'$vote' => $likebuttons,
-				'$like' => $like,
-				'$dislike' => $dislike,
-				'$comment' => $comment
-			));
-
-			$arr = array('item' => $item, 'output' => $tmp_item);
-			call_hooks('display_item', $arr);
-
-			$o .= $arr['output'];
-
-		}
-	}
+	$o .= conversation($a,$r,$mode,$update);
 
 	if(! $update) {
 
-		// if author collapsing is in force but didn't get closed, close it off now.
-
-		if($blowhard_count >= 3)
-			$o .= '</div>';
-
-
 		$o .= paginate($a);
 		$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
 	}