mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #5619 from annando/dba-item

Browse source 
Use the Item class instead of DBA calls when possible
This commit is contained in:
Tobias Diekershoff 2018-08-15 07:23:02 +02:00 committed by GitHub
parent e1d2ee3400 e8334c4655
commit a8b74e6bc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/display.php
View file

@ -247,7 +247,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
} }
// We are displaying an "alternate" link if that post was public. See issue 2864 // We are displaying an "alternate" link if that post was public. See issue 2864
$is_public = DBA::exists('item', ['id' => $item_id, 'private' => [0, 2]]); $is_public = Item::exists(['id' => $item_id, 'private' => [0, 2]]);
if ($is_public) { if ($is_public) {
// For the atom feed the nickname doesn't matter at all, we only need the item id. // For the atom feed the nickname doesn't matter at all, we only need the item id.
$alternate = System::baseUrl().'/display/feed-item/'.$item_id.'.atom'; $alternate = System::baseUrl().'/display/feed-item/'.$item_id.'.atom';
@ -324,7 +324,7 @@ function display_content(App $a, $update = false, $update_uid = 0)
if (local_user() && (local_user() == $a->profile['uid'])) { if (local_user() && (local_user() == $a->profile['uid'])) {
$condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true]; $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true];
$unseen = DBA::exists('item', $condition); $unseen = Item::exists($condition);
} else { } else {
$unseen = false; $unseen = false;
} }

2
mod/item.php
View file

