X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FOStatus.php;h=127773f3c6ce1a15dd7ee61a76f191544c0dbf6d;hb=e5a29cf979ffecf63033efd2a5b4038ed950e024;hp=c7747e8cfc79b79c095edfde8fe113a8aef9f969;hpb=bd0c53673682d88b49c8eaf027e7ef5ad98ac311;p=friendica.git diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index c7747e8cfc..127773f3c6 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -417,13 +417,6 @@ class OStatus $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); @@ -463,7 +456,7 @@ class OStatus } if ($item["verb"] == ACTIVITY_FOLLOW) { - Contact::addRelationship($importer, $contact, $item, $nickname); + Contact::addRelationship($importer, $contact, $item); continue; } @@ -745,7 +738,7 @@ class OStatus 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; @@ -938,7 +931,7 @@ class OStatus } $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; @@ -2226,7 +2219,7 @@ class OStatus $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]; @@ -2241,7 +2234,7 @@ class OStatus $condition[] = $authorid; } - $params = ['order' => ['created' => true], 'limit' => $max_items]; + $params = ['order' => ['received' => true], 'limit' => $max_items]; if ($filter === 'posts') { $ret = Item::selectThread([], $condition, $params);