namespace Friendica\Model;
-use dba;
use Friendica\BaseObject;
-use Friendica\Content\Text;
+use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
use Friendica\Core\Lock;
use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
-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;
class Item extends BaseObject
{
+ // Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types
+ const PT_ARTICLE = 0;
+ const PT_NOTE = 1;
+ const PT_PAGE = 2;
+ const PT_IMAGE = 16;
+ const PT_AUDIO = 17;
+ const PT_VIDEO = 18;
+ const PT_DOCUMENT = 19;
+ const PT_EVENT = 32;
+ const PT_PERSONAL_NOTE = 128;
+
// Field list that is used to display the items
const DISPLAY_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network',
'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid',
'created', 'edited', 'verb', 'object-type', 'object', 'target',
'private', 'title', 'body', 'location', 'coord', 'app',
- 'attach', 'tag', 'bookmark', 'deleted', 'extid',
+ 'attach', 'tag', 'deleted', 'extid', 'post-type',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'author-id', 'author-link', 'owner-link', 'contact-uid',
'signed_text', 'signature', 'signer', 'network'];
// Field list for "item-content" table that is not present in the "item" table
const CONTENT_FIELDLIST = ['language'];
+ // Field list for additional delivery data
+ const DELIVERY_DATA_FIELDLIST = ['postopts', 'inform'];
+
// 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',
- 'created', 'edited', 'commented', 'received', 'changed', 'verb',
+ 'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
+ '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',
+ 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'network',
'title', 'content-warning', 'body', 'location', 'coord', 'app',
'rendered-hash', 'rendered-html', 'object-type', 'object', 'target-type', 'target',
'author-id', 'author-link', 'author-name', 'author-avatar',
- 'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'emailcc'];
+ 'owner-id', 'owner-link', 'owner-name', 'owner-avatar'];
// Never reorder or remove entries from this list. Just add new ones at the end, if needed.
// The item-activity table only stores the index and needs this array to know the matching activity.
public static function isLegacyMode()
{
if (is_null(self::$legacy_mode)) {
- self::$legacy_mode = (Config::get("system", "post_update_version") < 1276);
+ self::$legacy_mode = (Config::get("system", "post_update_version") < 1279);
}
return self::$legacy_mode;
* @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);
*/
public static function fetch($stmt)
{
- $row = dba::fetch($stmt);
+ $row = DBA::fetch($stmt);
if (is_bool($row)) {
return $row;
// 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;
}
// Fetch data from the item-content table whenever there is content there
if (self::isLegacyMode()) {
- foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
+ $legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+ foreach ($legacy_fields as $field) {
if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
$row[$field] = $row['internal-item-' . $field];
}
}
}
+ if (array_key_exists('signed_text', $row) && array_key_exists('interaction', $row) && !is_null($row['interaction'])) {
+ $row['signed_text'] = $row['interaction'];
+ }
+
+ 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']);
+ unset($row['interaction']);
return $row;
}
$data[] = $row;
}
if ($do_close) {
- dba::close($stmt);
+ DBA::close($stmt);
}
return $data;
}
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;
}
* @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 = [])
{
* @param array $condition
* @param array $params
* @return bool|array
- * @see dba::select
+ * @see DBA::select
*/
public static function selectFirst(array $fields = [], array $condition = [], $params = [])
{
return $result;
} else {
$row = self::fetch($result);
- dba::close($result);
+ DBA::close($result);
return $row;
}
}
$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);
$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);
}
/**
* @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 = [])
{
* @param array $condition
* @param array $params
* @return bool|array
- * @see dba::select
+ * @see DBA::select
*/
public static function selectFirstThread(array $fields = [], array $condition = [], $params = [])
{
return $result;
} else {
$row = self::fetch($result);
- dba::close($result);
+ DBA::close($result);
return $row;
}
}
$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',
- 'pubmail', 'moderated', 'visible', 'starred', 'ignored', 'bookmark',
+ 'pubmail', 'moderated', 'visible', 'starred', 'ignored', 'post-type',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'network']];
$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);
$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);
$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
- return dba::p($sql, $condition);
+ return DBA::p($sql, $condition);
}
/**
*
* @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', 'postopts',
- 'resource-id', 'event-id', 'tag', 'attach', 'inform',
- 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+ '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'];
$fields['sign'] = ['signed_text', 'signature', 'signer'];
+ $fields['diaspora-interaction'] = ['interaction'];
+
return $fields;
}
} 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);
}
/**
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`";
$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`";
+ }
+
if (strpos($sql_commands, "`item-activity`.") !== false) {
$joins .= " LEFT JOIN `item-activity` ON `item-activity`.`id` = `item`.`iaid`";
}
$joins .= " LEFT JOIN `item-content` ON `item-content`.`id` = `item`.`icid`";
}
+ if (strpos($sql_commands, "`item-delivery-data`.") !== false) {
+ $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`";
}
$selected[] = 'internal-activity';
}
+ if (in_array('ignored', $selected)) {
+ $selected[] = 'internal-user-ignored';
+ }
+
+ if (in_array('signed_text', $selected)) {
+ $selected[] = 'interaction';
+ }
+
$selection = [];
foreach ($fields as $table => $table_fields) {
foreach ($table_fields as $field => $select) {
if (empty($selected) || in_array($select, $selected)) {
- if (self::isLegacyMode() && in_array($select, self::MIXED_CONTENT_FIELDLIST)) {
+ $legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+ if (self::isLegacyMode() && in_array($select, $legacy_fields)) {
$selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`";
}
if (is_int($field)) {
}
// 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) {
}
}
- $author_owner_fields = ['author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link'];
- foreach ($author_owner_fields as $field) {
+ $clear_fields = ['bookmark', 'type', 'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link'];
+ foreach ($clear_fields as $field) {
if (array_key_exists($field, $fields)) {
$fields[$field] = null;
}
$files = '';
}
+ $delivery_data = ['postopts' => defaults($fields, 'postopts', ''),
+ 'inform' => defaults($fields, 'inform', '')];
+
+ $fields['postopts'] = null;
+ $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))) {
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()) {
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 {
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) {
}
}
}
- dba::update('item', $item_fields, ['id' => $item['id']]);
+ DBA::update('item', $item_fields, ['id' => $item['id']]);
}
}
}
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']]);
}
}
+ self::updateDeliveryData($item['id'], $delivery_data);
+
self::updateThread($item['id']);
// We only need to notfiy others when it is an original entry from us.
}
}
- dba::close($items);
- dba::commit();
+ DBA::close($items);
+ DBA::commit();
return $rows;
}
*/
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);
}
/**
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);
}
/**
// 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;
}
}
$parent = self::selectFirst(['origin'], ['id' => $item['parent']]);
- if (!DBM::is_result($parent)) {
+ if (!DBA::isResult($parent)) {
$parent = ['origin' => false];
}
* 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.
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']]);
}
}
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'], '');
self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
}
+ 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']) {
self::delete(['parent' => $item['parent'], 'deleted' => false], $priority);
// 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);
}
}
}
$i = self::selectFirst(['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
- if (!DBM::is_result($i)) {
+ if (!DBA::isResult($i)) {
return;
}
if ($notify) {
// We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri.
// We add the hash of our own host because our host is the original creator of the post.
- $prefix_host = get_app()->get_hostname();
+ $prefix_host = get_app()->getHostName();
} else {
$prefix_host = '';
} 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;
// 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"];
}
}
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();
// If it is a posting where users should get notifications, then define it as wall posting
if ($notify) {
$item['wall'] = 1;
- $item['type'] = 'wall';
$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;
$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);
*/
$dsprsig = null;
- if (x($item, 'dsprsig')) {
+ if (isset($item['dsprsig'])) {
$encoded_signature = $item['dsprsig'];
$dsprsig = json_decode(base64_decode($item['dsprsig']));
unset($item['dsprsig']);
}
- if (!empty($item['diaspora_signed_text'])) {
+ $diaspora_signed_text = '';
+ if (isset($item['diaspora_signed_text'])) {
$diaspora_signed_text = $item['diaspora_signed_text'];
unset($item['diaspora_signed_text']);
- } else {
- $diaspora_signed_text = '';
}
// 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'])) {
$item['parent-uri'] = $item['thr-parent'];
}
- $item['type'] = defaults($item, 'type', 'remote');
-
if (isset($item['gravity'])) {
$item['gravity'] = intval($item['gravity']);
} elseif ($item['parent-uri'] === $item['uri']) {
$item['gravity'] = GRAVITY_PARENT;
} elseif (activity_match($item['verb'], ACTIVITY_POST)) {
$item['gravity'] = GRAVITY_COMMENT;
- } elseif ($item['type'] == 'activity') {
- $item['gravity'] = GRAVITY_ACTIVITY;
} else {
$item['gravity'] = GRAVITY_UNKNOWN; // Should not happen
- logger('Unknown gravity for verb: ' . $item['verb'] . ' - type: ' . $item['type'], LOGGER_DEBUG);
+ logger('Unknown gravity for verb: ' . $item['verb'], LOGGER_DEBUG);
}
$uid = intval($item['uid']);
// 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'];
}
* 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']);
}
// 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', ''));
$item['visible'] = ((x($item, 'visible') !== false) ? intval($item['visible']) : 1);
$item['deleted'] = 0;
$item['parent-uri'] = trim(defaults($item, 'parent-uri', $item['uri']));
+ $item['post-type'] = defaults($item, 'post-type', self::PT_ARTICLE);
$item['verb'] = trim(defaults($item, 'verb', ''));
$item['object-type'] = trim(defaults($item, 'object-type', ''));
$item['object'] = trim(defaults($item, 'object', ''));
$item['deny_cid'] = trim(defaults($item, 'deny_cid', ''));
$item['deny_gid'] = trim(defaults($item, 'deny_gid', ''));
$item['private'] = intval(defaults($item, 'private', 0));
- $item['bookmark'] = intval(defaults($item, 'bookmark', 0));
$item['body'] = trim(defaults($item, 'body', ''));
$item['tag'] = trim(defaults($item, 'tag', ''));
$item['attach'] = trim(defaults($item, 'attach', ''));
return 0;
}
+ self::addLanguageToItemArray($item);
+
// Items cannot be stored before they happen ...
if ($item['created'] > DateTimeFormat::utcNow()) {
$item['created'] = DateTimeFormat::utcNow();
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);
}
$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.
$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;
}
}
// 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);
}
}
}
}
+ $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));
$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"]]);
}
$files = '';
}
+ // Creates or assigns the permission set
+ $item['psid'] = PermissionSet::fetchIDForPost($item);
+
// We are doing this outside of the transaction to avoid timing problems
if (!self::insertActivity($item)) {
self::insertContent($item);
}
- dba::transaction();
- $ret = dba::insert('item', $item);
+ $delivery_data = ['postopts' => defaults($item, 'postopts', ''),
+ 'inform' => defaults($item, 'inform', '')];
+
+ unset($item['postopts']);
+ unset($item['inform']);
+
+ // 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.
$spoolpath = get_spoolpath();
if ($spoolpath != "") {
$spool = $spoolpath.'/'.$file;
+
+ // Ensure to have the removed data from above again in the item array
+ $item = array_merge($item, $delivery_data);
+
file_put_contents($spool, json_encode($item));
logger("Item wasn't stored - Item was spooled into file ".$file, LOGGER_DEBUG);
}
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;
}
}
// 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;
// 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) {
logger("Repaired double encoded signature from handle ".$dsprsig->signer, LOGGER_DEBUG);
}
- dba::insert('sign', ['iid' => $current_post, 'signed_text' => $dsprsig->signed_text,
- 'signature' => $dsprsig->signature, 'signer' => $dsprsig->signer]);
+ 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]);
+ }
}
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('diaspora-interaction', ['uri-id' => $item['uri-id'], 'interaction' => $diaspora_signed_text], true);
}
$deleted = self::tagDeliver($item['uid'], $current_post);
*/
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 {
self::updateThread($parent_id);
}
- dba::commit();
+ $delivery_data['iid'] = $current_post;
+
+ self::insertDeliveryData($delivery_data);
+
+ DBA::commit();
/*
* Due to deadlock issues with the "term" table we are doing these steps after the commit.
return $current_post;
}
+ /**
+ * @brief Insert a new item delivery data entry
+ *
+ * @param array $item The item fields that are to be inserted
+ */
+ private static function insertDeliveryData($delivery_data)
+ {
+ if (empty($delivery_data['iid']) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
+ return;
+ }
+
+ DBA::insert('item-delivery-data', $delivery_data);
+ }
+
+ /**
+ * @brief Update an existing item delivery data entry
+ *
+ * @param integer $id The item id that is to be updated
+ * @param array $item The item fields that are to be inserted
+ */
+ private static function updateDeliveryData($id, $delivery_data)
+ {
+ if (empty($id) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
+ return;
+ }
+
+ DBA::update('item-delivery-data', $delivery_data, ['iid' => $id], true);
+ }
+
/**
* @brief Insert a new item content entry
*
}
$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) {
}
// 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) {
*/
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])) {
}
// 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.
logger('Update activity for ' . json_encode($condition));
- dba::update('item-activity', $fields, $condition, true);
+ DBA::update('item-activity', $fields, $condition, true);
return true;
}
logger('Update content for ' . json_encode($condition));
- dba::update('item-content', $fields, $condition, true);
+ DBA::update('item-content', $fields, $condition, true);
}
/**
{
$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;
}
$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'];
}
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'];
}
- if (in_array($item['type'], ["net-comment", "wall-comment"])) {
- $item['type'] = 'remote-comment';
- } elseif ($item['type'] == 'wall') {
- $item['type'] = 'remote';
- }
-
/// @todo Handling of "event-id"
$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);
}
}
$condition = ['id' => $itemid, 'parent' => [0, $itemid]];
$item = self::selectFirst($fields, $condition);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
return;
}
}
// 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;
}
$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']);
unset($item['mention']);
unset($item['origin']);
unset($item['starred']);
+ unset($item['postopts']);
+ unset($item['inform']);
if ($item['uri'] == $item['parent-uri']) {
$item['contact-id'] = $item['owner-id'];
} else {
$item['contact-id'] = $item['author-id'];
}
- if (in_array($item['type'], ["net-comment", "wall-comment"])) {
- $item['type'] = 'remote-comment';
- } elseif ($item['type'] == 'wall') {
- $item['type'] = 'remote';
- }
-
$public_shadow = self::insert($item, false, false, true);
logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
public static function addShadowPost($itemid)
{
$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
return;
}
unset($item['mention']);
unset($item['origin']);
unset($item['starred']);
+ unset($item['postopts']);
+ unset($item['inform']);
$item['contact-id'] = Contact::getIdForURL($item['author-link']);
- if (in_array($item['type'], ["net-comment", "wall-comment"])) {
- $item['type'] = 'remote-comment';
- } elseif ($item['type'] == 'wall') {
- $item['type'] = 'remote';
- }
-
$public_shadow = self::insert($item, false, false, true);
logger("Stored public shadow for comment ".$item['uri']." under id ".$public_shadow, LOGGER_DEBUG);
// 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);
}
}
*/
private static function addLanguageToItemArray(&$item)
{
- $naked_body = Text\BBCode::toPlaintext($item['body'], false);
+ $naked_body = BBCode::toPlaintext($item['body'], false);
$ld = new Text_LanguageDetect();
$ld->setNameMode(2);
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()->getBaseURL() . '/objects/' . $guid;
}
/**
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']]);
}
}
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 = "";
// 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];
{
$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;
}
// 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;
}
// 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;
}
$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);
}
// 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;
}
// Prevent to forward already forwarded posts
- if ($datarray["app"] == $a->get_hostname()) {
+ if ($datarray["app"] == $a->getHostName()) {
logger('Already forwarded (second test)', LOGGER_DEBUG);
return false;
}
return false;
}
- if (($contact['network'] != NETWORK_FEED) && $datarray['private']) {
+ if (($contact['network'] != Protocol::FEED) && $datarray['private']) {
logger('Not public', LOGGER_DEBUG);
return false;
}
$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"];
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 {
}
}
- 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);
$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
}
// 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']));
$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;
}
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;
}
++$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");
}
{
$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;
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;
}
}
// 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;
}
// 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;
}
$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;
}
$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;
return true;
}
- $objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
+ $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,
- 'type' => 'activity',
'wall' => $item['wall'],
'origin' => 1,
- 'network' => NETWORK_DFRN,
+ 'network' => Protocol::DFRN,
'gravity' => GRAVITY_ACTIVITY,
'parent' => $item['id'],
'parent-uri' => $item['uri'],
'thr-parent' => $item['uri'],
- 'owner-id' => $item['owner-id'],
+ 'owner-id' => $author_id,
'author-id' => $author_id,
'body' => $activity,
'verb' => $activity,
private static function addThread($itemid, $onlyshadow = false)
{
$fields = ['uid', 'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private', 'pubmail',
- 'moderated', 'visible', 'starred', 'bookmark', 'contact-id',
+ 'moderated', 'visible', 'starred', 'contact-id', 'post-type',
'deleted', 'origin', 'forum_mode', 'mention', 'network', 'author-id', 'owner-id'];
$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);
}
private static function updateThread($itemid, $setmention = false)
{
- $fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed',
- 'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'contact-id',
+ $fields = ['uid', 'guid', 'created', 'edited', 'commented', 'received', 'changed', 'post-type',
+ 'wall', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'contact-id',
'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id'];
$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
$item = self::selectFirst($fields, $condition);
- if (!DBM::is_result($item)) {
+ if (!DBA::isResult($item)) {
return;
}
}
}
- $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);
}
}
projects / friendica.git / blobdiff