keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Diaspora: Complete /people/* links from fcontact or author domain

Browse source
This commit is contained in:
Hypolite Petovan 2016-12-19 23:30:50 -05:00
parent 29bc27fa6a
commit 81d003cad1
1 changed files with 67 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
include/diaspora.php
View file

@ -700,6 +700,33 @@ class diaspora {
return strtolower($handle); return strtolower($handle);
} }
/**
* @brief get a url (scheme://domain.tld/u/user) from a given Diaspora
* fcontact id or guid
*
* @param mixed $contact_id Either the numeric id or the string guid
*
* @return string the url
*/
public static function url_from_fcontact($contact_id) {
$handle = False;
logger("fcontact id is ".$contact_id, LOGGER_DEBUG);
if (is_numeric($contact_id)) {
$r = q("SELECT `url` FROM `fcontact` WHERE `id` = %d AND `network` = 'dspr' `url` != ''",
intval($contact_id));
}else {
$r = q("SELECT `url` FROM `fcontact` WHERE `guid` = '%s' AND `network` = 'dspr' AND `url` != ''",
$contact_id);
}
if ($r) {
return $r[0]['url'];
}
return null;
}
/** /**
* @brief Get a contact id for a given handle * @brief Get a contact id for a given handle
* *
@ -826,6 +853,37 @@ class diaspora {
},$item["body"]); },$item["body"]);
} }
/**
* @brief Checks for relative /people/* links to match local contacts or
* prepends the remote host taken from the author link
*
* @param string $body The item body to replace links from
* @param string $author_link The author link for missing local contact fallback
*/
public function replace_people_guid($body, $author_link) {
$return = preg_replace_callback("&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($author_link){
// $match
// 0 => '[url=/people/0123456789abcdef]Foo Bar[/url]'
// 1 => '0123456789abcdef'
// 2 => 'Foo Bar'
$handle = self::url_from_fcontact($match[1]);
if ($handle) {
$return = '@[url='.$handle.']'.$match[2].'[/url]';
}else {
// No local match, restoring absolute remote URL from author scheme and host
$author_url = parse_url($author_link);
$return = '[url='.$author_url['scheme'].'://'.$author_url['host'].'/people/'.$match[1].']'.$match[2].'[/url]';
}
return $return;
}, $body);
return $return;
}
/** /**
* @brief sub function of "fetch_guid" which checks for links in messages * @brief sub function of "fetch_guid" which checks for links in messages
* *
@ -1170,6 +1228,8 @@ class diaspora {
$datarray["body"] = diaspora2bb($text); $datarray["body"] = diaspora2bb($text);
$datarray["body"] = self::replace_people_gui($datarray);
self::fetch_guid($datarray); self::fetch_guid($datarray);
$message_id = item_store($datarray); $message_id = item_store($datarray);
@ -1564,7 +1624,8 @@ class diaspora {
$reply = 0; $reply = 0;
$body = diaspora2bb($text); $body = self::replace_people_guid(diaspora2bb($text), $person["url"]);
$message_uri = $author.":".$guid; $message_uri = $author.":".$guid;
$person = self::person_by_handle($author); $person = self::person_by_handle($author);
@ -2031,7 +2092,7 @@ class diaspora {
if (self::is_reshare($r[0]["body"], true)) if (self::is_reshare($r[0]["body"], true))
$r = array(); $r = array();
elseif (self::is_reshare($r[0]["body"], false)) { elseif (self::is_reshare($r[0]["body"], false)) {
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"])); $r[0]["body"] = self::replace_people_guid(diaspora2bb(bb2diaspora($r[0]["body"])), $r[0]["author-link"]);
// Add OEmbed and other information to the body // Add OEmbed and other information to the body
$r[0]["body"] = add_page_info_to_body($r[0]["body"], false, true); $r[0]["body"] = add_page_info_to_body($r[0]["body"], false, true);
@ -2060,8 +2121,9 @@ class diaspora {
if ($r) { if ($r) {
// If it is a reshared post from another network then reformat to avoid display problems with two share elements // If it is a reshared post from another network then reformat to avoid display problems with two share elements
if (self::is_reshare($r[0]["body"], false)) if (self::is_reshare($r[0]["body"], false)) {
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"])); $r[0]["body"] = self::replace_people_guid(diaspora2bb(bb2diaspora($r[0]["body"])), $r[0]["author-link"]);
}
return $r[0]; return $r[0];
} }
@ -2319,7 +2381,7 @@ class diaspora {
$datarray["object"] = $xml; $datarray["object"] = $xml;
$datarray["body"] = $body; $datarray["body"] = self::replace_people_guid($body, $datarray["author-link"]);
if ($provider_display_name != "") if ($provider_display_name != "")
$datarray["app"] = $provider_display_name; $datarray["app"] = $provider_display_name;