]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Item.php
Merge pull request #5575 from annando/issue-5541
[friendica.git] / src / Model / Item.php
index 46d0187da9ab7fa88ab698e9db099460de4fd419..6d0b1901bdc9fbc4b2ced855ccd5591e515cc60f 100644 (file)
@@ -15,7 +15,9 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\PermissionSet;
+use Friendica\Model\ItemURI;
 use Friendica\Object\Image;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
@@ -514,9 +516,8 @@ class Item extends BaseObject
 
                $fields['item'] = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
                        'contact-id', 'owner-id', 'author-id', 'type', 'wall', 'gravity', 'extid',
-                       'created', 'edited', 'commented', 'received', 'changed',
-                       'resource-id', 'event-id', 'tag', 'attach', 'post-type',
-                       'file', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'psid',
+                       'created', 'edited', 'commented', 'received', 'changed', 'psid',
+                       'resource-id', 'event-id', 'tag', 'attach', 'post-type', 'file',
                        'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark',
                        'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'global',
                        'id' => 'item_id', 'network', 'icid', 'iaid', 'id' => 'internal-iid',
@@ -529,6 +530,8 @@ class Item extends BaseObject
 
                $fields['item-delivery-data'] = self::DELIVERY_DATA_FIELDLIST;
 
+               $fields['permissionset'] = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
+
                $fields['author'] = ['url' => 'author-link', 'name' => 'author-name',
                        'thumb' => 'author-avatar', 'nick' => 'author-nick', 'network' => 'author-network'];
 
@@ -601,7 +604,7 @@ class Item extends BaseObject
                                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, GRAVITY_PARENT, intval($uid));
