]> git.mxchange.org Git - friendica.git/blobdiff - src/Model/Item.php
Honor item delivery data legacy fields
[friendica.git] / src / Model / Item.php
index 9acff3bfa8490bb5241162ed0d4784af5e1f0c7b..f212045206cc3e5171230a9ed7e5288eb955fb3f 100644 (file)
@@ -36,10 +36,6 @@ use Friendica\Util\Security;
 use Friendica\Util\Strings;
 use Text_LanguageDetect;
 
-require_once 'boot.php';
-require_once 'include/items.php';
-require_once 'include/text.php';
-
 class Item extends BaseObject
 {
        // Posting types, inspired by https://www.w3.org/TR/activitystreams-vocabulary/#object-types
@@ -54,18 +50,21 @@ class Item extends BaseObject
        const PT_PERSONAL_NOTE = 128;
 
        // Field list that is used to display the items
-       const DISPLAY_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network',
-                       'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
-                       'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language',
-                       'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
-                       'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id',
-                       'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
-                       'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
-                       'contact-id', 'contact-link', 'contact-name', 'contact-avatar',
-                       'writable', 'self', 'cid', 'alias',
-                       'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
-                       'event-summary', 'event-desc', 'event-location', 'event-type',
-                       'event-nofinish', 'event-adjust', 'event-ignore', 'event-id'];
+       const DISPLAY_FIELDLIST = [
+               'uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', 'network',
+               'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink',
+               'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', 'language',
+               'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object',
+               'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id',
+               'author-id', 'author-link', 'author-name', 'author-avatar', 'author-network',
+               'owner-id', 'owner-link', 'owner-name', 'owner-avatar', 'owner-network',
+               'contact-id', 'contact-link', 'contact-name', 'contact-avatar',
+               'writable', 'self', 'cid', 'alias',
+               'event-id', 'event-created', 'event-edited', 'event-start', 'event-finish',
+               'event-summary', 'event-desc', 'event-location', 'event-type',
+               'event-nofinish', 'event-adjust', 'event-ignore', 'event-id',
+               'delivery_queue_count', 'delivery_queue_done'
+       ];
 
        // Field list that is used to deliver items via the protocols
        const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid',
@@ -84,9 +83,6 @@ class Item extends BaseObject
        // Field list for "item-content" table that is not present in the "item" table
        const CONTENT_FIELDLIST = ['language'];
 
