// 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',
- 'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach',
+ 'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language',
'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id',
- 'author-id', 'author-link', 'author-name', 'author-avatar',
- 'owner-id', 'owner-link', 'owner-name', 'owner-avatar',
+ 'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
+ 'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
'contact-id', 'contact-link', 'contact-name', 'contact-avatar',
'writable', 'self', 'cid', 'alias',
'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
'signed_text', 'signature', 'signer'];
// Field list for "item-content" table that is mixed with the item table
- const CONTENT_FIELDLIST = ['title', 'content-warning', 'body', 'location',
+ const MIXED_CONTENT_FIELDLIST = ['title', 'content-warning', 'body', 'location',
'coord', 'app', 'rendered-hash', 'rendered-html', 'verb',
'object-type', 'object', 'target-type', 'target', 'plink'];
+ // Field list for "item-content" table that is not present in the "item" table
+ const CONTENT_FIELDLIST = ['language'];
+
// 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',
+ 'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid',
'created', 'edited', 'commented', 'received', 'changed', 'verb',
'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'author-id', 'author-link', 'author-name', 'author-avatar',
'owner-id', 'owner-link', 'owner-name', 'owner-avatar'];
+ const ACTIVITIES = [ACTIVITY_LIKE, ACTIVITY_DISLIKE, ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE];
+
+ /**
+ * @brief returns an activity index from an activity string
+ *
+ * @param string $activity activity string
+ * @return integer Activity index
+ */
+ private static function activityToIndex($activity)
+ {
+ $index = array_search($activity, self::ACTIVITIES);
+
+ if (is_bool($index)) {
+ $index = -1;
+ }
+
+ return $index;
+ }
+
+ /**
+ * @brief returns an activity string from an activity index
+ *
+ * @param integer $index activity index
+ * @return string Activity string
+ */
+ private static function indexToActivity($index)
+ {
+ if (!isset(self::ACTIVITIES[$index])) {
+ return '';
+ }
+
+ return self::ACTIVITIES[$index];
+ }
+
/**
* @brief Fetch a single item row
*
{
$row = dba::fetch($stmt);
- // Fetch data from the item-content table whenever there is content there
- foreach (self::CONTENT_FIELDLIST as $field) {
- if (empty($row[$field]) && !empty($row['item-' . $field])) {
- $row[$field] = $row['item-' . $field];
- }
- unset($row['item-' . $field]);
+ if (is_bool($row)) {
+ return $row;
}
+ // ---------------------- Transform item structure data ----------------------
+
// We prefer the data from the user's contact over the public one
if (!empty($row['author-link']) && !empty($row['contact-link']) &&
($row['author-link'] == $row['contact-link'])) {
}
// We can always comment on posts from these networks
- if (isset($row['writable']) && !empty($row['network']) &&
- in_array($row['network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
+ if (array_key_exists('writable', $row) &&
+ in_array($row['internal-network'], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS])) {
$row['writable'] = true;
}
+ // ---------------------- Transform item content data ----------------------
+
+ // Fetch data from the item-content table whenever there is content there
+ foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
+ if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
+ $row[$field] = $row['internal-item-' . $field];
+ }
+ unset($row['internal-item-' . $field]);
+ }
+
+ if (!empty($row['internal-iaid']) && array_key_exists('verb', $row)) {
+ $row['verb'] = self::indexToActivity($row['internal-activity']);
+ if (array_key_exists('title', $row)) {
+ $row['title'] = '';
+ }
+ if (array_key_exists('body', $row)) {
+ $row['body'] = $row['verb'];
+ }
+ if (array_key_exists('object', $row)) {
+ $row['object'] = '';
+ }
+ if (array_key_exists('object-type', $row)) {
+ $row['object-type'] = ACTIVITY_OBJ_NOTE;
+ }
+ } elseif (in_array($row['verb'], ['', ACTIVITY_POST, ACTIVITY_SHARE])) {
+ // Posts don't have an object or target - but having tags or files.
+ // We safe some performance by building tag and file strings only here.
+ // We remove object and target since they aren't used for this type.
+ if (array_key_exists('object', $row)) {
+ $row['object'] = '';
+ }
+ if (array_key_exists('target', $row)) {
+ $row['target'] = '';
+ }
+ // Build the tag string out of the term entries
+ if (array_key_exists('tag', $row)) {
+ $row['tag'] = Term::tagTextFromItemId($row['internal-iid']);
+ }
+
+ // Build the file string out of the term entries
+ if (array_key_exists('file', $row)) {
+ $row['file'] = Term::fileTextFromItemId($row['internal-iid']);
+ }
+ }
+
+ // Remove internal fields
+ unset($row['internal-activity']);
+ unset($row['internal-network']);
+ unset($row['internal-iid']);
+ unset($row['internal-iaid']);
+ unset($row['internal-icid']);
+
return $row;
}
$param_string = self::addTablesToFields(dba::buildParameter($params), $fields);
- $table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false);
+ $table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false, $usermode);
$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
$param_string = self::addTablesToFields($param_string, $threadfields);
$param_string = self::addTablesToFields($param_string, $fields);
- $table = "`thread` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, true);
+ $table = "`thread` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, true, $usermode);
$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
- 'id' => 'item_id', 'network', 'icid'];
+ 'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid',
+ 'network' => 'internal-network', 'icid' => 'internal-icid',
+ 'iaid' => 'internal-iaid'];
+
+ $fields['item-activity'] = ['activity' => 'internal-activity'];
- $fields['item-content'] = self::CONTENT_FIELDLIST;
+ $fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
$fields['author'] = ['url' => 'author-link', 'name' => 'author-name',
- 'thumb' => 'author-avatar', 'nick' => 'author-nick'];
+ 'thumb' => 'author-avatar', 'nick' => 'author-nick', 'network' => 'author-network'];
$fields['owner'] = ['url' => 'owner-link', 'name' => 'owner-name',
- 'thumb' => 'owner-avatar', 'nick' => 'owner-nick'];
+ 'thumb' => 'owner-avatar', 'nick' => 'owner-nick', 'network' => 'owner-network'];
$fields['contact'] = ['url' => 'contact-link', 'name' => 'contact-name', 'thumb' => 'contact-avatar',
'writable', 'self', 'id' => 'cid', 'alias', 'uid' => 'contact-uid',
*
* @return string The SQL joins for the "select" functions
*/
- private static function constructJoins($uid, $sql_commands, $thread_mode)
+ private static function constructJoins($uid, $sql_commands, $thread_mode, $user_mode)
{
if ($thread_mode) {
$master_table = "`thread`";
$joins = '';
}
- $joins .= sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`
- AND NOT `contact`.`blocked`
- AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
- OR `contact`.`self` OR (`item`.`id` != `item`.`parent`) 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, intval($uid));
+ if ($user_mode) {
+ $joins .= sprintf("STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`
+ AND NOT `contact`.`blocked`
+ AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s)))
+ OR `contact`.`self` OR (`item`.`id` != `item`.`parent`) 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, intval($uid));
+ } else {
+ if (strpos($sql_commands, "`contact`.") !== false) {
+ $joins .= "STRAIGHT_JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`";
+ }
+ if (strpos($sql_commands, "`author`.") !== false) {
+ $joins .= " STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = $master_table.`author-id`";
+ }
+ if (strpos($sql_commands, "`owner`.") !== false) {
+ $joins .= " STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = $master_table.`owner-id`";
+ }
+ }
if (strpos($sql_commands, "`group_member`.") !== false) {
$joins .= " STRAIGHT_JOIN `group_member` ON `group_member`.`contact-id` = $master_table.`contact-id`";
$joins .= " LEFT JOIN `sign` ON `sign`.`iid` = `item`.`id`";
}
+ if (strpos($sql_commands, "`item-activity`.") !== false) {
+ $joins .= " LEFT JOIN `item-activity` ON `item-activity`.`id` = `item`.`iaid`";
+ }
+
if (strpos($sql_commands, "`item-content`.") !== false) {
$joins .= " LEFT JOIN `item-content` ON `item-content`.`id` = `item`.`icid`";
}
*/
private static function constructSelectFields($fields, $selected)
{
+ if (!empty($selected)) {
+ $selected[] = 'internal-iid';
+ $selected[] = 'internal-iaid';
+ $selected[] = 'internal-icid';
+ $selected[] = 'internal-network';
+ }
+
+ if (in_array('verb', $selected)) {
+ $selected[] = 'internal-activity';
+ }
+
$selection = [];
foreach ($fields as $table => $table_fields) {
foreach ($table_fields as $field => $select) {
if (empty($selected) || in_array($select, $selected)) {
- if (in_array($select, self::CONTENT_FIELDLIST)) {
- $selection[] = "`item`.`".$select."` AS `item-" . $select . "`";
+ if (in_array($select, self::MIXED_CONTENT_FIELDLIST)) {
+ $selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`";
}
if (is_int($field)) {
$selection[] = "`" . $table . "`.`" . $select . "`";
// 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', 'plink'], $condition);
+ $items = dba::select('item', ['id', 'origin', 'uri', 'plink', 'iaid', 'icid'], $condition);
$content_fields = [];
- foreach (self::CONTENT_FIELDLIST as $field) {
+ foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
if (isset($fields[$field])) {
$content_fields[$field] = $fields[$field];
unset($fields[$field]);
}
}
+ if (array_key_exists('tag', $fields)) {
+ $tags = $fields['tag'];
+ unset($fields['tag']);
+ } else {
+ $tags = '';
+ }
+
+ if (array_key_exists('file', $fields)) {
+ $files = $fields['file'];
+ unset($fields['file']);
+ } else {
+ $files = '';
+ }
+
if (!empty($fields)) {
$success = dba::update('item', $fields, $condition);
while ($item = dba::fetch($items)) {
if (!empty($item['plink'])) {
- $content_fields['plink'] = $item['plink'];
+ $content_fields['plink'] = $item['plink'];
+ }
+ if (self::updateActivity($content_fields, ['uri' => $item['uri']])) {
+ if (empty($item['iaid'])) {
+ $item_activity = dba::selectFirst('item-activity', ['id'], ['uri' => $item['uri']]);
+ if (DBM::is_result($item_activity)) {
+ $item_fields = ['iaid' => $item_activity['id'], 'icid' => null];
+ foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
+ $item_fields[$field] = '';
+ }
+ 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']]);
+ }
+ }
+ }
+ } else {
+ self::updateContent($content_fields, ['uri' => $item['uri']]);
+
+ if (empty($item['icid'])) {
+ $item_content = dba::selectFirst('item-content', [], ['uri' => $item['uri']]);
+ if (DBM::is_result($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) {
+ if (in_array($field, self::MIXED_CONTENT_FIELDLIST) && !empty($item_content[$field])) {
+ $item_fields[$field] = '';
+ }
+ }
+ dba::update('item', $item_fields, ['id' => $item['id']]);
+ }
+ }
}
- self::updateContent($content_fields, ['uri' => $item['uri']]);
- Term::insertFromTagFieldByItemId($item['id']);
- Term::insertFromFileFieldByItemId($item['id']);
+
+ if (!empty($tags)) {
+ Term::insertFromTagFieldByItemId($item['id'], $tags);
+ }
+
+ if (!empty($files)) {
+ Term::insertFromFileFieldByItemId($item['id'], $files);
+ }
+
self::updateThread($item['id']);
// We only need to notfiy others when it is an original entry from us.
$fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin',
'deleted', 'file', 'resource-id', 'event-id', 'attach',
'verb', 'object-type', 'object', 'target', 'contact-id'];
- $item = dba::selectFirst('item', $fields, ['id' => $item_id]);
+ $item = self::selectFirst($fields, ['id' => $item_id]);
if (!DBM::is_result($item)) {
logger('Item with ID ' . $item_id . " hasn't been found.", LOGGER_DEBUG);
return false;
return false;
}
- $parent = dba::selectFirst('item', ['origin'], ['id' => $item['parent']]);
+ $parent = self::selectFirst(['origin'], ['id' => $item['parent']]);
if (!DBM::is_result($parent)) {
$parent = ['origin' => false];
}
'object' => '', 'target' => '', 'tag' => '', 'postopts' => '', 'attach' => '', 'file' => ''];
dba::update('item', $item_fields, ['id' => $item['id']]);
- Term::insertFromTagFieldByItemId($item['id']);
- Term::insertFromFileFieldByItemId($item['id']);
+ Term::insertFromTagFieldByItemId($item['id'], '');
+ Term::insertFromFileFieldByItemId($item['id'], '');
self::deleteThread($item['id'], $item['parent-uri']);
if (!self::exists(["`uri` = ? AND `uid` != 0 AND NOT `deleted`", $item['uri']])) {
} elseif ($item['uid'] != 0) {
// When we delete just our local user copy of an item, we have to set a marker to hide it
- $global_item = dba::selectFirst('item', ['id'], ['uri' => $item['uri'], 'uid' => 0, 'deleted' => false]);
+ $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);
}
return;
}
- $i = dba::selectFirst('item', ['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
+ $i = self::selectFirst(['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
if (!DBM::is_result($i)) {
return;
}
$condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?)",
trim($item['uri']), $item['uid'],
NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS];
- $existing = dba::selectFirst('item', ['id', 'network'], $condition);
+ $existing = self::selectFirst(['id', 'network'], $condition);
if (DBM::is_result($existing)) {
// We only log the entries with a different user id than 0. Otherwise we would have too many false positives
if ($uid != 0) {
}
}
- self::addLanguageInPostopts($item);
+ self::addLanguageToItemArray($item);
$item['wall'] = intval(defaults($item, 'wall', 0));
$item['extid'] = trim(defaults($item, 'extid', ''));
'wall', 'private', 'forum_mode', 'origin'];
$condition = ['uri' => $item['parent-uri'], 'uid' => $item['uid']];
$params = ['order' => ['id' => false]];
- $parent = dba::selectFirst('item', $fields, $condition, $params);
+ $parent = self::selectFirst($fields, $condition, $params);
if (DBM::is_result($parent)) {
// is the new message multi-level threaded?
'parent-uri' => $item['parent-uri'],
'uid' => $item['uid']];
$params = ['order' => ['id' => false]];
- $toplevel_parent = dba::selectFirst('item', $fields, $condition, $params);
+ $toplevel_parent = self::selectFirst($fields, $condition, $params);
if (DBM::is_result($toplevel_parent)) {
$parent = $toplevel_parent;
logger('' . print_r($item,true), LOGGER_DATA);
+ if (array_key_exists('tag', $item)) {
+ $tags = $item['tag'];
+ unset($item['tag']);
+ } else {
+ $tags = '';
+ }
+
+ if (array_key_exists('file', $item)) {
+ $files = $item['file'];
+ unset($item['file']);
+ } else {
+ $files = '';
+ }
+
// We are doing this outside of the transaction to avoid timing problems
- self::insertContent($item);
+ if (!self::insertActivity($item)) {
+ self::insertContent($item);
+ }
dba::transaction();
$ret = dba::insert('item', $item);
* in it.
*/
if (!$deleted && !$dontcache) {
- $posted_item = dba::selectFirst('item', [], ['id' => $current_post]);
+ $posted_item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $current_post]);
if (DBM::is_result($posted_item)) {
if ($notify) {
Addon::callHooks('post_local_end', $posted_item);
* Due to deadlock issues with the "term" table we are doing these steps after the commit.
* This is not perfect - but a workable solution until we found the reason for the problem.
*/
- Term::insertFromTagFieldByItemId($current_post);
- Term::insertFromFileFieldByItemId($current_post);
+ if (!empty($tags)) {
+ Term::insertFromTagFieldByItemId($current_post, $tags);
+ }
+
+ if (!empty($files)) {
+ Term::insertFromFileFieldByItemId($current_post, $files);
+ }
if ($item['parent-uri'] === $item['uri']) {
self::addShadow($current_post);
return $current_post;
}
+ /**
+ * @brief Insert a new item content entry
+ *
+ * @param array $item The item fields that are to be inserted
+ */
+ private static function insertActivity(&$item)
+ {
+ $activity_index = self::activityToIndex($item['verb']);
+
+ if ($activity_index < 0) {
+ return false;
+ }
+
+ $fields = ['uri' => $item['uri'], 'activity' => $activity_index,
+ 'uri-hash' => hash('sha1', $item['uri']) . hash('ripemd160', $item['uri'])];
+
+ $saved_item = $item;
+
+ // We just remove everything that is content
+ foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
+ unset($item[$field]);
+ }
+
+ // To avoid timing problems, we are using locks.
+ $locked = Lock::set('item_insert_activity');
+ if (!$locked) {
+ logger("Couldn't acquire lock for URI " . $item['uri'] . " - proceeding anyway.");
+ }
+
+ // Do we already have this content?
+ $item_activity = dba::selectFirst('item-activity', ['id'], ['uri' => $item['uri']]);
+ if (DBM::is_result($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();
+ logger('Inserted activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
+ } else {
+ // This shouldn't happen. But if it does, we simply store it in the item-content table
+ logger('Could not insert activity for URI ' . $item['uri'] . ' - should not happen');
+ $item = $saved_item;
+ return false;
+ }
+ if ($locked) {
+ Lock::remove('item_insert_activity');
+ }
+ return true;
+ }
+
/**
* @brief Insert a new item content entry
*
$fields = ['uri' => $item['uri'], 'plink' => $item['plink'],
'uri-plink-hash' => hash('sha1', $item['plink']).hash('sha1', $item['uri'])];
- foreach (self::CONTENT_FIELDLIST as $field) {
+ foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
if (isset($item[$field])) {
$fields[$field] = $item[$field];
unset($item[$field]);
}
}
+ /**
+ * @brief Update existing item content entries
+ *
+ * @param array $item The item fields that are to be changed
+ * @param array $condition The condition for finding the item content entries
+ */
+ private static function updateActivity($item, $condition)
+ {
+ if (empty($item['verb'])) {
+ return false;
+ }
+ $activity_index = self::activityToIndex($item['verb']);
+
+ if ($activity_index < 0) {
+ return false;
+ }
+
+ $fields = ['activity' => $activity_index,
+ 'uri-hash' => hash('sha1', $condition['uri']) . hash('ripemd160', $condition['uri'])];
+
+ logger('Update activity for URI ' . $condition['uri']);
+
+ dba::update('item-activity', $fields, $condition, true);
+
+ return true;
+ }
+
/**
* @brief Update existing item content entries
*
{
// We have to select only the fields from the "item-content" table
$fields = [];
- foreach (self::CONTENT_FIELDLIST as $field) {
+ foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
if (isset($item[$field])) {
$fields[$field] = $item[$field];
}
public static function distribute($itemid, $signed_text = '')
{
$condition = ["`id` IN (SELECT `parent` FROM `item` WHERE `id` = ?)", $itemid];
- $parent = dba::selectFirst('item', ['owner-id'], $condition);
+ $parent = self::selectFirst(['owner-id'], $condition);
if (!DBM::is_result($parent)) {
return;
}
$origin_uid = 0;
if ($item['uri'] != $item['parent-uri']) {
- $parents = dba::select('item', ['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
+ $parents = self::select(['uid', 'origin'], ["`uri` = ? AND `uid` != 0", $item['parent-uri']]);
while ($parent = dba::fetch($parents)) {
$users[$parent['uid']] = $parent['uid'];
if ($parent['origin'] && !$item['origin']) {
*/
public static function addShadow($itemid)
{
- $fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network'];
+ $fields = ['uid', 'private', 'moderated', 'visible', 'deleted', 'network', 'uri'];
$condition = ['id' => $itemid, 'parent' => [0, $itemid]];
- $item = dba::selectFirst('item', $fields, $condition);
+ $item = self::selectFirst($fields, $condition);
if (!DBM::is_result($item)) {
return;
return;
}
+ if (self::exists(['uri' => $item['uri'], 'uid' => 0])) {
+ return;
+ }
+
$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
- if (DBM::is_result($item) && ($item["allow_cid"] == '') && ($item["allow_gid"] == '') &&
- ($item["deny_cid"] == '') && ($item["deny_gid"] == '')) {
-
- if (!self::exists(['uri' => $item['uri'], 'uid' => 0])) {
- // Preparing public shadow (removing user specific data)
- $item['uid'] = 0;
- unset($item['id']);
- unset($item['parent']);
- unset($item['wall']);
- unset($item['mention']);
- unset($item['origin']);
- unset($item['starred']);
- if ($item['uri'] == $item['parent-uri']) {
- $item['contact-id'] = $item['owner-id'];
- } else {
- $item['contact-id'] = $item['author-id'];
- }
+ if (DBM::is_result($item)) {
+ // Preparing public shadow (removing user specific data)
+ $item['uid'] = 0;
+ unset($item['id']);
+ unset($item['parent']);
+ unset($item['wall']);
+ unset($item['mention']);
+ unset($item['origin']);
+ unset($item['starred']);
+ 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';
- }
+ 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);
+ $public_shadow = self::insert($item, false, false, true);
- logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
- }
+ logger("Stored public shadow for thread ".$itemid." under id ".$public_shadow, LOGGER_DEBUG);
}
}
}
/**
- * Adds a "lang" specification in a "postopts" element of given $arr,
- * if possible and not already present.
+ * Adds a language specification in a "language" element of given $arr.
* Expects "body" element to exist in $arr.
*/
- private static function addLanguageInPostopts(&$item)
+ private static function addLanguageToItemArray(&$item)
{
- $postopts = "";
-
- if (!empty($item['postopts'])) {
- if (strstr($item['postopts'], 'lang=')) {
- // do not override
- return;
- }
- $postopts = $item['postopts'];
- }
-
$naked_body = Text\BBCode::toPlaintext($item['body'], false);
- $languages = (new Text_LanguageDetect())->detect($naked_body, 3);
+ $ld = new Text_LanguageDetect();
+ $ld->setNameMode(2);
+ $languages = $ld->detect($naked_body, 3);
- if (sizeof($languages) > 0) {
- if ($postopts != '') {
- $postopts .= '&'; // arbitrary separator, to be reviewed
- }
-
- $postopts .= 'lang=';
- $sep = "";
-
- foreach ($languages as $language => $score) {
- $postopts .= $sep . $language . ";" . $score;
- $sep = ':';
- }
- $item['postopts'] = $postopts;
+ if (is_array($languages)) {
+ $item['language'] = json_encode($languages);
}
}
public static function getGuidById($id)
{
- $item = dba::selectFirst('item', ['guid'], ['id' => $id]);
+ $item = self::selectFirst(['guid'], ['id' => $id]);
if (DBM::is_result($item)) {
return $item['guid'];
} else {
$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`.`allow_cid` = '' AND `item`.`allow_gid` = ''
- AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND NOT `item`.`private` AND `item`.`wall`
AND `item`.`guid` = ?", $guid);
if (DBM::is_result($item)) {
$community_page = (($user['page-flags'] == PAGE_COMMUNITY) ? true : false);
$prvgroup = (($user['page-flags'] == PAGE_PRVGROUP) ? true : false);
- $item = dba::selectFirst('item', [], ['id' => $item_id]);
+ $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
if (!DBM::is_result($item)) {
return;
}
private static function hasPermissions($obj)
{
- return (
- (
- x($obj, 'allow_cid')
- ) || (
- x($obj, 'allow_gid')
- ) || (
- x($obj, 'deny_cid')
- ) || (
- x($obj, 'deny_gid')
- )
- );
+ return !empty($obj['allow_cid']) || !empty($obj['allow_gid']) ||
+ !empty($obj['deny_cid']) || !empty($obj['deny_gid']);
}
private static function samePermissions($obj1, $obj2)
return;
}
+ $condition = ["`uid` = ? AND NOT `deleted` AND `id` = `parent` AND `gravity` = ?",
+ $uid, GRAVITY_PARENT];
+
/*
* $expire_network_only = save your own wall posts
* and just expire conversations started by others
*/
- $expire_network_only = PConfig::get($uid,'expire', 'network_only');
- $sql_extra = (intval($expire_network_only) ? " AND wall = 0 " : "");
+ $expire_network_only = PConfig::get($uid, 'expire', 'network_only', false);
+
+ if ($expire_network_only) {
+ $condition[0] .= " AND NOT `wall`";
+ }
if ($network != "") {
- $sql_extra .= sprintf(" AND network = '%s' ", dbesc($network));
+ $condition[0] .= " AND `network` = ?";
+ $condition[] = $network;
/*
* There is an index "uid_network_received" but not "uid_network_created"
* This avoids the creation of another index just for one purpose.
* And it doesn't really matter wether to look at "received" or "created"
*/
- $range = "AND `received` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
+ $condition[0] .= " AND `received` < UTC_TIMESTAMP() - INTERVAL ? DAY";
+ $condition[] = $days;
} else {
- $range = "AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY ";
+ $condition[0] .= " AND `created` < UTC_TIMESTAMP() - INTERVAL ? DAY";
+ $condition[] = $days;
}
- $r = q("SELECT `file`, `resource-id`, `starred`, `type`, `id` FROM `item`
- WHERE `uid` = %d $range
- AND `id` = `parent`
- $sql_extra
- AND `deleted` = 0",
- intval($uid),
- intval($days)
- );
+ $items = self::select(['file', 'resource-id', 'starred', 'type', 'id'], $condition);
- if (!DBM::is_result($r)) {
+ if (!DBM::is_result($items)) {
return;
}
- $expire_items = PConfig::get($uid, 'expire', 'items', 1);
+ $expire_items = PConfig::get($uid, 'expire', 'items', true);
// Forcing expiring of items - but not notes and marked items
if ($force) {
$expire_items = true;
}
- $expire_notes = PConfig::get($uid, 'expire', 'notes', 1);
- $expire_starred = PConfig::get($uid, 'expire', 'starred', 1);
- $expire_photos = PConfig::get($uid, 'expire', 'photos', 0);
-
- logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
+ $expire_notes = PConfig::get($uid, 'expire', 'notes', true);
+ $expire_starred = PConfig::get($uid, 'expire', 'starred', true);
+ $expire_photos = PConfig::get($uid, 'expire', 'photos', false);
- foreach ($r as $item) {
+ $expired = 0;
+ while ($item = Item::fetch($items)) {
// don't expire filed items
- if (strpos($item['file'],'[') !== false) {
+ if (strpos($item['file'], '[') !== false) {
continue;
}
// Only expire posts, not photos and photo comments
- if ($expire_photos == 0 && strlen($item['resource-id'])) {
+ if (!$expire_photos && strlen($item['resource-id'])) {
continue;
- } elseif ($expire_starred == 0 && intval($item['starred'])) {
+ } elseif (!$expire_starred && intval($item['starred'])) {
continue;
- } elseif ($expire_notes == 0 && $item['type'] == 'note') {
+ } elseif (!$expire_notes && $item['type'] == 'note') {
continue;
- } elseif ($expire_items == 0 && $item['type'] != 'note') {
+ } elseif (!$expire_items && $item['type'] != 'note') {
continue;
}
self::deleteById($item['id'], PRIORITY_LOW);
+
+ ++$expired;
}
+ 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");
}
public static function firstPostDate($uid, $wall = false)
logger('like: verb ' . $verb . ' item ' . $item_id);
- $item = dba::selectFirst('item', [], ['`id` = ? OR `uri` = ?', $item_id, $item_id]);
+ $item = self::selectFirst(self::ITEM_FIELDLIST, ['`id` = ? OR `uri` = ?', $item_id, $item_id]);
if (!DBM::is_result($item)) {
logger('like: unknown item ' . $item_id);
return false;
}
$base_condition = ['verb' => $verbs, 'deleted' => false, 'gravity' => GRAVITY_ACTIVITY,
- 'author-id' => $author_contact['id'], 'uid' => item['uid']];
+ 'author-id' => $author_contact['id'], 'uid' => $item['uid']];
$condition = array_merge($base_condition, ['parent' => $item_id]);
$like_item = self::selectFirst(['id', 'guid', 'verb'], $condition);
'moderated', 'visible', 'starred', 'bookmark', 'contact-id',
'deleted', 'origin', 'forum_mode', 'mention', 'network', 'author-id', 'owner-id'];
$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
- $item = dba::selectFirst('item', $fields, $condition);
+ $item = self::selectFirst($fields, $condition);
if (!DBM::is_result($item)) {
return;
'deleted', 'origin', 'forum_mode', 'network', 'author-id', 'owner-id'];
$condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
- $item = dba::selectFirst('item', $fields, $condition);
+ $item = self::selectFirst($fields, $condition);
if (!DBM::is_result($item)) {
return;
}
projects / friendica.git / blobdiff