X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FItem.php;h=19ab371d7c0f9581f86e0709fa45e12f81c5bdfc;hb=dc49ad090eca1bf4e511091418166da6fe68009b;hp=4f9f1cf9049992a4b86773f526ff663fa0a1b7b6;hpb=daa1177e3a1e42b4c95e0a8759f1610942b952c7;p=friendica.git diff --git a/src/Model/Item.php b/src/Model/Item.php index 4f9f1cf904..19ab371d7c 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -12,10 +12,13 @@ use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\Lock; use Friendica\Core\PConfig; +use Friendica\Core\Protocol; use Friendica\Core\System; use Friendica\Core\Worker; -use Friendica\Database\dba; -use Friendica\Database\DBM; +use Friendica\Database\DBA; +use Friendica\Model\Contact; +use Friendica\Model\PermissionSet; +use Friendica\Model\ItemURI; use Friendica\Object\Image; use Friendica\Protocol\Diaspora; use Friendica\Protocol\OStatus; @@ -77,7 +80,7 @@ class Item extends BaseObject // All fields in the item table const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid', 'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid', - 'created', 'edited', 'commented', 'received', 'changed', 'verb', + 'uri-hash', 'created', 'edited', 'commented', 'received', 'changed', 'verb', 'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform', 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', @@ -108,7 +111,7 @@ class Item extends BaseObject * @param string $activity activity string * @return integer Activity index */ - private static function activityToIndex($activity) + public static function activityToIndex($activity) { $index = array_search($activity, self::ACTIVITIES); @@ -142,7 +145,7 @@ class Item extends BaseObject */ public static function fetch($stmt) { - $row = dba::fetch($stmt); + $row = DBA::fetch($stmt); if (is_bool($row)) { return $row; @@ -173,7 +176,7 @@ class Item extends BaseObject // We can always comment on posts from these networks if (array_key_exists('writable', $row) && - in_array($row['internal-network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) { + in_array($row['internal-network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) { $row['writable'] = true; } @@ -228,12 +231,17 @@ class Item extends BaseObject } } + if (array_key_exists('ignored', $row) && array_key_exists('internal-user-ignored', $row) && !is_null($row['internal-user-ignored'])) { + $row['ignored'] = $row['internal-user-ignored']; + } + // Remove internal fields unset($row['internal-activity']); unset($row['internal-network']); unset($row['internal-iid']); unset($row['internal-iaid']); unset($row['internal-icid']); + unset($row['internal-user-ignored']); return $row; } @@ -254,7 +262,7 @@ class Item extends BaseObject $data[] = $row; } if ($do_close) { - dba::close($stmt); + DBA::close($stmt); } return $data; } @@ -272,10 +280,10 @@ class Item extends BaseObject if (is_bool($stmt)) { $retval = $stmt; } else { - $retval = (dba::num_rows($stmt) > 0); + $retval = (DBA::numRows($stmt) > 0); } - dba::close($stmt); + DBA::close($stmt); return $retval; } @@ -289,7 +297,7 @@ class Item extends BaseObject * @param array $condition * @param array $params * @return bool|array - * @see dba::select + * @see DBA::select */ public static function selectFirstForUser($uid, array $selected = [], array $condition = [], $params = []) { @@ -331,7 +339,7 @@ class Item extends BaseObject * @param array $condition * @param array $params * @return bool|array - * @see dba::select + * @see DBA::select */ public static function selectFirst(array $fields = [], array $condition = [], $params = []) { @@ -343,7 +351,7 @@ class Item extends BaseObject return $result; } else { $row = self::fetch($result); - dba::close($result); + DBA::close($result); return $row; } } @@ -367,11 +375,11 @@ class Item extends BaseObject $usermode = true; } - $fields = self::fieldlist($selected); + $fields = self::fieldlist($selected, $usermode); $select_fields = self::constructSelectFields($fields, $selected); - $condition_string = dba::buildCondition($condition); + $condition_string = DBA::buildCondition($condition); $condition_string = self::addTablesToFields($condition_string, $fields); @@ -379,13 +387,13 @@ class Item extends BaseObject $condition_string = $condition_string . ' AND ' . self::condition(false); } - $param_string = self::addTablesToFields(dba::buildParameter($params), $fields); + $param_string = self::addTablesToFields(DBA::buildParameter($params), $fields); $table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false, $usermode); $sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string; - return dba::p($sql, $condition); + return DBA::p($sql, $condition); } /** @@ -418,7 +426,7 @@ class Item extends BaseObject * @param array $condition * @param array $params * @return bool|array - * @see dba::select + * @see DBA::select */ public static function selectFirstThreadForUser($uid, array $selected = [], array $condition = [], $params = []) { @@ -439,7 +447,7 @@ class Item extends BaseObject * @param array $condition * @param array $params * @return bool|array - * @see dba::select + * @see DBA::select */ public static function selectFirstThread(array $fields = [], array $condition = [], $params = []) { @@ -450,7 +458,7 @@ class Item extends BaseObject return $result; } else { $row = self::fetch($result); - dba::close($result); + DBA::close($result); return $row; } } @@ -474,7 +482,9 @@ class Item extends BaseObject $usermode = true; } - $fields = self::fieldlist($selected); + $fields = self::fieldlist($selected, $usermode); + + $fields['thread'] = ['mention', 'ignored', 'iid']; $threadfields = ['thread' => ['iid', 'uid', 'contact-id', 'owner-id', 'author-id', 'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private', @@ -483,7 +493,7 @@ class Item extends BaseObject $select_fields = self::constructSelectFields($fields, $selected); - $condition_string = dba::buildCondition($condition); + $condition_string = DBA::buildCondition($condition); $condition_string = self::addTablesToFields($condition_string, $threadfields); $condition_string = self::addTablesToFields($condition_string, $fields); @@ -492,7 +502,7 @@ class Item extends BaseObject $condition_string = $condition_string . ' AND ' . self::condition(true); } - $param_string = dba::buildParameter($params); + $param_string = DBA::buildParameter($params); $param_string = self::addTablesToFields($param_string, $threadfields); $param_string = self::addTablesToFields($param_string, $fields); @@ -500,7 +510,7 @@ class Item extends BaseObject $sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string; - return dba::p($sql, $condition); + return DBA::p($sql, $condition); } /** @@ -508,27 +518,32 @@ class Item extends BaseObject * * @return array field list */ - private static function fieldlist($selected) + private static function fieldlist($selected, $usermode) { $fields = []; $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid', 'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid', - 'created', 'edited', 'commented', 'received', 'changed', - 'resource-id', 'event-id', 'tag', 'attach', 'post-type', - 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'psid', + 'created', 'edited', 'commented', 'received', 'changed', 'psid', 'uri-hash', + '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']; + if ($usermode) { + $fields['user-item'] = ['ignored' => 'internal-user-ignored']; + } + $fields['item-activity'] = ['activity', 'activity' => 'internal-activity']; $fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST); $fields['item-delivery-data'] = self::DELIVERY_DATA_FIELDLIST; + $fields['permissionset'] = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']; + $fields['author'] = ['url' => 'author-link', 'name' => 'author-name', 'thumb' => 'author-avatar', 'nick' => 'author-nick', 'network' => 'author-network']; @@ -569,7 +584,13 @@ class Item extends BaseObject } else { $master_table = "`item`"; } - return "$master_table.`visible` AND NOT $master_table.`deleted` AND NOT $master_table.`moderated` AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`) "; + return sprintf("$master_table.`visible` AND NOT $master_table.`deleted` AND NOT $master_table.`moderated` + AND (`user-item`.`hidden` IS NULL OR NOT `user-item`.`hidden`) + AND (`user-author`.`blocked` IS NULL OR NOT `user-author`.`blocked`) + AND (`user-author`.`ignored` IS NULL OR NOT `user-author`.`ignored` OR `item`.`gravity` != %d) + AND (`user-owner`.`blocked` IS NULL OR NOT `user-owner`.`blocked`) + AND (`user-owner`.`ignored` IS NULL OR NOT `user-owner`.`ignored` OR `item`.`gravity` != %d) ", + GRAVITY_PARENT, GRAVITY_PARENT); } /** @@ -600,8 +621,10 @@ class Item extends BaseObject OR `contact`.`self` OR `item`.`gravity` != %d OR `contact`.`uid` = 0) STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id` AND NOT `author`.`blocked` STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id` AND NOT `owner`.`blocked` - LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d", - CONTACT_IS_SHARING, CONTACT_IS_FRIEND, GRAVITY_PARENT, intval($uid)); + LEFT JOIN `user-item` ON `user-item`.`iid` = $master_table_key AND `user-item`.`uid` = %d + LEFT JOIN `user-contact` AS `user-author` ON `user-author`.`cid` = $master_table.`author-id` AND `user-author`.`uid` = %d + LEFT JOIN `user-contact` AS `user-owner` ON `user-owner`.`cid` = $master_table.`owner-id` AND `user-owner`.`uid` = %d", + Contact::SHARING, Contact::FRIEND, GRAVITY_PARENT, intval($uid), intval($uid), intval($uid)); } else { if (strpos($sql_commands, "`contact`.") !== false) { $joins .= "LEFT JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`"; @@ -642,6 +665,10 @@ class Item extends BaseObject $joins .= " LEFT JOIN `item-delivery-data` ON `item-delivery-data`.`iid` = `item`.`id`"; } + if (strpos($sql_commands, "`permissionset`.") !== false) { + $joins .= " LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`"; + } + if ((strpos($sql_commands, "`parent-item`.") !== false) || (strpos($sql_commands, "`parent-author`.") !== false)) { $joins .= " STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`"; } @@ -674,6 +701,10 @@ class Item extends BaseObject $selected[] = 'internal-activity'; } + if (in_array('ignored', $selected)) { + $selected[] = 'internal-user-ignored'; + } + $selection = []; foreach ($fields as $table => $table_fields) { foreach ($table_fields as $field => $select) { @@ -752,12 +783,12 @@ class Item extends BaseObject } // To ensure the data integrity we do it in an transaction - dba::transaction(); + DBA::transaction(); // We cannot simply expand the condition to check for origin entries // The condition needn't to be a simple array but could be a complex condition. // And we have to execute this query before the update to ensure to fetch the same data. - $items = dba::select('item', ['id', 'origin', 'uri', 'created', 'uri-hash', 'iaid', 'icid', 'tag', 'file'], $condition); + $items = DBA::select('item', ['id', 'origin', 'uri', 'created', 'uri-hash', 'iaid', 'icid', 'tag', 'file'], $condition); $content_fields = []; foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) { @@ -799,35 +830,35 @@ class Item extends BaseObject $fields['inform'] = null; if (!empty($fields)) { - $success = dba::update('item', $fields, $condition); + $success = DBA::update('item', $fields, $condition); if (!$success) { - dba::close($items); - dba::rollback(); + DBA::close($items); + DBA::rollback(); return false; } } // When there is no content for the "old" item table, this will count the fetched items - $rows = dba::affected_rows(); + $rows = DBA::affectedRows(); - while ($item = dba::fetch($items)) { + while ($item = DBA::fetch($items)) { // This part here can safely be removed when the legacy fields in the item had been removed if (empty($item['uri-hash']) && !empty($item['uri']) && !empty($item['created'])) { // Fetch the uri-hash from an existing item entry if there is one $item_condition = ["`uri` = ? AND `uri-hash` != ''", $item['uri']]; - $existing = dba::selectfirst('item', ['uri-hash'], $item_condition); - if (DBM::is_result($existing)) { + $existing = DBA::selectfirst('item', ['uri-hash'], $item_condition); + if (DBA::isResult($existing)) { $item['uri-hash'] = $existing['uri-hash']; } else { $item['uri-hash'] = self::itemHash($item['uri'], $item['created']); } - dba::update('item', ['uri-hash' => $item['uri-hash']], ['id' => $item['id']]); - dba::update('item-activity', ['uri-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-hash` = ''", $item['uri']]); - dba::update('item-content', ['uri-plink-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-plink-hash` = ''", $item['uri']]); + DBA::update('item', ['uri-hash' => $item['uri-hash']], ['id' => $item['id']]); + DBA::update('item-activity', ['uri-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-hash` = ''", $item['uri']]); + DBA::update('item-content', ['uri-plink-hash' => $item['uri-hash']], ["`uri` = ? AND `uri-plink-hash` = ''", $item['uri']]); } if (!empty($item['iaid']) || (!empty($content_fields['verb']) && (self::activityToIndex($content_fields['verb']) >= 0))) { @@ -839,8 +870,8 @@ class Item extends BaseObject self::updateActivity($content_fields, $update_condition); if (empty($item['iaid'])) { - $item_activity = dba::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]); - if (DBM::is_result($item_activity)) { + $item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]); + if (DBA::isResult($item_activity)) { $item_fields = ['iaid' => $item_activity['id'], 'icid' => null]; foreach (self::MIXED_CONTENT_FIELDLIST as $field) { if (self::isLegacyMode()) { @@ -849,17 +880,17 @@ class Item extends BaseObject unset($item_fields[$field]); } } - dba::update('item', $item_fields, ['id' => $item['id']]); + DBA::update('item', $item_fields, ['id' => $item['id']]); - if (!empty($item['icid']) && !dba::exists('item', ['icid' => $item['icid']])) { - dba::delete('item-content', ['id' => $item['icid']]); + if (!empty($item['icid']) && !DBA::exists('item', ['icid' => $item['icid']])) { + DBA::delete('item-content', ['id' => $item['icid']]); } } } elseif (!empty($item['icid'])) { - dba::update('item', ['icid' => null], ['id' => $item['id']]); + DBA::update('item', ['icid' => null], ['id' => $item['id']]); - if (!dba::exists('item', ['icid' => $item['icid']])) { - dba::delete('item-content', ['id' => $item['icid']]); + if (!DBA::exists('item', ['icid' => $item['icid']])) { + DBA::delete('item-content', ['id' => $item['icid']]); } } } else { @@ -871,8 +902,8 @@ class Item extends BaseObject self::updateContent($content_fields, $update_condition); if (empty($item['icid'])) { - $item_content = dba::selectFirst('item-content', [], ['uri-plink-hash' => $item['uri-hash']]); - if (DBM::is_result($item_content)) { + $item_content = DBA::selectFirst('item-content', [], ['uri-plink-hash' => $item['uri-hash']]); + if (DBA::isResult($item_content)) { $item_fields = ['icid' => $item_content['id']]; // Clear all fields in the item table that have a content in the item-content table foreach ($item_content as $field => $content) { @@ -884,7 +915,7 @@ class Item extends BaseObject } } } - dba::update('item', $item_fields, ['id' => $item['id']]); + DBA::update('item', $item_fields, ['id' => $item['id']]); } } } @@ -892,14 +923,14 @@ class Item extends BaseObject if (!empty($tags)) { Term::insertFromTagFieldByItemId($item['id'], $tags); if (!empty($item['tag'])) { - dba::update('item', ['tag' => ''], ['id' => $item['id']]); + DBA::update('item', ['tag' => ''], ['id' => $item['id']]); } } if (!empty($files)) { Term::insertFromFileFieldByItemId($item['id'], $files); if (!empty($item['file'])) { - dba::update('item', ['file' => ''], ['id' => $item['id']]); + DBA::update('item', ['file' => ''], ['id' => $item['id']]); } } @@ -914,8 +945,8 @@ class Item extends BaseObject } } - dba::close($items); - dba::commit(); + DBA::close($items); + DBA::commit(); return $rows; } @@ -927,11 +958,11 @@ class Item extends BaseObject */ public static function delete($condition, $priority = PRIORITY_HIGH) { - $items = dba::select('item', ['id'], $condition); - while ($item = dba::fetch($items)) { + $items = self::select(['id'], $condition); + while ($item = self::fetch($items)) { self::deleteById($item['id'], $priority); } - dba::close($items); + DBA::close($items); } /** @@ -946,18 +977,18 @@ class Item extends BaseObject return; } - $items = dba::select('item', ['id', 'uid'], $condition); - while ($item = dba::fetch($items)) { + $items = self::select(['id', 'uid'], $condition); + while ($item = self::fetch($items)) { // "Deleting" global items just means hiding them if ($item['uid'] == 0) { - dba::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true); + DBA::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true); } elseif ($item['uid'] == $uid) { self::deleteById($item['id'], PRIORITY_HIGH); } else { logger('Wrong ownership. Not deleting item ' . $item['id']); } } - dba::close($items); + DBA::close($items); } /** @@ -973,9 +1004,10 @@ class Item extends BaseObject // locate item to be deleted $fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin', 'deleted', 'file', 'resource-id', 'event-id', 'attach', - 'verb', 'object-type', 'object', 'target', 'contact-id']; + 'verb', 'object-type', 'object', 'target', 'contact-id', + 'icid', 'iaid', 'psid']; $item = self::selectFirst($fields, ['id' => $item_id]); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { logger('Item with ID ' . $item_id . " hasn't been found.", LOGGER_DEBUG); return false; } @@ -986,7 +1018,7 @@ class Item extends BaseObject } $parent = self::selectFirst(['origin'], ['id' => $item['parent']]); - if (!DBM::is_result($parent)) { + if (!DBA::isResult($parent)) { $parent = ['origin' => false]; } @@ -1016,7 +1048,7 @@ class Item extends BaseObject * generate a resource-id and therefore aren't intimately linked to the item. */ if (strlen($item['resource-id'])) { - dba::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]); + DBA::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]); } // If item is a link to an event, delete the event. @@ -1028,7 +1060,7 @@ class Item extends BaseObject foreach (explode(", ", $item['attach']) as $attach) { preg_match("|attach/(\d+)|", $attach, $matches); if (is_array($matches) && count($matches) > 1) { - dba::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]); + DBA::delete('attach', ['id' => $matches[1], 'uid' => $item['uid']]); } } @@ -1036,12 +1068,8 @@ class Item extends BaseObject self::deleteTagsFromItem($item); // Set the item to "deleted" - // This erasing of item content is superfluous for items with a matching item-content. - // But for the next time we will still have old content in the item table. - $item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow(), - 'body' => '', 'title' => '', 'content-warning' => '', 'rendered-hash' => '', 'rendered-html' => '', - 'object' => '', 'target' => '', 'tag' => '', 'postopts' => '', 'attach' => '', 'file' => '']; - dba::update('item', $item_fields, ['id' => $item['id']]); + $item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()]; + DBA::update('item', $item_fields, ['id' => $item['id']]); Term::insertFromTagFieldByItemId($item['id'], ''); Term::insertFromFileFieldByItemId($item['id'], ''); @@ -1051,7 +1079,18 @@ class Item extends BaseObject self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority); } - dba::delete('item-delivery-data', ['iid' => $item['id']]); + DBA::delete('item-delivery-data', ['iid' => $item['id']]); + + // We don't delete the item-activity here, since we need some of the data for ActivityPub + + if (!empty($item['icid']) && !self::exists(['icid' => $item['icid'], 'deleted' => false])) { + DBA::delete('item-content', ['id' => $item['icid']], ['cascade' => false]); + } + // When the permission set will be used in photo and events as well, + // this query here needs to be extended. + if (!empty($item['psid']) && !self::exists(['psid' => $item['psid'], 'deleted' => false])) { + DBA::delete('permissionset', ['id' => $item['psid']], ['cascade' => false]); + } // If it's the parent of a comment thread, kill all the kids if ($item['id'] == $item['parent']) { @@ -1070,8 +1109,8 @@ class Item extends BaseObject // When we delete just our local user copy of an item, we have to set a marker to hide it $global_item = self::selectFirst(['id'], ['uri' => $item['uri'], 'uid' => 0, 'deleted' => false]); - if (DBM::is_result($global_item)) { - dba::update('user-item', ['hidden' => true], ['iid' => $global_item['id'], 'uid' => $item['uid']], true); + if (DBA::isResult($global_item)) { + DBA::update('user-item', ['hidden' => true], ['iid' => $global_item['id'], 'uid' => $item['uid']], true); } } @@ -1094,7 +1133,7 @@ class Item extends BaseObject } $i = self::selectFirst(['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]); - if (!DBM::is_result($i)) { + if (!DBA::isResult($i)) { return; } @@ -1165,7 +1204,7 @@ class Item extends BaseObject } elseif (!empty($item['uri'])) { $guid = self::guidFromUri($item['uri'], $prefix_host); } else { - $guid = System::createGUID(32, hash('crc32', $prefix_host)); + $guid = System::createUUID(hash('crc32', $prefix_host)); } return $guid; @@ -1194,8 +1233,8 @@ class Item extends BaseObject // Still missing? Then use the "self" contact of the current user if ($contact_id == 0) { - $self = dba::selectFirst('contact', ['id'], ['self' => true, 'uid' => $item['uid']]); - if (DBM::is_result($self)) { + $self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $item['uid']]); + if (DBA::isResult($self)) { $contact_id = $self["id"]; } } @@ -1204,6 +1243,17 @@ class Item extends BaseObject return $contact_id; } + // This function will finally cover most of the preparation functionality in mod/item.php + public static function prepare(&$item) + { + $data = BBCode::getAttachmentData($item['body']); + if ((preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism", $item['body'], $match, PREG_SET_ORDER) || isset($data["type"])) + && ($posttype != Item::PT_PERSONAL_NOTE)) { + $posttype = Item::PT_PAGE; + $objecttype = ACTIVITY_OBJ_BOOKMARK; + } + } + public static function insert($item, $force_parent = false, $notify = false, $dontcache = false) { $a = get_app(); @@ -1212,8 +1262,8 @@ class Item extends BaseObject if ($notify) { $item['wall'] = 1; $item['origin'] = 1; - $item['network'] = NETWORK_DFRN; - $item['protocol'] = PROTOCOL_DFRN; + $item['network'] = Protocol::DFRN; + $item['protocol'] = Conversation::PARCEL_DFRN; if (is_int($notify)) { $priority = $notify; @@ -1221,12 +1271,15 @@ class Item extends BaseObject $priority = PRIORITY_HIGH; } } else { - $item['network'] = trim(defaults($item, 'network', NETWORK_PHANTOM)); + $item['network'] = trim(defaults($item, 'network', Protocol::PHANTOM)); } $item['guid'] = self::guid($item, $notify); $item['uri'] = notags(trim(defaults($item, 'uri', self::newURI($item['uid'], $item['guid'])))); + // Store URI data + $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]); + // Store conversation data $item = Conversation::insert($item); @@ -1251,7 +1304,7 @@ class Item extends BaseObject // Converting the plink /// @TODO Check if this is really still needed - if ($item['network'] == NETWORK_OSTATUS) { + if ($item['network'] == Protocol::OSTATUS) { if (isset($item['plink'])) { $item['plink'] = OStatus::convertHref($item['plink']); } elseif (isset($item['uri'])) { @@ -1279,8 +1332,8 @@ class Item extends BaseObject // check for create date and expire time $expire_interval = Config::get('system', 'dbclean-expire-days', 0); - $user = dba::selectFirst('user', ['expire'], ['uid' => $uid]); - if (DBM::is_result($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) { + $user = DBA::selectFirst('user', ['expire'], ['uid' => $uid]); + if (DBA::isResult($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) { $expire_interval = $user['expire']; } @@ -1298,12 +1351,12 @@ class Item extends BaseObject * We have to check several networks since Friendica posts could be repeated * via OStatus (maybe Diasporsa as well) */ - if (in_array($item['network'], [NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS, ""])) { + if (in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS, ""])) { $condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?)", trim($item['uri']), $item['uid'], - NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS]; + Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS]; $existing = self::selectFirst(['id', 'network'], $condition); - if (DBM::is_result($existing)) { + if (DBA::isResult($existing)) { // We only log the entries with a different user id than 0. Otherwise we would have too many false positives if ($uid != 0) { logger("Item with uri ".$item['uri']." already existed for user ".$uid." with id ".$existing["id"]." target network ".$existing["network"]." - new network: ".$item['network']); @@ -1314,14 +1367,12 @@ class Item extends BaseObject } // Ensure to always have the same creation date. - $existing = dba::selectfirst('item', ['created', 'uri-hash'], ['uri' => $item['uri']]); - if (DBM::is_result($existing)) { + $existing = self::selectfirst(['created', 'uri-hash'], ['uri' => $item['uri']]); + if (DBA::isResult($existing)) { $item['created'] = $existing['created']; $item['uri-hash'] = $existing['uri-hash']; } - self::addLanguageToItemArray($item); - $item['wall'] = intval(defaults($item, 'wall', 0)); $item['extid'] = trim(defaults($item, 'extid', '')); $item['author-name'] = trim(defaults($item, 'author-name', '')); @@ -1373,6 +1424,8 @@ class Item extends BaseObject return 0; } + self::addLanguageToItemArray($item); + // Items cannot be stored before they happen ... if ($item['created'] > DateTimeFormat::utcNow()) { $item['created'] = DateTimeFormat::utcNow(); @@ -1408,19 +1461,10 @@ class Item extends BaseObject return 0; } - // These fields aren't stored anymore in the item table, they are fetched upon request - unset($item['author-link']); - unset($item['author-name']); - unset($item['author-avatar']); - - unset($item['owner-link']); - unset($item['owner-name']); - unset($item['owner-avatar']); - - if ($item['network'] == NETWORK_PHANTOM) { + if ($item['network'] == Protocol::PHANTOM) { logger('Missing network. Called by: '.System::callstack(), LOGGER_DEBUG); - $item['network'] = NETWORK_DFRN; + $item['network'] = Protocol::DFRN; logger("Set network to " . $item["network"] . " for " . $item["uri"], LOGGER_DEBUG); } @@ -1462,7 +1506,7 @@ class Item extends BaseObject $params = ['order' => ['id' => false]]; $parent = self::selectFirst($fields, $condition, $params); - if (DBM::is_result($parent)) { + if (DBA::isResult($parent)) { // is the new message multi-level threaded? // even though we don't support it now, preserve the info // and re-attach to the conversation parent. @@ -1476,7 +1520,7 @@ class Item extends BaseObject $params = ['order' => ['id' => false]]; $toplevel_parent = self::selectFirst($fields, $condition, $params); - if (DBM::is_result($toplevel_parent)) { + if (DBA::isResult($toplevel_parent)) { $parent = $toplevel_parent; } } @@ -1510,13 +1554,13 @@ class Item extends BaseObject // If its a post from myself then tag the thread as "mention" logger("Checking if parent ".$parent_id." has to be tagged as mention for user ".$item['uid'], LOGGER_DEBUG); - $user = dba::selectFirst('user', ['nickname'], ['uid' => $item['uid']]); - if (DBM::is_result($user)) { + $user = DBA::selectFirst('user', ['nickname'], ['uid' => $item['uid']]); + if (DBA::isResult($user)) { $self = normalise_link(System::baseUrl() . '/profile/' . $user['nickname']); $self_id = Contact::getIdForURL($self, 0, true); logger("'myself' is ".$self_id." for parent ".$parent_id." checking against ".$item['author-id']." and ".$item['owner-id'], LOGGER_DEBUG); if (($item['author-id'] == $self_id) || ($item['owner-id'] == $self_id)) { - dba::update('thread', ['mention' => true], ['iid' => $parent_id]); + DBA::update('thread', ['mention' => true], ['iid' => $parent_id]); logger("tagged thread ".$parent_id." as mention for user ".$self, LOGGER_DEBUG); } } @@ -1539,15 +1583,18 @@ class Item extends BaseObject } } + $item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']); + $item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']); + $condition = ["`uri` = ? AND `network` IN (?, ?) AND `uid` = ?", - $item['uri'], $item['network'], NETWORK_DFRN, $item['uid']]; + $item['uri'], $item['network'], Protocol::DFRN, $item['uid']]; if (self::exists($condition)) { logger('duplicated item with the same uri found. '.print_r($item,true)); return 0; } // On Friendica and Diaspora the GUID is unique - if (in_array($item['network'], [NETWORK_DFRN, NETWORK_DIASPORA])) { + if (in_array($item['network'], [Protocol::DFRN, Protocol::DIASPORA])) { $condition = ['guid' => $item['guid'], 'uid' => $item['uid']]; if (self::exists($condition)) { logger('duplicated item with the same guid found. '.print_r($item,true)); @@ -1568,7 +1615,7 @@ class Item extends BaseObject $item["global"] = true; // Set the global flag on all items if this was a global item entry - dba::update('item', ['global' => true], ['uri' => $item["uri"]]); + self::update(['global' => true], ['uri' => $item["uri"]]); } else { $item["global"] = self::exists(['uid' => 0, 'uri' => $item["uri"]]); } @@ -1637,8 +1684,7 @@ class Item extends BaseObject $files = ''; } - // Creates the permission set - // Currently we only store the data but don't using it + // Creates or assigns the permission set $item['psid'] = PermissionSet::fetchIDForPost($item); // We are doing this outside of the transaction to avoid timing problems @@ -1652,15 +1698,24 @@ class Item extends BaseObject unset($item['postopts']); unset($item['inform']); - dba::transaction(); - $ret = dba::insert('item', $item); + // These fields aren't stored anymore in the item table, they are fetched upon request + unset($item['author-link']); + unset($item['author-name']); + unset($item['author-avatar']); + + unset($item['owner-link']); + unset($item['owner-name']); + unset($item['owner-avatar']); + + DBA::transaction(); + $ret = DBA::insert('item', $item); // When the item was successfully stored we fetch the ID of the item. - if (DBM::is_result($ret)) { - $current_post = dba::lastInsertId(); + if (DBA::isResult($ret)) { + $current_post = DBA::lastInsertId(); } else { // This can happen - for example - if there are locking timeouts. - dba::rollback(); + DBA::rollback(); // Store the data into a spool file so that we can try again later. @@ -1689,26 +1744,26 @@ class Item extends BaseObject if ($current_post == 0) { // This is one of these error messages that never should occur. logger("couldn't find created item - we better quit now."); - dba::rollback(); + DBA::rollback(); return 0; } // How much entries have we created? // We wouldn't need this query when we could use an unique index - but MySQL has length problems with them. - $entries = dba::count('item', ['uri' => $item['uri'], 'uid' => $item['uid'], 'network' => $item['network']]); + $entries = DBA::count('item', ['uri' => $item['uri'], 'uid' => $item['uid'], 'network' => $item['network']]); if ($entries > 1) { // There are duplicates. We delete our just created entry. logger('Duplicated post occurred. uri = ' . $item['uri'] . ' uid = ' . $item['uid']); // Yes, we could do a rollback here - but we are having many users with MyISAM. - dba::delete('item', ['id' => $current_post]); - dba::commit(); + DBA::delete('item', ['id' => $current_post]); + DBA::commit(); return 0; } elseif ($entries == 0) { // This really should never happen since we quit earlier if there were problems. logger("Something is terribly wrong. We haven't found our created entry."); - dba::rollback(); + DBA::rollback(); return 0; } @@ -1720,7 +1775,7 @@ class Item extends BaseObject } // Set parent id - dba::update('item', ['parent' => $parent_id], ['id' => $current_post]); + self::update(['parent' => $parent_id], ['id' => $current_post]); $item['id'] = $current_post; $item['parent'] = $parent_id; @@ -1728,9 +1783,9 @@ class Item extends BaseObject // update the commented timestamp on the parent // Only update "commented" if it is really a comment if (($item['gravity'] != GRAVITY_ACTIVITY) || !Config::get("system", "like_no_comment")) { - dba::update('item', ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]); + self::update(['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]); } else { - dba::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]); + self::update(['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]); } if ($dsprsig) { @@ -1743,14 +1798,14 @@ class Item extends BaseObject logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG); } - dba::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text, + DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text, 'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]); } if (!empty($diaspora_signed_text)) { // Formerly we stored the signed text, the signature and the author in different fields. // We now store the raw data so that we are more flexible. - dba::insert('sign', ['iid' => $current_post, 'signed_text' => $diaspora_signed_text]); + DBA::insert('sign', ['iid' => $current_post, 'signed_text' => $diaspora_signed_text]); } $deleted = self::tagDeliver($item['uid'], $current_post); @@ -1761,7 +1816,7 @@ class Item extends BaseObject */ if (!$deleted && !$dontcache) { $posted_item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $current_post]); - if (DBM::is_result($posted_item)) { + if (DBA::isResult($posted_item)) { if ($notify) { Addon::callHooks('post_local_end', $posted_item); } else { @@ -1782,7 +1837,7 @@ class Item extends BaseObject self::insertDeliveryData($delivery_data); - dba::commit(); + DBA::commit(); /* * Due to deadlock issues with the "term" table we are doing these steps after the commit. @@ -1824,7 +1879,7 @@ class Item extends BaseObject return; } - dba::insert('item-delivery-data', $delivery_data); + DBA::insert('item-delivery-data', $delivery_data); } /** @@ -1839,7 +1894,7 @@ class Item extends BaseObject return; } - dba::update('item-delivery-data', $delivery_data, ['iid' => $id], true); + DBA::update('item-delivery-data', $delivery_data, ['iid' => $id], true); } /** @@ -1856,7 +1911,7 @@ class Item extends BaseObject } $fields = ['uri' => $item['uri'], 'activity' => $activity_index, - 'uri-hash' => $item['uri-hash']]; + 'uri-hash' => $item['uri-hash'], 'uri-id' => $item['uri-id']]; // We just remove everything that is content foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) { @@ -1870,16 +1925,17 @@ class Item extends BaseObject } // Do we already have this content? - $item_activity = dba::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]); - if (DBM::is_result($item_activity)) { + $item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]); + if (DBA::isResult($item_activity)) { $item['iaid'] = $item_activity['id']; logger('Fetched activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')'); - } elseif (dba::insert('item-activity', $fields)) { - $item['iaid'] = dba::lastInsertId(); + } elseif (DBA::insert('item-activity', $fields)) { + $item['iaid'] = DBA::lastInsertId(); logger('Inserted activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')'); } else { // This shouldn't happen. logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen'); + Lock::release('item_insert_activity'); return false; } if ($locked) { @@ -1895,7 +1951,8 @@ class Item extends BaseObject */ private static function insertContent(&$item) { - $fields = ['uri' => $item['uri'], 'uri-plink-hash' => $item['uri-hash']]; + $fields = ['uri' => $item['uri'], 'uri-plink-hash' => $item['uri-hash'], + 'uri-id' => $item['uri-id']]; foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) { if (isset($item[$field])) { @@ -1911,12 +1968,12 @@ class Item extends BaseObject } // Do we already have this content? - $item_content = dba::selectFirst('item-content', ['id'], ['uri-plink-hash' => $item['uri-hash']]); - if (DBM::is_result($item_content)) { + $item_content = DBA::selectFirst('item-content', ['id'], ['uri-plink-hash' => $item['uri-hash']]); + if (DBA::isResult($item_content)) { $item['icid'] = $item_content['id']; logger('Fetched content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')'); - } elseif (dba::insert('item-content', $fields)) { - $item['icid'] = dba::lastInsertId(); + } elseif (DBA::insert('item-content', $fields)) { + $item['icid'] = DBA::lastInsertId(); logger('Inserted content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')'); } else { // This shouldn't happen. @@ -1948,7 +2005,7 @@ class Item extends BaseObject logger('Update activity for ' . json_encode($condition)); - dba::update('item-activity', $fields, $condition, true); + DBA::update('item-activity', $fields, $condition, true); return true; } @@ -1977,7 +2034,7 @@ class Item extends BaseObject logger('Update content for ' . json_encode($condition)); - dba::update('item-content', $fields, $condition, true); + DBA::update('item-content', $fields, $condition, true); } /** @@ -1990,16 +2047,16 @@ class Item extends BaseObject { $condition = ["`id` IN (SELECT `parent` FROM `item` WHERE `id` = ?)", $itemid]; $parent = self::selectFirst(['owner-id'], $condition); - if (!DBM::is_result($parent)) { + if (!DBA::isResult($parent)) { return; } // Only distribute public items from native networks $condition = ['id' => $itemid, 'uid' => 0, - 'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""], + 'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""], 'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false]; $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { return; } @@ -2014,18 +2071,52 @@ class Item extends BaseObject $users = []; - $condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)", - $parent['owner-id'], CONTACT_IS_SHARING, CONTACT_IS_FRIEND]; - $contacts = dba::select('contact', ['uid'], $condition); - while ($contact = dba::fetch($contacts)) { + /// @todo add a field "pcid" in the contact table that referrs to the public contact id. + $owner = DBA::selectFirst('contact', ['url', 'nurl', 'alias'], ['id' => $parent['owner-id']]); + if (!DBA::isResult($owner)) { + return; + } + + $condition = ['nurl' => $owner['nurl'], 'rel' => [Contact::SHARING, Contact::FRIEND]]; + $contacts = DBA::select('contact', ['uid'], $condition); + while ($contact = DBA::fetch($contacts)) { + if ($contact['uid'] == 0) { + continue; + } + $users[$contact['uid']] = $contact['uid']; } + DBA::close($contacts); + + $condition = ['alias' => $owner['url'], 'rel' => [Contact::SHARING, Contact::FRIEND]]; + $contacts = DBA::select('contact', ['uid'], $condition); + while ($contact = DBA::fetch($contacts)) { + if ($contact['uid'] == 0) { + continue; + } + + $users[$contact['uid']] = $contact['uid']; + } + DBA::close($contacts); + + if (!empty($owner['alias'])) { + $condition = ['url' => $owner['alias'], 'rel' => [Contact::SHARING, Contact::FRIEND]]; + $contacts = DBA::select('contact', ['uid'], $condition); + while ($contact = DBA::fetch($contacts)) { + if ($contact['uid'] == 0) { + continue; + } + + $users[$contact['uid']] = $contact['uid']; + } + DBA::close($contacts); + } $origin_uid = 0; if ($item['uri'] != $item['parent-uri']) { $parents = self::select(['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]); - while ($parent = dba::fetch($parents)) { + while ($parent = self::fetch($parents)) { $users[$parent['uid']] = $parent['uid']; if ($parent['origin'] && !$origin) { $origin_uid = $parent['uid']; @@ -2060,8 +2151,8 @@ class Item extends BaseObject } if (empty($item['contact-id'])) { - $self = dba::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]); - if (!DBM::is_result($self)) { + $self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]); + if (!DBA::isResult($self)) { return; } $item['contact-id'] = $self['id']; @@ -2071,8 +2162,8 @@ class Item extends BaseObject $notify = false; if ($item['uri'] == $item['parent-uri']) { - $contact = dba::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]); - if (DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]); + if (DBA::isResult($contact)) { $notify = self::isRemoteSelf($contact, $item); } } @@ -2101,7 +2192,7 @@ class Item extends BaseObject $condition = ['id' => $itemid, 'parent' => [0, $itemid]]; $item = self::selectFirst($fields, $condition); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { return; } @@ -2116,7 +2207,7 @@ class Item extends BaseObject } // is it an entry from a connector? Only add an entry for natively connected networks - if (!in_array($item["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) { + if (!in_array($item["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) { return; } @@ -2126,7 +2217,7 @@ class Item extends BaseObject $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { // Preparing public shadow (removing user specific data) $item['uid'] = 0; unset($item['id']); @@ -2159,7 +2250,7 @@ class Item extends BaseObject public static function addShadowPost($itemid) { $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { return; } @@ -2206,7 +2297,7 @@ class Item extends BaseObject // If this was a comment to a Diaspora post we don't get our comment back. // This means that we have to distribute the comment by ourselves. - if ($origin && self::exists(['id' => $parent, 'network' => NETWORK_DIASPORA])) { + if ($origin && self::exists(['id' => $parent, 'network' => Protocol::DIASPORA])) { self::distribute($public_shadow); } } @@ -2267,16 +2358,10 @@ class Item extends BaseObject public static function newURI($uid, $guid = "") { if ($guid == "") { - $guid = System::createGUID(32); + $guid = System::createUUID(); } - $hostname = self::getApp()->get_hostname(); - - $user = dba::selectFirst('user', ['nickname'], ['uid' => $uid]); - - $uri = "urn:X-dfrn:" . $hostname . ':' . $user['nickname'] . ':' . $guid; - - return $uri; + return self::getApp()->get_baseurl() . '/objects/' . $guid; } /** @@ -2291,37 +2376,37 @@ class Item extends BaseObject private static function updateContact($arr) { // Unarchive the author - $contact = dba::selectFirst('contact', [], ['id' => $arr["author-id"]]); - if (DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', [], ['id' => $arr["author-id"]]); + if (DBA::isResult($contact)) { Contact::unmarkForArchival($contact); } // Unarchive the contact if it's not our own contact - $contact = dba::selectFirst('contact', [], ['id' => $arr["contact-id"], 'self' => false]); - if (DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', [], ['id' => $arr["contact-id"], 'self' => false]); + if (DBA::isResult($contact)) { Contact::unmarkForArchival($contact); } $update = (!$arr['private'] && ((defaults($arr, 'author-link', '') === defaults($arr, 'owner-link', '')) || ($arr["parent-uri"] === $arr["uri"]))); // Is it a forum? Then we don't care about the rules from above - if (!$update && ($arr["network"] == NETWORK_DFRN) && ($arr["parent-uri"] === $arr["uri"])) { - if (dba::exists('contact', ['id' => $arr['contact-id'], 'forum' => true])) { + if (!$update && ($arr["network"] == Protocol::DFRN) && ($arr["parent-uri"] === $arr["uri"])) { + if (DBA::exists('contact', ['id' => $arr['contact-id'], 'forum' => true])) { $update = true; } } if ($update) { - dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], + DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], ['id' => $arr['contact-id']]); } // Now do the same for the system wide contacts with uid=0 if (!$arr['private']) { - dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], + DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], ['id' => $arr['owner-id']]); if ($arr['owner-id'] != $arr['author-id']) { - dba::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], + DBA::update('contact', ['success_update' => $arr['received'], 'last-item' => $arr['received']], ['id' => $arr['author-id']]); } } @@ -2398,13 +2483,19 @@ class Item extends BaseObject public static function getGuidById($id) { $item = self::selectFirst(['guid'], ['id' => $id]); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { return $item['guid']; } else { return ''; } } + /** + * This function is only used for the old Friendica app on Android that doesn't like paths with guid + * @param string $guid item guid + * @param int $uid user id + * @return array with id and nick of the item with the given guid + */ public static function getIdAndNickByGuid($guid, $uid = 0) { $nick = ""; @@ -2416,26 +2507,28 @@ class Item extends BaseObject // Does the given user have this item? if ($uid) { - $item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item` - INNER JOIN `user` ON `user`.`uid` = `item`.`uid` - WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND `item`.`guid` = ? AND `item`.`uid` = ?", $guid, $uid); - if (DBM::is_result($item)) { - $id = $item["id"]; - $nick = $item["nickname"]; + $item = self::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]); + if (DBA::isResult($item)) { + $user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]); + if (!DBA::isResult($user)) { + return; + } + $id = $item['id']; + $nick = $user['nickname']; } } // Or is it anywhere on the server? if ($nick == "") { - $item = dba::fetch_first("SELECT `item`.`id`, `user`.`nickname` FROM `item` - INNER JOIN `user` ON `user`.`uid` = `item`.`uid` - WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND NOT `item`.`private` AND `item`.`wall` - AND `item`.`guid` = ?", $guid); - if (DBM::is_result($item)) { - $id = $item["id"]; - $nick = $item["nickname"]; + $condition = ["`guid` = ? AND `uid` != 0", $guid]; + $item = self::selectFirst(['id', 'uid'], $condition); + if (DBA::isResult($item)) { + $user = DBA::selectFirst('user', ['nickname'], ['uid' => $item['uid']]); + if (!DBA::isResult($user)) { + return; + } + $id = $item['id']; + $nick = $user['nickname']; } } return ["nick" => $nick, "id" => $id]; @@ -2451,16 +2544,16 @@ class Item extends BaseObject { $mention = false; - $user = dba::selectFirst('user', [], ['uid' => $uid]); - if (!DBM::is_result($user)) { + $user = DBA::selectFirst('user', [], ['uid' => $uid]); + if (!DBA::isResult($user)) { return; } - $community_page = (($user['page-flags'] == PAGE_COMMUNITY) ? true : false); - $prvgroup = (($user['page-flags'] == PAGE_PRVGROUP) ? true : false); + $community_page = (($user['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false); + $prvgroup = (($user['page-flags'] == Contact::PAGE_PRVGROUP) ? true : false); $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { return; } @@ -2488,7 +2581,7 @@ class Item extends BaseObject // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment) // delete it! logger("no-mention top-level post to community or private group. delete."); - dba::delete('item', ['id' => $item_id]); + DBA::delete('item', ['id' => $item_id]); return true; } return; @@ -2512,8 +2605,8 @@ class Item extends BaseObject } // now change this copy of the post to a forum head message and deliver to all the tgroup members - $self = dba::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]); - if (!DBM::is_result($self)) { + $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]); + if (!DBA::isResult($self)) { return; } @@ -2523,12 +2616,13 @@ class Item extends BaseObject $private = ($user['allow_cid'] || $user['allow_gid'] || $user['deny_cid'] || $user['deny_gid']) ? 1 : 0; + $psid = PermissionSet::fetchIDForPost($user); + $forum_mode = ($prvgroup ? 2 : 1); $fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'], - 'owner-id' => $owner_id, 'owner-link' => $self['url'], 'private' => $private, 'allow_cid' => $user['allow_cid'], - 'allow_gid' => $user['allow_gid'], 'deny_cid' => $user['deny_cid'], 'deny_gid' => $user['deny_gid']]; - dba::update('item', $fields, ['id' => $item_id]); + 'owner-id' => $owner_id, 'private' => $private, 'psid' => $psid]; + self::update($fields, ['id' => $item_id]); self::updateThread($item_id); @@ -2544,7 +2638,7 @@ class Item extends BaseObject } // Prevent the forwarding of posts that are forwarded - if (!empty($datarray["extid"]) && ($datarray["extid"] == NETWORK_DFRN)) { + if (!empty($datarray["extid"]) && ($datarray["extid"] == Protocol::DFRN)) { logger('Already forwarded', LOGGER_DEBUG); return false; } @@ -2561,7 +2655,7 @@ class Item extends BaseObject return false; } - if (($contact['network'] != NETWORK_FEED) && $datarray['private']) { + if (($contact['network'] != Protocol::FEED) && $datarray['private']) { logger('Not public', LOGGER_DEBUG); return false; } @@ -2569,9 +2663,9 @@ class Item extends BaseObject $datarray2 = $datarray; logger('remote-self start - Contact '.$contact['url'].' - '.$contact['remote_self'].' Item '.print_r($datarray, true), LOGGER_DEBUG); if ($contact['remote_self'] == 2) { - $self = dba::selectFirst('contact', ['id', 'name', 'url', 'thumb'], + $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $contact['uid'], 'self' => true]); - if (DBM::is_result($self)) { + if (DBA::isResult($self)) { $datarray['contact-id'] = $self["id"]; $datarray['owner-name'] = $self["name"]; @@ -2590,13 +2684,13 @@ class Item extends BaseObject unset($datarray['author-id']); } - if ($contact['network'] != NETWORK_FEED) { - $datarray["guid"] = System::createGUID(32); + if ($contact['network'] != Protocol::FEED) { + $datarray["guid"] = System::createUUID(); unset($datarray["plink"]); $datarray["uri"] = self::newURI($contact['uid'], $datarray["guid"]); $datarray["parent-uri"] = $datarray["uri"]; $datarray["thr-parent"] = $datarray["uri"]; - $datarray["extid"] = NETWORK_DFRN; + $datarray["extid"] = Protocol::DFRN; $urlpart = parse_url($datarray2['author-link']); $datarray["app"] = $urlpart["host"]; } else { @@ -2604,7 +2698,7 @@ class Item extends BaseObject } } - if ($contact['network'] != NETWORK_FEED) { + if ($contact['network'] != Protocol::FEED) { // Store the original post $result = self::insert($datarray2, false, false); logger('remote-self post original item - Contact '.$contact['url'].' return '.$result.' Item '.print_r($datarray2, true), LOGGER_DEBUG); @@ -2664,8 +2758,8 @@ class Item extends BaseObject $res = substr($i, $x + 1); $i = substr($i, 0, $x); $fields = ['data', 'type', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']; - $photo = dba::selectFirst('photo', $fields, ['resource-id' => $i, 'scale' => $res, 'uid' => $uid]); - if (DBM::is_result($photo)) { + $photo = DBA::selectFirst('photo', $fields, ['resource-id' => $i, 'scale' => $res, 'uid' => $uid]); + if (DBA::isResult($photo)) { /* * Check to see if we should replace this photo link with an embedded image * 1. No need to do so if the photo is public @@ -2757,7 +2851,7 @@ class Item extends BaseObject } // returns an array of contact-ids that are allowed to see this object - private static function enumeratePermissions($obj) + public static function enumeratePermissions($obj) { $allow_people = expand_acl($obj['allow_cid']); $allow_groups = Group::expand(expand_acl($obj['allow_gid'])); @@ -2828,9 +2922,9 @@ class Item extends BaseObject $condition[] = $days; } - $items = self::select(['file', 'resource-id', 'starred', 'type', 'id'], $condition); + $items = self::select(['file', 'resource-id', 'starred', 'type', 'id', 'post-type'], $condition); - if (!DBM::is_result($items)) { + if (!DBA::isResult($items)) { return; } @@ -2860,9 +2954,9 @@ class Item extends BaseObject continue; } elseif (!$expire_starred && intval($item['starred'])) { continue; - } elseif (!$expire_notes && $item['type'] == 'note') { + } elseif (!$expire_notes && (($item['type'] == 'note') || ($item['post-type'] == Item::PT_PERSONAL_NOTE))) { continue; - } elseif (!$expire_items && $item['type'] != 'note') { + } elseif (!$expire_items && ($item['type'] != 'note') && ($item['post-type'] != Item::PT_PERSONAL_NOTE)) { continue; } @@ -2870,7 +2964,7 @@ class Item extends BaseObject ++$expired; } - dba::close($items); + DBA::close($items); logger('User ' . $uid . ": expired $expired items; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos"); } @@ -2878,8 +2972,8 @@ class Item extends BaseObject { $condition = ['uid' => $uid, 'wall' => $wall, 'deleted' => false, 'visible' => true, 'moderated' => false]; $params = ['order' => ['created' => false]]; - $thread = dba::selectFirst('thread', ['created'], $condition, $params); - if (DBM::is_result($thread)) { + $thread = DBA::selectFirst('thread', ['created'], $condition, $params); + if (DBA::isResult($thread)) { return substr(DateTimeFormat::local($thread['created']), 0, 10); } return false; @@ -2937,7 +3031,7 @@ class Item extends BaseObject logger('like: verb ' . $verb . ' item ' . $item_id); $item = self::selectFirst(self::ITEM_FIELDLIST, ['`id` = ? OR `uri` = ?', $item_id, $item_id]); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { logger('like: unknown item ' . $item_id); return false; } @@ -2955,8 +3049,8 @@ class Item extends BaseObject } // Retrieves the local post owner - $owner_self_contact = dba::selectFirst('contact', [], ['uid' => $uid, 'self' => true]); - if (!DBM::is_result($owner_self_contact)) { + $owner_self_contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'self' => true]); + if (!DBA::isResult($owner_self_contact)) { logger('like: unknown owner ' . $uid); return false; } @@ -2964,8 +3058,8 @@ class Item extends BaseObject // Retrieve the current logged in user's public contact $author_id = public_contact(); - $author_contact = dba::selectFirst('contact', ['url'], ['id' => $author_id]); - if (!DBM::is_result($author_contact)) { + $author_contact = DBA::selectFirst('contact', ['url'], ['id' => $author_id]); + if (!DBA::isResult($author_contact)) { logger('like: unknown author ' . $author_id); return false; } @@ -2976,8 +3070,8 @@ class Item extends BaseObject $item_contact = $owner_self_contact; } else { $item_contact_id = Contact::getIdForURL($author_contact['url'], $uid, true); - $item_contact = dba::selectFirst('contact', [], ['id' => $item_contact_id]); - if (!DBM::is_result($item_contact)) { + $item_contact = DBA::selectFirst('contact', [], ['id' => $item_contact_id]); + if (!DBA::isResult($item_contact)) { logger('like: unknown item contact ' . $item_contact_id); return false; } @@ -3004,16 +3098,8 @@ class Item extends BaseObject $like_item = self::selectFirst(['id', 'guid', 'verb'], $condition); // If it exists, mark it as deleted - if (DBM::is_result($like_item)) { - // Already voted, undo it - $fields = ['deleted' => true, 'unseen' => true, 'changed' => DateTimeFormat::utcNow()]; - /// @todo Consider using self::update - but before doing so, check the side effects - dba::update('item', $fields, ['id' => $like_item['id']]); - - // Clean up the Diaspora signatures for this like - dba::delete('sign', ['iid' => $like_item['id']]); - - Worker::add(PRIORITY_HIGH, "Notifier", "like", $like_item['id']); + if (DBA::isResult($like_item)) { + self::deleteById($like_item['id']); if (!$event_verb_flag || $like_item['verb'] == $activity) { return true; @@ -3028,13 +3114,13 @@ class Item extends BaseObject $objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ; $new_item = [ - 'guid' => System::createGUID(32), + 'guid' => System::createUUID(), 'uri' => self::newURI($item['uid']), 'uid' => $item['uid'], 'contact-id' => $item_contact_id, 'wall' => $item['wall'], 'origin' => 1, - 'network' => NETWORK_DFRN, + 'network' => Protocol::DFRN, 'gravity' => GRAVITY_ACTIVITY, 'parent' => $item['id'], 'parent-uri' => $item['uri'], @@ -3079,14 +3165,14 @@ class Item extends BaseObject $condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid]; $item = self::selectFirst($fields, $condition); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { return; } $item['iid'] = $itemid; if (!$onlyshadow) { - $result = dba::insert('thread', $item); + $result = DBA::insert('thread', $item); logger("Add thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG); } @@ -3100,7 +3186,7 @@ class Item extends BaseObject $condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid]; $item = self::selectFirst($fields, $condition); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { return; } @@ -3118,28 +3204,27 @@ class Item extends BaseObject } } - $result = dba::update('thread', $fields, ['iid' => $itemid]); + $result = DBA::update('thread', $fields, ['iid' => $itemid]); logger("Update thread for item ".$itemid." - guid ".$item["guid"]." - ".(int)$result, LOGGER_DEBUG); } private static function deleteThread($itemid, $itemuri = "") { - $item = dba::selectFirst('thread', ['uid'], ['iid' => $itemid]); - if (!DBM::is_result($item)) { + $item = DBA::selectFirst('thread', ['uid'], ['iid' => $itemid]); + if (!DBA::isResult($item)) { logger('No thread found for id '.$itemid, LOGGER_DEBUG); return; } - // Using dba::delete at this time could delete the associated item entries - $result = dba::e("DELETE FROM `thread` WHERE `iid` = ?", $itemid); + $result = DBA::delete('thread', ['iid' => $itemid], ['cascade' => false]); logger("deleteThread: Deleted thread for item ".$itemid." - ".print_r($result, true), LOGGER_DEBUG); if ($itemuri != "") { $condition = ["`uri` = ? AND NOT `deleted` AND NOT (`uid` IN (?, 0))", $itemuri, $item["uid"]]; if (!self::exists($condition)) { - dba::delete('item', ['uri' => $itemuri, 'uid' => 0]); + DBA::delete('item', ['uri' => $itemuri, 'uid' => 0]); logger("deleteThread: Deleted shadow for item ".$itemuri, LOGGER_DEBUG); } }