X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=d24340d76494657e1c47bab33ac68a31d26c59b2;hb=57cd063da10b827f2457c27e6cf53255b4561c8e;hp=94fe567f66fe5e21c59fe37af6eb808e7a604e39;hpb=58f69481e61a091f919a8c9cc7d6662e876e765f;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index 94fe567f66..d24340d764 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -1,16 +1,29 @@ . + * */ namespace Friendica\Model; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; -use Friendica\Core\Config; use Friendica\Core\Hook; -use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Protocol; use Friendica\Core\Renderer; @@ -31,6 +44,7 @@ use Friendica\Util\Strings; use Friendica\Util\XML; use Friendica\Worker\Delivery; use Text_LanguageDetect; +use Friendica\Repository\PermissionSet as RepPermissionSet; class Item { @@ -100,12 +114,16 @@ class Item Activity::FOLLOW, Activity::ANNOUNCE]; + const PUBLIC = 0; + const PRIVATE = 1; + const UNLISTED = 2; + private static $legacy_mode = null; public static function isLegacyMode() { if (is_null(self::$legacy_mode)) { - self::$legacy_mode = (Config::get("system", "post_update_version") < 1279); + self::$legacy_mode = (DI::config()->get("system", "post_update_version") < 1279); } return self::$legacy_mode; @@ -141,7 +159,7 @@ class Item } /** - * @brief Select pinned rows from the item table for a given user + * Select pinned rows from the item table for a given user * * @param integer $uid User ID * @param array $selected Array of selected fields, empty for all @@ -159,7 +177,7 @@ class Item } $pinned = []; - while ($useritem = self::fetch($useritems)) { + while ($useritem = DBA::fetch($useritems)) { $pinned[] = $useritem['iid']; } DBA::close($useritems); @@ -186,7 +204,7 @@ class Item } /** - * @brief returns an activity index from an activity string + * returns an activity index from an activity string * * @param string $activity activity string * @return integer Activity index @@ -203,7 +221,7 @@ class Item } /** - * @brief returns an activity string from an activity index + * returns an activity string from an activity index * * @param integer $index activity index * @return string Activity string @@ -218,7 +236,7 @@ class Item } /** - * @brief Fetch a single item row + * Fetch a single item row * * @param mixed $stmt statement object * @return array current row @@ -309,8 +327,19 @@ class Item } } - if (array_key_exists('signed_text', $row) && array_key_exists('interaction', $row) && !is_null($row['interaction'])) { - $row['signed_text'] = $row['interaction']; + if ($row['internal-psid'] == RepPermissionSet::PUBLIC) { + if (array_key_exists('allow_cid', $row)) { + $row['allow_cid'] = ''; + } + if (array_key_exists('allow_gid', $row)) { + $row['allow_gid'] = ''; + } + if (array_key_exists('deny_cid', $row)) { + $row['deny_cid'] = ''; + } + if (array_key_exists('deny_gid', $row)) { + $row['deny_gid'] = ''; + } } if (array_key_exists('ignored', $row) && array_key_exists('internal-user-ignored', $row) && !is_null($row['internal-user-ignored'])) { @@ -321,8 +350,8 @@ class Item unset($row['internal-activity']); unset($row['internal-network']); unset($row['internal-iid']); + unset($row['internal-psid']); unset($row['internal-iaid']); - unset($row['internal-icid']); unset($row['internal-user-ignored']); unset($row['interaction']); @@ -330,7 +359,7 @@ class Item } /** - * @brief Fills an array with data from an item query + * Fills an array with data from an item query * * @param object $stmt statement object * @param bool $do_close @@ -352,7 +381,7 @@ class Item } /** - * @brief Check if item data exists + * Check if item data exists * * @param array $condition array of fields for condition * @@ -376,7 +405,6 @@ class Item /** * Retrieve a single record from the item table for a given user and returns it in an associative array * - * @brief Retrieve a single record from a table * @param integer $uid User ID * @param array $selected * @param array $condition @@ -397,7 +425,7 @@ class Item } /** - * @brief Select rows from the item table for a given user + * Select rows from the item table for a given user * * @param integer $uid User ID * @param array $selected Array of selected fields, empty for all @@ -421,7 +449,6 @@ class Item /** * Retrieve a single record from the item table and returns it in an associative array * - * @brief Retrieve a single record from a table * @param array $fields * @param array $condition * @param array $params @@ -445,7 +472,7 @@ class Item } /** - * @brief Select rows from the item table and returns them as an array + * Select rows from the item table and returns them as an array * * @param array $selected Array of selected fields, empty for all * @param array $condition Array of fields for condition @@ -472,7 +499,7 @@ class Item } /** - * @brief Select rows from the item table + * Select rows from the item table * * @param array $selected Array of selected fields, empty for all * @param array $condition Array of fields for condition @@ -513,7 +540,7 @@ class Item } /** - * @brief Select rows from the starting post in the item table + * Select rows from the starting post in the item table * * @param integer $uid User ID * @param array $selected @@ -537,7 +564,6 @@ class Item /** * Retrieve a single record from the starting post in the item table and returns it in an associative array * - * @brief Retrieve a single record from a table * @param integer $uid User ID * @param array $selected * @param array $condition @@ -560,7 +586,6 @@ class Item /** * Retrieve a single record from the starting post in the item table and returns it in an associative array * - * @brief Retrieve a single record from a table * @param array $fields * @param array $condition * @param array $params @@ -583,7 +608,7 @@ class Item } /** - * @brief Select rows from the starting post in the item table + * Select rows from the starting post in the item table * * @param array $selected Array of selected fields, empty for all * @param array $condition Array of fields for condition @@ -634,7 +659,7 @@ class Item } /** - * @brief Returns a list of fields that are associated with the item table + * Returns a list of fields that are associated with the item table * * @param $usermode * @return array field list @@ -643,15 +668,15 @@ class Item { $fields = []; - $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid', + $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', + 'guid', 'uri-id', 'parent-uri-id', 'thr-parent-id', 'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid', 'created', 'edited', 'commented', 'received', 'changed', 'psid', 'resource-id', 'event-id', 'tag', 'attach', 'post-type', 'file', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid', - 'network' => 'internal-network', 'icid' => 'internal-icid', - 'iaid' => 'internal-iaid']; + 'network' => 'internal-network', 'iaid' => 'internal-iaid', 'psid' => 'internal-psid']; if ($usermode) { $fields['user-item'] = ['pinned', 'notification-type', 'ignored' => 'internal-user-ignored']; @@ -686,15 +711,13 @@ class Item 'nofinish' => 'event-nofinish','adjust' => 'event-adjust', 'ignore' => 'event-ignore', 'id' => 'event-id']; - $fields['sign'] = ['signed_text', 'signature', 'signer']; - - $fields['diaspora-interaction'] = ['interaction']; + $fields['diaspora-interaction'] = ['interaction', 'interaction' => 'signed_text']; return $fields; } /** - * @brief Returns SQL condition for the "select" functions + * Returns SQL condition for the "select" functions * * @param boolean $thread_mode Called for the items (false) or for the threads (true) * @@ -717,7 +740,7 @@ class Item } /** - * @brief Returns all needed "JOIN" commands for the "select" functions + * Returns all needed "JOIN" commands for the "select" functions * * @param integer $uid User ID * @param string $sql_commands The parts of the built SQL commands in the "select" functions @@ -773,10 +796,6 @@ class Item $joins .= " LEFT JOIN `event` ON `event-id` = `event`.`id`"; } - if (strpos($sql_commands, "`sign`.") !== false) { - $joins .= " LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`"; - } - if (strpos($sql_commands, "`diaspora-interaction`.") !== false) { $joins .= " LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`"; } @@ -809,20 +828,17 @@ class Item } /** - * @brief Add the field list for the "select" functions + * Add the field list for the "select" functions * * @param array $fields The field definition array * @param array $selected The array with the selected fields from the "select" functions * * @return string The field list */ - private static function constructSelectFields($fields, $selected) + private static function constructSelectFields(array $fields, array $selected) { if (!empty($selected)) { - $selected[] = 'internal-iid'; - $selected[] = 'internal-iaid'; - $selected[] = 'internal-icid'; - $selected[] = 'internal-network'; + $selected = array_merge($selected, ['internal-iid', 'internal-psid', 'internal-iaid', 'internal-network']); } if (in_array('verb', $selected)) { @@ -833,10 +849,6 @@ class Item $selected[] = 'internal-user-ignored'; } - if (in_array('signed_text', $selected)) { - $selected[] = 'interaction'; - } - $legacy_fields = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, self::MIXED_CONTENT_FIELDLIST); $selection = []; @@ -858,7 +870,7 @@ class Item } /** - * @brief add table definition to fields in an SQL query + * add table definition to fields in an SQL query * * @param string $query SQL query * @param array $fields The field definition array @@ -884,7 +896,7 @@ class Item } /** - * @brief Update existing item entries + * Update existing item entries * * @param array $fields The fields that are to be changed * @param array $condition The condition for finding the item entries @@ -1047,23 +1059,23 @@ class Item } /** - * @brief Delete an item and notify others about it - if it was ours + * Delete an item and notify others about it - if it was ours * * @param array $condition The condition for finding the item entries * @param integer $priority Priority for the notification * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function delete($condition, $priority = PRIORITY_HIGH) + public static function markForDeletion($condition, $priority = PRIORITY_HIGH) { $items = self::select(['id'], $condition); while ($item = self::fetch($items)) { - self::deleteById($item['id'], $priority); + self::markForDeletionById($item['id'], $priority); } DBA::close($items); } /** - * @brief Delete an item for an user and notify others about it - if it was ours + * Delete an item for an user and notify others about it - if it was ours * * @param array $condition The condition for finding the item entries * @param integer $uid User who wants to delete this item @@ -1084,7 +1096,7 @@ class Item // Delete notifications DBA::delete('notify', ['iid' => $item['id'], 'uid' => $uid]); } elseif ($item['uid'] == $uid) { - self::deleteById($item['id'], PRIORITY_HIGH); + self::markForDeletionById($item['id'], PRIORITY_HIGH); } else { Logger::log('Wrong ownership. Not deleting item ' . $item['id']); } @@ -1093,16 +1105,17 @@ class Item } /** - * @brief Delete an item and notify others about it - if it was ours + * Mark an item for deletion, delete related data and notify others about it - if it was ours * - * @param integer $item_id Item ID that should be delete + * @param integer $item_id * @param integer $priority Priority for the notification * * @return boolean success * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ - public static function deleteById($item_id, $priority = PRIORITY_HIGH) + public static function markForDeletionById($item_id, $priority = PRIORITY_HIGH) { + Logger::info('Mark item for deletion by id', ['id' => $item_id, 'callstack' => System::callstack()]); // locate item to be deleted $fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin', 'deleted', 'file', 'resource-id', 'event-id', 'attach', @@ -1110,12 +1123,12 @@ class Item 'icid', 'iaid', 'psid']; $item = self::selectFirst($fields, ['id' => $item_id]); if (!DBA::isResult($item)) { - Logger::log('Item with ID ' . $item_id . " hasn't been found.", Logger::DEBUG); + Logger::info('Item not found.', ['id' => $item_id]); return false; } if ($item['deleted']) { - Logger::log('Item with ID ' . $item_id . ' has already been deleted.', Logger::DEBUG); + Logger::info('Item has already been marked for deletion.', ['id' => $item_id]); return false; } @@ -1185,7 +1198,7 @@ class Item self::deleteThread($item['id'], $item['parent-uri']); if (!self::exists(["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) { - self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority); + self::markForDeletion(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority); } ItemDeliveryData::delete($item['id']); @@ -1205,14 +1218,13 @@ class Item // If it's the parent of a comment thread, kill all the kids if ($item['id'] == $item['parent']) { - self::delete(['parent' => $item['parent'], 'deleted' => false], $priority); + self::markForDeletion(['parent' => $item['parent'], 'deleted' => false], $priority); } // Is it our comment and/or our thread? if ($item['origin'] || $parent['origin']) { - // When we delete the original post we will delete all existing copies on the server as well - self::delete(['uri' => $item['uri'], 'deleted' => false], $priority); + self::markForDeletion(['uri' => $item['uri'], 'deleted' => false], $priority); // send the notification upstream/downstream Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", Delivery::DELETION, intval($item['id'])); @@ -1225,7 +1237,7 @@ class Item } } - Logger::log('Item with ID ' . $item_id . " has been deleted.", Logger::DEBUG); + Logger::info('Item has been marked for deletion.', ['id' => $item_id]); return true; } @@ -1398,7 +1410,7 @@ class Item } $item['guid'] = self::guid($item, $notify); - $item['uri'] = Strings::escapeTags(trim(($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid']))); + $item['uri'] = substr(Strings::escapeTags(trim(($item['uri'] ?? '') ?: self::newURI($item['uid'], $item['guid']))), 0, 255); // Store URI data $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]); @@ -1456,7 +1468,7 @@ class Item $uid = intval($item['uid']); // check for create date and expire time - $expire_interval = Config::get('system', 'dbclean-expire-days', 0); + $expire_interval = DI::config()->get('system', 'dbclean-expire-days', 0); $user = DBA::selectFirst('user', ['expire'], ['uid' => $uid]); if (DBA::isResult($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) { @@ -1515,7 +1527,7 @@ class Item $item['edited'] = (isset($item['edited']) ? DateTimeFormat::utc($item['edited']) : $item['created']); $item['changed'] = (isset($item['changed']) ? DateTimeFormat::utc($item['changed']) : $item['created']); $item['commented'] = (isset($item['commented']) ? DateTimeFormat::utc($item['commented']) : $item['created']); - $item['title'] = trim($item['title'] ?? ''); + $item['title'] = substr(trim($item['title'] ?? ''), 0, 255); $item['location'] = trim($item['location'] ?? ''); $item['coord'] = trim($item['coord'] ?? ''); $item['visible'] = (isset($item['visible']) ? intval($item['visible']) : 1); @@ -1527,12 +1539,12 @@ class Item $item['object'] = trim($item['object'] ?? ''); $item['target-type'] = trim($item['target-type'] ?? ''); $item['target'] = trim($item['target'] ?? ''); - $item['plink'] = trim($item['plink'] ?? ''); + $item['plink'] = substr(trim($item['plink'] ?? ''), 0, 255); $item['allow_cid'] = trim($item['allow_cid'] ?? ''); $item['allow_gid'] = trim($item['allow_gid'] ?? ''); $item['deny_cid'] = trim($item['deny_cid'] ?? ''); $item['deny_gid'] = trim($item['deny_gid'] ?? ''); - $item['private'] = intval($item['private'] ?? 0); + $item['private'] = intval($item['private'] ?? self::PUBLIC); $item['body'] = trim($item['body'] ?? ''); $item['tag'] = trim($item['tag'] ?? ''); $item['attach'] = trim($item['attach'] ?? ''); @@ -1682,7 +1694,7 @@ class Item $fields = ['uri', 'parent-uri', 'id', 'deleted', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', - 'wall', 'private', 'forum_mode', 'origin']; + 'wall', 'private', 'forum_mode', 'origin', 'author-id']; $condition = ['uri' => $item['parent-uri'], 'uid' => $item['uid']]; $params = ['order' => ['id' => false]]; $parent = self::selectFirst($fields, $condition, $params); @@ -1728,8 +1740,8 @@ class Item * The original author commented, but as this is a comment, the permissions * weren't fixed up so it will still show the comment as private unless we fix it here. */ - if ((intval($parent['forum_mode']) == 1) && $parent['private']) { - $item['private'] = 0; + if ((intval($parent['forum_mode']) == 1) && ($parent['private'] != self::PUBLIC)) { + $item['private'] = self::PUBLIC; } // If its a post that originated here then tag the thread as "mention" @@ -1737,6 +1749,11 @@ class Item DBA::update('thread', ['mention' => true], ['iid' => $parent_id]); Logger::log('tagged thread ' . $parent_id . ' as mention for user ' . $item['uid'], Logger::DEBUG); } + + // Update the contact relations + if ($item['author-id'] != $parent['author-id']) { + DBA::update('contact-relation', ['last-interaction' => $item['created']], ['cid' => $parent['author-id'], 'relation-cid' => $item['author-id']], true); + } } else { /* * Allow one to see reply tweets from status.net even when @@ -1799,7 +1816,7 @@ class Item // ACL settings if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) { - $private = 1; + $private = self::PRIVATE; } else { $private = $item['private']; } @@ -1862,7 +1879,18 @@ class Item } // Creates or assigns the permission set - $item['psid'] = PermissionSet::fetchIDForPost($item); + $item['psid'] = PermissionSet::getIdFromACL( + $item['uid'], + $item['allow_cid'], + $item['allow_gid'], + $item['deny_cid'], + $item['deny_gid'] + ); + + $item['allow_cid'] = null; + $item['allow_gid'] = null; + $item['deny_cid'] = null; + $item['deny_gid'] = null; // We are doing this outside of the transaction to avoid timing problems if (!self::insertActivity($item)) { @@ -1884,7 +1912,7 @@ class Item unset($item['owner-name']); unset($item['owner-avatar']); - $like_no_comment = Config::get('system', 'like_no_comment'); + $like_no_comment = DI::config()->get('system', 'like_no_comment'); DBA::transaction(); $ret = DBA::insert('item', $item); @@ -1914,9 +1942,9 @@ class Item if ($entries > 1) { // There are duplicates. We delete our just created entry. - Logger::log('Duplicated post occurred. uri = ' . $item['uri'] . ' uid = ' . $item['uid']); + Logger::info('Delete duplicated item', ['id' => $current_post, 'uri' => $item['uri'], 'uid' => $item['uid'], 'guid' => $item['guid']]); - // Yes, we could do a rollback here - but we are having many users with MyISAM. + // Yes, we could do a rollback here - but we possibly are still having users with MyISAM. DBA::delete('item', ['id' => $current_post]); DBA::commit(); return 0; @@ -1959,10 +1987,6 @@ class Item if (!empty($dsprsig->signed_text) && empty($dsprsig->signature) && empty($dsprsig->signer)) { DBA::insert('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $dsprsig->signed_text], true); - } else { - // The other fields are used by very old Friendica servers, so we currently store them differently - DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text, - 'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]); } } @@ -2036,7 +2060,7 @@ class Item } /** - * @brief Insert a new item content entry + * Insert a new item content entry * * @param array $item The item fields that are to be inserted * @return bool @@ -2084,7 +2108,7 @@ class Item } /** - * @brief Insert a new item content entry + * Insert a new item content entry * * @param array $item The item fields that are to be inserted * @throws \Exception @@ -2124,7 +2148,7 @@ class Item } /** - * @brief Update existing item content entries + * Update existing item content entries * * @param array $item The item fields that are to be changed * @param array $condition The condition for finding the item content entries @@ -2152,7 +2176,7 @@ class Item } /** - * @brief Update existing item content entries + * Update existing item content entries * * @param array $item The item fields that are to be changed * @param array $condition The condition for finding the item content entries @@ -2180,7 +2204,7 @@ class Item } /** - * @brief Distributes public items to the receivers + * Distributes public items to the receivers * * @param integer $itemid Item ID that should be added * @param string $signed_text Original text (for Diaspora signatures), JSON encoded. @@ -2197,7 +2221,7 @@ class Item // Only distribute public items from native networks $condition = ['id' => $itemid, 'uid' => 0, 'network' => array_merge(Protocol::FEDERATED ,['']), - 'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false]; + 'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => [self::PUBLIC, self::UNLISTED]]; $item = self::selectFirst(self::ITEM_FIELDLIST, $condition); if (!DBA::isResult($item)) { return; @@ -2276,7 +2300,7 @@ class Item } /** - * @brief Store public items for the receivers + * Store public items for the receivers * * @param integer $itemid Item ID that should be added * @param array $item The item entry that will be stored @@ -2322,7 +2346,7 @@ class Item } /** - * @brief Add a shadow entry for a given item id that is a thread starter + * Add a shadow entry for a given item id that is a thread starter * * We store every public item entry additionally with the user id "0". * This is used for the community page and for the search. @@ -2347,7 +2371,7 @@ class Item } // Is it a visible public post? - if (!$item["visible"] || $item["deleted"] || $item["moderated"] || $item["private"]) { + if (!$item["visible"] || $item["deleted"] || $item["moderated"] || ($item["private"] == Item::PRIVATE)) { return; } @@ -2386,7 +2410,7 @@ class Item } /** - * @brief Add a shadow entry for a given item id that is a comment + * Add a shadow entry for a given item id that is a comment * * This function does the same like the function above - but for comments * @@ -2469,7 +2493,7 @@ class Item } /** - * @brief Creates an unique guid out of a given uri + * Creates an unique guid out of a given uri * * @param string $uri uri of an item entry * @param string $host hostname for the GUID prefix @@ -2515,7 +2539,7 @@ class Item } /** - * @brief Set "success_update" and "last-item" to the date of the last time we heard from this contact + * Set "success_update" and "last-item" to the date of the last time we heard from this contact * * This can be used to filter for inactive contacts. * Only do this for public postings to avoid privacy problems, since poco data is public. @@ -2538,7 +2562,7 @@ class Item Contact::unmarkForArchival($contact); } - $update = (!$arr['private'] && ((($arr['author-link'] ?? '') === ($arr['owner-link'] ?? '')) || ($arr["parent-uri"] === $arr["uri"]))); + $update = (($arr['private'] != self::PRIVATE) && ((($arr['author-link'] ?? '') === ($arr['owner-link'] ?? '')) || ($arr["parent-uri"] === $arr["uri"]))); // Is it a forum? Then we don't care about the rules from above if (!$update && in_array($arr["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN]) && ($arr["parent-uri"] === $arr["uri"])) { @@ -2552,7 +2576,7 @@ class Item ['id' => $arr['contact-id']]); } // Now do the same for the system wide contacts with uid=0 - if (!$arr['private']) { + if ($arr['private'] != self::PRIVATE) { DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], ['id' => $arr['owner-id']]); @@ -2590,7 +2614,7 @@ class Item $URLSearchString = "^\[\]"; // All hashtags should point to the home server if "local_tags" is activated - if (Config::get('system', 'local_tags')) { + if (DI::config()->get('system', 'local_tags')) { $item["body"] = preg_replace("/#\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", "#[url=".DI::baseUrl()."/search?tag=$2]$2[/url]", $item["body"]); @@ -2697,9 +2721,7 @@ class Item if (!$mention) { if (($community_page || $prvgroup) && !$item['wall'] && !$item['origin'] && ($item['id'] == $item['parent'])) { - // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment) - // delete it! - Logger::log("no-mention top-level post to community or private group. delete."); + Logger::info('Delete private group/communiy top-level item without mention', ['id' => $item_id, 'guid'=> $item['guid']]); DBA::delete('item', ['id' => $item_id]); return true; } @@ -2733,9 +2755,15 @@ class Item // also reset all the privacy bits to the forum default permissions - $private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? 1 : 0; + $private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? self::PRIVATE : self::PUBLIC; - $psid = PermissionSet::fetchIDForPost($user); + $psid = PermissionSet::getIdFromACL( + $user['uid'], + $user['allow_cid'], + $user['allow_gid'], + $user['deny_cid'], + $user['deny_gid'] + ); $forum_mode = ($prvgroup ? 2 : 1); @@ -2774,7 +2802,7 @@ class Item return false; } - if (($contact['network'] != Protocol::FEED) && $datarray['private']) { + if (($contact['network'] != Protocol::FEED) && ($datarray['private'] == self::PRIVATE)) { Logger::log('Not public', Logger::DEBUG); return false; } @@ -2812,7 +2840,7 @@ class Item $urlpart = parse_url($datarray2['author-link']); $datarray["app"] = $urlpart["host"]; } else { - $datarray['private'] = 0; + $datarray['private'] = self::PUBLIC; } } @@ -2847,7 +2875,7 @@ class Item */ public static function fixPrivatePhotos($s, $uid, $item = null, $cid = 0) { - if (Config::get('system', 'disable_embedded')) { + if (DI::config()->get('system', 'disable_embedded')) { return $s; } @@ -3076,7 +3104,7 @@ class Item continue; } - self::deleteById($item['id'], PRIORITY_LOW); + self::markForDeletionById($item['id'], PRIORITY_LOW); ++$expired; } @@ -3096,7 +3124,7 @@ class Item } /** - * @brief add/remove activity to an item + * add/remove activity to an item * * Toggle activities as like,dislike,attend of an item * @@ -3112,7 +3140,7 @@ class Item * array $arr * 'post_id' => ID of posted item */ - public static function performLike($item_id, $verb) + public static function performActivity($item_id, $verb) { if (!Session::isAuthenticated()) { return false; @@ -3139,6 +3167,10 @@ class Item case 'unattendmaybe': $activity = Activity::ATTENDMAYBE; break; + case 'follow': + case 'unfollow': + $activity = Activity::FOLLOW; + break; default: Logger::log('like: unknown verb ' . $verb . ' for item ' . $item_id); return false; @@ -3217,7 +3249,7 @@ class Item // If it exists, mark it as deleted if (DBA::isResult($like_item)) { - self::deleteById($like_item['id']); + self::markForDeletionById($like_item['id']); if (!$event_verb_flag || $like_item['verb'] == $activity) { return true; @@ -3341,7 +3373,7 @@ class Item $condition = ["`uri` = ? AND NOT `deleted` AND NOT (`uid` IN (?, 0))", $itemuri, $item["uid"]]; if (!self::exists($condition)) { DBA::delete('item', ['uri' => $itemuri, 'uid' => 0]); - Logger::log("deleteThread: Deleted shadow for item ".$itemuri, Logger::DEBUG); + Logger::debug('Deleted shadow item', ['id' => $itemid, 'uri' => $itemuri]); } } } @@ -3356,7 +3388,7 @@ class Item * * default permissions - anonymous user */ - $sql = " AND NOT `item`.`private`"; + $sql = sprintf(" AND `item`.`private` != %d", self::PRIVATE); // Profile owner - everything is visible if ($local_user && ($local_user == $owner_id)) { @@ -3372,12 +3404,12 @@ class Item $set = PermissionSet::get($owner_id, $remote_user); if (!empty($set)) { - $sql_set = " OR (`item`.`private` IN (1,2) AND `item`.`wall` AND `item`.`psid` IN (" . implode(',', $set) . "))"; + $sql_set = sprintf(" OR (`item`.`private` = %d AND `item`.`wall` AND `item`.`psid` IN (", self::PRIVATE) . implode(',', $set) . "))"; } else { $sql_set = ''; } - $sql = " AND (NOT `item`.`private`" . $sql_set . ")"; + $sql = sprintf(" AND (`item`.`private` != %d", self::PRIVATE) . $sql_set . ")"; } return $sql; @@ -3392,16 +3424,16 @@ class Item public static function postType($item) { if (!empty($item['event-id'])) { - return L10n::t('event'); + return DI::l10n()->t('event'); } elseif (!empty($item['resource-id'])) { - return L10n::t('photo'); + return DI::l10n()->t('photo'); } elseif (!empty($item['verb']) && $item['verb'] !== Activity::POST) { - return L10n::t('activity'); + return DI::l10n()->t('activity'); } elseif ($item['id'] != $item['parent']) { - return L10n::t('comment'); + return DI::l10n()->t('comment'); } - return L10n::t('post'); + return DI::l10n()->t('post'); } /** @@ -3425,7 +3457,7 @@ class Item if ($rendered_hash == '' || $rendered_html == "" || $rendered_hash != hash("md5", $item["body"]) - || Config::get("system", "ignore_cache") + || DI::config()->get("system", "ignore_cache") ) { self::addRedirToImageTags($item); @@ -3444,7 +3476,7 @@ class Item } // Only compare the HTML when we forcefully ignore the cache - if (Config::get("system", "ignore_cache") && ($rendered_html != $item["rendered-html"])) { + if (DI::config()->get("system", "ignore_cache") && ($rendered_html != $item["rendered-html"])) { $update = true; } @@ -3463,7 +3495,7 @@ class Item } /** - * @brief Find any non-embedded images in private items and add redir links to them + * Find any non-embedded images in private items and add redir links to them * * @param array &$item The field array of an item row */ @@ -3479,7 +3511,7 @@ class Item continue; } - if ((local_user() == $item['uid']) && ($item['private'] == 1) && ($item['contact-id'] != $app->contact['id']) && ($item['network'] == Protocol::DFRN)) { + if ((local_user() == $item['uid']) && ($item['private'] == self::PRIVATE) && ($item['contact-id'] != $app->contact['id']) && ($item['network'] == Protocol::DFRN)) { $img_url = 'redir/' . $item['contact-id'] . '?url=' . urlencode($mtch[1]); $item['body'] = str_replace($mtch[0], '[img]' . $img_url . '[/img]', $item['body']); } @@ -3488,7 +3520,7 @@ class Item } /** - * @brief Given an item array, convert the body element from bbcode to html and add smilie icons. + * Given an item array, convert the body element from bbcode to html and add smilie icons. * If attach is true, also add icons for item attachments. * * @param array $item @@ -3524,7 +3556,7 @@ class Item $filter_reasons = []; if (!$is_preview && public_contact() != $item['author-id']) { if (!empty($item['content-warning']) && (!local_user() || !DI::pConfig()->get(local_user(), 'system', 'disable_cw', false))) { - $filter_reasons[] = L10n::t('Content warning: %s', $item['content-warning']); + $filter_reasons[] = DI::l10n()->t('Content warning: %s', $item['content-warning']); } $hook_data = [ @@ -3584,7 +3616,7 @@ class Item $as .= Renderer::replaceMacros(Renderer::getMarkupTemplate('video_top.tpl'), [ '$video' => [ 'id' => $id, - 'title' => L10n::t('View Video'), + 'title' => DI::l10n()->t('View Video'), 'src' => $the_url, 'mime' => $mime, ], @@ -3601,10 +3633,10 @@ class Item } $title = Strings::escapeHtml(trim(($mtch[4] ?? '') ?: $mtch[1])); - $title .= ' ' . $mtch[2] . ' ' . L10n::t('bytes'); + $title .= ' ' . $mtch[2] . ' ' . DI::l10n()->t('bytes'); $icon = '
'; - $as .= '' . $icon . ''; + $as .= '' . $icon . ''; } if ($as != '') { @@ -3648,20 +3680,20 @@ class Item $ret = [ 'href' => "display/" . $item['guid'], 'orig' => "display/" . $item['guid'], - 'title' => L10n::t('View on separate page'), - 'orig_title' => L10n::t('view on separate page'), + 'title' => DI::l10n()->t('View on separate page'), + 'orig_title' => DI::l10n()->t('view on separate page'), ]; if (!empty($item['plink'])) { $ret["href"] = DI::baseUrl()->remove($item['plink']); - $ret["title"] = L10n::t('link to source'); + $ret["title"] = DI::l10n()->t('link to source'); } - } elseif (!empty($item['plink']) && ($item['private'] != 1)) { + } elseif (!empty($item['plink']) && ($item['private'] != self::PRIVATE)) { $ret = [ 'href' => $item['plink'], 'orig' => $item['plink'], - 'title' => L10n::t('link to source'), + 'title' => DI::l10n()->t('link to source'), ]; } else { $ret = []; @@ -3733,6 +3765,36 @@ class Item return 0; } + /** + * Return the URI for a link to the post + * + * @param string $uri URI or link to post + * + * @return string URI + */ + public static function getURIByLink(string $uri) + { + $ssl_uri = str_replace('http://', 'https://', $uri); + $uris = [$uri, $ssl_uri, Strings::normaliseLink($uri)]; + + $item = DBA::selectFirst('item', ['uri'], ['uri' => $uris]); + if (DBA::isResult($item)) { + return $item['uri']; + } + + $itemcontent = DBA::selectFirst('item-content', ['uri-id'], ['plink' => $uris]); + if (!DBA::isResult($itemcontent)) { + return ''; + } + + $itemuri = DBA::selectFirst('item-uri', ['uri'], ['id' => $itemcontent['uri-id']]); + if (DBA::isResult($itemuri)) { + return $itemuri['uri']; + } + + return ''; + } + /** * Fetches item for given URI or plink * @@ -3748,8 +3810,8 @@ class Item return $item_id; } - if (ActivityPub\Processor::fetchMissingActivity($uri)) { - $item_id = self::searchByLink($uri, $uid); + if ($fetched_uri = ActivityPub\Processor::fetchMissingActivity($uri)) { + $item_id = self::searchByLink($fetched_uri, $uid); } else { $item_id = Diaspora::fetchByURL($uri); } @@ -3811,6 +3873,10 @@ class Item // first try to fetch the item via the GUID. This will work for all reshares that had been created on this system $shared_item = self::selectFirst(['title', 'body', 'attach'], ['guid' => $shared['guid'], 'uid' => [0, $uid]]); if (!DBA::isResult($shared_item)) { + if (empty($shared['link'])) { + return $item; + } + // Otherwhise try to find (and possibly fetch) the item via the link. This should work for Diaspora and ActivityPub posts $id = self::fetchByLink($shared['link'], $uid); if (empty($id)) {