-       // Field list for additional delivery data
-       const DELIVERY_DATA_FIELDLIST = ['postopts', 'inform'];
-
        // All fields in the item table
        const ITEM_FIELDLIST = ['id', 'uid', 'parent', 'uri', 'parent-uri', 'thr-parent', 'guid',
                        'contact-id', 'type', 'wall', 'gravity', 'extid', 'icid', 'iaid', 'psid',
@@ -194,7 +190,7 @@ class Item extends BaseObject
 
                // Fetch data from the item-content table whenever there is content there
                if (self::isLegacyMode()) {
-                       $legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+                       $legacy_fields = array_merge(ItemDeliveryData::FIELD_LIST, self::MIXED_CONTENT_FIELDLIST);
                        foreach ($legacy_fields as $field) {
                                if (empty($row[$field]) && !empty($row['internal-item-' . $field])) {
                                        $row[$field] = $row['internal-item-' . $field];
@@ -555,7 +551,7 @@ class Item extends BaseObject
 
                $fields['item-content'] = array_merge(self::CONTENT_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
 
-               $fields['item-delivery-data'] = self::DELIVERY_DATA_FIELDLIST;
+               $fields['item-delivery-data'] = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, ItemDeliveryData::FIELD_LIST);
 
                $fields['permissionset'] = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'];
 
@@ -734,7 +730,7 @@ class Item extends BaseObject
                foreach ($fields as $table => $table_fields) {
                        foreach ($table_fields as $field => $select) {
                                if (empty($selected) || in_array($select, $selected)) {
-                                       $legacy_fields = array_merge(self::DELIVERY_DATA_FIELDLIST, self::MIXED_CONTENT_FIELDLIST);
+                                       $legacy_fields = array_merge(ItemDeliveryData::LEGACY_FIELD_LIST, self::MIXED_CONTENT_FIELDLIST);
                                        if (self::isLegacyMode() && in_array($select, $legacy_fields)) {
                                                $selection[] = "`item`.`".$select."` AS `internal-item-" . $select . "`";
                                        }
@@ -814,7 +810,9 @@ class Item extends BaseObject
                        }
                }
 
-               $clear_fields = ['bookmark', 'type', 'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link'];
+               $delivery_data = ItemDeliveryData::extractFields($fields);
+
+               $clear_fields = ['bookmark', 'type', 'author-name', 'author-avatar', 'author-link', 'owner-name', 'owner-avatar', 'owner-link', 'postopts', 'inform'];
                foreach ($clear_fields as $field) {
                        if (array_key_exists($field, $fields)) {
                                $fields[$field] = null;
@@ -835,12 +833,6 @@ class Item extends BaseObject
                        $files = null;
                }
 
-               $delivery_data = ['postopts' => defaults($fields, 'postopts', ''),
-                       'inform' => defaults($fields, 'inform', '')];
-
-               $fields['postopts'] = null;
-               $fields['inform'] = null;
-
                if (!empty($fields)) {
                        $success = DBA::update('item', $fields, $condition);
 
@@ -918,7 +910,7 @@ class Item extends BaseObject
                                }
                        }
 
-                       self::updateDeliveryData($item['id'], $delivery_data);
+                       ItemDeliveryData::update($item['id'], $delivery_data);
 
                        self::updateThread($item['id']);
 
@@ -1034,7 +1026,7 @@ class Item extends BaseObject
                 * generate a resource-id and therefore aren't intimately linked to the item.
                 */
                if (strlen($item['resource-id'])) {
-                       DBA::delete('photo', ['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
+                       Photo::delete(['resource-id' => $item['resource-id'], 'uid' => $item['uid']]);
                }
 
                // If item is a link to an event, delete the event.
@@ -1065,7 +1057,7 @@ class Item extends BaseObject
                        self::delete(['uri' => $item['uri'], 'uid' => 0, 'deleted' => false], $priority);
                }
 
-               DBA::delete('item-delivery-data', ['iid' => $item['id']]);
+               ItemDeliveryData::delete($item['id']);
 
                // We don't delete the item-activity here, since we need some of the data for ActivityPub
 
@@ -1152,7 +1144,7 @@ class Item extends BaseObject
                if ($notify) {
                        // We have to avoid duplicates. So we create the GUID in form of a hash of the plink or uri.
                        // We add the hash of our own host because our host is the original creator of the post.
-                       $prefix_host = get_app()->getHostName();
+                       $prefix_host = \get_app()->getHostName();
                } else {
                        $prefix_host = '';
 
@@ -1242,7 +1234,7 @@ class Item extends BaseObject
 
        public static function insert($item, $force_parent = false, $notify = false, $dontcache = false)
        {
-               $a = get_app();
+               $orig_item = $item;
 
                // If it is a posting where users should get notifications, then define it as wall posting
                if ($notify) {
@@ -1667,8 +1659,7 @@ class Item extends BaseObject
                        self::insertContent($item);
                }
 
-               $delivery_data = ['postopts' => defaults($item, 'postopts', ''),
-                       'inform' => defaults($item, 'inform', '')];
+               $delivery_data = ItemDeliveryData::extractFields($item);
 
                unset($item['postopts']);
                unset($item['inform']);
@@ -1707,10 +1698,7 @@ class Item extends BaseObject
                        if ($spoolpath != "") {
                                $spool = $spoolpath.'/'.$file;
 
-                               // Ensure to have the removed data from above again in the item array
-                               $item = array_merge($item, $delivery_data);
-
-                               file_put_contents($spool, json_encode($item));
+                               file_put_contents($spool, json_encode($orig_item));
                                Logger::log("Item wasn't stored - Item was spooled into file ".$file, Logger::DEBUG);
                        }
                        return 0;
@@ -1811,9 +1799,7 @@ class Item extends BaseObject
                        self::updateThread($parent_id);
                }
 
-               $delivery_data['iid'] = $current_post;
-
-               self::insertDeliveryData($delivery_data);
+               ItemDeliveryData::insert($current_post, $delivery_data);
 
                DBA::commit();
 
@@ -1854,39 +1840,11 @@ class Item extends BaseObject
                return $current_post;
        }
 
-       /**
-        * @brief Insert a new item delivery data entry
-        *
-        * @param array $item The item fields that are to be inserted
-        */
-       private static function insertDeliveryData($delivery_data)
-       {
-               if (empty($delivery_data['iid']) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
-                       return;
-               }
-
-               DBA::insert('item-delivery-data', $delivery_data);
-       }
-
-       /**
-        * @brief Update an existing item delivery data entry
-        *
-        * @param integer $id The item id that is to be updated
-        * @param array $item The item fields that are to be inserted
-        */
-       private static function updateDeliveryData($id, $delivery_data)
-       {
-               if (empty($id) || (empty($delivery_data['postopts']) && empty($delivery_data['inform']))) {
-                       return;
-               }
-
-               DBA::update('item-delivery-data', $delivery_data, ['iid' => $id], true);
-       }
-
        /**
         * @brief Insert a new item content entry
         *
         * @param array $item The item fields that are to be inserted
+        * @return bool
         */
        private static function insertActivity(&$item)
        {
@@ -2374,7 +2332,7 @@ class Item extends BaseObject
                $update = (!$arr['private'] && ((defaults($arr, 'author-link', '') === defaults($arr, 'owner-link', '')) || ($arr["parent-uri"] === $arr["uri"])));
 
                // Is it a forum? Then we don't care about the rules from above
-               if (!$update && ($arr["network"] == Protocol::DFRN) && ($arr["parent-uri"] === $arr["uri"])) {
+               if (!$update && in_array($arr["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN]) && ($arr["parent-uri"] === $arr["uri"])) {
                        if (DBA::exists('contact', ['id' => $arr['contact-id'], 'forum' => true])) {
                                $update = true;
                        }
@@ -2615,7 +2573,7 @@ class Item extends BaseObject
 
        public static function isRemoteSelf($contact, &$datarray)
        {
-               $a = get_app();
+               $a = \get_app();
 
                if (!$contact['remote_self']) {
                        return false;
@@ -2741,8 +2699,7 @@ class Item extends BaseObject
                                if ($x) {
                                        $res = substr($i, $x + 1);
                                        $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]);
+                                       $photo = Photo::getPhotoForUser($uid, $i, $res);
                                        if (DBA::isResult($photo)) {
                                                /*
                                                 * Check to see if we should replace this photo link with an embedded image
@@ -2766,9 +2723,7 @@ class Item extends BaseObject
                                                        }
                                                }
                                                if ($replace) {
-                                                       $data = $photo['data'];
-                                                       $type = $photo['type'];
-
+                                                       $photo_img = Photo::getImageForPhoto($photo);
                                                        // If a custom width and height were specified, apply before embedding
                                                        if (preg_match("/\[img\=([0-9]*)x([0-9]*)\]/is", substr($orig_body, $img_start, $img_st_close), $match)) {
                                                                Logger::log('scaling photo', Logger::DEBUG);
@@ -2776,14 +2731,12 @@ class Item extends BaseObject
                                                                $width = intval($match[1]);
                                                                $height = intval($match[2]);
 
-                                                               $Image = new Image($data, $type);
-                                                               if ($Image->isValid()) {
-                                                                       $Image->scaleDown(max($width, $height));
-                                                                       $data = $Image->asString();
-                                                                       $type = $Image->getType();
-                                                               }
+                                                               $photo_img->scaleDown(max($width, $height));
                                                        }
 
+                                                       $data = $photo_img->asString();
+                                                       $type = $photo_img->getType();
+
                                                        Logger::log('replacing photo', Logger::DEBUG);
                                                        $image = 'data:' . $type . ';base64,' . base64_encode($data);
                                                        Logger::log('replaced: ' . $image, Logger::DATA);