keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5184 from annando/fetch-item

Browse source 
Central function to retrieve item or thread data
This commit is contained in:
Hypolite Petovan 2018-06-10 15:48:08 -04:00 committed by GitHub
commit 1355798584
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 540 additions and 438 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

409
include/api.php
View file

@ -686,14 +686,8 @@ function api_get_user(App $a, $contact_id = null)
$uinfo[0]['network'] = NETWORK_DFRN; $uinfo[0]['network'] = NETWORK_DFRN;
} }
$usr = q( $usr = dba::selectFirst('user', ['default-location'], ['uid' => api_user()]);
"SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", $profile = dba::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]);
intval(api_user())
);
$profile = q(
"SELECT * FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
intval(api_user())
);
/// @TODO old-lost code? (twice) /// @TODO old-lost code? (twice)
// Counting is deactivated by now, due to performance issues // Counting is deactivated by now, due to performance issues
@ -760,14 +754,14 @@ function api_get_user(App $a, $contact_id = null)
$pcontact_id = Contact::getIdForURL($uinfo[0]['url'], 0, true); $pcontact_id = Contact::getIdForURL($uinfo[0]['url'], 0, true);
if (!empty($profile[0]['about'])) { if (!empty($profile['about'])) {
$description = $profile[0]['about']; $description = $profile['about'];
} else { } else {
$description = $uinfo[0]["about"]; $description = $uinfo[0]["about"];
} }
if (!empty($usr[0]['default-location'])) { if (!empty($usr['default-location'])) {
$location = $usr[0]['default-location']; $location = $usr['default-location'];
} elseif (!empty($uinfo[0]["location"])) { } elseif (!empty($uinfo[0]["location"])) {
$location = $uinfo[0]["location"]; $location = $uinfo[0]["location"];
} else { } else {
@ -1602,7 +1596,6 @@ function api_search($type)
} }
$data = []; $data = [];
$sql_extra = '';
if (!x($_REQUEST, 'q')) { if (!x($_REQUEST, 'q')) {
throw new BadRequestException("q parameter is required."); throw new BadRequestException("q parameter is required.");
@ -1622,24 +1615,20 @@ function api_search($type)
$start = $page * $count; $start = $page * $count;
$condition = ["`verb` = ? AND `item`.`id` > ?
AND (`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))
AND `item`.`body` LIKE CONCAT('%',?,'%')",
ACTIVITY_POST, $since_id, api_user(), $_REQUEST['q']];
if ($max_id > 0) { if ($max_id > 0) {
$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id); $condition[0] .= " AND `item`.`id` <= ?";
$condition[] = $max_id;
} }
$r = dba::p( $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
"SELECT ".item_fieldlists()." $statuses = Item::select(api_user(), [], $condition, $params);
FROM `item` ".item_joins(api_user())."
WHERE ".item_condition()." AND (`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))
AND `item`.`body` LIKE CONCAT('%',?,'%')
$sql_extra
AND `item`.`id`>?
ORDER BY `item`.`id` DESC LIMIT ".intval($start)." ,".intval($count)." ",
api_user(),
$_REQUEST['q'],
$since_id
);
$data['status'] = api_format_items(dba::inArray($r), $user_info); $data['status'] = api_format_items(dba::inArray($statuses), $user_info);
return api_format_data("statuses", $type, $data); return api_format_data("statuses", $type, $data);
} }
@ -1689,37 +1678,30 @@ function api_statuses_home_timeline($type)
$start = $page * $count; $start = $page * $count;
$sql_extra = ''; $condition = ["`uid` = ? AND `verb` = ? AND `item`.`id` > ?", api_user(), ACTIVITY_POST, $since_id];
if ($max_id > 0) { if ($max_id > 0) {
$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id); $condition[0] .= " AND `item`.`id` <= ?";
$condition[] = $max_id;
} }
if ($exclude_replies > 0) { if ($exclude_replies > 0) {
$sql_extra .= ' AND `item`.`parent` = `item`.`id`'; $condition[0] .= ' AND `item`.`parent` = `item`.`id`';
} }
if ($conversation_id > 0) { if ($conversation_id > 0) {
$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); $condition[0] .= " AND `item`.`parent` = ?";
$condition[] = $conversation_id;
} }
$r = q("SELECT `item`.* FROM `item` $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` $statuses = Item::select(api_user(), [], $condition, $params);
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`uid` = %d AND `verb` = '%s'
AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
$sql_extra
AND `item`.`id` > %d
ORDER BY `item`.`id` DESC LIMIT %d ,%d",
intval(api_user()),
dbesc(ACTIVITY_POST),
intval($since_id),
intval($start),
intval($count)
);
$ret = api_format_items($r, $user_info, false, $type); $items = dba::inArray($statuses);
$ret = api_format_items($items, $user_info, false, $type);
// Set all posts from the query above to seen // Set all posts from the query above to seen
$idarray = []; $idarray = [];
foreach ($r as $item) { foreach ($items as $item) {
$idarray[] = intval($item["id"]); $idarray[] = intval($item["id"]);
} }
@ -1779,61 +1761,35 @@ function api_statuses_public_timeline($type)
$sql_extra = ''; $sql_extra = '';
if ($exclude_replies && !$conversation_id) { if ($exclude_replies && !$conversation_id) {
$condition = ["`verb` = ? AND `iid` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall`",
ACTIVITY_POST, $since_id];
if ($max_id > 0) { if ($max_id > 0) {
$sql_extra = 'AND `thread`.`iid` <= ' . intval($max_id); $condition[0] .= " AND `thread`.`iid` <= ?";
$condition[] = $max_id;
} }
$r = dba::p( $params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
"SELECT " . item_fieldlists() . " $statuses = Item::selectThread(api_user(), [], $condition, $params);
FROM `thread`
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
" . item_joins(api_user()) . "
STRAIGHT_JOIN `user` ON `user`.`uid` = `thread`.`uid`
AND NOT `user`.`hidewall`
AND `verb` = ?
AND NOT `thread`.`private`
AND `thread`.`wall`
AND `thread`.`visible`
AND NOT `thread`.`deleted`
AND NOT `thread`.`moderated`
AND `thread`.`iid` > ?
$sql_extra
ORDER BY `thread`.`iid` DESC
LIMIT " . intval($start) . ", " . intval($count),
ACTIVITY_POST,
$since_id
);
$r = dba::inArray($r); $r = dba::inArray($statuses);
} else { } else {
$condition = ["`verb` = ? AND `id` > ? AND NOT `private` AND `wall` AND NOT `user`.`hidewall` AND `item`.`origin`",
ACTIVITY_POST, $since_id];
if ($max_id > 0) { if ($max_id > 0) {
$sql_extra = 'AND `item`.`id` <= ' . intval($max_id); $condition[0] .= " AND `item`.`id` <= ?";
$condition[] = $max_id;
} }
if ($conversation_id > 0) { if ($conversation_id > 0) {
$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); $condition[0] .= " AND `item`.`parent` = ?";
$condition[] = $conversation_id;
} }
$r = dba::p( $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
"SELECT " . item_fieldlists() . " $statuses = Item::select(api_user(), [], $condition, $params);
FROM `item`
" . item_joins(api_user()) . "
STRAIGHT_JOIN `user` ON `user`.`uid` = `item`.`uid`
AND NOT `user`.`hidewall`
AND `verb` = ?
AND NOT `item`.`private`
AND `item`.`wall`
AND `item`.`visible`
AND NOT `item`.`deleted`
AND NOT `item`.`moderated`
AND `item`.`id` > ?
$sql_extra
ORDER BY `item`.`id` DESC
LIMIT " . intval($start) . ", " . intval($count),
ACTIVITY_POST,
$since_id
);
$r = dba::inArray($r); $r = dba::inArray($statuses);
} }
$ret = api_format_items($r, $user_info, false, $type); $ret = api_format_items($r, $user_info, false, $type);
@ -1881,33 +1837,18 @@ function api_statuses_networkpublic_timeline($type)
} }
$start = ($page - 1) * $count; $start = ($page - 1) * $count;
$sql_extra = ''; $condition = ["`uid` = 0 AND `verb` = ? AND `thread`.`iid` > ? AND NOT `private`",
ACTIVITY_POST, $since_id];
if ($max_id > 0) { if ($max_id > 0) {
$sql_extra = 'AND `thread`.`iid` <= ' . intval($max_id); $condition[0] .= " AND `thread`.`iid` <= ?";
$condition[] = $max_id;
} }
$r = dba::p( $params = ['order' => ['iid' => true], 'limit' => [$start, $count]];
"SELECT " . item_fieldlists() . " $statuses = Item::selectThread(api_user(), [], $condition, $params);
FROM `thread`
STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid`
" . item_joins(api_user()) . "
WHERE `thread`.`uid` = 0
AND `verb` = ?
AND NOT `thread`.`private`
AND `thread`.`visible`
AND NOT `thread`.`deleted`
AND NOT `thread`.`moderated`
AND `thread`.`iid` > ?
$sql_extra
ORDER BY `thread`.`iid` DESC
LIMIT " . intval($start) . ", " . intval($count),
ACTIVITY_POST,
$since_id
);
$r = dba::inArray($r); $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
$ret = api_format_items($r, $user_info, false, $type);
$data = ['status' => $ret]; $data = ['status' => $ret];
switch ($type) { switch ($type) {
@ -1955,13 +1896,6 @@ function api_statuses_show($type)
$conversation = (x($_REQUEST, 'conversation') ? 1 : 0); $conversation = (x($_REQUEST, 'conversation') ? 1 : 0);
$sql_extra = '';
if ($conversation) {
$sql_extra .= " AND `item`.`parent` = %d ORDER BY `id` ASC ";
} else {
$sql_extra .= " AND `item`.`id` = %d";
}
// try to fetch the item for the local user - or the public item, if there is no local one // try to fetch the item for the local user - or the public item, if there is no local one
$uri_item = dba::selectFirst('item', ['uri'], ['id' => $id]); $uri_item = dba::selectFirst('item', ['uri'], ['id' => $id]);
if (!DBM::is_result($uri_item)) { if (!DBM::is_result($uri_item)) {
@ -1975,24 +1909,22 @@ function api_statuses_show($type)
$id = $item['id']; $id = $item['id'];
$r = q( if ($conversation) {
"SELECT `item`.* FROM `item` $condition = ['parent' => $id, 'verb' => ACTIVITY_POST];
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` $params = ['order' => ['id' => true]];
AND (NOT `contact`.`blocked` OR `contact`.`pending`) } else {
WHERE `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted` $condition = ['id' => $id, 'verb' => ACTIVITY_POST];
AND `item`.`uid` IN (0, %d) AND `item`.`verb` = '%s' $params = [];
$sql_extra", }
intval(api_user()),
dbesc(ACTIVITY_POST), $statuses = Item::select(api_user(), [], $condition, $params);
intval($id)
);
/// @TODO How about copying this to above methods which don't check $r ? /// @TODO How about copying this to above methods which don't check $r ?
if (!DBM::is_result($r)) { if (!DBM::is_result($statuses)) {
throw new BadRequestException("There is no status with this id."); throw new BadRequestException("There is no status with this id.");
} }
$ret = api_format_items($r, $user_info, false, $type); $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
if ($conversation) { if ($conversation) {
$data = ['status' => $ret]; $data = ['status' => $ret];
@ -2057,33 +1989,22 @@ function api_conversation_show($type)
$id = $parent['id']; $id = $parent['id'];
$sql_extra = ''; $condition = ["`parent` = ? AND `uid` IN (0, ?) AND `verb` = ? AND `item`.`id` > ?",
$id, api_user(), ACTIVITY_POST, $since_id];
if ($max_id > 0) { if ($max_id > 0) {
$sql_extra = ' AND `item`.`id` <= ' . intval($max_id); $condition[0] .= " AND `item`.`id` <= ?";
$condition[] = $max_id;
} }
$r = q("SELECT `item`.* FROM `item` $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` $statuses = Item::select(api_user(), [], $condition, $params);
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`parent` = %d AND `item`.`visible`
AND NOT `item`.`moderated` AND NOT `item`.`deleted`
AND `item`.`uid` IN (0, %d) AND `item`.`verb` = '%s'
AND `item`.`id`>%d $sql_extra
ORDER BY `item`.`id` DESC LIMIT %d ,%d",
intval($id),
intval(api_user()),
dbesc(ACTIVITY_POST),
intval($since_id),
intval($start),
intval($count)
);
if (!DBM::is_result($r)) { if (!DBM::is_result($statuses)) {
throw new BadRequestException("There is no status with this id."); throw new BadRequestException("There is no status with id $id.");
} }
$ret = api_format_items($r, $user_info, false, $type); $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
$data = ['status' => $ret]; $data = ['status' => $ret];
return api_format_data("statuses", $type, $data); return api_format_data("statuses", $type, $data);
@ -2126,24 +2047,17 @@ function api_statuses_repeat($type)
logger('API: api_statuses_repeat: '.$id); logger('API: api_statuses_repeat: '.$id);
$r = q("SELECT `item`.* FROM `item` $fields = ['body', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` $item = Item::selectFirst(api_user(), $fields, ['id' => $id, 'private' => false]);
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
AND NOT `item`.`private`
AND `item`.`id`=%d",
intval($id)
);
/// @TODO other style than above functions! if (DBM::is_result($item) && $item['body'] != "") {
if (DBM::is_result($r) && $r[0]['body'] != "") { if (strpos($item['body'], "[/share]") !== false) {
if (strpos($r[0]['body'], "[/share]") !== false) { $pos = strpos($item['body'], "[share");
$pos = strpos($r[0]['body'], "[share"); $post = substr($item['body'], $pos);
$post = substr($r[0]['body'], $pos);
} else { } else {
$post = share_header($r[0]['author-name'], $r[0]['author-link'], $r[0]['author-avatar'], $r[0]['guid'], $r[0]['created'], $r[0]['plink']); $post = share_header($item['author-name'], $item['author-link'], $item['author-avatar'], $item['guid'], $item['created'], $item['plink']);
$post .= $r[0]['body']; $post .= $item['body'];
$post .= "[/share]"; $post .= "[/share]";
} }
$_REQUEST['body'] = $post; $_REQUEST['body'] = $post;
@ -2244,32 +2158,19 @@ function api_statuses_mentions($type)
$start = ($page - 1) * $count; $start = ($page - 1) * $count;
$sql_extra = ''; $condition = ["`uid` = ? AND `verb` = ? AND `item`.`id` > ? AND `author-id` != ?
AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `uid` = ? AND `mention` AND NOT `ignored`)",
api_user(), ACTIVITY_POST, $since_id, $user_info['pid'], api_user()];
if ($max_id > 0) { if ($max_id > 0) {
$sql_extra = ' AND `item`.`id` <= ' . intval($max_id); $condition[0] .= " AND `item`.`id` <= ?";
$condition[] = $max_id;
} }
$r = q("SELECT `item`.* FROM `item` FORCE INDEX (`uid_id`) $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` $statuses = Item::select(api_user(), [], $condition, $params);
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`uid` = %d AND `item`.`verb` = '%s'
AND `item`.`author-id` != %d
AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `uid` = %d AND `mention` AND NOT `ignored`)
$sql_extra
AND `item`.`id` > %d
ORDER BY `item`.`id` DESC LIMIT %d ,%d",
intval(api_user()),
dbesc(ACTIVITY_POST),
intval($user_info['pid']),
intval(api_user()),
intval($since_id),
intval($start),
intval($count)
);
$ret = api_format_items($r, $user_info, false, $type); $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
$data = ['status' => $ret]; $data = ['status' => $ret];
switch ($type) { switch ($type) {
@ -2325,41 +2226,31 @@ function api_statuses_user_timeline($type)
} }
$start = ($page - 1) * $count; $start = ($page - 1) * $count;
$sql_extra = ''; $condition = ["`uid` = ? AND `verb` = ? AND `item`.`id` > ? AND `item`.`contact-id` = ?",
api_user(), ACTIVITY_POST, $since_id, $user_info['cid']];
if ($user_info['self'] == 1) { if ($user_info['self'] == 1) {
$sql_extra .= " AND `item`.`wall` = 1 "; $condition[0] .= ' AND `item`.`wall` ';
} }
if ($exclude_replies > 0) { if ($exclude_replies > 0) {
$sql_extra .= ' AND `item`.`parent` = `item`.`id`'; $condition[0] .= ' AND `item`.`parent` = `item`.`id`';
} }
if ($conversation_id > 0) { if ($conversation_id > 0) {
$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); $condition[0] .= " AND `item`.`parent` = ?";
$condition[] = $conversation_id;
} }
if ($max_id > 0) { if ($max_id > 0) {
$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id); $condition[0] .= " AND `item`.`id` <= ?";
$condition[] = $max_id;
} }
$r = q("SELECT `item`.* FROM `item` FORCE INDEX (`uid_contactid_id`) $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` $statuses = Item::select(api_user(), [], $condition, $params);
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`uid` = %d AND `verb` = '%s'
AND `item`.`contact-id` = %d
AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
$sql_extra
AND `item`.`id` > %d
ORDER BY `item`.`id` DESC LIMIT %d ,%d",
intval(api_user()),
dbesc(ACTIVITY_POST),
intval($user_info['cid']),
intval($since_id),
intval($start),
intval($count)
);
$ret = api_format_items($r, $user_info, true, $type); $ret = api_format_items(dba::inArray($statuses), $user_info, true, $type);
$data = ['status' => $ret]; $data = ['status' => $ret];
switch ($type) { switch ($type) {
@ -2409,24 +2300,24 @@ function api_favorites_create_destroy($type)
$itemid = intval($_REQUEST['id']); $itemid = intval($_REQUEST['id']);
} }
$item = q("SELECT * FROM `item` WHERE `id`=%d AND `uid`=%d LIMIT 1", $itemid, api_user()); $item = Item::selectFirst(api_user(), [], ['id' => $itemid, 'uid' => api_user()]);
if (!DBM::is_result($item) || count($item) == 0) { if (!DBM::is_result($item)) {
throw new BadRequestException("Invalid item."); throw new BadRequestException("Invalid item.");
} }
switch ($action) { switch ($action) {
case "create": case "create":
$item[0]['starred'] = 1; $item['starred'] = 1;
break; break;
case "destroy": case "destroy":
$item[0]['starred'] = 0; $item['starred'] = 0;
break; break;
default: default:
throw new BadRequestException("Invalid action ".$action); throw new BadRequestException("Invalid action ".$action);
} }
$r = Item::update(['starred' => $item[0]['starred']], ['id' => $itemid]); $r = Item::update(['starred' => $item['starred']], ['id' => $itemid]);
if ($r === false) { if ($r === false) {
throw new InternalServerErrorException("DB error"); throw new InternalServerErrorException("DB error");
@ -2434,7 +2325,7 @@ function api_favorites_create_destroy($type)
$user_info = api_get_user($a); $user_info = api_get_user($a);
$rets = api_format_items($item, $user_info, false, $type); $rets = api_format_items([$item], $user_info, false, $type);
$ret = $rets[0]; $ret = $rets[0];
$data = ['status' => $ret]; $data = ['status' => $ret];
@ -2478,8 +2369,6 @@ function api_favorites($type)
if ($user_info['self'] == 0) { if ($user_info['self'] == 0) {
$ret = []; $ret = [];
} else { } else {
$sql_extra = "";
// params // params
$since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0); $since_id = (x($_REQUEST, 'since_id') ? $_REQUEST['since_id'] : 0);
$max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0); $max_id = (x($_REQUEST, 'max_id') ? $_REQUEST['max_id'] : 0);
@ -2491,26 +2380,19 @@ function api_favorites($type)
$start = $page*$count; $start = $page*$count;
$condition = ["`uid` = ? AND `verb` = ? AND `id` > ? AND `starred`",
api_user(), ACTIVITY_POST, $since_id];
$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
if ($max_id > 0) { if ($max_id > 0) {
$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id); $condition[0] .= " AND `item`.`id` <= ?";
$condition[] = $max_id;
} }
$r = q("SELECT `item`.* FROM `item` $statuses = Item::select(api_user(), [], $condition, $params);
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`uid` = %d
AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
AND `item`.`starred`
$sql_extra
AND `item`.`id`>%d
ORDER BY `item`.`id` DESC LIMIT %d ,%d",
intval(api_user()),
intval($since_id),
intval($start),
intval($count)
);
$ret = api_format_items($r, $user_info, false, $type); $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type);
} }
$data = ['status' => $ret]; $data = ['status' => $ret];
@ -3300,32 +3182,23 @@ function api_lists_statuses($type)
$start = $page * $count; $start = $page * $count;
$sql_extra = ''; $condition = ["`uid` = ? AND `verb` = ? AND `id` > ? AND `group_member`.`gid` = ?",
api_user(), ACTIVITY_POST, $since_id, $_REQUEST['list_id']];
if ($max_id > 0) { if ($max_id > 0) {
$sql_extra .= ' AND `item`.`id` <= ' . intval($max_id); $condition[0] .= " AND `item`.`id` <= ?";
$condition[] = $max_id;
} }
if ($exclude_replies > 0) { if ($exclude_replies > 0) {
$sql_extra .= ' AND `item`.`parent` = `item`.`id`'; $condition[0] .= ' AND `item`.`parent` = `item`.`id`';
} }
if ($conversation_id > 0) { if ($conversation_id > 0) {
$sql_extra .= ' AND `item`.`parent` = ' . intval($conversation_id); $condition[0] .= " AND `item`.`parent` = ?";
$condition[] = $conversation_id;
} }
$statuses = dba::p("SELECT `item`.* FROM `item` $params = ['order' => ['id' => true], 'limit' => [$start, $count]];
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` $statuses = Item::select(api_user(), [], $condition, $params);
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
STRAIGHT_JOIN `group_member` ON `group_member`.`contact-id` = `item`.`contact-id`
WHERE `item`.`uid` = ? AND `verb` = ?
AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
$sql_extra
AND `item`.`id`>?
AND `group_member`.`gid` = ?
ORDER BY `item`.`id` DESC LIMIT ".intval($start)." ,".intval($count),
api_user(),
ACTIVITY_POST,
$since_id,
$_REQUEST['list_id']
);
$items = api_format_items(dba::inArray($statuses), $user_info, false, $type); $items = api_format_items(dba::inArray($statuses), $user_info, false, $type);
@ -4847,19 +4720,13 @@ function prepare_photo_data($type, $scale, $photo_id)
$data['photo']['friendica_activities'] = api_format_items_activities($item[0], $type); $data['photo']['friendica_activities'] = api_format_items_activities($item[0], $type);
// retrieve comments on photo // retrieve comments on photo
$r = q("SELECT `item`.* FROM `item` $condition = ["`parent` = ? AND `uid` = ? AND (`verb` = ? OR `type`='photo')",
STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id` $item[0]['parent'], api_user(), ACTIVITY_POST];
AND (NOT `contact`.`blocked` OR `contact`.`pending`)
WHERE `item`.`parent` = %d AND `item`.`visible` $statuses = Item::select(api_user(), [], $condition);
AND NOT `item`.`moderated` AND NOT `item`.`deleted`
AND `item`.`uid` = %d AND (`item`.`verb`='%s' OR `type`='photo')",
intval($item[0]['parent']),
intval(api_user()),
dbesc(ACTIVITY_POST)
);
// prepare output of comments // prepare output of comments
$commentData = api_format_items($r, $user_info, false, $type); $commentData = api_format_items(dba::inArray($statuses), $user_info, false, $type);
$comments = []; $comments = [];
if ($type == "xml") { if ($type == "xml") {
$k = 0; $k = 0;
@ -5849,14 +5716,10 @@ function api_friendica_notification_seen($type)
$nm->setSeen($note); $nm->setSeen($note);
if ($note['otype']=='item') { if ($note['otype']=='item') {
// would be really better with an ItemsManager and $im->getByID() :-P // would be really better with an ItemsManager and $im->getByID() :-P
$r = q( $item = Item::selectFirst(api_user(), [], ['id' => $note['iid'], 'uid' => api_user()]);
"SELECT * FROM `item` WHERE `id`=%d AND `uid`=%d", if (DBM::is_result($$item)) {
intval($note['iid']),
intval(local_user())
);
if ($r!==false) {
// we found the item, return it to the user // we found the item, return it to the user
$ret = api_format_items($r, $user_info, false, $type); $ret = api_format_items([$item], $user_info, false, $type);
$data = ['status' => $ret]; $data = ['status' => $ret];
return api_format_data("status", $type, $data); return api_format_data("status", $type, $data);
} }

25
include/conversation.php
View file

@ -15,6 +15,7 @@ use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Model\Item;
use Friendica\Object\Post; use Friendica\Object\Post;
use Friendica\Object\Thread; use Friendica\Object\Thread;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -467,8 +468,8 @@ function item_joins($uid = 0) {
AND NOT `contact`.`blocked` AND NOT `contact`.`blocked`
AND ((NOT `contact`.`readonly` AND NOT `contact`.`pending` AND (`contact`.`rel` IN (%s, %s))) 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) OR `contact`.`self` OR (`item`.`id` != `item`.`parent`) OR `contact`.`uid` = 0)
INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` AND NOT `author`.`blocked` STRAIGHT_JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` AND NOT `author`.`blocked`
INNER JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id` AND NOT `owner`.`blocked` STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id`=`item`.`owner-id` AND NOT `owner`.`blocked`
LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = %d LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = %d
LEFT JOIN `event` ON `event-id` = `event`.`id`", LEFT JOIN `event` ON `event-id` = `event`.`id`",
CONTACT_IS_SHARING, CONTACT_IS_FRIEND, intval($uid) CONTACT_IS_SHARING, CONTACT_IS_FRIEND, intval($uid)
@ -734,7 +735,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
'guid' => (($preview) ? 'Q0' : $item['guid']), 'guid' => (($preview) ? 'Q0' : $item['guid']),
'network' => $item['item_network'], 'network' => $item['item_network'],
'network_name' => ContactSelector::networkToName($item['item_network'], $profile_link), 'network_name' => ContactSelector::networkToName($item['item_network'], $profile_link),
'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), 'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']),
'profile_url' => $profile_link, 'profile_url' => $profile_link,
'item_photo_menu' => item_photo_menu($item), 'item_photo_menu' => item_photo_menu($item),
'name' => $profile_name_e, 'name' => $profile_name_e,
@ -865,21 +866,21 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
function conversation_add_children($parents, $block_authors, $order, $uid) { function conversation_add_children($parents, $block_authors, $order, $uid) {
$max_comments = Config::get('system', 'max_comments', 100); $max_comments = Config::get('system', 'max_comments', 100);
$params = ['order' => ['uid', 'commented' => true]];
if ($max_comments > 0) { if ($max_comments > 0) {
$limit = ' LIMIT '.intval($max_comments + 1); $params['limit'] = $max_comments;
} else {
$limit = '';
} }
$items = []; $items = [];
$block_sql = $block_authors ? "AND NOT `author`.`hidden` AND NOT `author`.`blocked`" : "";
foreach ($parents AS $parent) { foreach ($parents AS $parent) {
$thread_items = dba::p(item_query(local_user())."AND `item`.`parent-uri` = ? $condition = ["`item`.`parent-uri` = ? AND `item`.`uid` IN (0, ?) ",
AND `item`.`uid` IN (0, ?) $block_sql $parent['uri'], local_user()];
ORDER BY `item`.`uid` ASC, `item`.`commented` DESC" . $limit, if ($block_authors) {
$parent['uri'], local_user()); $condition[0] .= "AND NOT `author`.`hidden`";
}
$thread_items = Item::select(local_user(), [], $condition, $params);
$comments = dba::inArray($thread_items); $comments = dba::inArray($thread_items);

63
include/dba.php
View file

@ -1148,29 +1148,9 @@ class dba {
$condition_string = self::buildCondition($condition); $condition_string = self::buildCondition($condition);
$order_string = ''; $param_string = self::buildParameter($params);
if (isset($params['order'])) {
$order_string = " ORDER BY ";
foreach ($params['order'] AS $fields => $order) {
if (!is_int($fields)) {
$order_string .= "`" . $fields . "` " . ($order ? "DESC" : "ASC") . ", ";
} else {
$order_string .= "`" . $order . "`, ";
}
}
$order_string = substr($order_string, 0, -2);
}
$limit_string = ''; $sql = "SELECT " . $select_fields . " FROM `" . $table . "`" . $condition_string . $param_string;
if (isset($params['limit']) && is_int($params['limit'])) {
$limit_string = " LIMIT " . $params['limit'];
}
if (isset($params['limit']) && is_array($params['limit'])) {
$limit_string = " LIMIT " . intval($params['limit'][0]) . ", " . intval($params['limit'][1]);
}
$sql = "SELECT " . $select_fields . " FROM `" . $table . "`" . $condition_string . $order_string . $limit_string;
$result = self::p($sql, $condition); $result = self::p($sql, $condition);
@ -1227,14 +1207,14 @@ class dba {
* @param array $condition * @param array $condition
* @return string * @return string
*/ */
private static function buildCondition(array &$condition = []) public static function buildCondition(array &$condition = [])
{ {
$condition_string = ''; $condition_string = '';
if (count($condition) > 0) { if (count($condition) > 0) {
reset($condition); reset($condition);
$first_key = key($condition); $first_key = key($condition);
if (is_int($first_key)) { if (is_int($first_key)) {
$condition_string = " WHERE ".array_shift($condition); $condition_string = " WHERE (" . array_shift($condition) . ")";
} else { } else {
$new_values = []; $new_values = [];
$condition_string = ""; $condition_string = "";
@ -1251,7 +1231,7 @@ class dba {
$condition_string .= "`" . $field . "` = ?"; $condition_string .= "`" . $field . "` = ?";
} }
} }
$condition_string = " WHERE " . $condition_string; $condition_string = " WHERE (" . $condition_string . ")";
$condition = $new_values; $condition = $new_values;
} }
} }
@ -1259,6 +1239,39 @@ class dba {
return $condition_string; return $condition_string;
} }
/**
* @brief Returns the SQL parameter string built from the provided parameter array
*
* @param array $params
* @return string
*/
public static function buildParameter(array $params = [])
{
$order_string = '';
if (isset($params['order'])) {
$order_string = " ORDER BY ";
foreach ($params['order'] AS $fields => $order) {
if (!is_int($fields)) {
$order_string .= "`" . $fields . "` " . ($order ? "DESC" : "ASC") . ", ";
} else {
$order_string .= "`" . $order . "`, ";
}
}
$order_string = substr($order_string, 0, -2);
}
$limit_string = '';
if (isset($params['limit']) && is_int($params['limit'])) {
$limit_string = " LIMIT " . $params['limit'];
}
if (isset($params['limit']) && is_array($params['limit'])) {
$limit_string = " LIMIT " . intval($params['limit'][0]) . ", " . intval($params['limit'][1]);
}
return $order_string.$limit_string;
}
/** /**
* @brief Fills an array with data from a query * @brief Fills an array with data from a query
* *

13
include/enotify.php
View file

@ -11,6 +11,7 @@ use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Emailer; use Friendica\Util\Emailer;
use Friendica\Model\Item;
/** /**
* @brief Creates a notification entry and possibly sends a mail * @brief Creates a notification entry and possibly sends a mail
@ -129,7 +130,7 @@ function notification($params)
$item = null; $item = null;
if ($params['otype'] === 'item' && $parent_id) { if ($params['otype'] === 'item' && $parent_id) {
$item = dba::selectFirst('item', [], ['id' => $parent_id]); $item = Item::selectFirst($params['uid'], [], ['id' => $parent_id]);
} }
$item_post_type = item_post_type($item); $item_post_type = item_post_type($item);
@ -739,7 +740,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
// Only act if it is a "real" post // Only act if it is a "real" post
// We need the additional check for the "local_profile" because of mixed situations on connector networks // We need the additional check for the "local_profile" because of mixed situations on connector networks
$item = q("SELECT `id`, `mention`, `tag`,`parent`, `title`, `body`, `author-name`, `author-link`, `author-avatar`, `guid`, $item = q("SELECT `id`, `mention`, `tag`,`parent`, `title`, `body`, `author-id`, `guid`,
`parent-uri`, `uri`, `contact-id` `parent-uri`, `uri`, `contact-id`
FROM `item` WHERE `id` = %d AND `verb` IN ('%s', '') AND `type` != 'activity' AND FROM `item` WHERE `id` = %d AND `verb` IN ('%s', '') AND `type` != 'activity' AND
NOT (`author-link` IN ($profile_list)) LIMIT 1", NOT (`author-link` IN ($profile_list)) LIMIT 1",
@ -747,6 +748,8 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
if (!$item) if (!$item)
return false; return false;
$author = dba::selectFirst('contact', ['name', 'thumb', 'url'], ['id' => $item[0]['author-id']]);
// Generate the notification array // Generate the notification array
$params = []; $params = [];
$params["uid"] = $uid; $params["uid"] = $uid;
@ -758,9 +761,9 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
$params["parent"] = $item[0]["parent"]; $params["parent"] = $item[0]["parent"];
$params["link"] = System::baseUrl().'/display/'.urlencode($item[0]["guid"]); $params["link"] = System::baseUrl().'/display/'.urlencode($item[0]["guid"]);
$params["otype"] = 'item'; $params["otype"] = 'item';
$params["source_name"] = $item[0]["author-name"]; $params["source_name"] = $author["name"];
$params["source_link"] = $item[0]["author-link"]; $params["source_link"] = $author["url"];
$params["source_photo"] = $item[0]["author-avatar"]; $params["source_photo"] = $author["thumb"];
if ($item[0]["parent-uri"] === $item[0]["uri"]) { if ($item[0]["parent-uri"] === $item[0]["uri"]) {
// Send a notification for every new post? // Send a notification for every new post?

10
mod/display.php
View file

@ -14,6 +14,7 @@ use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Protocol\DFRN; use Friendica\Protocol\DFRN;
@ -345,11 +346,10 @@ function display_content(App $a, $update = false, $update_uid = 0) {
return ''; return '';
} }
$r = dba::p(item_query(local_user())."AND `item`.`parent-uri` = (SELECT `parent-uri` FROM `item` WHERE `id` = ?) $condition = ["`item`.`parent-uri` = (SELECT `parent-uri` FROM `item` WHERE `id` = ?)
AND `item`.`uid` IN (0, ?) $sql_extra AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()];
ORDER BY `item`.`uid` ASC, `parent` DESC, `gravity` ASC, `id` ASC", $params = ['order' => ['uid', 'parent' => true, 'gravity', 'id']];
$item_id, local_user() $r = Item::select(local_user(), [], $condition, $params);
);
if (!DBM::is_result($r)) { if (!DBM::is_result($r)) {
notice(L10n::t('Item not found.') . EOL); notice(L10n::t('Item not found.') . EOL);

86
mod/notes.php
View file

@ -7,6 +7,7 @@ use Friendica\Content\Nav;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Profile; use Friendica\Model\Profile;
use Friendica\Model\Item;
function notes_init(App $a) function notes_init(App $a)
{ {
@ -26,36 +27,21 @@ function notes_init(App $a)
function notes_content(App $a, $update = false) function notes_content(App $a, $update = false)
{ {
if (! local_user()) { if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL); notice(L10n::t('Permission denied.') . EOL);
return; return;
} }
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/conversation.php'; require_once 'include/conversation.php';
$groups = [];
$o = Profile::getTabs($a, true);
$o = '';
$remote_contact = false;
$contact_id = $_SESSION['cid'];
$contact = $a->contact;
$is_owner = true;
$o ="";
$o .= Profile::getTabs($a, true);
if (!$update) { if (!$update) {
$o .= '<h3>' . L10n::t('Personal Notes') . '</h3>'; $o .= '<h3>' . L10n::t('Personal Notes') . '</h3>';
$commpage = false;
$commvisitor = false;
$x = [ $x = [
'is_owner' => $is_owner, 'is_owner' => true,
'allow_location' => (($a->user['allow_location']) ? true : false), 'allow_location' => (($a->user['allow_location']) ? true : false),
'default_location' => $a->user['default-location'], 'default_location' => $a->user['default-location'],
'nickname' => $a->user['nickname'], 'nickname' => $a->user['nickname'],
@ -71,63 +57,31 @@ function notes_content(App $a, $update = false)
$o .= status_editor($a, $x, $a->contact['id']); $o .= status_editor($a, $x, $a->contact['id']);
} }
// Construct permissions $condition = ["`uid` = ? AND `type` = 'note' AND `id` = `parent` AND NOT `wall`
AND `allow_cid` = ? AND `contact-id` = ?",
local_user(), '<' . $a->contact['id'] . '>', $a->contact['id']];
// default permissions - anonymous user $notes = dba::count('item', $condition);
$sql_extra = " AND `item`.`allow_cid` = '<" . $a->contact['id'] . ">' "; $a->set_pager_total($notes);
$a->set_pager_itemspage(40);
$r = q("SELECT COUNT(*) AS `total` $params = ['order' => ['created' => true],
FROM `item` %s 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note' $r = Item::select(local_user(), ['item_id'], $condition, $params);
AND `contact`.`self` AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
$sql_extra ",
item_joins(local_user()),
item_condition(),
intval(local_user())
);
if (DBM::is_result($r)) { if (DBM::is_result($r)) {
$a->set_pager_total($r[0]['total']); $parents_arr = [];
$a->set_pager_itemspage(40);
}
$r = q("SELECT `item`.`id` AS `item_id` FROM `item` %s while ($rr = dba::fetch($r)) {
WHERE %s AND `item`.`uid` = %d AND `item`.`type` = 'note'
AND `item`.`id` = `item`.`parent` AND NOT `item`.`wall`
$sql_extra
ORDER BY `item`.`created` DESC LIMIT %d ,%d ",
item_joins(local_user()),
item_condition(),
intval(local_user()),
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
$parents_arr = [];
$parents_str = '';
if (DBM::is_result($r)) {
foreach ($r as $rr) {
$parents_arr[] = $rr['item_id']; $parents_arr[] = $rr['item_id'];
} }
$parents_str = implode(', ', $parents_arr); dba::close($r);
$r = q("SELECT %s FROM `item` %s
WHERE %s AND `item`.`uid` = %d AND `item`.`parent` IN (%s)
$sql_extra
ORDER BY `parent` DESC, `gravity` ASC, `item`.`id` ASC ",
item_fieldlists(),
item_joins(local_user()),
item_condition(),
intval(local_user()),
dbesc($parents_str)
);
if (DBM::is_result($r)) {
$items = conv_sort($r, "`commented`");
$condition = ['uid' => local_user(), 'parent' => $parents_arr];
$result = Item::select(local_user(), [], $condition);
if (DBM::is_result($result)) {
$items = conv_sort(dba::inArray($result), 'commented');
$o .= conversation($a, $items, 'notes', $update); $o .= conversation($a, $items, 'notes', $update);
} }
} }

13
mod/profile.php
View file

@ -337,16 +337,9 @@ function profile_content(App $a, $update = 0)
$parents_arr[] = $rr['item_id']; $parents_arr[] = $rr['item_id'];
} }
$parents_str = implode(', ', $parents_arr); $condition = ['uid' => $a->profile['profile_uid'], 'parent' => $parents_arr];
$result = Item::select($a->profile['profile_uid'], [], $condition);
$items = q(item_query($a->profile['profile_uid']) . " AND `item`.`uid` = %d $items = conv_sort(dba::inArray($result), 'created');
AND `item`.`parent` IN (%s)
$sql_extra ",
intval($a->profile['profile_uid']),
dbesc($parents_str)
);
$items = conv_sort($items, 'created');
} else { } else {
$items = []; $items = [];
} }

47
mod/search.php
View file

@ -10,6 +10,7 @@ use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Database\DBM; use Friendica\Database\DBM;
use Friendica\Model\Item;
require_once 'include/security.php'; require_once 'include/security.php';
require_once 'include/conversation.php'; require_once 'include/conversation.php';
@ -197,34 +198,34 @@ function search_content(App $a) {
if ($tag) { if ($tag) {
logger("Start tag search for '".$search."'", LOGGER_DEBUG); logger("Start tag search for '".$search."'", LOGGER_DEBUG);
$r = q("SELECT %s $condition = ["(`uid` = 0 OR (`uid` = ? AND NOT `global`))
FROM `term` AND `otype` = ? AND `type` = ? AND `term` = ?",
STRAIGHT_JOIN `item` ON `item`.`id`=`term`.`oid` %s local_user(), TERM_OBJ_POST, TERM_HASHTAG, $search];
WHERE %s AND (`term`.`uid` = 0 OR (`term`.`uid` = %d AND NOT `term`.`global`)) $params = ['order' => ['created' => true],
AND `term`.`otype` = %d AND `term`.`type` = %d AND `term`.`term` = '%s' AND `item`.`verb` = '%s' 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
AND NOT `author`.`blocked` AND NOT `author`.`hidden` $terms = dba::select('term', ['oid'], $condition, $params);
ORDER BY term.created DESC LIMIT %d , %d ",
item_fieldlists(), item_joins(local_user()), item_condition(), $itemids = [];
intval(local_user()), while ($term = dba::fetch($terms)) {
intval(TERM_OBJ_POST), intval(TERM_HASHTAG), dbesc(protect_sprintf($search)), dbesc(ACTIVITY_POST), $itemids[] = $term['oid'];
intval($a->pager['start']), intval($a->pager['itemspage'])); }
dba::close($terms);
$items = Item::select(local_user(), [], ['id' => array_reverse($itemids)]);
$r = dba::inArray($items);
} else { } else {
logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); logger("Start fulltext search for '".$search."'", LOGGER_DEBUG);
$sql_extra = sprintf(" AND `item`.`body` REGEXP '%s' ", dbesc(protect_sprintf(preg_quote($search)))); $condition = ["(`uid` = 0 OR (`uid` = ? AND NOT `global`))
AND `body` LIKE CONCAT('%',?,'%')",
$r = q("SELECT %s local_user(), $search];
FROM `item` %s $params = ['order' => ['id' => true],
WHERE %s AND (`item`.`uid` = 0 OR (`item`.`uid` = %s AND NOT `item`.`global`)) 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
AND NOT `author`.`blocked` AND NOT `author`.`hidden` $items = Item::select(local_user(), [], $condition, $params);
$sql_extra $r = dba::inArray($items);
GROUP BY `item`.`uri`, `item`.`id` ORDER BY `item`.`id` DESC LIMIT %d , %d",
item_fieldlists(), item_joins(local_user()), item_condition(),
intval(local_user()),
intval($a->pager['start']), intval($a->pager['itemspage']));
} }
if (! DBM::is_result($r)) { if (!DBM::is_result($r)) {
info(L10n::t('No results.') . EOL); info(L10n::t('No results.') . EOL);
return $o; return $o;
} }

6
src/Content/Widget/TagCloud.php
View file

@ -74,7 +74,6 @@ class TagCloud
*/ */
private static function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG) private static function tagadelic($uid, $count = 0, $owner_id = 0, $flags = '', $type = TERM_HASHTAG)
{ {
$item_condition = item_condition();
$sql_options = item_permissions_sql($uid); $sql_options = item_permissions_sql($uid);
$limit = $count ? sprintf('LIMIT %d', intval($count)) : ''; $limit = $count ? sprintf('LIMIT %d', intval($count)) : '';
@ -91,13 +90,12 @@ class TagCloud
// Fetch tags // Fetch tags
$r = dba::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term` $r = dba::p("SELECT `term`, COUNT(`term`) AS `total` FROM `term`
LEFT JOIN `item` ON `term`.`oid` = `item`.`id` LEFT JOIN `item` ON `term`.`oid` = `item`.`id`
LEFT JOIN `user-item` ON `user-item`.`iid` = `item`.`id` AND `user-item`.`uid` = ?
WHERE `term`.`uid` = ? AND `term`.`type` = ? WHERE `term`.`uid` = ? AND `term`.`type` = ?
AND `term`.`otype` = ? AND `term`.`otype` = ?
AND $item_condition $sql_options AND `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
$sql_options
GROUP BY `term` ORDER BY `total` DESC $limit", GROUP BY `term` ORDER BY `total` DESC $limit",
$uid, $uid,
$uid,
$type, $type,
TERM_OBJ_POST TERM_OBJ_POST
); );

16
src/Model/Contact.php
View file

@ -1055,22 +1055,22 @@ class Contact extends BaseObject
} }
if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) { if (in_array($r[0]["network"], [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""])) {
$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = %d AND NOT `item`.`global`))"; $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
} else { } else {
$sql = "`item`.`uid` = %d"; $sql = "`item`.`uid` = ?";
} }
$author_id = intval($r[0]["author-id"]); $author_id = intval($r[0]["author-id"]);
$contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id'); $contact = ($r[0]["contact-type"] == ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
$r = q(item_query(local_user()) . " AND `item`.`" . $contact . "` = %d AND " . $sql . $condition = ["`$contact` = ? AND `verb` = ? AND " . $sql,
" AND `item`.`verb` = '%s' ORDER BY `item`.`created` DESC LIMIT %d, %d", $author_id, ACTIVITY_POST, local_user()];
intval($author_id), intval(local_user()), dbesc(ACTIVITY_POST), $params = ['order' => ['created' => true],
intval($a->pager['start']), intval($a->pager['itemspage']) 'limit' => [$a->pager['start'], $a->pager['itemspage']]];
); $r = Item::select(local_user(), [], $condition, $params);
$o = conversation($a, $r, 'contact-posts', false); $o = conversation($a, dba::inArray($r), 'contact-posts', false);
$o .= alt_pager($a, count($r)); $o .= alt_pager($a, count($r));

