X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDFRN.php;h=7cb9db1a136d2d4834bc8ad8ef24ea63011f75cf;hb=ab5a447bc2261522d0f5560f8933dd928a6fc6e3;hp=a322327b0ec79e92de9ca5e14f940c41f795c4f7;hpb=fd562677fdac92a9a5e9eb97f271bad9c427d8c7;p=friendica.git diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index a322327b0e..7cb9db1a13 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -37,8 +37,7 @@ use Friendica\Model\FContact; use Friendica\Model\Item; use Friendica\Model\ItemURI; use Friendica\Model\Mail; -use Friendica\Model\Notify; -use Friendica\Model\Notify\Type; +use Friendica\Model\Notification; use Friendica\Model\PermissionSet; use Friendica\Model\Post; use Friendica\Model\Post\Category; @@ -184,7 +183,7 @@ class DFRN // default permissions - anonymous user - $sql_extra = sprintf(" AND `item`.`private` != %s ", Item::PRIVATE); + $sql_extra = sprintf(" AND `private` != %s ", Item::PRIVATE); $owner = DBA::selectFirst('owner-view', [], ['nickname' => $owner_nick]); if (!DBA::isResult($owner)) { @@ -194,9 +193,7 @@ class DFRN $owner_id = $owner['uid']; - $sql_post_table = ""; - - if (! $public_feed) { + if (!$public_feed) { switch ($direction) { case (-1): $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id)); @@ -212,72 +209,41 @@ class DFRN break; // NOTREACHED } - $r = q( - "SELECT * FROM `contact` WHERE NOT `blocked` AND `contact`.`uid` = %d $sql_extra LIMIT 1", - intval($owner_id) - ); - - if (! DBA::isResult($r)) { - Logger::log(sprintf('No contact found for uid=%d', $owner_id), Logger::WARNING); + $contact = DBA::selectFirst('contact', [], ["NOT `blocked` AND `contact`.`uid` = ?" . $sql_extra, $owner_id]); + if (!DBA::isResult($contact)) { + Logger::notice('No contact found', ['uid' => $owner_id]); exit(); } - $contact = $r[0]; - $set = PermissionSet::get($owner_id, $contact['id']); if (!empty($set)) { - $sql_extra = " AND `item`.`psid` IN (" . implode(',', $set) .")"; + $sql_extra = " AND `psid` IN (" . implode(',', $set) .")"; } else { - $sql_extra = sprintf(" AND `item`.`private` != %s", Item::PRIVATE); + $sql_extra = sprintf(" AND `private` != %s", Item::PRIVATE); } } - if ($public_feed) { - $sort = 'DESC'; - } else { - $sort = 'ASC'; - } - - if (! strlen($last_update)) { + if (!strlen($last_update)) { $last_update = 'now -30 days'; } if (isset($category)) { - $sql_post_table = sprintf("INNER JOIN (SELECT `uri-id` FROM `category-view` WHERE `name` = '%s' AND `type` = %d AND `uid` = %d ORDER BY `uri-id` DESC) AS `category` ON `item`.`uri-id` = `category`.`uri-id` ", + $sql_extra .= sprintf(" AND `uri-id` IN (SELECT `uri-id` FROM `category-view` WHERE `name` = '%s' AND `type` = %d AND `uid` = %d)", DBA::escape(Strings::protectSprintf($category)), intval(Category::CATEGORY), intval($owner_id)); } if ($public_feed && ! $converse) { - $sql_extra .= " AND `contact`.`self` = 1 "; + $sql_extra .= " AND `self` "; } $check_date = DateTimeFormat::utc($last_update); - $r = q( - "SELECT `item`.`id` - FROM `item` USE INDEX (`uid_wall_changed`) $sql_post_table - STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uid` = %d AND `item`.`wall` AND `item`.`changed` > '%s' - AND `vid` != %d AND `item`.`visible` $sql_extra - ORDER BY `item`.`parent` ".$sort.", `item`.`received` ASC LIMIT 0, 300", - intval($owner_id), - DBA::escape($check_date), - Verb::getID(Activity::ANNOUNCE), - DBA::escape($sort) - ); + $condition = ["`uid` = ? AND `wall` AND `changed` > ? AND `vid` != ? AND `visible`" . $sql_extra, + $owner_id, $check_date, Verb::getID(Activity::ANNOUNCE)]; - $ids = []; - foreach ($r as $item) { - $ids[] = $item['id']; - } - - if (!empty($ids)) { - $ret = Item::select(Item::DELIVER_FIELDLIST, ['id' => $ids]); - $items = Item::inArray($ret); - } else { - $items = []; - } + $params = ['sort' => ['parent' => $public_feed, 'received']]; + $items = Post::selectToArray(Item::DELIVER_FIELDLIST, $condition, $params, ['limit' => 300]); /* * Will check further below if this actually returned results. @@ -344,25 +310,27 @@ class DFRN } /** - * Generate an atom entry for a given item id + * Generate an atom entry for a given uri id and user * - * @param int $item_id The item id + * @param int $uri_id The uri id + * @param int $uid The user id * @param boolean $conversation Show the conversation. If false show the single post. * * @return string DFRN feed entry * @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \ImagickException */ - public static function itemFeed($item_id, $conversation = false) + public static function itemFeed(int $uri_id, int $uid, bool $conversation = false) { if ($conversation) { - $condition = ['parent' => $item_id]; + $condition = ['parent-uri-id' => $uri_id]; } else { - $condition = ['id' => $item_id]; + $condition = ['uri-id' => $uri_id]; } - $ret = Item::select(Item::DELIVER_FIELDLIST, $condition); - $items = Item::inArray($ret); + $condition['uid'] = $uid; + + $items = Post::selectToArray(Item::DELIVER_FIELDLIST, $condition); if (!DBA::isResult($items)) { return ''; } @@ -957,7 +925,7 @@ class DFRN $entry->appendChild($dfrnowner); if ($item['gravity'] != GRAVITY_PARENT) { - $parent = Item::selectFirst(['guid', 'plink'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]); + $parent = Post::selectFirst(['guid', 'plink'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]); if (DBA::isResult($parent)) { $attributes = ["ref" => $item['thr-parent'], "type" => "text/html", "href" => $parent['plink'], @@ -1926,32 +1894,15 @@ class DFRN $community = true; Logger::log("possible community action"); } else { - $sql_extra = " AND `contact`.`self` AND `item`.`wall` "; + $sql_extra = " AND `self` AND `wall`"; } // was the top-level post for this action written by somebody on this site? // Specifically, the recipient? + $parent = Post::selectFirst(['forum_mode', 'wall'], + ["`uri` = ? AND `uid` = ?" . $sql_extra, $item["thr-parent"], $importer["importer_uid"]]); - $is_a_remote_action = false; - - $parent = Item::selectFirst(['thr-parent'], ['uri' => $item["thr-parent"]]); - if (DBA::isResult($parent)) { - $r = q( - "SELECT `item`.`forum_mode`, `item`.`wall` FROM `item` - INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` - WHERE `item`.`uri` = '%s' AND (`item`.`thr-parent` = '%s' OR `item`.`thr-parent` = '%s') - AND `item`.`uid` = %d - $sql_extra - LIMIT 1", - DBA::escape($parent["thr-parent"]), - DBA::escape($parent["thr-parent"]), - DBA::escape($parent["thr-parent"]), - intval($importer["importer_uid"]) - ); - if (DBA::isResult($r)) { - $is_a_remote_action = true; - } - } + $is_a_remote_action = DBA::isResult($parent); /* * Does this have the characteristics of a community or private group action? @@ -1959,7 +1910,7 @@ class DFRN * valid community action. Also forum_mode makes it valid for sure. * If neither, it's not. */ - if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) { + if ($is_a_remote_action && $community && (!$parent["forum_mode"]) && (!$parent["wall"])) { $is_a_remote_action = false; Logger::log("not a community action"); } @@ -2008,14 +1959,14 @@ class DFRN if ($Blink && Strings::compareLink($Blink, DI::baseUrl() . "/profile/" . $importer["nickname"])) { $author = DBA::selectFirst('contact', ['id', 'name', 'thumb', 'url'], ['id' => $item['author-id']]); - $parent = Item::selectFirst(['id'], ['uri' => $item['thr-parent'], 'uid' => $importer["importer_uid"]]); + $parent = Post::selectFirst(['id'], ['uri' => $item['thr-parent'], 'uid' => $importer["importer_uid"]]); $item['parent'] = $parent['id']; // send a notification notification( [ - "type" => Type::POKE, - "otype" => Notify\ObjectType::PERSON, + "type" => Notification\Type::POKE, + "otype" => Notification\ObjectType::PERSON, "activity" => $verb, "verb" => $item["verb"], "uid" => $importer["importer_uid"], @@ -2087,13 +2038,13 @@ class DFRN // split into two queries for performance issues $condition = ['uid' => $item["uid"], 'author-id' => $item["author-id"], 'gravity' => GRAVITY_ACTIVITY, 'verb' => $item['verb'], 'parent-uri' => $item['thr-parent']]; - if (Item::exists($condition)) { + if (Post::exists($condition)) { return false; } $condition = ['uid' => $item["uid"], 'author-id' => $item["author-id"], 'gravity' => GRAVITY_ACTIVITY, 'verb' => $item['verb'], 'thr-parent' => $item['thr-parent']]; - if (Item::exists($condition)) { + if (Post::exists($condition)) { return false; } @@ -2111,7 +2062,7 @@ class DFRN $xt = XML::parseString($item["target"]); if ($xt->type == Activity\ObjectType::NOTE) { - $item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]); + $item_tag = Post::selectFirst(['id', 'uri-id'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]); if (!DBA::isResult($item_tag)) { Logger::log("Query failed to execute, no result returned in " . __FUNCTION__); @@ -2214,7 +2165,7 @@ class DFRN $item["edited"] = XML::getFirstNodeValue($xpath, "atom:updated/text()", $entry); - $current = Item::selectFirst(['id', 'uid', 'edited', 'body'], + $current = Post::selectFirst(['id', 'uid', 'edited', 'body'], ['uri' => $item["uri"], 'uid' => $importer["importer_uid"]] ); // Is there an existing item? @@ -2559,14 +2510,14 @@ class DFRN } $condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]]; - $item = Item::selectFirst(['id', 'parent', 'contact-id', 'file', 'deleted', 'gravity'], $condition); + $item = Post::selectFirst(['id', 'parent', 'contact-id', 'uri-id', 'deleted', 'gravity'], $condition); if (!DBA::isResult($item)) { Logger::log("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", Logger::DEBUG); return; } - if (strstr($item['file'], '[')) { - Logger::log("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " is filed. So it won't be deleted.", Logger::DEBUG); + if (DBA::exists('post-category', ['uri-id' => $item['uri-id'], 'uid' => $importer['importer_uid'], 'type' => Post\Category::FILE])) { + Logger::notice("Item is filed. It won't be deleted.", ['uri' => $uri, 'uri-id' => $item['uri_id'], 'uid' => $importer["importer_uid"]]); return; } @@ -2579,7 +2530,7 @@ class DFRN // Comments can be deleted by the thread owner or comment owner if (($item['gravity'] != GRAVITY_PARENT) && ($item['contact-id'] != $importer["id"])) { $condition = ['id' => $item['parent'], 'contact-id' => $importer["id"]]; - if (!Item::exists($condition)) { + if (!Post::exists($condition)) { Logger::log("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", Logger::DEBUG); return; }