X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=0340ad3e4a8c8e74f3cde7f8cbcd843fef63c052;hb=75be187216255c7c45421cb5f9596118a954f878;hp=38f6e76862c5a4bad2faea85b8006ff86bc9ac65;hpb=3e7e866e133405c3ae3047c429611a39984c81d3;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 38f6e76862..0340ad3e4a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -373,6 +373,86 @@ function visible_activity($item) {
 	return true;
 }
 
+/**
+ * @brief SQL query for items
+ */
+function item_query() {
+
+	return "SELECT ".item_fieldlists()." FROM `item` ".
+		item_joins()." WHERE ".item_condition();
+}
+
+/**
+ * @brief List of all data fields that are needed for displaying items
+ */
+function item_fieldlists() {
+
+/*
+These Fields are not added below (yet). They are here to for bug search.
+`item`.`type`,
+`item`.`object`,
+`item`.`extid`,
+`item`.`received`,
+`item`.`changed`,
+`item`.`moderated`,
+`item`.`target-type`,
+`item`.`target`,
+`item`.`resource-id`,
+`item`.`tag`,
+`item`.`attach`,
+`item`.`inform`,
+`item`.`pubmail`,
+`item`.`visible`,
+`item`.`spam`,
+`item`.`bookmark`,
+`item`.`unseen`,
+`item`.`deleted`,
+`item`.`origin`,
+`item`.`forum_mode`,
+`item`.`last-child`,
+`item`.`mention`,
+`item`.`global`,
+`item`.`gcontact-id`,
+`item`.`shadow`,
+*/
+
+	return "`item`.`author-link`, `item`.`author-name`, `item`.`author-avatar`,
+		`item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
+		`item`.`contact-id`, `item`.`uid`, `item`.`id`, `item`.`parent`,
+		`item`.`uri`, `item`.`thr-parent`, `item`.`parent-uri`,
+		`item`.`commented`, `item`.`created`, `item`.`edited`,
+		`item`.`verb`, `item`.`object-type`, `item`.`postopts`, `item`.`plink`,
+		`item`.`guid`, `item`.`wall`, `item`.`private`, `item`.`starred`,
+		`item`.`title`,	`item`.`body`, `item`.`file`, `item`.`event-id`,
+		`item`.`location`, `item`.`coord`, `item`.`app`,
+		`item`.`rendered-hash`, `item`.`rendered-html`,
+		`item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`,
+		`item`.`id` AS `item_id`, `item`.`network` AS `item_network`,
+
+		`author`.`thumb` AS `author-thumb`, `owner`.`thumb` AS `owner-thumb`,
+
+		`contact`.`network`, `contact`.`url`, `contact`.`name`, `contact`.`writable`,
+		`contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`";
+}
+
+/**
+ * @brief SQL join for contacts that are needed for displaying items
+ */
+function item_joins() {
+
+	return "STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` AND
+		NOT `contact`.`blocked` AND NOT `contact`.`pending`
+		LEFT JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
+		LEFT JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id`";
+}
+
+/**
+ * @brief SQL condition for items that are needed for displaying items
+ */
+function item_condition() {
+
+	return "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`";
+}
 
 /**
  * "Render" a conversation or list of items for HTML display.
@@ -543,7 +623,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 				$comment     = '';
 				$owner_url   = '';
-				$owner_photo = '';
 				$owner_name  = '';
 				$sparkle     = '';
 
@@ -588,18 +667,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					$tags[] = $prefix."<a href=\"".$tag["url"]."\" target=\"_blank\">".$tag["term"]."</a>";
 				}
 
-				/*foreach(explode(',',$item['tag']) as $tag){
-					$tag = trim($tag);
-					if ($tag!="") {
-						$t = bbcode($tag);
-						$tags[] = $t;
-						if($t[0] == '#')
-							$hashtags[] = $t;
-						elseif($t[0] == '@')
-							$mentions[] = $t;
-					}
-				}*/
-
 				$sp = false;
 				$profile_link = best_link_url($item,$sp);
 				if($profile_link === 'mailbox')
@@ -609,12 +676,21 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				else
 					$profile_link = zrl($profile_link);
 
-				// Don't rely on the author-avatar. It is better to use the data from the contact table
-				$author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
-				if ($author_contact["thumb"])
-					$profile_avatar = $author_contact["thumb"];
-				else
-					$profile_avatar = $item['author-avatar'];
+				if (!isset($item['author-thumb']) OR ($item['author-thumb'] == "")) {
+					$author_contact = get_contact_details_by_url($item['author-link'], $profile_owner);
+					if ($author_contact["thumb"])
+						$item['author-thumb'] = $author_contact["thumb"];
+					else
+						$item['author-thumb'] = $item['author-avatar'];
+				}
+
+				if (!isset($item['owner-thumb']) OR ($item['owner-thumb'] == "")) {
+					$owner_contact = get_contact_details_by_url($item['owner-link'], $profile_owner);
+					if ($owner_contact["thumb"])
+						$item['owner-thumb'] = $owner_contact["thumb"];
+					else
+						$item['owner-thumb'] = $item['owner-avatar'];
+				}
 
 				$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
 				call_hooks('render_location',$locate);
@@ -682,7 +758,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'name' => $profile_name_e,
 					'sparkle' => $sparkle,
 					'lock' => $lock,
-					'thumb' => App::remove_baseurl(proxy_url($profile_avatar, false, PROXY_SIZE_THUMB)),
+					'thumb' => App::remove_baseurl(proxy_url($item['author-thumb'], false, PROXY_SIZE_THUMB)),
 					'title' => $item['title_e'],
 					'body' => $body_e,
 					'tags' => $tags_e,
@@ -701,7 +777,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'indent' => '',
 					'owner_name' => $owner_name_e,
 					'owner_url' => $owner_url,
-					'owner_photo' => proxy_url($owner_photo, false, PROXY_SIZE_THUMB),
+					'owner_photo' => App::remove_baseurl(proxy_url($item['owner-thumb'], false, PROXY_SIZE_THUMB)),
 					'plink' => get_plink($item),
 					'edpost' => false,
 					'isstarred' => $isstarred,
@@ -805,8 +881,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 function best_link_url($item,&$sparkle,$ssl_state = false) {
 
-	$a = get_app();
-
 	$best_url = '';
 	$sparkle  = false;
 
@@ -833,7 +907,6 @@ function best_link_url($item,&$sparkle,$ssl_state = false) {
 
 if(! function_exists('item_photo_menu')){
 function item_photo_menu($item){
-	$a = get_app();
 
 	$ssl_state = false;
 
@@ -1209,6 +1282,10 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$private' => t('Private post'),
 		'$is_private' => $private_post,
 		'$public_link' => $public_post_link,
+
+		//jot nav tab (used in some themes)
+		'$message' => t('Message'),
+		'$browser' => t('Browser'),
 	));