'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',
$row['tag'] = Term::tagTextFromItemId($row['id']);
}
- /// @todo This is a preparation
// Build the file string out of the term entries
- //if (isset($row['id']) && array_key_exists('file', $row)) {
- // $row['file'] = Term::fileTextFromItemId($row['id']);
- //}
+ if (isset($row['id']) && array_key_exists('file', $row)) {
+ $row['file'] = Term::fileTextFromItemId($row['id']);
+ }
// We can always comment on posts from these networks
if (isset($row['writable']) && !empty($row['network']) &&
$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;
$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`";
$selected[] = 'id';
}
- /// @todo This is a preparation
// To be able to fetch the files we need the item id
- //if (in_array('file', $selected) && !in_array('id', $selected)) {
- // $selected[] = 'id';
- //}
+ if (in_array('file', $selected) && !in_array('id', $selected)) {
+ $selected[] = 'id';
+ }
$selection = [];
foreach ($fields as $table => $table_fields) {
// 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', 'icid'], $condition);
$content_fields = [];
foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
if (array_key_exists('file', $fields)) {
$files = $fields['file'];
- /// @todo This is a preparation
- //unset($fields['file']);
+ unset($fields['file']);
} else {
$files = '';
}
}
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']]);
+ }
+ }
+
if (!empty($tags)) {
Term::insertFromTagFieldByItemId($item['id'], $tags);
}
if (array_key_exists('file', $item)) {
$files = $item['file'];
- /// @todo This is a preparation
- //unset($item['file']);
+ unset($item['file']);
} else {
$files = '';
}
*/
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 = self::selectFirst($fields, $condition);
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);
}
}
$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)) {
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)
}
$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);
projects / friendica.git / blobdiff