@ -152,7 +152,7 @@ function item_post(App $a) {
// Check for multiple posts with the same message id (when the post was created via API) // Check for multiple posts with the same message id (when the post was created via API)
if (($message_id != '') && ($profile_uid != 0)) { if (($message_id != '') && ($profile_uid != 0)) {
if (DBA::exists('item', ['uri' => $message_id, 'uid' => $profile_uid])) { if (Item::exists(['uri' => $message_id, 'uid' => $profile_uid])) {
logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG); logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
return; return;
} }

2
mod/network.php
View file

@ -318,7 +318,7 @@ function networkSetSeen($condition)
return; return;
} }
$unseen = DBA::exists('item', $condition); $unseen = Item::exists($condition);
if ($unseen) { if ($unseen) {
$r = Item::update(['unseen' => false], $condition); $r = Item::update(['unseen' => false], $condition);

2
mod/profile.php
View file

@ -347,7 +347,7 @@ function profile_content(App $a, $update = 0)
if ($is_owner) { if ($is_owner) {
$unseen = DBA::exists('item', ['wall' => true, 'unseen' => true, 'uid' => local_user()]); $unseen = Item::exists(['wall' => true, 'unseen' => true, 'uid' => local_user()]);
if ($unseen) { if ($unseen) {
$r = Item::update(['unseen' => false], $r = Item::update(['unseen' => false],
['wall' => true, 'unseen' => true, 'uid' => local_user()]); ['wall' => true, 'unseen' => true, 'uid' => local_user()]);

34
src/Model/Item.php
View file

@ -80,7 +80,7 @@ class Item extends BaseObject
// All fields in the item table // All fields in the item table
const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid', const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid', 'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
'created', 'edited', 'commented', 'received', 'changed', 'verb', 'uri-hash', 'created', 'edited', 'commented', 'received', 'changed', 'verb',
'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform', 'postopts', 'plink', 'resource-id', 'event-id', 'tag', 'attach', 'inform',
'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type', 'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'post-type',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
@ -524,7 +524,7 @@ class Item extends BaseObject
$fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid', $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid', 'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid',
'created', 'edited', 'commented', 'received', 'changed', 'psid', 'created', 'edited', 'commented', 'received', 'changed', 'psid', 'uri-hash',
'resource-id', 'event-id', 'tag', 'attach', 'post-type', 'file', 'resource-id', 'event-id', 'tag', 'attach', 'post-type', 'file',
'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global', 'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
@ -950,8 +950,8 @@ class Item extends BaseObject
*/ */
public static function delete($condition, $priority = PRIORITY_HIGH) public static function delete($condition, $priority = PRIORITY_HIGH)
{ {
$items = DBA::select('item', ['id'], $condition); $items = self::select(['id'], $condition);
while ($item = DBA::fetch($items)) { while ($item = self::fetch($items)) {
self::deleteById($item['id'], $priority); self::deleteById($item['id'], $priority);
} }
DBA::close($items); DBA::close($items);
@ -969,8 +969,8 @@ class Item extends BaseObject
return; return;
} }
$items = DBA::select('item', ['id', 'uid'], $condition); $items = self::select(['id', 'uid'], $condition);
while ($item = DBA::fetch($items)) { while ($item = self::fetch($items)) {
// "Deleting" global items just means hiding them // "Deleting" global items just means hiding them
if ($item['uid'] == 0) { if ($item['uid'] == 0) {
DBA::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true); DBA::update('user-item', ['hidden' => true], ['iid' => $item['id'], 'uid' => $uid], true);
@ -1073,15 +1073,15 @@ class Item extends BaseObject
DBA::delete('item-delivery-data', ['iid' => $item['id']]); DBA::delete('item-delivery-data', ['iid' => $item['id']]);
if (!empty($item['iaid']) && !DBA::exists('item', ['iaid' => $item['iaid'], 'deleted' => false])) { if (!empty($item['iaid']) && !self::exists(['iaid' => $item['iaid'], 'deleted' => false])) {
DBA::delete('item-activity', ['id' => $item['iaid']], ['cascade' => false]); DBA::delete('item-activity', ['id' => $item['iaid']], ['cascade' => false]);
} }
if (!empty($item['icid']) && !DBA::exists('item', ['icid' => $item['icid'], 'deleted' => false])) { if (!empty($item['icid']) && !self::exists(['icid' => $item['icid'], 'deleted' => false])) {
DBA::delete('item-content', ['id' => $item['icid']], ['cascade' => false]); DBA::delete('item-content', ['id' => $item['icid']], ['cascade' => false]);
} }
// When the permission set will be used in photo and events as well, // When the permission set will be used in photo and events as well,
// this query here needs to be extended. // this query here needs to be extended.
if (!empty($item['psid']) && !DBA::exists('item', ['psid' => $item['psid'], 'deleted' => false])) { if (!empty($item['psid']) && !self::exists(['psid' => $item['psid'], 'deleted' => false])) {
DBA::delete('permissionset', ['id' => $item['psid']], ['cascade' => false]); DBA::delete('permissionset', ['id' => $item['psid']], ['cascade' => false]);
} }
@ -1360,7 +1360,7 @@ class Item extends BaseObject
} }
// Ensure to always have the same creation date. // Ensure to always have the same creation date.
$existing = DBA::selectfirst('item', ['created', 'uri-hash'], ['uri' => $item['uri']]); $existing = self::selectfirst(['created', 'uri-hash'], ['uri' => $item['uri']]);
if (DBA::isResult($existing)) { if (DBA::isResult($existing)) {
$item['created'] = $existing['created']; $item['created'] = $existing['created'];
$item['uri-hash'] = $existing['uri-hash']; $item['uri-hash'] = $existing['uri-hash'];
@ -1617,7 +1617,7 @@ class Item extends BaseObject
$item["global"] = true; $item["global"] = true;
// Set the global flag on all items if this was a global item entry // Set the global flag on all items if this was a global item entry
DBA::update('item', ['global' => true], ['uri' => $item["uri"]]); self::update(['global' => true], ['uri' => $item["uri"]]);
} else { } else {
$item["global"] = self::exists(['uid' => 0, 'uri' => $item["uri"]]); $item["global"] = self::exists(['uid' => 0, 'uri' => $item["uri"]]);
} }
@ -1768,7 +1768,7 @@ class Item extends BaseObject
} }
// Set parent id // Set parent id
DBA::update('item', ['parent' => $parent_id], ['id' => $current_post]); self::update(['parent' => $parent_id], ['id' => $current_post]);
$item['id'] = $current_post; $item['id'] = $current_post;
$item['parent'] = $parent_id; $item['parent'] = $parent_id;
@ -1776,9 +1776,9 @@ class Item extends BaseObject
// update the commented timestamp on the parent // update the commented timestamp on the parent
// Only update "commented" if it is really a comment // Only update "commented" if it is really a comment
if (($item['gravity'] != GRAVITY_ACTIVITY) || !Config::get("system", "like_no_comment")) { if (($item['gravity'] != GRAVITY_ACTIVITY) || !Config::get("system", "like_no_comment")) {
DBA::update('item', ['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]); self::update(['commented' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
} else { } else {
DBA::update('item', ['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]); self::update(['changed' => DateTimeFormat::utcNow()], ['id' => $parent_id]);
} }
if ($dsprsig) { if ($dsprsig) {
@ -2076,7 +2076,7 @@ class Item extends BaseObject
if ($item['uri'] != $item['parent-uri']) { if ($item['uri'] != $item['parent-uri']) {
$parents = self::select(['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)) { while ($parent = self::fetch($parents)) {
$users[$parent['uid']] = $parent['uid']; $users[$parent['uid']] = $parent['uid'];
if ($parent['origin'] && !$origin) { if ($parent['origin'] && !$origin) {
$origin_uid = $parent['uid']; $origin_uid = $parent['uid'];
@ -2467,6 +2467,7 @@ class Item extends BaseObject
// Does the given user have this item? // Does the given user have this item?
if ($uid) { if ($uid) {
/// @todo This query has to be abstracted for the "uri-id" changes
$item = DBA::fetchFirst("SELECT `item`.`id`, `user`.`nickname` FROM `item` $item = DBA::fetchFirst("SELECT `item`.`id`, `user`.`nickname` FROM `item`
INNER JOIN `user` ON `user`.`uid` = `item`.`uid` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
@ -2479,6 +2480,7 @@ class Item extends BaseObject
// Or is it anywhere on the server? // Or is it anywhere on the server?
if ($nick == "") { if ($nick == "") {
/// @todo This query has to be abstracted for the "uri-id" changes
$item = DBA::fetchFirst("SELECT `item`.`id`, `user`.`nickname` FROM `item` $item = DBA::fetchFirst("SELECT `item`.`id`, `user`.`nickname` FROM `item`
INNER JOIN `user` ON `user`.`uid` = `item`.`uid` INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
@ -2579,7 +2581,7 @@ class Item extends BaseObject
$fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'], $fields = ['wall' => true, 'origin' => true, 'forum_mode' => $forum_mode, 'contact-id' => $self['id'],
'owner-id' => $owner_id, 'owner-link' => $self['url'], 'private' => $private, 'allow_cid' => $user['allow_cid'], 'owner-id' => $owner_id, 'owner-link' => $self['url'], 'private' => $private, 'allow_cid' => $user['allow_cid'],
'allow_gid' => $user['allow_gid'], 'deny_cid' => $user['deny_cid'], 'deny_gid' => $user['deny_gid']]; 'allow_gid' => $user['allow_gid'], 'deny_cid' => $user['deny_cid'], 'deny_gid' => $user['deny_gid']];
DBA::update('item', $fields, ['id' => $item_id]); self::update($fields, ['id' => $item_id]);
self::updateThread($item_id); self::updateThread($item_id);