From 5c668bd6e9f22b657ca31245da3bf8df7a0cffb0 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 29 May 2018 05:24:25 +0000 Subject: [PATCH 1/2] Changed function that will be private in the future --- pumpio/pumpio.php | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index 8426c535..b45e7670 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -1042,21 +1042,15 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) { function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { // Two queries for speed issues - $r = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - dbesc($post->object->id), - intval($uid) - ); + $condition = ['uri' => $post->object->id, 'uid' => $uid]; + if (dba::exists('item', $condition)) { + return Item::delete($condition); + } - if (count($r)) - return Item::deleteById($r[0]["id"]); - - $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1", - dbesc($post->object->id), - intval($uid) - ); - - if (count($r)) - return Item::deleteById($r[0]["id"]); + $condition = ['extid' => $post->object->id, 'uid' => $uid]; + if (dba::exists('item', $condition)) { + return Item::delete($condition); + } } function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) { From 476302afc51c69135c27ee31bdb72d9cdfe777d9 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 29 May 2018 12:36:44 +0000 Subject: [PATCH 2/2] Return values --- pumpio/pumpio.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index b45e7670..2da35abc 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -1044,13 +1044,16 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) { // Two queries for speed issues $condition = ['uri' => $post->object->id, 'uid' => $uid]; if (dba::exists('item', $condition)) { - return Item::delete($condition); + Item::delete($condition); + return true; } $condition = ['extid' => $post->object->id, 'uid' => $uid]; if (dba::exists('item', $condition)) { - return Item::delete($condition); + Item::delete($condition); + return true; } + return false; } function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) {