use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
+use Friendica\Model\GlobalContact;
+use Friendica\Object\Contact;
+use Friendica\Object\Profile;
+use Friendica\Protocol\OStatus;
use Friendica\Util\XML;
use dba;
use DOMDocument;
use DomXPath;
-use ostatus;
-require_once "include/Contact.php";
require_once "include/enotify.php";
require_once "include/threads.php";
-require_once "include/socgraph.php";
require_once "include/items.php";
require_once "include/tags.php";
require_once "include/files.php";
if ($public) {
// DFRN itself doesn't uses this. But maybe someone else wants to subscribe to the public feed.
- ostatus::hublinks($doc, $root, $owner["nick"]);
+ OStatus::hublinks($doc, $root, $owner["nick"]);
$attributes = array("rel" => "salmon", "href" => System::baseUrl()."/salmon/".$owner["nick"]);
XML::add_element($doc, $root, "link", "", $attributes);
if (trim($profile["locality"].$profile["region"].$profile["country-name"]) != "") {
$element = $doc->createElement("poco:address");
- XML::add_element($doc, $element, "poco:formatted", formatted_location($profile));
+ XML::add_element($doc, $element, "poco:formatted", Profile::formatLocation($profile));
if (trim($profile["locality"]) != "") {
XML::add_element($doc, $element, "poco:locality", $profile["locality"]);
*/
private static function add_entry_author($doc, $element, $contact_url, $item)
{
-
- $contact = get_contact_details_by_url($contact_url, $item["uid"]);
+ $contact = Contact::getDetailsByURL($contact_url, $item["uid"]);
$author = $doc->createElement($element);
XML::add_element($doc, $author, "name", $contact["name"]);
if ($contact['term-date'] > NULL_DATE) {
logger("dfrn_deliver: $url back from the dead - removing mark for death");
- include_once 'include/Contact.php';
- unmark_for_death($contact);
+ Contact::unmarkForArchival($contact);
}
$res = parse_xml_string($xml);
$poco["photo"] = $author["avatar"];
$poco["hide"] = $hide;
$poco["contact-type"] = $contact["contact-type"];
- $gcid = update_gcontact($poco);
+ $gcid = GlobalContact::update($poco);
- link_gcontact($gcid, $importer["uid"], $contact["id"]);
+ GlobalContact::link($gcid, $importer["uid"], $contact["id"]);
}
return($author);
$changed = true;
if ($entrytype == DFRN_REPLY_RC) {
- Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $current["id"]);
+ Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $current["id"]);
}
}
if ($posted_id && $parent && ($entrytype == DFRN_REPLY_RC)) {
logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
- Worker::add(PRIORITY_HIGH, "notifier", "comment-import", $posted_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $posted_id);
}
return true;
if ($entrytype == DFRN_REPLY_RC) {
logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
- Worker::add(PRIORITY_HIGH, "notifier", "drop", $item["id"]);
+ Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
}
}
}