* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact, $onlyfetch)
+ private static function fetchAuthor(DOMXPath $xpath, $context, array $importer, array &$contact = null, $onlyfetch)
{
$author = [];
$author["author-link"] = XML::getFirstNodeValue($xpath, 'atom:author/atom:uri/text()', $context);
}
$author["author-id"] = Contact::getIdForURL($author["author-link"]);
- $author["contact-id"] = $contact["id"];
+ $author['contact-id'] = defaults($contact, 'id', $author['author-id']);
- $contact = null;
+ $contact = [];
/*
This here would be better, but we would get problems with contacts from the statusnet addon
GContact::link($gcid, $contact["uid"], $contact["id"]);
} elseif ($contact["network"] != Protocol::DFRN) {
- $contact = null;
+ $contact = [];
}
return $author;
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function process($xml, array $importer, array &$contact, &$hub, $stored = false, $initialize = true)
+ private static function process($xml, array $importer, array &$contact = null, &$hub, $stored = false, $initialize = true)
{
if ($initialize) {
self::$itemlist = [];
$author = self::fetchAuthor($xpath, $entry, $importer, $contact, $stored);
}
- $value = XML::getFirstNodeValue($xpath, 'atom:author/poco:preferredUsername/text()', $entry);
- if ($value != "") {
- $nickname = $value;
- } else {
- $nickname = $author["author-name"];
- }
-
$item = array_merge($header, $author);
$item["uri"] = XML::getFirstNodeValue($xpath, 'atom:id/text()', $entry);
}
if ($item["verb"] == ACTIVITY_FOLLOW) {
- Contact::addRelationship($importer, $contact, $item, $nickname);
+ Contact::addRelationship($importer, $contact, $item);
continue;
}
self::$conv_list[$conversation] = true;
- $curlResult = Network::curl($conversation, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
+ $curlResult = Network::curl($conversation, false, ['accept_content' => 'application/atom+xml, text/html']);
if (!$curlResult->isSuccess()) {
return;
}
$stored = false;
- $curlResult = Network::curl($related, false, $redirects, ['accept_content' => 'application/atom+xml, text/html']);
+ $curlResult = Network::curl($related, false, ['accept_content' => 'application/atom+xml, text/html']);
if (!$curlResult->isSuccess()) {
return;
* @param array $owner Contact data of the poster
* @param bool $show_profile Whether to show profile
*
- * @return object author element
+ * @return \DOMElement author element
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function addAuthor(DOMDocument $doc, array $owner, $show_profile = true)
$author->appendChild($urls);
}
- XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl()."/viewcontacts/".$owner["nick"]]);
+ XML::addElement($doc, $author, "followers", "", ["url" => System::baseUrl() . "/profile/" . $owner["nick"] . "/contacts/followers"]);
XML::addElement($doc, $author, "statusnet:profile_info", "", ["local_id" => $owner["uid"]]);
if ($profile["publish"]) {
* @param bool $toplevel optional default false
* @param bool $feed_mode Behave like a regular feed for users if true
*
- * @return object Entry element
+ * @return \DOMElement Entry element
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
* @param DOMDocument $doc XML document
* @param array $contact Array of the contact that is added
*
- * @return object Source element
+ * @return \DOMElement Source element
* @throws \Exception
*/
private static function sourceEntry(DOMDocument $doc, array $contact)
}
if (!DBA::isResult($r)) {
- $contact = owner;
+ $contact = $owner;
}
if (!isset($contact["poll"])) {
Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
}
- self::entryHeader($doc, $entry, $owner, $item, $toplevel);
+ $entry = self::entryHeader($doc, $owner, $item, $toplevel);
$condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false,
'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS]];
* @param array $owner Contact data of the poster
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
- * @return object Entry element with "like"
+ * @return \DOMElement Entry element with "like"
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
}
- self::entryHeader($doc, $entry, $owner, $item, $toplevel);
+ $entry = self::entryHeader($doc, $owner, $item, $toplevel);
$verb = NAMESPACE_ACTIVITY_SCHEMA."favorite";
self::entryContent($doc, $entry, $item, $owner, "Favorite", $verb, false);
- $as_object = $doc->createElement("activity:object");
-
$parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]);
+ if (DBA::isResult($parent)) {
+ $as_object = $doc->createElement("activity:object");
- if (!$parent) {
- $parent = [];
- }
+ XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
- XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent));
+ self::entryContent($doc, $as_object, $parent, $owner, "New entry");
- self::entryContent($doc, $as_object, $parent, $owner, "New entry");
-
- $entry->appendChild($as_object);
+ $entry->appendChild($as_object);
+ }
self::entryFooter($doc, $entry, $item, $owner);
* @param array $owner Contact data of the poster
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
- * @return object Entry element
+ * @return \DOMElement Entry element
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
$item["body"] = sprintf($message, $owner["nick"], $contact["nick"]);
- self::entryHeader($doc, $entry, $owner, $item, $toplevel);
+ $entry = self::entryHeader($doc, $owner, $item, $toplevel);
self::entryContent($doc, $entry, $item, $owner, $title);
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
* @param bool $feed_mode Behave like a regular feed for users if true
*
- * @return object Entry element
+ * @return \DOMElement Entry element
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
Logger::log("OStatus entry is from author ".$owner["url"]." - not from ".$item["author-link"].". Quitting.", Logger::DEBUG);
}
- $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel);
+ if (!$toplevel) {
+ if (!empty($item['title'])) {
+ $title = BBCode::convert($item['title'], false, 7);
+ } else {
+ $title = sprintf("New note by %s", $owner["nick"]);
+ }
+ } else {
+ $title = sprintf("New comment by %s", $owner["nick"]);
+ }
+
+ $entry = self::entryHeader($doc, $owner, $item, $toplevel);
XML::addElement($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
* @brief Adds a header element to the XML document
*
* @param DOMDocument $doc XML document
- * @param object $entry The entry element where the elements are added
* @param array $owner Contact data of the poster
* @param array $item
* @param bool $toplevel Is it for en entry element (false) or a feed entry (true)?
*
- * @return string The title for the element
+ * @return \DOMElement The entry element where the elements are added
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function entryHeader(DOMDocument $doc, &$entry, array $owner, array $item, $toplevel)
+ private static function entryHeader(DOMDocument $doc, array $owner, array $item, $toplevel)
{
- /// @todo Check if this title stuff is really needed (I guess not)
if (!$toplevel) {
$entry = $doc->createElement("entry");
- if (!empty($item['title'])) {
- $title = BBCode::convert($item['title'], false, 7);
- } else {
- $title = sprintf("New note by %s", $owner["nick"]);
- }
if ($owner['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
$contact = self::contactEntry($item['author-link'], $owner);
$author = self::addAuthor($doc, $owner);
$entry->appendChild($author);
-
- $title = sprintf("New comment by %s", $owner["nick"]);
}
- return $title;
+
+ return $entry;
}
/**
* @brief Adds elements to the XML document
*
* @param DOMDocument $doc XML document
- * @param object $entry Entry element where the content is added
+ * @param \DOMElement $entry Entry element where the content is added
* @param array $item Data of the item that is to be posted
* @param array $owner Contact data of the poster
* @param string $title Title for the post
* @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function entryContent(DOMDocument $doc, $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false)
+ private static function entryContent(DOMDocument $doc, \DOMElement $entry, array $item, array $owner, $title, $verb = "", $complete = true, $feed_mode = false)
{
if ($verb == "") {
$verb = self::constructVerb($item);
$check_date = DateTimeFormat::utc($last_update);
$authorid = Contact::getIdForURL($owner["url"], 0, true);
- $condition = ["`uid` = ? AND `created` > ? AND NOT `deleted`
+ $condition = ["`uid` = ? AND `received` > ? AND NOT `deleted`
AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)",
$owner["uid"], $check_date, Protocol::OSTATUS, Protocol::DFRN];
$condition[] = $authorid;
}
- $params = ['order' => ['created' => true], 'limit' => $max_items];
+ $params = ['order' => ['received' => true], 'limit' => $max_items];
if ($filter === 'posts') {
$ret = Item::selectThread([], $condition, $params);
projects / friendica.git / blobdiff