}
/**
- * @brief List of all contact fields that are needed for the conversation function
+ * @brief SQL query for items
*/
-function contact_fieldlist() {
+function item_query() {
- $fieldlist = "`contact`.`network`, `contact`.`url`, `contact`.`name`, `contact`.`writable`,
- `contact`.`self`, `contact`.`id` AS `cid`, `contact`.`alias`";
-
- return $fieldlist;
-}
-
-/**
- * @brief SQL condition for contacts
- */
-function contact_condition() {
-
- $condition = "NOT `contact`.`blocked` AND NOT `contact`.`pending`";
-
- return $condition;
+ return "SELECT ".item_fieldlists()." FROM `item` ".
+ item_joins()." WHERE ".item_condition();
}
/**
- * @brief List of all item fields that are needed for the conversation function
+ * @brief List of all data fields that are needed for displaying items
*/
-function item_fieldlist() {
+function item_fieldlists() {
/*
These Fields are not added below (yet). They are here to for bug search.
`item`.`extid`,
`item`.`received`,
`item`.`changed`,
-`item`.`author-avatar`,
-`item`.`object`,
+`item`.`moderated`,
`item`.`target-type`,
`item`.`target`,
`item`.`resource-id`,
`item`.`tag`,
-`item`.`attach`,
`item`.`inform`,
`item`.`pubmail`,
-`item`.`moderated`,
`item`.`visible`,
`item`.`spam`,
-`item`.`starred`,
`item`.`bookmark`,
`item`.`unseen`,
`item`.`deleted`,
`item`.`shadow`,
*/
- $fieldlist = "`item`.`author-link`, `item`.`verb`, `item`.`id`, `item`.`parent`, `item`.`file`,
- `item`.`uid`, `item`.`author-name`, `item`.`location`, `item`.`coord`,
- `item`.`title`, `item`.`uri`, `item`.`created`, `item`.`app`, `item`.`guid`,
- `item`.`contact-id`, `item`.`thr-parent`, `item`.`parent-uri`, `item`.`rendered-hash`,
- `item`.`body`, `item`.`rendered-html`, `item`.`private`, `item`.`edited`,
- `item`.`allow_cid`, `item`.`allow_gid`, `item`.`deny_cid`, `item`.`deny_gid`,
- `item`.`event-id`, `item`.`object-type`, `item`.`starred`, `item`.`created`,
- `item`.`postopts`, `item`.`owner-link`, `item`.`owner-name`, `item`.`owner-avatar`,
- `item`.`plink`, `item`.`wall`, `item`.`commented`,
- `item`.`id` AS `item_id`, `item`.`network` AS `item_network`";
-
- return $fieldlist;
+ 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`.`attach`,
+ `item`.`rendered-hash`, `item`.`rendered-html`, `item`.`object`,
+ `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 condition for items
+ * @brief SQL join for contacts that are needed for displaying items
*/
-function item_condition() {
+function item_joins() {
- $condition = "`item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`";
+ 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`";
+}
- return $condition;
+/**
+ * @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`";
}
/**
$comment = '';
$owner_url = '';
- $owner_photo = '';
$owner_name = '';
$sparkle = '';
$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')
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);
'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,
'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,
function best_link_url($item,&$sparkle,$ssl_state = false) {
- $a = get_app();
-
$best_url = '';
$sparkle = false;
$clean_url = normalise_link($item['author-link']);
if (local_user()) {
- $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' LIMIT 1",
+ $r = q("SELECT `id` FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` = '%s' AND NOT `pending` LIMIT 1",
dbesc(NETWORK_DFRN), intval(local_user()), dbesc(normalise_link($clean_url)));
if ($r) {
$best_url = 'redir/'.$r[0]['id'];
if(! function_exists('item_photo_menu')){
function item_photo_menu($item){
- $a = get_app();
$ssl_state = 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'),
));
projects / friendica.git / blobdiff