mexon/friendica
1
0
Fork 0
Code Pull requests Activity

refactor "which link to show" logic

Browse source
This commit is contained in:
Friendika 2011-05-06 06:30:33 -07:00
parent 34f3cb68a6
commit 2c63b65e3c
3 changed files with 106 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
boot.php
View file

@ -212,6 +212,7 @@ class App {
public $user; public $user;
public $cid; public $cid;
public $contact; public $contact;
public $contacts;
public $page_contact; public $page_contact;
public $content; public $content;
public $data; public $data;
@ -2454,6 +2455,13 @@ function get_birthdays() {
}} }}
if(! function_exists('normalise_link')) {
function normalise_link($url) {
$ret = str_replace(array('https:','//www.'), array('http:','//'), $url);
return(rtrim($ret,'/'));
}}
/** /**
* *
* Compare two URLs to see if they are the same, but ignore * Compare two URLs to see if they are the same, but ignore
@ -2467,9 +2475,7 @@ function get_birthdays() {
if(! function_exists('link_compare')) { if(! function_exists('link_compare')) {
function link_compare($a,$b) { function link_compare($a,$b) {
$a1 = str_replace(array('https:','//www.'), array('http:','//'), $a); if(strcasecmp(normalise_link($a),normalise_link($b)) === 0)
$b1 = str_replace(array('https:','//www.'), array('http:','//'), $b);
if(strcasecmp($a1,$b1) === 0)
return true; return true;
return false; return false;
}} }}

192
include/conversation.php
View file

@ -101,12 +101,7 @@ function conversation(&$a, $items, $mode, $update) {
else else
$return_url = $_SESSION['return_url'] = $a->cmd; $return_url = $_SESSION['return_url'] = $a->cmd;
load_contact_links(local_user());
// 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($items,local_user());
$cmnt_tpl = load_view_file('view/comment_item.tpl'); $cmnt_tpl = load_view_file('view/comment_item.tpl');
@ -147,22 +142,14 @@ function conversation(&$a, $items, $mode, $update) {
$profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']); $profile_name = ((strlen($item['author-name'])) ? $item['author-name'] : $item['name']);
$profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']); $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
$profile_link = ((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
$sp = false;
$profile_link = best_link_url($item,$sp);
if($sp)
$sparkle = ' sparkle';
if($profile_link === 'mailbox') if($profile_link === 'mailbox')
$profile_link = ''; $profile_link = '';
$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>' : ''); $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>' : ''); $coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
@ -403,33 +390,15 @@ function conversation(&$a, $items, $mode, $update) {
$profile_name = (((strlen($item['author-name'])) && $diff_author) ? $item['author-name'] : $item['name']); $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); $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
if($mode === 'profile') { $sp = false;
if(local_user() && ($item['contact-uid'] == local_user()) && ($item['network'] === 'dfrn') && (! $item['self'] )) { $profile_link = best_link_url($item,$sp);
$profile_link = $redirect_url; if($sp)
$sparkle = ' sparkle'; $sparkle = ' sparkle';
}
else {
$profile_link = $item['url'];
$sparkle = '';
}
}
elseif(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'];
if($profile_link === 'mailbox') if($profile_link === 'mailbox')
$profile_link = ''; $profile_link = '';
$like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : ''); $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']) : ''); $dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
@ -503,98 +472,99 @@ function conversation(&$a, $items, $mode, $update) {
} }
if(! function_exists('load_contact_links')) {
function load_contact_links($uid) {
$a = get_app();
if(! function_exists('extract_item_authors')) { $ret = array();
function extract_item_authors($arr,$uid) {
if((! $uid) || (! is_array($arr)) || (! count($arr))) if(! $uid || x($a->contacts,'empty'))
return array(); return;
$urls = array();
foreach($arr as $rr) {
if(! in_array("'" . dbesc($rr['author-link']) . "'",$urls))
$urls[] = "'" . dbesc($rr['author-link']) . "'";
}
// pre-quoted, don't put quotes on %s $r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
if(count($urls)) { intval($uid)
$r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s ) AND `self` = 0 AND `blocked` = 0 ", );
intval($uid), if(count($r)) {
implode(',',$urls) foreach($r as $rr){
); $url = normalise_link($rr['url']);
if(count($r)) { $ret[$url] = $rr;
$ret = array();
$authors = array();
foreach($r as $rr){
if ($rr['network']=='dfrn')
$ret[$rr['url']] = $rr['id'];
$authors[$r['url']]= $rr;
}
$a->authors = $authors;
return $ret;
} }
} }
return array(); else
$ret['empty'] = true;
$a->contacts = $ret;
return;
}} }}
function best_link_url($item,&$sparkle) {
$a = get_app();
$best_url = '';
$sparkle = false;
$clean_url = normalise_link($item['author-link']);
if((local_user()) && (local_user() == $item['uid'])) {
if(isset($a->contacts) && x($a->contacts,$clean_url)) {
if($a->contacts[$clean_url]['network'] === NETWORK_DFRN) {
$best_url = $a->get_baseurl() . '/redir/' . $a->contacts[$clean_url]['id'];
$sparkle = true;
}
else
$best_url = $a->contacts[$clean_url]['url'];
}
}
if(! $best_url) {
if(strlen($item['author-link']))
$best_url = $item['author-link'];
else
$best_url = $item['url'];
}
return $best_url;
}
if(! function_exists('item_photo_menu')){ if(! function_exists('item_photo_menu')){
function item_photo_menu($item){ function item_photo_menu($item){
$a = get_app(); $a = get_app();
if (!isset($a->authors)){ if (local_user() && (! count($a->contacts)))
$rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user())); load_contact_links(local_user());
$authors = array();
foreach($rr as $r) $authors[$r['url']]= $r;
$a->authors = $authors;
}
$contact_url=""; $contact_url="";
$pm_url=""; $pm_url="";
$status_link=""; $status_link="";
$photos_link=""; $photos_link="";
$posts_link=""; $posts_link="";
$profile_link = ((strlen($item['author-link'])) ? $item['author-link'] : $item['url']);
$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
$sparkle = false;
$profile_link = best_link_url($item,$sparkle);
if($profile_link === 'mailbox') if($profile_link === 'mailbox')
$profile_link = ''; $profile_link = '';
// $item['contact-uid'] is only set on profile page and indicates the uid of the user who owns the profile. if($sparkle) {
$cid = intval(basename($profile_link));
$profile_owner = ((x($item,'contact-uid')) && intval($item['contact-uid']) ? intval($item['contact-uid']) : 0); $status_link = $profile_link . "?url=status";
$photos_link = $profile_link . "?url=photos";
// So we are checking that this is a logged in user on some page that *isn't* a profile page $profile_link = $profile_link . "?url=profile";
// OR a profile page where the viewer owns the profile. $pm_url = $a->get_baseurl() . '/message/new/' . $cid;
// Then check if we can use a sparkle (redirect) link to the profile by virtue of it being our contact }
// or a friend's contact that we both have a connection to. else {
if(local_user() && local_user() == $item['uid'] && link_compare($item['url'],$item['author-link'])) {
if((local_user() && ($profile_owner == 0)) $cid = $item['contact-id'];
|| ($profile_owner && $profile_owner == local_user())) { }
else {
if(strlen($item['author-link']) && link_compare($item['author-link'],$item['url'])) { $cid = 0;
$redir = $redirect_url;
$cid = $item['cid'];
}
elseif(isset($a->authors[$item['author-link']])) {
$redir = $a->get_baseurl() . '/redir/' . $a->authors[$item['author-link']]['id'];
$cid = $a->authors[$item['author-link']]['id'];
}
if($item['author-link'] === 'mailbox')
$cid = $item['cid'];
if((isset($cid)) && (! $item['self'])) {
$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
$posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
if($item['network'] === 'dfrn') {
$status_link = $redir . "?url=status";
$profile_link = $redir . "?url=profile";
$photos_link = $redir . "?url=photos";
$pm_url = $a->get_baseurl() . '/message/new/' . $cid;
}
} }
} }
if(($cid) && (! $item['self'])) {
$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
$posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
}
$menu = Array( $menu = Array(
t("View status") => $status_link, t("View status") => $status_link,

16
include/items.php
View file

@ -1205,6 +1205,13 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
$item_id = $item->get_id(); $item_id = $item->get_id();
$datarray = get_atom_elements($feed,$item); $datarray = get_atom_elements($feed,$item);
if(! x($datarray,'author-name'))
$datarray['author-name'] = $contact['name'];
if(! x($datarray,'author-link'))
$datarray['author-link'] = $contact['url'];
if(! x($datarray,'author-avatar'))
$datarray['author-avatar'] = $contact['thumb'];
$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id), dbesc($item_id),
intval($importer['uid']) intval($importer['uid'])
@ -1278,6 +1285,15 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
$datarray = get_atom_elements($feed,$item); $datarray = get_atom_elements($feed,$item);
if(is_array($contact)) {
if(! x($datarray,'author-name'))
$datarray['author-name'] = $contact['name'];
if(! x($datarray,'author-link'))
$datarray['author-link'] = $contact['url'];
if(! x($datarray,'author-avatar'))
$datarray['author-avatar'] = $contact['thumb'];
}
$r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id), dbesc($item_id),
intval($importer['uid']) intval($importer['uid'])