+                               Contact::SHARING, Contact::FRIEND, GRAVITY_PARENT, intval($uid));
                } else {
                        if (strpos($sql_commands, "`contact`.") !== false) {
                                $joins .= "LEFT JOIN `contact` ON `contact`.`id` = $master_table.`contact-id`";
@@ -642,6 +645,10 @@ class Item extends BaseObject
                        $joins .= " LEFT JOIN `item-delivery-data` ON `item-delivery-data`.`iid` = `item`.`id`";
                }
 
+               if (strpos($sql_commands, "`permissionset`.") !== false) {
+                       $joins .= " LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`";
+               }
+
                if ((strpos($sql_commands, "`parent-item`.") !== false) || (strpos($sql_commands, "`parent-author`.") !== false)) {
                        $joins .= " STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`";
                }
@@ -819,7 +826,7 @@ class Item extends BaseObject
                                // Fetch the uri-hash from an existing item entry if there is one
                                $item_condition = ["`uri` = ? AND `uri-hash` != ''", $item['uri']];
                                $existing = DBA::selectfirst('item', ['uri-hash'], $item_condition);
-                               if (DBM::is_result($existing)) {
+                               if (DBA::isResult($existing)) {
                                        $item['uri-hash'] = $existing['uri-hash'];
                                } else {
                                        $item['uri-hash'] = self::itemHash($item['uri'], $item['created']);
@@ -840,7 +847,7 @@ class Item extends BaseObject
 
                                if (empty($item['iaid'])) {
                                        $item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]);
-                                       if (DBM::is_result($item_activity)) {
+                                       if (DBA::isResult($item_activity)) {
                                                $item_fields = ['iaid' => $item_activity['id'], 'icid' => null];
                                                foreach (self::MIXED_CONTENT_FIELDLIST as $field) {
                                                        if (self::isLegacyMode()) {
@@ -872,7 +879,7 @@ class Item extends BaseObject
 
                                if (empty($item['icid'])) {
                                        $item_content = DBA::selectFirst('item-content', [], ['uri-plink-hash' => $item['uri-hash']]);
-                                       if (DBM::is_result($item_content)) {
+                                       if (DBA::isResult($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) {
@@ -973,9 +980,10 @@ class Item extends BaseObject
                // locate item to be deleted
                $fields = ['id', 'uri', 'uid', 'parent', 'parent-uri', 'origin',
                        'deleted', 'file', 'resource-id', 'event-id', 'attach',
-                       'verb', 'object-type', 'object', 'target', 'contact-id'];
+                       'verb', 'object-type', 'object', 'target', 'contact-id',
+                       'icid', 'iaid', 'psid'];
                $item = self::selectFirst($fields, ['id' => $item_id]);
-               if (!DBM::is_result($item)) {
+               if (!DBA::isResult($item)) {
                        logger('Item with ID ' . $item_id . " hasn't been found.", LOGGER_DEBUG);
                        return false;
                }
@@ -986,7 +994,7 @@ class Item extends BaseObject
                }
 
                $parent = self::selectFirst(['origin'], ['id' => $item['parent']]);
-               if (!DBM::is_result($parent)) {
+               if (!DBA::isResult($parent)) {
                        $parent = ['origin' => false];
                }
 
@@ -1036,11 +1044,7 @@ class Item extends BaseObject
                self::deleteTagsFromItem($item);
 
                // Set the item to "deleted"
-               // This erasing of item content is superfluous for items with a matching item-content.
-               // But for the next time we will still have old content in the item table.
-               $item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow(),
-                       'body' => '', 'title' => '', 'content-warning' => '', 'rendered-hash' => '', 'rendered-html' => '',
-                       'object' => '', 'target' => '', 'tag' => '', 'postopts' => '', 'attach' => '', 'file' => ''];
+               $item_fields = ['deleted' => true, 'edited' => DateTimeFormat::utcNow(), 'changed' => DateTimeFormat::utcNow()];
                DBA::update('item', $item_fields, ['id' => $item['id']]);
 
                Term::insertFromTagFieldByItemId($item['id'], '');
@@ -1053,6 +1057,18 @@ class Item extends BaseObject
 
                DBA::delete('item-delivery-data', ['iid' => $item['id']]);
 
+               if (!empty($item['iaid']) && !DBA::exists('item', ['iaid' => $item['iaid'], 'deleted' => false])) {
+                       DBA::delete('item-activity', ['id' => $item['iaid']], ['cascade' => false]);
+               }
+               if (!empty($item['icid']) && !DBA::exists('item', ['icid' => $item['icid'], 'deleted' => false])) {
+                       DBA::delete('item-content', ['id' => $item['icid']], ['cascade' => false]);
+               }
+               // When the permission set will be used in photo and events as well,
+               // this query here needs to be extended.
+               if (!empty($item['psid']) && !DBA::exists('item', ['psid' => $item['psid'], 'deleted' => false])) {
+                       DBA::delete('permissionset', ['id' => $item['psid']], ['cascade' => false]);
+               }
+
                // If it's the parent of a comment thread, kill all the kids
                if ($item['id'] == $item['parent']) {
                        self::delete(['parent' => $item['parent'], 'deleted' => false], $priority);
@@ -1070,7 +1086,7 @@ class Item extends BaseObject
 
                        // When we delete just our local user copy of an item, we have to set a marker to hide it
                        $global_item = self::selectFirst(['id'], ['uri' => $item['uri'], 'uid' => 0, 'deleted' => false]);
-                       if (DBM::is_result($global_item)) {
+                       if (DBA::isResult($global_item)) {
                                DBA::update('user-item', ['hidden' => true], ['iid' => $global_item['id'], 'uid' => $item['uid']], true);
                        }
                }
@@ -1094,7 +1110,7 @@ class Item extends BaseObject
                }
 
                $i = self::selectFirst(['id', 'contact-id', 'tag'], ['uri' => $xt->id, 'uid' => $item['uid']]);
-               if (!DBM::is_result($i)) {
+               if (!DBA::isResult($i)) {
                        return;
                }
 
@@ -1195,7 +1211,7 @@ class Item extends BaseObject
                // Still missing? Then use the "self" contact of the current user
                if ($contact_id == 0) {
                        $self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $item['uid']]);
-                       if (DBM::is_result($self)) {
+                       if (DBA::isResult($self)) {
                                $contact_id = $self["id"];
                        }
                }
@@ -1224,7 +1240,7 @@ class Item extends BaseObject
                        $item['wall'] = 1;
                        $item['origin'] = 1;
                        $item['network'] = NETWORK_DFRN;
-                       $item['protocol'] = PROTOCOL_DFRN;
+                       $item['protocol'] = Conversation::PARCEL_DFRN;
 
                        if (is_int($notify)) {
                                $priority = $notify;
@@ -1238,6 +1254,9 @@ class Item extends BaseObject
                $item['guid'] = self::guid($item, $notify);
                $item['uri'] = notags(trim(defaults($item, 'uri', self::newURI($item['uid'], $item['guid']))));
 
+               // Store URI data
+               $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
+
                // Store conversation data
                $item = Conversation::insert($item);
 
@@ -1291,7 +1310,7 @@ class Item extends BaseObject
                $expire_interval = Config::get('system', 'dbclean-expire-days', 0);
 
                $user = DBA::selectFirst('user', ['expire'], ['uid' => $uid]);
-               if (DBM::is_result($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
+               if (DBA::isResult($user) && ($user['expire'] > 0) && (($user['expire'] < $expire_interval) || ($expire_interval == 0))) {
                        $expire_interval = $user['expire'];
                }
 
@@ -1314,7 +1333,7 @@ class Item extends BaseObject
                                trim($item['uri']), $item['uid'],
                                NETWORK_DIASPORA, NETWORK_DFRN, NETWORK_OSTATUS];
                        $existing = self::selectFirst(['id', 'network'], $condition);
-                       if (DBM::is_result($existing)) {
+                       if (DBA::isResult($existing)) {
                                // We only log the entries with a different user id than 0. Otherwise we would have too many false positives
                                if ($uid != 0) {
                                        logger("Item with uri ".$item['uri']." already existed for user ".$uid." with id ".$existing["id"]." target network ".$existing["network"]." - new network: ".$item['network']);
@@ -1326,13 +1345,11 @@ class Item extends BaseObject
 
                // Ensure to always have the same creation date.
                $existing = DBA::selectfirst('item', ['created', 'uri-hash'], ['uri' => $item['uri']]);
-               if (DBM::is_result($existing)) {
+               if (DBA::isResult($existing)) {
                        $item['created'] = $existing['created'];
                        $item['uri-hash'] = $existing['uri-hash'];
                }
 
-               self::addLanguageToItemArray($item);
-
                $item['wall']          = intval(defaults($item, 'wall', 0));
                $item['extid']         = trim(defaults($item, 'extid', ''));
                $item['author-name']   = trim(defaults($item, 'author-name', ''));
@@ -1384,6 +1401,8 @@ class Item extends BaseObject
                        return 0;
                }
 
+               self::addLanguageToItemArray($item);
+
                // Items cannot be stored before they happen ...
                if ($item['created'] > DateTimeFormat::utcNow()) {
                        $item['created'] = DateTimeFormat::utcNow();
@@ -1473,7 +1492,7 @@ class Item extends BaseObject
                        $params = ['order' => ['id' => false]];
                        $parent = self::selectFirst($fields, $condition, $params);
 
-                       if (DBM::is_result($parent)) {
+                       if (DBA::isResult($parent)) {
                                // is the new message multi-level threaded?
                                // even though we don't support it now, preserve the info
                                // and re-attach to the conversation parent.
@@ -1487,7 +1506,7 @@ class Item extends BaseObject
                                        $params = ['order' => ['id' => false]];
                                        $toplevel_parent = self::selectFirst($fields, $condition, $params);
 
-                                       if (DBM::is_result($toplevel_parent)) {
+                                       if (DBA::isResult($toplevel_parent)) {
                                                $parent = $toplevel_parent;
                                        }
                                }
@@ -1522,7 +1541,7 @@ class Item extends BaseObject
                                // If its a post from myself then tag the thread as "mention"
                                logger("Checking if parent ".$parent_id." has to be tagged as mention for user ".$item['uid'], LOGGER_DEBUG);
                                $user = DBA::selectFirst('user', ['nickname'], ['uid' => $item['uid']]);
-                               if (DBM::is_result($user)) {
+                               if (DBA::isResult($user)) {
                                        $self = normalise_link(System::baseUrl() . '/profile/' . $user['nickname']);
                                        $self_id = Contact::getIdForURL($self, 0, true);
                                        logger("'myself' is ".$self_id." for parent ".$parent_id." checking against ".$item['author-id']." and ".$item['owner-id'], LOGGER_DEBUG);
@@ -1550,6 +1569,9 @@ class Item extends BaseObject
                        }
                }
 
+               $item['parent-uri-id'] = ItemURI::getIdByURI($item['parent-uri']);
+               $item['thr-parent-id'] = ItemURI::getIdByURI($item['thr-parent']);
+
                $condition = ["`uri` = ? AND `network` IN (?, ?) AND `uid` = ?",
                        $item['uri'], $item['network'], NETWORK_DFRN, $item['uid']];
                if (self::exists($condition)) {
@@ -1648,8 +1670,7 @@ class Item extends BaseObject
                        $files = '';
                }
 
-               // Creates the permission set
-               // Currently we only store the data but don't using it
+               // Creates or assigns the permission set
                $item['psid'] = PermissionSet::fetchIDForPost($item);
 
                // We are doing this outside of the transaction to avoid timing problems
@@ -1667,7 +1688,7 @@ class Item extends BaseObject
                $ret = DBA::insert('item', $item);
 
                // When the item was successfully stored we fetch the ID of the item.
-               if (DBM::is_result($ret)) {
+               if (DBA::isResult($ret)) {
                        $current_post = DBA::lastInsertId();
                } else {
                        // This can happen - for example - if there are locking timeouts.
@@ -1772,7 +1793,7 @@ class Item extends BaseObject
                 */
                if (!$deleted && !$dontcache) {
                        $posted_item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $current_post]);
-                       if (DBM::is_result($posted_item)) {
+                       if (DBA::isResult($posted_item)) {
                                if ($notify) {
                                        Addon::callHooks('post_local_end', $posted_item);
                                } else {
@@ -1867,7 +1888,7 @@ class Item extends BaseObject
                }
 
                $fields = ['uri' => $item['uri'], 'activity' => $activity_index,
-                       'uri-hash' => $item['uri-hash']];
+                       'uri-hash' => $item['uri-hash'], 'uri-id' => $item['uri-id']];
 
                // We just remove everything that is content
                foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
@@ -1882,7 +1903,7 @@ class Item extends BaseObject
 
                // Do we already have this content?
                $item_activity = DBA::selectFirst('item-activity', ['id'], ['uri-hash' => $item['uri-hash']]);
-               if (DBM::is_result($item_activity)) {
+               if (DBA::isResult($item_activity)) {
                        $item['iaid'] = $item_activity['id'];
                        logger('Fetched activity for URI ' . $item['uri'] . ' (' . $item['iaid'] . ')');
                } elseif (DBA::insert('item-activity', $fields)) {
@@ -1906,7 +1927,8 @@ class Item extends BaseObject
         */
        private static function insertContent(&$item)
        {
-               $fields = ['uri' => $item['uri'], 'uri-plink-hash' => $item['uri-hash']];
+               $fields = ['uri' => $item['uri'], 'uri-plink-hash' => $item['uri-hash'],
+                       'uri-id' => $item['uri-id']];
 
                foreach (array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST) as $field) {
                        if (isset($item[$field])) {
@@ -1923,7 +1945,7 @@ class Item extends BaseObject
 
                // Do we already have this content?
                $item_content = DBA::selectFirst('item-content', ['id'], ['uri-plink-hash' => $item['uri-hash']]);
-               if (DBM::is_result($item_content)) {
+               if (DBA::isResult($item_content)) {
                        $item['icid'] = $item_content['id'];
                        logger('Fetched content for URI ' . $item['uri'] . ' (' . $item['icid'] . ')');
                } elseif (DBA::insert('item-content', $fields)) {
@@ -2001,7 +2023,7 @@ class Item extends BaseObject
        {
                $condition = ["`id` IN (SELECT `parent` FROM `item` WHERE `id` = ?)", $itemid];
                $parent = self::selectFirst(['owner-id'], $condition);
-               if (!DBM::is_result($parent)) {
+               if (!DBA::isResult($parent)) {
                        return;
                }
 
@@ -2010,7 +2032,7 @@ class Item extends BaseObject
                        'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""],
                        'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false];
                $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
-               if (!DBM::is_result($item)) {
+               if (!DBA::isResult($item)) {
                        return;
                }
 
@@ -2026,8 +2048,10 @@ class Item extends BaseObject
                $users = [];
 
                $condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)",
-                       $parent['owner-id'], CONTACT_IS_SHARING,  CONTACT_IS_FRIEND];
+                       $parent['owner-id'], Contact::SHARING,  Contact::FRIEND];
+
                $contacts = DBA::select('contact', ['uid'], $condition);
+
                while ($contact = DBA::fetch($contacts)) {
                        $users[$contact['uid']] = $contact['uid'];
                }
@@ -2072,7 +2096,7 @@ class Item extends BaseObject
 
                if (empty($item['contact-id'])) {
                        $self = DBA::selectFirst('contact', ['id'], ['self' => true, 'uid' => $uid]);
-                       if (!DBM::is_result($self)) {
+                       if (!DBA::isResult($self)) {
                                return;
                        }
                        $item['contact-id'] = $self['id'];
@@ -2083,7 +2107,7 @@ class Item extends BaseObject
                $notify = false;
                if ($item['uri'] == $item['parent-uri']) {
                        $contact = DBA::selectFirst('contact', [], ['id' => $item['contact-id'], 'self' => false]);
-                       if (DBM::is_result($contact)) {
+                       if (DBA::isResult($contact)) {
                                $notify = self::isRemoteSelf($contact, $item);
                        }
                }
@@ -2112,7 +2136,7 @@ class Item extends BaseObject
                $condition = ['id' => $itemid, 'parent' => [0, $itemid]];
                $item = self::selectFirst($fields, $condition);
 
-               if (!DBM::is_result($item)) {
+               if (!DBA::isResult($item)) {
                        return;
                }
 
@@ -2137,7 +2161,7 @@ class Item extends BaseObject
 
                $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
 
-               if (DBM::is_result($item)) {
+               if (DBA::isResult($item)) {
                        // Preparing public shadow (removing user specific data)
                        $item['uid'] = 0;
                        unset($item['id']);
@@ -2170,7 +2194,7 @@ class Item extends BaseObject
        public static function addShadowPost($itemid)
        {
                $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
-               if (!DBM::is_result($item)) {
+               if (!DBA::isResult($item)) {
                        return;
                }
 
@@ -2303,13 +2327,13 @@ class Item extends BaseObject
        {
                // Unarchive the author
                $contact = DBA::selectFirst('contact', [], ['id' => $arr["author-id"]]);
-               if (DBM::is_result($contact)) {
+               if (DBA::isResult($contact)) {
                        Contact::unmarkForArchival($contact);
                }
 
                // Unarchive the contact if it's not our own contact
                $contact = DBA::selectFirst('contact', [], ['id' => $arr["contact-id"], 'self' => false]);
-               if (DBM::is_result($contact)) {
+               if (DBA::isResult($contact)) {
                        Contact::unmarkForArchival($contact);
                }
 
@@ -2409,7 +2433,7 @@ class Item extends BaseObject
        public static function getGuidById($id)
        {
                $item = self::selectFirst(['guid'], ['id' => $id]);
-               if (DBM::is_result($item)) {
+               if (DBA::isResult($item)) {
                        return $item['guid'];
                } else {
                        return '';
@@ -2431,7 +2455,7 @@ class Item extends BaseObject
                                INNER JOIN `user` ON `user`.`uid` = `item`.`uid`
                                WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
                                        AND `item`.`guid` = ? AND `item`.`uid` = ?", $guid, $uid);
-                       if (DBM::is_result($item)) {
+                       if (DBA::isResult($item)) {
                                $id = $item["id"];
                                $nick = $item["nickname"];
                        }
@@ -2444,7 +2468,7 @@ class Item extends BaseObject
                                WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
                                        AND NOT `item`.`private` AND `item`.`wall`
                                        AND `item`.`guid` = ?", $guid);
-                       if (DBM::is_result($item)) {
+                       if (DBA::isResult($item)) {
                                $id = $item["id"];
                                $nick = $item["nickname"];
                        }
@@ -2463,15 +2487,15 @@ class Item extends BaseObject
                $mention = false;
 
                $user = DBA::selectFirst('user', [], ['uid' => $uid]);
-               if (!DBM::is_result($user)) {
+               if (!DBA::isResult($user)) {
                        return;
                }
 
-               $community_page = (($user['page-flags'] == PAGE_COMMUNITY) ? true : false);
-               $prvgroup = (($user['page-flags'] == PAGE_PRVGROUP) ? true : false);
+               $community_page = (($user['page-flags'] == Contact::PAGE_COMMUNITY) ? true : false);
+               $prvgroup = (($user['page-flags'] == Contact::PAGE_PRVGROUP) ? true : false);
 
                $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $item_id]);
-               if (!DBM::is_result($item)) {
+               if (!DBA::isResult($item)) {
                        return;
                }
 
@@ -2524,7 +2548,7 @@ class Item extends BaseObject
 
                // now change this copy of the post to a forum head message and deliver to all the tgroup members
                $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'], ['uid' => $uid, 'self' => true]);
-               if (!DBM::is_result($self)) {
+               if (!DBA::isResult($self)) {
                        return;
                }
 
@@ -2582,7 +2606,7 @@ class Item extends BaseObject
                if ($contact['remote_self'] == 2) {
                        $self = DBA::selectFirst('contact', ['id', 'name', 'url', 'thumb'],
                                        ['uid' => $contact['uid'], 'self' => true]);
-                       if (DBM::is_result($self)) {
+                       if (DBA::isResult($self)) {
                                $datarray['contact-id'] = $self["id"];
 
                                $datarray['owner-name'] = $self["name"];
@@ -2676,7 +2700,7 @@ class Item extends BaseObject
                                        $i = substr($i, 0, $x);
                                        $fields = ['data', 'type', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
                                        $photo = DBA::selectFirst('photo', $fields, ['resource-id' => $i, 'scale' => $res, 'uid' => $uid]);
-                                       if (DBM::is_result($photo)) {
+                                       if (DBA::isResult($photo)) {
                                                /*
                                                 * Check to see if we should replace this photo link with an embedded image
                                                 * 1. No need to do so if the photo is public
@@ -2839,9 +2863,9 @@ class Item extends BaseObject
                        $condition[] = $days;
                }
 
-               $items = self::select(['file', 'resource-id', 'starred', 'type', 'id'], $condition);
+               $items = self::select(['file', 'resource-id', 'starred', 'type', 'id', 'post-type'], $condition);
 
-               if (!DBM::is_result($items)) {
+               if (!DBA::isResult($items)) {
                        return;
                }
 
@@ -2871,9 +2895,9 @@ class Item extends BaseObject
                                continue;
                        } elseif (!$expire_starred && intval($item['starred'])) {
                                continue;
-                       } elseif (!$expire_notes && $item['type'] == 'note') {
+                       } elseif (!$expire_notes && (($item['type'] == 'note') || ($item['post-type'] == Item::PT_PERSONAL_NOTE))) {
                                continue;
-                       } elseif (!$expire_items && $item['type'] != 'note') {
+                       } elseif (!$expire_items && ($item['type'] != 'note') && ($item['post-type'] != Item::PT_PERSONAL_NOTE)) {
                                continue;
                        }
 
@@ -2890,7 +2914,7 @@ class Item extends BaseObject
                $condition = ['uid' => $uid, 'wall' => $wall, 'deleted' => false, 'visible' => true, 'moderated' => false];
                $params = ['order' => ['created' => false]];
                $thread = DBA::selectFirst('thread', ['created'], $condition, $params);
-               if (DBM::is_result($thread)) {
+               if (DBA::isResult($thread)) {
                        return substr(DateTimeFormat::local($thread['created']), 0, 10);
                }
                return false;
@@ -2948,7 +2972,7 @@ class Item extends BaseObject
                logger('like: verb ' . $verb . ' item ' . $item_id);
 
                $item = self::selectFirst(self::ITEM_FIELDLIST, ['`id` = ? OR `uri` = ?', $item_id, $item_id]);
-               if (!DBM::is_result($item)) {
+               if (!DBA::isResult($item)) {
                        logger('like: unknown item ' . $item_id);
                        return false;
                }
@@ -2967,7 +2991,7 @@ class Item extends BaseObject
 
                // Retrieves the local post owner
                $owner_self_contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'self' => true]);
-               if (!DBM::is_result($owner_self_contact)) {
+               if (!DBA::isResult($owner_self_contact)) {
                        logger('like: unknown owner ' . $uid);
                        return false;
                }
@@ -2976,7 +3000,7 @@ class Item extends BaseObject
                $author_id = public_contact();
 
                $author_contact = DBA::selectFirst('contact', ['url'], ['id' => $author_id]);
-               if (!DBM::is_result($author_contact)) {
+               if (!DBA::isResult($author_contact)) {
                        logger('like: unknown author ' . $author_id);
                        return false;
                }
@@ -2988,7 +3012,7 @@ class Item extends BaseObject
                } else {
                        $item_contact_id = Contact::getIdForURL($author_contact['url'], $uid, true);
                        $item_contact = DBA::selectFirst('contact', [], ['id' => $item_contact_id]);
-                       if (!DBM::is_result($item_contact)) {
+                       if (!DBA::isResult($item_contact)) {
                                logger('like: unknown item contact ' . $item_contact_id);
                                return false;
                        }
@@ -3015,16 +3039,8 @@ class Item extends BaseObject
                $like_item = self::selectFirst(['id', 'guid', 'verb'], $condition);
 
                // If it exists, mark it as deleted
-               if (DBM::is_result($like_item)) {
-                       // Already voted, undo it
-                       $fields = ['deleted' => true, 'unseen' => true, 'changed' => DateTimeFormat::utcNow()];
-                       /// @todo Consider using self::update - but before doing so, check the side effects
-                       DBA::update('item', $fields, ['id' => $like_item['id']]);
-
-                       // Clean up the Diaspora signatures for this like
-                       DBA::delete('sign', ['iid' => $like_item['id']]);
-
-                       Worker::add(PRIORITY_HIGH, "Notifier", "like", $like_item['id']);
+               if (DBA::isResult($like_item)) {
+                       self::deleteById($like_item['id']);
 
                        if (!$event_verb_flag || $like_item['verb'] == $activity) {
                                return true;
@@ -3090,7 +3106,7 @@ class Item extends BaseObject
                $condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
                $item = self::selectFirst($fields, $condition);
 
-               if (!DBM::is_result($item)) {
+               if (!DBA::isResult($item)) {
                        return;
                }
 
@@ -3111,7 +3127,7 @@ class Item extends BaseObject
                $condition = ["`id` = ? AND (`parent` = ? OR `parent` = 0)", $itemid, $itemid];
 
                $item = self::selectFirst($fields, $condition);
-               if (!DBM::is_result($item)) {
+               if (!DBA::isResult($item)) {
                        return;
                }
 
@@ -3137,7 +3153,7 @@ class Item extends BaseObject
        private static function deleteThread($itemid, $itemuri = "")
        {
                $item = DBA::selectFirst('thread', ['uid'], ['iid' => $itemid]);
-               if (!DBM::is_result($item)) {
+               if (!DBA::isResult($item)) {
                        logger('No thread found for id '.$itemid, LOGGER_DEBUG);
                        return;
                }