Tupambae_Org/friendica_2021-01
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

DFRN: Entry import could work now, first steps for mails

Browse source
This commit is contained in:
Michael Vogel 2016-01-29 17:42:38 +01:00
parent 8412eb7066
commit 1cdcb9fc2e
2 changed files with 315 additions and 223 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/Photo.php
View file

@ -726,10 +726,11 @@ function guess_image_type($filename, $fromcurl=false) {
* @param string $avatar Link to avatar picture * @param string $avatar Link to avatar picture
* @param int $uid User id of contact owner * @param int $uid User id of contact owner
* @param int $cid Contact id * @param int $cid Contact id
* @param bool $force force picture update
* *
* @return array Returns array of the different avatar sizes * @return array Returns array of the different avatar sizes
*/ */
function update_contact_avatar($avatar,$uid,$cid) { function update_contact_avatar($avatar,$uid,$cid, $force = false) {
$r = q("SELECT `avatar`, `photo`, `thumb`, `micro` FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid)); $r = q("SELECT `avatar`, `photo`, `thumb`, `micro` FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
if (!$r) if (!$r)
@ -737,7 +738,7 @@ function update_contact_avatar($avatar,$uid,$cid) {
else else
$data = array($r[0]["photo"], $r[0]["thumb"], $r[0]["micro"]); $data = array($r[0]["photo"], $r[0]["thumb"], $r[0]["micro"]);
if ($r[0]["avatar"] != $avatar) { if (($r[0]["avatar"] != $avatar) OR $force) {
$photos = import_profile_photo($avatar,$uid,$cid, true); $photos = import_profile_photo($avatar,$uid,$cid, true);
if ($photos) { if ($photos) {

261
include/import-dfrn.php
View file

@ -109,6 +109,8 @@ class dfrn2 {
$author["avatar"] = current($avatarlist); $author["avatar"] = current($avatarlist);
} }
$onlyfetch = true; // Test
if ($r AND !$onlyfetch) { if ($r AND !$onlyfetch) {
// When was the last change to name or uri? // When was the last change to name or uri?
@ -186,8 +188,8 @@ class dfrn2 {
$contact["bd"] = $value; $contact["bd"] = $value;
} }
//if ($old_bdyear != $contact["bdyear"]) if ($old_bdyear != $contact["bdyear"])
// self::birthday_event($contact, $birthday); self::birthday_event($contact, $birthday);
// Get all field names // Get all field names
$fields = array(); $fields = array();
@ -214,76 +216,109 @@ class dfrn2 {
intval($contact["id"]), dbesc($contact["network"])); intval($contact["id"]), dbesc($contact["network"]));
} }
if ((isset($author["avatar"]) AND ($author["avatar"] != $r[0]["photo"])) OR update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"], ($contact["avatar-date"] != $r[0]["avatar-date"]));
($contact["avatar-date"] != $r[0]["avatar-date"])) {
logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
$photos = import_profile_photo($author["avatar"], $importer["uid"], $contact["id"]);
q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d AND `network` = '%s'",
dbesc($author["avatar"]), dbesc($photos[1]), dbesc($photos[2]),
dbesc($contact["avatar-date"]), intval($contact["id"]), dbesc($contact["network"]));
}
$contact["generation"] = 2; $contact["generation"] = 2;
$contact["photo"] = $author["avatar"]; $contact["photo"] = $author["avatar"];
print_r($contact);
update_gcontact($contact); update_gcontact($contact);
} }
return($author); return($author);
} }
function import($xml,$importer,&$contact, &$hub) { private function transform_activity($xpath, $activity, $element) {
if (!is_object($activity))
return "";
$a = get_app(); $obj_doc = new DOMDocument('1.0', 'utf-8');
$obj_doc->formatOutput = true;
logger("Import DFRN message", LOGGER_DEBUG); $obj_element = $obj_doc->createElementNS(NS_ATOM, $element);
if ($xml == "") $activity_type = $xpath->query('activity:object-type/text()', $activity)->item(0)->nodeValue;
return; xml_add_element($obj_doc, $obj_element, "type", $activity_type);
$doc = new DOMDocument(); $id = $xpath->query('atom:id', $activity)->item(0);
@$doc->loadXML($xml); if (is_object($id))
$obj_element->appendChild($obj_doc->importNode($id, true));
$xpath = new DomXPath($doc); $title = $xpath->query('atom:title', $activity)->item(0);
$xpath->registerNamespace('atom', "http://www.w3.org/2005/Atom"); if (is_object($title))
$xpath->registerNamespace('thr', "http://purl.org/syndication/thread/1.0"); $obj_element->appendChild($obj_doc->importNode($title, true));
$xpath->registerNamespace('at', "http://purl.org/atompub/tombstones/1.0");
$xpath->registerNamespace('media', "http://purl.org/syndication/atommedia");
$xpath->registerNamespace('dfrn', "http://purl.org/macgirvin/dfrn/1.0");
$xpath->registerNamespace('activity', "http://activitystrea.ms/spec/1.0/");
$xpath->registerNamespace('georss', "http://www.georss.org/georss");
$xpath->registerNamespace('poco', "http://portablecontacts.net/spec/1.0");
$xpath->registerNamespace('ostatus', "http://ostatus.org/schema/1.0");
$xpath->registerNamespace('statusnet', "http://status.net/schema/api/1/");
$header = array(); $link = $xpath->query('atom:link', $activity)->item(0);
$header["uid"] = $importer["uid"]; if (is_object($link))
$header["network"] = NETWORK_DFRN; $obj_element->appendChild($obj_doc->importNode($link, true));
$header["type"] = "remote";
$header["wall"] = 0;
$header["origin"] = 0;
$header["gravity"] = GRAVITY_PARENT;
$header["contact-id"] = $importer["id"];
// Update the contact table if the data has changed $content = $xpath->query('atom:content', $activity)->item(0);
// Only the "dfrn:owner" in the head section contains all data if (is_object($content))
self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", $contact, false); $obj_element->appendChild($obj_doc->importNode($content, true));
// is it a public forum? Private forums aren't supported by now with this method $obj_doc->appendChild($obj_element);
//$contact["forum"] = intval($xpath->evaluate($element.'/dfrn:community/text()', $context)->item(0)->nodeValue);
$entries = $xpath->query('/atom:feed/atom:entry'); $objxml = $obj_doc->saveXML($obj_element);
$item_id = 0; // @todo This isn't totally clean. We should find a way to transform the namespaces
$objxml = str_replace('<'.$element.' xmlns="http://www.w3.org/2005/Atom">', "<".$element.">", $objxml);
return($objxml);
}
foreach ($entries AS $entry) { private function process_mail($header, $xpath, $mail, $importer, $contact) {
$msg = array();
$msg["uid"] = $importer['importer_uid'];
$msg["from-name"] = $xpath->query('dfrn:sender/dfrn:name/text()', $mail)->item(0)->nodeValue;
$msg["from-url"] = $xpath->query('dfrn:sender/dfrn:uri/text()', $mail)->item(0)->nodeValue;
$msg["from-photo"] = $xpath->query('dfrn:sender/dfrn:avatar/text()', $mail)->item(0)->nodeValue;
$msg["contact-id"] = $importer["id"];
$msg["uri"] = $xpath->query('dfrn:id/text()', $mail)->item(0)->nodeValue;
$msg["parent-uri"] = $xpath->query('dfrn:in-reply-to/text()', $mail)->item(0)->nodeValue;
$msg["created"] = $xpath->query('dfrn:sentdate/text()', $mail)->item(0)->nodeValue;
$msg["title"] = $xpath->query('dfrn:subject/text()', $mail)->item(0)->nodeValue;
$msg["body"] = $xpath->query('dfrn:content/text()', $mail)->item(0)->nodeValue;
$msg["seen"] = 0;
$msg["replied"] = 0;
dbesc_array($msg);
//$r = dbq("INSERT INTO `mail` (`" . implode("`, `", array_keys($msg))
// . "`) VALUES ('" . implode("', '", array_values($msg)) . "')" );
print_r($msg);
// send notifications.
require_once('include/enotify.php');
$notif_params = array(
'type' => NOTIFY_MAIL,
'notify_flags' => $importer['notify-flags'],
'language' => $importer['language'],
'to_name' => $importer['username'],
'to_email' => $importer['email'],
'uid' => $importer['importer_uid'],
'item' => $msg,
'source_name' => $msg['from-name'],
'source_link' => $importer['url'],
'source_photo' => $importer['thumb'],
'verb' => ACTIVITY_POST,
'otype' => 'mail'
);
// notification($notif_params);
print_r($notif_params);
}
private function process_suggestion($header, $xpath, $suggestion, $importer, $contact) {
}
private function process_relocation($header, $xpath, $relocation, $importer, $contact) {
}
private function process_entry($header, $xpath, $entry, $importer, $contact) {
$item = $header; $item = $header;
$mention = false;
// Fetch the owner // Fetch the owner
$owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", $contact, true); $owner = self::fetchauthor($xpath, $entry, $importer, "dfrn:owner", $contact, true);
@ -317,7 +352,7 @@ class dfrn2 {
intval($importer["uid"]), dbesc($item["uri"])); intval($importer["uid"]), dbesc($item["uri"]));
if ($r) { if ($r) {
//logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG); //logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
//continue; //return false;
} }
// Is it a reply? // Is it a reply?
@ -377,7 +412,8 @@ class dfrn2 {
$item["guid"] = $xpath->query('dfrn:diaspora_guid/text()', $entry)->item(0)->nodeValue; $item["guid"] = $xpath->query('dfrn:diaspora_guid/text()', $entry)->item(0)->nodeValue;
// dfrn:diaspora_signature // We store the data from "dfrn:diaspora_signature" in a later step. See some lines below
$signature = $xpath->query('dfrn:diaspora_signature/text()', $entry)->item(0)->nodeValue;
$item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue; $item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
@ -386,9 +422,13 @@ class dfrn2 {
$item["object-type"] = $objecttype; $item["object-type"] = $objecttype;
// activity:object // I have the feeling that we don't do anything with this data
$object = $xpath->query('activity:object', $entry)->item(0);
$item["object"] = self::transform_activity($xpath, $object, "object");
// activity:target // Could someone explain what this is for?
$target = $xpath->query('activity:target', $entry)->item(0);
$item["target"] = self::transform_activity($xpath, $target, "target");
$categories = $xpath->query('atom:category', $entry); $categories = $xpath->query('atom:category', $entry);
if ($categories) { if ($categories) {
@ -398,6 +438,7 @@ class dfrn2 {
$term = $attributes->textContent; $term = $attributes->textContent;
if(strlen($item["tag"])) if(strlen($item["tag"]))
$item["tag"] .= ','; $item["tag"] .= ',';
$item["tag"] .= "#[url=".$a->get_baseurl()."/search?tag=".$term."]".$term."[/url]"; $item["tag"] .= "#[url=".$a->get_baseurl()."/search?tag=".$term."]".$term."[/url]";
} }
} }
@ -437,50 +478,100 @@ class dfrn2 {
$item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]'; $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
break; break;
case "mentioned":
// Notification check
if ($importer["nurl"] == normalise_link($href))
$mention = true;
break;
} }
} }
} }
print_r($item); print_r($item);
/* //$item_id = item_store($item);
return;
if (!$item_id) { if (!$item_id) {
logger("Error storing item", LOGGER_DEBUG); logger("Error storing item", LOGGER_DEBUG);
continue; return false;
} } else {
logger("Item was stored with id ".$item_id, LOGGER_DEBUG); logger("Item was stored with id ".$item_id, LOGGER_DEBUG);
$item["id"] = $item_id;
*/
/* if ($signature) {
if ($mention) { $signature = json_decode(base64_decode($signature));
$u = q("SELECT `notify-flags`, `language`, `username`, `email` FROM user WHERE uid = %d LIMIT 1", intval($item['uid']));
$r = q("SELECT `parent` FROM `item` WHERE `id` = %d", intval($item_id));
notification(array( // Check for falsely double encoded signatures
'type' => NOTIFY_TAGSELF, $signature->signature = diaspora_repair_signature($signature->signature, $signature->signer);
'notify_flags' => $u[0]["notify-flags"],
'language' => $u[0]["language"], // Store it in the "sign" table where we will read it for comments that we relay to Diaspora
'to_name' => $u[0]["username"], q("INSERT INTO `sign` (`iid`,`signed_text`,`signature`,`signer`) VALUES (%d,'%s','%s','%s')",
'to_email' => $u[0]["email"], intval($item_id),
'uid' => $item["uid"], dbesc($signature->signed_text),
'item' => $item, dbesc($signature->signature),
'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($item_id)), dbesc($signature->signer)
'source_name' => $item["author-name"], );
'source_link' => $item["author-link"],
'source_photo' => $item["author-avatar"],
'verb' => ACTIVITY_TAG,
'otype' => 'item',
'parent' => $r[0]["parent"]
));
} }
*/
} }
return $item_id;
}
function import($xml,$importer,&$contact, &$hub) {
$a = get_app();
logger("Import DFRN message", LOGGER_DEBUG);
if ($xml == "")
return;
$doc = new DOMDocument();
@$doc->loadXML($xml);
$xpath = new DomXPath($doc);
$xpath->registerNamespace('atom', "http://www.w3.org/2005/Atom");
$xpath->registerNamespace('thr', "http://purl.org/syndication/thread/1.0");
$xpath->registerNamespace('at', "http://purl.org/atompub/tombstones/1.0");
$xpath->registerNamespace('media', "http://purl.org/syndication/atommedia");
$xpath->registerNamespace('dfrn', "http://purl.org/macgirvin/dfrn/1.0");
$xpath->registerNamespace('activity', "http://activitystrea.ms/spec/1.0/");
$xpath->registerNamespace('georss', "http://www.georss.org/georss");
$xpath->registerNamespace('poco', "http://portablecontacts.net/spec/1.0");
$xpath->registerNamespace('ostatus', "http://ostatus.org/schema/1.0");
$xpath->registerNamespace('statusnet', "http://status.net/schema/api/1/");
$header = array();
$header["uid"] = $importer["uid"];
$header["network"] = NETWORK_DFRN;
$header["type"] = "remote";
$header["wall"] = 0;
$header["origin"] = 0;
$header["gravity"] = GRAVITY_PARENT;
$header["contact-id"] = $importer["id"];
// Update the contact table if the data has changed
// Only the "dfrn:owner" in the head section contains all data
$dfrn_owner = self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", $contact, false);
// is it a public forum? Private forums aren't supported by now with this method
$forum = intval($xpath->evaluate('/atom:feed/dfrn:community/text()', $context)->item(0)->nodeValue);
if ($forum AND ($dfrn_owner["contact-id"] != 0))
q("UPDATE `contact` SET `forum` = %d WHERE `forum` != %d AND `id` = %d",
intval($forum), intval($forum),
intval($dfrn_owner["contact-id"])
);
$mails = $xpath->query('/atom:feed/dfrn:mail');
foreach ($mails AS $mail)
self::process_mail($header, $xpath, $mail, $importer, $contact);
$suggestions = $xpath->query('/atom:feed/dfrn:suggest');
foreach ($suggestions AS $suggestion)
self::process_suggestion($header, $xpath, $suggestion, $importer, $contact);
$relocations = $xpath->query('/atom:feed/dfrn:relocate');
foreach ($relocations AS $relocation)
self::process_relocation($header, $xpath, $relocation, $importer, $contact);
$entries = $xpath->query('/atom:feed/atom:entry');
foreach ($entries AS $entry)
self::process_entry($header, $xpath, $entry, $importer, $contact);
} }
} }
?> ?>