264
src/Model/Item.php
View file

@ -33,6 +33,270 @@ require_once 'include/text.php';
class Item extends BaseObject class Item extends BaseObject
{ {
/**
* Retrieve a single record from the item table and returns it in an associative array
*
* @brief Retrieve a single record from a table
* @param integer $uid User ID
* @param array $fields
* @param array $condition
* @param array $params
* @return bool|array
* @see dba::select
*/
public static function selectFirst($uid, array $fields = [], array $condition = [], $params = [])
{
$params['limit'] = 1;
$result = self::select($uid, $fields, $condition, $params);
if (is_bool($result)) {
return $result;
} else {
$row = dba::fetch($result);
dba::close($result);
return $row;
}
}
/**
* @brief Select rows from the item table
*
* @param integer $uid User ID
* @param array $fields Array of selected fields, empty for all
* @param array $condition Array of fields for condition
* @param array $params Array of several parameters
*
* @return boolean|object
*/
public static function select($uid, array $selected = [], array $condition = [], $params = [])
{
$fields = self::fieldlist();
$select_fields = self::constructSelectFields($fields, $selected);
$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);
$table = "`item` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, false);
$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
return dba::p($sql, $condition);
}
/**
* Retrieve a single record from the starting post in the item table and returns it in an associative array
*
* @brief Retrieve a single record from a table
* @param integer $uid User ID
* @param array $fields
* @param array $condition
* @param array $params
* @return bool|array
* @see dba::select
*/
public static function selectFirstThread($uid, array $fields = [], array $condition = [], $params = [])
{
$params['limit'] = 1;
$result = self::selectThread($uid, $fields, $condition, $params);
if (is_bool($result)) {
return $result;
} else {
$row = dba::fetch($result);
dba::close($result);
return $row;
}
}
/**
* @brief Select rows from the starting post in the item table
*
* @param integer $uid User ID
* @param array $fields Array of selected fields, empty for all
* @param array $condition Array of fields for condition
* @param array $params Array of several parameters
*
* @return boolean|object
*/
public static function selectThread($uid, array $selected = [], array $condition = [], $params = [])
{
$fields = self::fieldlist();
$threadfields = ['thread' => ['iid', 'uid', 'contact-id', 'owner-id', 'author-id',
'created', 'edited', 'commented', 'received', 'changed', 'wall', 'private',
'pubmail', 'moderated', 'visible', 'starred', 'ignored', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'network']];
$select_fields = self::constructSelectFields($fields, $selected);
$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 = self::addTablesToFields($param_string, $threadfields);
$param_string = self::addTablesToFields($param_string, $fields);
$table = "`thread` " . self::constructJoins($uid, $select_fields . $condition_string . $param_string, true);
$sql = "SELECT " . $select_fields . " FROM " . $table . $condition_string . $param_string;
return dba::p($sql, $condition);
}
/**
* @brief Returns a list of fields that are associated with the item table
*
* @return array field list
*/
private static function fieldlist()
{
$item_fields = ['author-id', 'owner-id', 'contact-id', 'uid', 'id', 'parent',
'uri', 'thr-parent', 'parent-uri', 'content-warning',
'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
'guid', 'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'event-id',
'location', 'coord', 'app', 'attach', 'rendered-hash', 'rendered-html', 'object',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'id' => 'item_id', 'network' => 'item_network'];
$author_fields = ['url' => 'author-link', 'name' => 'author-name', 'thumb' => 'author-avatar'];
$owner_fields = ['url' => 'owner-link', 'name' => 'owner-name', 'thumb' => 'owner-avatar'];
$contact_fields = ['url' => 'contact-link', 'name' => 'contact-name', 'thumb' => 'contact-avatar',
'network', 'url', 'name', 'writable', 'self', 'id' => 'cid', 'alias'];
$event_fields = ['created' => 'event-created', 'edited' => 'event-edited',
'start' => 'event-start','finish' => 'event-finish',
'summary' => 'event-summary','desc' => 'event-desc',
'location' => 'event-location', 'type' => 'event-type',
'nofinish' => 'event-nofinish','adjust' => 'event-adjust',
'ignore' => 'event-ignore', 'id' => 'event-id'];
return ['item' => $item_fields, 'author' => $author_fields, 'owner' => $owner_fields,
'contact' => $contact_fields, 'event' => $event_fields];
}
/**
* @brief Returns SQL condition for the "select" functions
*
* @param boolean $thread_mode Called for the items (false) or for the threads (true)
*
* @return string SQL condition
*/
private static function condition($thread_mode)
{
if ($thread_mode) {
$master_table = "`thread`";
} 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`) ";
}
/**
* @brief Returns all needed "JOIN" commands for the "select" functions
*
* @param integer $uid User ID
* @param string $sql_commands The parts of the built SQL commands in the "select" functions
* @param boolean $thread_mode Called for the items (false) or for the threads (true)
*
* @return string The SQL joins for the "select" functions
*/
private static function constructJoins($uid, $sql_commands, $thread_mode)
{
if ($thread_mode) {
$master_table = "`thread`";
$master_table_key = "`thread`.`iid`";
$joins = "STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid` ";
} else {
$master_table = "`item`";
$master_table_key = "`item`.`id`";
$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 (strpos($sql_commands, "`group_member`.") !== false) {
$joins .= " STRAIGHT_JOIN `group_member` ON `group_member`.`contact-id` = $master_table.`contact-id`";
}
if (strpos($sql_commands, "`user`.") !== false) {
$joins .= " STRAIGHT_JOIN `user` ON `user`.`uid` = $master_table.`uid`";
}
if (strpos($sql_commands, "`event`.") !== false) {
$joins .= " LEFT JOIN `event` ON `event-id` = `event`.`id`";
}
return $joins;
}
/**
* @brief Add the field list for the "select" functions
*
* @param array $fields The field definition array
* @param array $selected The array with the selected fields from the "select" functions
*
* @return string The field list
*/
private static function constructSelectFields($fields, $selected)
{
$selection = [];
foreach ($fields as $table => $table_fields) {
foreach ($table_fields as $field => $select) {
if (empty($selected) || in_array($select, $selected)) {
if (is_int($field)) {
$selection[] = "`" . $table . "`.`".$select."`";
} else {
$selection[] = "`" . $table . "`.`" . $field . "` AS `".$select ."`";
}
}
}
}
return implode(", ", $selection);
}
/**
* @brief add table definition to fields in an SQL query
*
* @param string $query SQL query
* @param array $fields The field definition array
*
* @return string the changed SQL query
*/
private static function addTablesToFields($query, $fields)
{
foreach ($fields as $table => $table_fields) {
foreach ($table_fields as $alias => $field) {
if (is_int($alias)) {
$replace_field = $field;
} else {
$replace_field = $alias;
}
$search = "/([^\.])`" . $field . "`/i";
$replace = "$1`" . $table . "`.`" . $replace_field . "`";
$query = preg_replace($search, $replace, $query);
}
}
return $query;
}
/** /**
* @brief Update existing item entries * @brief Update existing item entries
* *

6
tests/ApiTest.php
View file

@ -1871,7 +1871,7 @@ class ApiTest extends DatabaseTest
$this->app->argv[1] = '1.1'; $this->app->argv[1] = '1.1';
$this->app->argv[3] = 'create'; $this->app->argv[3] = 'create';
$this->app->argc = 10; $this->app->argc = 10;
$_REQUEST['id'] = 1; $_REQUEST['id'] = 3;
$result = api_favorites_create_destroy('json'); $result = api_favorites_create_destroy('json');
$this->assertStatus($result['status']); $this->assertStatus($result['status']);
} }
@ -1885,7 +1885,7 @@ class ApiTest extends DatabaseTest
$this->app->argv[1] = '1.1'; $this->app->argv[1] = '1.1';
$this->app->argv[3] = 'create'; $this->app->argv[3] = 'create';
$this->app->argc = 10; $this->app->argc = 10;
$_REQUEST['id'] = 1; $_REQUEST['id'] = 3;
$result = api_favorites_create_destroy('rss'); $result = api_favorites_create_destroy('rss');
$this->assertXml($result, 'status'); $this->assertXml($result, 'status');
} }
@ -1899,7 +1899,7 @@ class ApiTest extends DatabaseTest
$this->app->argv[1] = '1.1'; $this->app->argv[1] = '1.1';
$this->app->argv[3] = 'destroy'; $this->app->argv[3] = 'destroy';
$this->app->argc = 10; $this->app->argc = 10;
$_REQUEST['id'] = 1; $_REQUEST['id'] = 3;
$result = api_favorites_create_destroy('json'); $result = api_favorites_create_destroy('json');
$this->assertStatus($result['status']); $this->assertStatus($result['status']);
} }

20
tests/datasets/api.yml
View file

@ -48,7 +48,7 @@ contact:
network: dfrn network: dfrn
- -
id: 44 id: 44
uid: 42 uid: 0
name: Friend contact name: Friend contact
nick: friendcontact nick: friendcontact
self: false self: false
@ -74,6 +74,7 @@ item:
author-link: http://localhost/profile/selfcontact author-link: http://localhost/profile/selfcontact
wall: true wall: true
starred: true starred: true
origin: true
allow_cid: '' allow_cid: ''
allow_gid: '' allow_gid: ''
deny_cid: '' deny_cid: ''
@ -92,6 +93,7 @@ item:
author-link: http://localhost/profile/selfcontact author-link: http://localhost/profile/selfcontact
wall: true wall: true
starred: false starred: false
origin: true
- -
id: 3 id: 3
visible: true visible: true
@ -106,20 +108,22 @@ item:
author-link: http://localhost/profile/othercontact author-link: http://localhost/profile/othercontact
wall: true wall: true
starred: false starred: false
origin: true
- -
id: 4 id: 4
visible: true visible: true
contact-id: 43 contact-id: 44
author-id: 43 author-id: 44
owner-id: 42 owner-id: 42
uid: 42 uid: 42
verb: http://activitystrea.ms/schema/1.0/post verb: http://activitystrea.ms/schema/1.0/post
unseen: false unseen: false
body: Other user reply body: Friend user reply
parent: 1 parent: 1
author-link: http://localhost/profile/othercontact author-link: http://localhost/profile/othercontact
wall: true wall: true
starred: false starred: false
origin: true
- -
id: 5 id: 5
visible: true visible: true
@ -134,6 +138,7 @@ item:
author-link: http://localhost/profile/othercontact author-link: http://localhost/profile/othercontact
wall: true wall: true
starred: false starred: false
origin: true
allow_cid: '' allow_cid: ''
allow_gid: '' allow_gid: ''
deny_cid: '' deny_cid: ''
@ -152,24 +157,31 @@ item:
author-link: http://localhost/profile/othercontact author-link: http://localhost/profile/othercontact
wall: true wall: true
starred: false starred: false
origin: true
thread: thread:
- -
iid: 1 iid: 1
visible: true visible: true
contact-id: 42 contact-id: 42
author-id: 42
owner-id: 42
uid: 42 uid: 42
wall: true wall: true
- -
iid: 3 iid: 3
visible: true visible: true
contact-id: 43 contact-id: 43
author-id: 43
owner-id: 43
uid: 0 uid: 0
wall: true wall: true
- -
iid: 6 iid: 6
visible: true visible: true
contact-id: 44 contact-id: 44
author-id: 44
owner-id: 44
uid: 0 uid: 0
wall: true wall: true