From 0280a46ab44c4cc1f1b294345a048f412a448989 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 17 Jun 2018 06:27:52 +0000 Subject: [PATCH] Use predefined field lists --- include/api.php | 28 +++++++++++------------ include/conversation.php | 2 +- mod/display.php | 2 +- mod/network.php | 2 +- mod/notes.php | 2 +- mod/profile.php | 2 +- mod/search.php | 4 ++-- src/Model/Contact.php | 4 ++-- src/Model/Item.php | 48 ++++++++++++++++++++++++++-------------- 9 files changed, 54 insertions(+), 40 deletions(-) diff --git a/include/api.php b/include/api.php index af71e2f1cf..9848862d55 100644 --- a/include/api.php +++ b/include/api.php @@ -1626,7 +1626,7 @@ function api_search($type) } $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; - $statuses = Item::select(api_user(), [], $condition, $params); + $statuses = Item::select(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $data['status'] = api_format_items(dba::inArray($statuses), $user_info); @@ -1693,7 +1693,7 @@ function api_statuses_home_timeline($type) } $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; - $statuses = Item::select(api_user(), [], $condition, $params); + $statuses = Item::select(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $items = dba::inArray($statuses); @@ -1770,7 +1770,7 @@ function api_statuses_public_timeline($type) } $params = ['order' => ['iid' => true], 'limit' => [$start, $count]]; - $statuses = Item::selectThread(api_user(), [], $condition, $params); + $statuses = Item::selectThread(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $r = dba::inArray($statuses); } else { @@ -1787,7 +1787,7 @@ function api_statuses_public_timeline($type) } $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; - $statuses = Item::select(api_user(), [], $condition, $params); + $statuses = Item::select(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $r = dba::inArray($statuses); } @@ -1846,7 +1846,7 @@ function api_statuses_networkpublic_timeline($type) } $params = ['order' => ['iid' => true], 'limit' => [$start, $count]]; - $statuses = Item::selectThread(api_user(), [], $condition, $params); + $statuses = Item::selectThread(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type); @@ -1917,7 +1917,7 @@ function api_statuses_show($type) $params = []; } - $statuses = Item::select(api_user(), [], $condition, $params); + $statuses = Item::select(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); /// @TODO How about copying this to above methods which don't check $r ? if (!DBM::is_result($statuses)) { @@ -1998,7 +1998,7 @@ function api_conversation_show($type) } $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; - $statuses = Item::select(api_user(), [], $condition, $params); + $statuses = Item::select(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); if (!DBM::is_result($statuses)) { throw new BadRequestException("There is no status with id $id."); @@ -2168,7 +2168,7 @@ function api_statuses_mentions($type) } $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; - $statuses = Item::select(api_user(), [], $condition, $params); + $statuses = Item::select(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type); @@ -2248,7 +2248,7 @@ function api_statuses_user_timeline($type) } $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; - $statuses = Item::select(api_user(), [], $condition, $params); + $statuses = Item::select(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $ret = api_format_items(dba::inArray($statuses), $user_info, true, $type); @@ -2300,7 +2300,7 @@ function api_favorites_create_destroy($type) $itemid = intval($_REQUEST['id']); } - $item = Item::selectFirst(api_user(), [], ['id' => $itemid, 'uid' => api_user()]); + $item = Item::selectFirst(api_user(), Item::DISPLAY_FIELDLIST, ['id' => $itemid, 'uid' => api_user()]); if (!DBM::is_result($item)) { throw new BadRequestException("Invalid item."); @@ -2390,7 +2390,7 @@ function api_favorites($type) $condition[] = $max_id; } - $statuses = Item::select(api_user(), [], $condition, $params); + $statuses = Item::select(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $ret = api_format_items(dba::inArray($statuses), $user_info, false, $type); } @@ -3198,7 +3198,7 @@ function api_lists_statuses($type) } $params = ['order' => ['id' => true], 'limit' => [$start, $count]]; - $statuses = Item::select(api_user(), [], $condition, $params); + $statuses = Item::select(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $items = api_format_items(dba::inArray($statuses), $user_info, false, $type); @@ -4723,7 +4723,7 @@ function prepare_photo_data($type, $scale, $photo_id) $condition = ["`parent` = ? AND `uid` = ? AND (`verb` = ? OR `type`='photo')", $item[0]['parent'], api_user(), ACTIVITY_POST]; - $statuses = Item::select(api_user(), [], $condition); + $statuses = Item::select(api_user(), Item::DISPLAY_FIELDLIST, $condition); // prepare output of comments $commentData = api_format_items(dba::inArray($statuses), $user_info, false, $type); @@ -5716,7 +5716,7 @@ function api_friendica_notification_seen($type) $nm->setSeen($note); if ($note['otype']=='item') { // would be really better with an ItemsManager and $im->getByID() :-P - $item = Item::selectFirst(api_user(), [], ['id' => $note['iid'], 'uid' => api_user()]); + $item = Item::selectFirst(api_user(), Item::DISPLAY_FIELDLIST, ['id' => $note['iid'], 'uid' => api_user()]); if (DBM::is_result($$item)) { // we found the item, return it to the user $ret = api_format_items([$item], $user_info, false, $type); diff --git a/include/conversation.php b/include/conversation.php index fd4814a361..9730c4af9d 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -788,7 +788,7 @@ function conversation_add_children($parents, $block_authors, $order, $uid) { if ($block_authors) { $condition[0] .= "AND NOT `author`.`hidden`"; } - $thread_items = Item::select(local_user(), [], $condition, $params); + $thread_items = Item::select(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $comments = dba::inArray($thread_items); diff --git a/mod/display.php b/mod/display.php index 816af820a1..ad71f3b1c4 100644 --- a/mod/display.php +++ b/mod/display.php @@ -349,7 +349,7 @@ function display_content(App $a, $update = false, $update_uid = 0) { $condition = ["`item`.`parent-uri` = (SELECT `parent-uri` FROM `item` WHERE `id` = ?) AND `item`.`uid` IN (0, ?) " . $sql_extra, $item_id, local_user()]; $params = ['order' => ['uid', 'parent' => true, 'gravity', 'id']]; - $r = Item::select(local_user(), [], $condition, $params); + $r = Item::select(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params); if (!DBM::is_result($r)) { notice(L10n::t('Item not found.') . EOL); diff --git a/mod/network.php b/mod/network.php index 995b1da55b..6921f54d80 100644 --- a/mod/network.php +++ b/mod/network.php @@ -455,7 +455,7 @@ function networkFlatView(App $a, $update = 0) } $params = ['order' => ['id' => true], 'limit' => [$a->pager['start'], $a->pager['itemspage']]]; - $result = Item::select(local_user(), [], $condition, $params); + $result = Item::select(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $items = dba::inArray($result); $condition = ['unseen' => true, 'uid' => local_user()]; diff --git a/mod/notes.php b/mod/notes.php index fb42408c60..0001a035f2 100644 --- a/mod/notes.php +++ b/mod/notes.php @@ -79,7 +79,7 @@ function notes_content(App $a, $update = false) dba::close($r); $condition = ['uid' => local_user(), 'parent' => $parents_arr]; - $result = Item::select(local_user(), [], $condition); + $result = Item::select(local_user(), Item::DISPLAY_FIELDLIST, $condition); if (DBM::is_result($result)) { $items = conv_sort(dba::inArray($result), 'commented'); $o .= conversation($a, $items, 'notes', $update); diff --git a/mod/profile.php b/mod/profile.php index 91d04b2de9..0efc9d5bec 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -338,7 +338,7 @@ function profile_content(App $a, $update = 0) } $condition = ['uid' => $a->profile['profile_uid'], 'parent' => $parents_arr]; - $result = Item::select($a->profile['profile_uid'], [], $condition); + $result = Item::select($a->profile['profile_uid'], Item::DISPLAY_FIELDLIST, $condition); $items = conv_sort(dba::inArray($result), 'created'); } else { $items = []; diff --git a/mod/search.php b/mod/search.php index c42bcacfa0..3c421984a2 100644 --- a/mod/search.php +++ b/mod/search.php @@ -211,7 +211,7 @@ function search_content(App $a) { } dba::close($terms); - $items = Item::select(local_user(), [], ['id' => array_reverse($itemids)]); + $items = Item::select(local_user(), Item::DISPLAY_FIELDLIST, ['id' => array_reverse($itemids)]); $r = dba::inArray($items); } else { logger("Start fulltext search for '".$search."'", LOGGER_DEBUG); @@ -221,7 +221,7 @@ function search_content(App $a) { local_user(), $search]; $params = ['order' => ['id' => true], 'limit' => [$a->pager['start'], $a->pager['itemspage']]]; - $items = Item::select(local_user(), [], $condition, $params); + $items = Item::select(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $r = dba::inArray($items); } diff --git a/src/Model/Contact.php b/src/Model/Contact.php index f354f89c7d..4e46b49fdd 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -1068,10 +1068,10 @@ class Contact extends BaseObject $author_id, ACTIVITY_POST, local_user()]; $params = ['order' => ['created' => true], 'limit' => [$a->pager['start'], $a->pager['itemspage']]]; - $r = Item::select(local_user(), [], $condition, $params); + $r = Item::select(local_user(), Item::DISPLAY_FIELDLIST, $condition, $params); $items = dba::inArray($r); - + $o = conversation($a, $items, 'contact-posts', false); $o .= alt_pager($a, count($items)); diff --git a/src/Model/Item.php b/src/Model/Item.php index e2b771d273..647c37d89d 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -33,6 +33,29 @@ require_once 'include/text.php'; class Item extends BaseObject { + // Field list that is used to display the items + const DISPLAY_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', + 'commented', 'created', 'edited', 'received', 'verb', 'object-type', 'postopts', 'plink', + 'wall', 'private', 'starred', 'origin', 'title', 'body', 'file', 'attach', + 'content-warning', 'location', 'coord', 'app', 'rendered-hash', 'rendered-html', 'object', + 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'item_id', 'item_network', + 'author-id', 'author-link', 'author-name', 'author-avatar', + 'owner-id', 'owner-link', 'owner-name', 'owner-avatar', + 'contact-id', 'contact-link', 'contact-name', 'contact-avatar', + 'network', 'url', 'name', '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']; + + // Field list that is used to deliver items via the protocols + const DELIVER_FIELDLIST = ['uid', 'id', 'parent', 'uri', 'thr-parent', 'parent-uri', 'guid', + 'created', 'edited', 'verb', 'object-type', 'object', 'target', + 'private', 'title', 'body', 'location', 'coord', 'app', + 'attach', 'tag', 'bookmark', 'deleted', 'extid', + 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', + 'author-id', 'author-link', 'owner-link', 'contact-uid', + 'signed_text', 'signature', 'signer']; + /** * Retrieve a single record from the item table and returns it in an associative array * @@ -170,22 +193,15 @@ class Item extends BaseObject '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']; - - // The additional fields aren't needed to be selected by default. - // We need them to select the correct tables. To see the difference we split the arrays - if (!empty($selected)) { - $additional_item_fields = ['type', 'extid', 'changed', 'moderated', 'target-type', 'target', - 'resource-id', 'tag', 'inform', 'pubmail', 'visible', 'bookmark', 'unseen', 'deleted', - 'forum_mode', 'mention', 'global', 'shadow']; - - $item_fields = array_merge($item_fields, $additional_item_fields); - } + 'id' => 'item_id', 'network' => 'item_network', + 'type', 'extid', 'changed', 'moderated', 'target-type', 'target', + 'resource-id', 'tag', 'inform', 'pubmail', 'visible', 'bookmark', 'unseen', 'deleted', + 'forum_mode', 'mention', 'global', 'shadow']; $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', + 'network', 'url', 'name', 'writable', 'self', 'id' => 'cid', 'alias', 'uid' => 'contact-uid', 'photo', 'name-date', 'uri-date', 'avatar-date', 'thumb', 'dfrn-id']; $event_fields = ['created' => 'event-created', 'edited' => 'event-edited', @@ -198,11 +214,9 @@ class Item extends BaseObject $fields = ['item' => $item_fields, 'author' => $author_fields, 'owner' => $owner_fields, 'contact' => $contact_fields, 'event' => $event_fields]; - if (!empty($selected)) { - $fields['parent-item'] = ['guid' => 'parent-guid']; - $fields['parent-item-author'] = ['url' => 'parent-author-link', 'name' => 'parent-author-name']; - $fields['sign'] = ['signed_text', 'signature', 'signer']; - } + $fields['parent-item'] = ['guid' => 'parent-guid']; + $fields['parent-item-author'] = ['url' => 'parent-author-link', 'name' => 'parent-author-name']; + $fields['sign'] = ['signed_text', 'signature', 'signer']; return $fields; }