From 507956818d909ccb57c1e1a5586d6b0d3d5b4c37 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 18 Jun 2018 05:19:28 +0000 Subject: [PATCH 1/7] Use the item classes where possible --- include/api.php | 53 +--------------------------------------------- include/text.php | 4 ++-- mod/display.php | 2 +- src/Model/Term.php | 3 ++- 4 files changed, 6 insertions(+), 56 deletions(-) diff --git a/include/api.php b/include/api.php index d66446cb6..1fbdd8f7f 100644 --- a/include/api.php +++ b/include/api.php @@ -688,59 +688,8 @@ function api_get_user(App $a, $contact_id = null) $usr = dba::selectFirst('user', ['default-location'], ['uid' => api_user()]); $profile = dba::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]); - - /// @TODO old-lost code? (twice) - // Counting is deactivated by now, due to performance issues - // count public wall messages - //$r = q("SELECT COUNT(*) as `count` FROM `item` WHERE `uid` = %d AND `wall`", - // intval($uinfo[0]['uid']) - //); - //$countitms = $r[0]['count']; - $countitms = 0; - } else { - // Counting is deactivated by now, due to performance issues - //$r = q("SELECT count(*) as `count` FROM `item` - // WHERE `contact-id` = %d", - // intval($uinfo[0]['id']) - //); - //$countitms = $r[0]['count']; - $countitms = 0; } - - /// @TODO old-lost code? (twice) - /* - // Counting is deactivated by now, due to performance issues - // count friends - $r = q("SELECT count(*) as `count` FROM `contact` - WHERE `uid` = %d AND `rel` IN ( %d, %d ) - AND `self`=0 AND NOT `blocked` AND NOT `pending` AND `hidden`=0", - intval($uinfo[0]['uid']), - intval(CONTACT_IS_SHARING), - intval(CONTACT_IS_FRIEND) - ); - $countfriends = $r[0]['count']; - - $r = q("SELECT count(*) as `count` FROM `contact` - WHERE `uid` = %d AND `rel` IN ( %d, %d ) - AND `self`=0 AND NOT `blocked` AND NOT `pending` AND `hidden`=0", - intval($uinfo[0]['uid']), - intval(CONTACT_IS_FOLLOWER), - intval(CONTACT_IS_FRIEND) - ); - $countfollowers = $r[0]['count']; - - $r = q("SELECT count(*) as `count` FROM item where starred = 1 and uid = %d and deleted = 0", - intval($uinfo[0]['uid']) - ); - $starred = $r[0]['count']; - - - if (! $uinfo[0]['self']) { - $countfriends = 0; - $countfollowers = 0; - $starred = 0; - } - */ + $countitms = 0; $countfriends = 0; $countfollowers = 0; $starred = 0; diff --git a/include/text.php b/include/text.php index 612100cb6..16c0b4181 100644 --- a/include/text.php +++ b/include/text.php @@ -1177,8 +1177,8 @@ function put_item_in_cache(&$item, $update = false) } if ($update && ($item["id"] > 0)) { - dba::update('item', ['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]], - ['id' => $item["id"]], false); + Item::update(['rendered-html' => $item["rendered-html"], 'rendered-hash' => $item["rendered-hash"]], + ['id' => $item["id"]]); } } diff --git a/mod/display.php b/mod/display.php index 7198d4bb5..13ec9331b 100644 --- a/mod/display.php +++ b/mod/display.php @@ -360,7 +360,7 @@ function display_content(App $a, $update = false, $update_uid = 0) { if ($unseen) { $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true]; - dba::update('item', ['unseen' => false], $condition); + Item::update(['unseen' => false], $condition); } $items = conv_sort($s, "`commented`"); diff --git a/src/Model/Term.php b/src/Model/Term.php index fd44603f9..0de2eddf4 100644 --- a/src/Model/Term.php +++ b/src/Model/Term.php @@ -6,6 +6,7 @@ namespace Friendica\Model; use Friendica\Core\System; use Friendica\Database\DBM; +use Friendica\Model\Item; use dba; require_once 'boot.php'; @@ -114,7 +115,7 @@ class Term $users = q("SELECT `uid` FROM `contact` WHERE self AND (`url` = '%s' OR `nurl` = '%s')", $link, $link); foreach ($users AS $user) { if ($user['uid'] == $message['uid']) { - dba::update('item', ['mention' => true], ['id' => $itemid]); + Item::update(['mention' => true], ['id' => $itemid]); dba::update('thread', ['mention' => true], ['iid' => $message['parent']]); } } From 4714cb746b6fb8e7bc4ae9676866c9da37af75af Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 18 Jun 2018 20:36:34 +0000 Subject: [PATCH 2/7] Use the item functions at many more places --- include/api.php | 113 +++++++++++---------------------------- include/conversation.php | 10 ++-- include/items.php | 10 ++-- mod/display.php | 74 +++++++++++-------------- mod/editpost.php | 17 +++--- mod/fetch.php | 42 +++++---------- mod/photos.php | 21 +++----- mod/tagrm.php | 43 ++++++--------- mod/viewsrc.php | 29 +++++----- src/Model/Item.php | 16 +++--- src/Model/User.php | 15 ++++++ src/Object/Post.php | 10 ++-- src/Protocol/OStatus.php | 97 ++++++++++++--------------------- 13 files changed, 191 insertions(+), 306 deletions(-) diff --git a/include/api.php b/include/api.php index 1fbdd8f7f..8f3dea616 100644 --- a/include/api.php +++ b/include/api.php @@ -1122,18 +1122,8 @@ function api_statuses_update($type) if ($throttle_day > 0) { $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60); - $r = q( - "SELECT COUNT(*) AS `posts_day` FROM `item` WHERE `uid`=%d AND `wall` - AND `created` > '%s' AND `id` = `parent`", - intval(api_user()), - dbesc($datefrom) - ); - - if (DBM::is_result($r)) { - $posts_day = $r[0]["posts_day"]; - } else { - $posts_day = 0; - } + $condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom]; + $posts_day = dba::count('item', $condition); if ($posts_day > $throttle_day) { logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG); @@ -1146,18 +1136,8 @@ function api_statuses_update($type) if ($throttle_week > 0) { $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7); - $r = q( - "SELECT COUNT(*) AS `posts_week` FROM `item` WHERE `uid`=%d AND `wall` - AND `created` > '%s' AND `id` = `parent`", - intval(api_user()), - dbesc($datefrom) - ); - - if (DBM::is_result($r)) { - $posts_week = $r[0]["posts_week"]; - } else { - $posts_week = 0; - } + $condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom]; + $posts_week = dba::count('item', $condition); if ($posts_week > $throttle_week) { logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG); @@ -1170,18 +1150,8 @@ function api_statuses_update($type) if ($throttle_month > 0) { $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30); - $r = q( - "SELECT COUNT(*) AS `posts_month` FROM `item` WHERE `uid`=%d AND `wall` - AND `created` > '%s' AND `id` = `parent`", - intval(api_user()), - dbesc($datefrom) - ); - - if (DBM::is_result($r)) { - $posts_month = $r[0]["posts_month"]; - } else { - $posts_month = 0; - } + $condition = ["`uid` = ? AND `wall` AND `created` > ? AND `id` = `parent`", api_user(), $datefrom]; + $posts_month = dba::count('item', $condition); if ($posts_month > $throttle_month) { logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG); @@ -2755,14 +2725,10 @@ function api_format_items_activities(&$item, $type = "json") 'attendmaybe' => [], ]; - $items = q( - 'SELECT * FROM `item` - WHERE `uid` = %d AND `thr-parent` = "%s" AND `visible` AND NOT `deleted`', - intval($item['uid']), - dbesc($item['uri']) - ); + $condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']]; + $ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition); - foreach ($items as $i) { + while ($i = dba::fetch($ret)) { // not used as result should be structured like other user data //builtin_activity_puller($i, $activities); @@ -2789,6 +2755,8 @@ function api_format_items_activities(&$item, $type = "json") } } + dba::close($ret); + if ($type == "xml") { $xml_activities = []; foreach ($activities as $k => $v) { @@ -3872,16 +3840,13 @@ function api_fr_photoalbum_delete($type) // function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore // to the user and the contacts of the users (drop_items() performs the federation of the deletion to other networks foreach ($r as $rr) { - $photo_item = q( - "SELECT `id` FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'", - intval(local_user()), - dbesc($rr['resource-id']) - ); + $condition = ['uid' => local_user(), 'resource-id' => $rr['resource-id'], 'type' => 'photo']; + $photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition); if (!DBM::is_result($photo_item)) { throw new InternalServerErrorException("problem with deleting items occured"); } - Item::deleteForUser(['id' => $photo_item[0]['id']], api_user()); + Item::deleteForUser(['id' => $photo_item['id']], api_user()); } // now let's delete all photos from the album @@ -4162,18 +4127,15 @@ function api_fr_photo_delete($type) // return success of deletion or error message if ($result) { // retrieve the id of the parent element (the photo element) - $photo_item = q( - "SELECT `id` FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'", - intval(local_user()), - dbesc($photo_id) - ); + $condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo']; + $photo_item = Item::selectFirstForUser(local_user(), ['id'], $condition); if (!DBM::is_result($photo_item)) { throw new InternalServerErrorException("problem with deleting items occured"); } // function for setting the items to "deleted = 1" which ensures that comments, likes etc. are not shown anymore // to the user and the contacts of the users (drop_items() do all the necessary magic to avoid orphans in database and federate deletion) - Item::deleteForUser(['id' => $photo_item[0]['id']], api_user()); + Item::deleteForUser(['id' => $photo_item['id']], api_user()); $answer = ['result' => 'deleted', 'message' => 'photo with id `' . $photo_id . '` has been deleted from server.']; return api_format_data("photo_delete", $type, ['$result' => $answer]); @@ -4661,12 +4623,10 @@ function prepare_photo_data($type, $scale, $photo_id) } // retrieve item element for getting activities (like, dislike etc.) related to photo - $item = q( - "SELECT * FROM `item` WHERE `uid` = %d AND `resource-id` = '%s' AND `type` = 'photo'", - intval(local_user()), - dbesc($photo_id) - ); - $data['photo']['friendica_activities'] = api_format_items_activities($item[0], $type); + $condition = ['uid' => local_user(), 'resource-id' => $photo_id, 'type' => 'photo']; + $item = Item::selectFirstForUser(local_user(), ['id'], $condition); + + $data['photo']['friendica_activities'] = api_format_items_activities($item, $type); // retrieve comments on photo $condition = ["`parent` = ? AND `uid` = ? AND (`verb` = ? OR `type`='photo')", @@ -4961,35 +4921,26 @@ function api_in_reply_to($item) $in_reply_to['screen_name'] = null; if (($item['thr-parent'] != $item['uri']) && (intval($item['parent']) != intval($item['id']))) { - $r = q( - "SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s' LIMIT 1", - intval($item['uid']), - dbesc($item['thr-parent']) - ); - - if (DBM::is_result($r)) { - $in_reply_to['status_id'] = intval($r[0]['id']); + $parent = Item::selectFirst(['id'], ['uid' => $item['uid'], 'uri' => $item['thr-parent']]); + if (DBM::is_result($parent)) { + $in_reply_to['status_id'] = intval($parent['id']); } else { $in_reply_to['status_id'] = intval($item['parent']); } $in_reply_to['status_id_str'] = (string) intval($in_reply_to['status_id']); - $r = q( - "SELECT `contact`.`nick`, `contact`.`name`, `contact`.`id`, `contact`.`url` FROM `item` - STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`author-id` - WHERE `item`.`id` = %d LIMIT 1", - intval($in_reply_to['status_id']) - ); + $fields = ['author-nick', 'author-name', 'author-id', 'author-link']; + $parent = Item::selectFirst($fields, ['id' => $in_reply_to['status_id']]); - if (DBM::is_result($r)) { - if ($r[0]['nick'] == "") { - $r[0]['nick'] = api_get_nick($r[0]["url"]); + if (DBM::is_result($parent)) { + if ($parent['author-nick'] == "") { + $parent['author-nick'] = api_get_nick($parent['author-link']); } - $in_reply_to['screen_name'] = (($r[0]['nick']) ? $r[0]['nick'] : $r[0]['name']); - $in_reply_to['user_id'] = intval($r[0]['id']); - $in_reply_to['user_id_str'] = (string) intval($r[0]['id']); + $in_reply_to['screen_name'] = (($parent['author-nick']) ? $parent['author-nick'] : $parent['author-name']); + $in_reply_to['user_id'] = intval($parent['author-id']); + $in_reply_to['user_id_str'] = (string) intval($parent['author-id']); } // There seems to be situation, where both fields are identical: diff --git a/include/conversation.php b/include/conversation.php index 97be7e9aa..6ef2e73aa 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -633,16 +633,12 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order = $location_e = $location; $owner_name_e = $owner_name; - if ($item['item_network'] == "") { - $item['item_network'] = $item['network']; - } - $tmp_item = [ 'template' => $tpl, 'id' => (($preview) ? 'P0' : $item['item_id']), 'guid' => (($preview) ? 'Q0' : $item['guid']), - 'network' => $item['item_network'], - 'network_name' => ContactSelector::networkToName($item['item_network'], $profile_link), + 'network' => $item['network'], + 'network_name' => ContactSelector::networkToName($item['network'], $profile_link), 'linktitle' => L10n::t('View %s\'s profile @ %s', $profile_name, $item['author-link']), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), @@ -688,7 +684,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order = Addon::callHooks('display_item', $arr); $threads[$threadsid]['id'] = $item['item_id']; - $threads[$threadsid]['network'] = $item['item_network']; + $threads[$threadsid]['network'] = $item['network']; $threads[$threadsid]['items'] = [$arr['output']]; } diff --git a/include/items.php b/include/items.php index c54869c3e..ee514c8fc 100644 --- a/include/items.php +++ b/include/items.php @@ -335,17 +335,14 @@ function drop_item($id) { // locate item to be deleted - $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", - intval($id) - ); + $fields = ['id', 'uid', 'contact-id', 'deleted']; + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $id]); - if (!DBM::is_result($r)) { + if (!DBM::is_result($item)) { notice(L10n::t('Item not found.') . EOL); goaway(System::baseUrl() . '/' . $_SESSION['return_url']); } - $item = $r[0]; - if ($item['deleted']) { return 0; } @@ -364,7 +361,6 @@ function drop_item($id) { } if ((local_user() == $item['uid']) || $contact_id) { - // Check if we should do HTML-based delete confirmation if ($_REQUEST['confirm']) { //
can't take arguments in its "action" parameter diff --git a/mod/display.php b/mod/display.php index 13ec9331b..ff1ae6741 100644 --- a/mod/display.php +++ b/mod/display.php @@ -43,6 +43,8 @@ function display_init(App $a) $r = false; + $fields = ['id', 'parent', 'author-id', 'body', 'uid']; + // If there is only one parameter, then check if this parameter could be a guid if ($a->argc == 2) { $nick = ""; @@ -50,9 +52,7 @@ function display_init(App $a) // Does the local user have this item? if (local_user()) { - $r = dba::fetch_first("SELECT `id`, `parent`, `author-id`, `body`, `uid` - FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated` - AND `guid` = ? AND `uid` = ? LIMIT 1", $a->argv[1], local_user()); + $r = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]); if (DBM::is_result($r)) { $nick = $a->user["nickname"]; } @@ -60,54 +60,44 @@ function display_init(App $a) // Is it an item with uid=0? if (!DBM::is_result($r)) { - $r = dba::fetch_first("SELECT `id`, `parent`, `author-id`, `body`, `uid` - FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated` - AND NOT `private` AND `uid` = 0 - AND `guid` = ? LIMIT 1", $a->argv[1]); - } - - if (!DBM::is_result($r)) { - $a->error = 404; - notice(L10n::t('Item not found.') . EOL); - return; + $r = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => false, 'uid' => 0]); } } elseif (($a->argc == 3) && ($nick == 'feed-item')) { - $r = dba::fetch_first("SELECT `id`, `parent`, `author-id`, `body`, `uid` - FROM `item` WHERE `visible` AND NOT `deleted` AND NOT `moderated` - AND NOT `private` AND `uid` = 0 - AND `id` = ? LIMIT 1", $a->argv[2]); + $r = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => false, 'uid' => 0]); } - if (DBM::is_result($r)) { - if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) { - logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG); - displayShowFeed($r["id"], false); - } + if (!DBM::is_result($r) || $r['deleted']) { + $a->error = 404; + notice(L10n::t('Item not found.') . EOL); + return; + } - if ($r["id"] != $r["parent"]) { - $r = dba::fetch_first("SELECT `id`, `author-id`, `body`, `uid` FROM `item` - WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND `id` = ?", $r["parent"]); - } + if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) { + logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG); + displayShowFeed($r["id"], false); + } - $profiledata = display_fetchauthor($a, $r); + if ($r["id"] != $r["parent"]) { + $r = Item::selectFirstForUser(local_user(), $fields, ['id' => $r["parent"]]); + } - if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) { - $nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"])); + $profiledata = display_fetchauthor($a, $r); - if (($nickname != $a->user["nickname"])) { - $r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` - INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` - WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", - $nickname - ); - if (DBM::is_result($r)) { - $profiledata = $r; - } - $profiledata["network"] = NETWORK_DFRN; - } else { - $profiledata = []; + if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) { + $nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"])); + + if (($nickname != $a->user["nickname"])) { + $r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` + INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` + WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", + $nickname + ); + if (DBM::is_result($r)) { + $profiledata = $r; } + $profiledata["network"] = NETWORK_DFRN; + } else { + $profiledata = []; } } diff --git a/mod/editpost.php b/mod/editpost.php index aa2c29684..dc98e93d9 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -8,6 +8,7 @@ use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\System; +use Friendica\Model\Item; use Friendica\Database\DBM; function editpost_content(App $a) { @@ -26,11 +27,9 @@ function editpost_content(App $a) { return; } - $itm = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($post_id), - intval(local_user()) - ); - + $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', + 'type', 'body', 'title', 'file']; + $itm = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]); if (! DBM::is_result($itm)) { notice(L10n::t('Item not found') . EOL); return; @@ -124,8 +123,8 @@ function editpost_content(App $a) { '$shortnoloc' => L10n::t('clear location'), '$wait' => L10n::t('Please wait'), '$permset' => L10n::t('Permission settings'), - '$ptyp' => $itm[0]['type'], - '$content' => undo_post_tagging($itm[0]['body']), + '$ptyp' => $itm['type'], + '$content' => undo_post_tagging($itm['body']), '$post_id' => $post_id, '$baseurl' => System::baseUrl(), '$defloc' => $a->user['default-location'], @@ -134,9 +133,9 @@ function editpost_content(App $a) { '$emailcc' => L10n::t('CC: email addresses'), '$public' => L10n::t('Public post'), '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm[0]['title']), + '$title' => htmlspecialchars($itm['title']), '$placeholdertitle' => L10n::t('Set title'), - '$category' => file_tag_file_to_list($itm[0]['file'], 'category'), + '$category' => file_tag_file_to_list($itm['file'], 'category'), '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''), '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, diff --git a/mod/fetch.php b/mod/fetch.php index 6892990c2..da616ad5b 100644 --- a/mod/fetch.php +++ b/mod/fetch.php @@ -7,7 +7,10 @@ use Friendica\App; use Friendica\Core\L10n; use Friendica\Core\System; use Friendica\Protocol\Diaspora; +use Friendica\Model\Item; +use Friendica\Model\User; use Friendica\Util\XML; +use Friendica\Database\DBM; function fetch_init(App $a) { @@ -20,24 +23,14 @@ function fetch_init(App $a) $guid = $a->argv[2]; // Fetch the item - $item = q( - "SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord` - FROM `item` WHERE `wall` AND NOT `private` AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1", - dbesc($guid), - NETWORK_DFRN, - NETWORK_DIASPORA - ); - if (!$item) { - $r = q( - "SELECT `author-link` - FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1", - dbesc($guid), - NETWORK_DFRN, - NETWORK_DIASPORA - ); - - if ($r) { - $parts = parse_url($r[0]["author-link"]); + $fields = ['uid', 'title', 'body', 'guid', 'contact-id', 'private', 'created', 'app', 'location', 'coord', 'network']; + $condition = ['wall' => true, 'private' => false, 'guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]]; + $item = Item::selectFirst($fields, $condition); + if (!DBM::is_result($item)) { + $condition = ['guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]]; + $item = Item::selectFirst(['author-link'], $condition); + if (DBM::is_result($item)) { + $parts = parse_url($item["author-link"]); $host = $parts["scheme"]."://".$parts["host"]; if (normalise_link($host) != normalise_link(System::baseUrl())) { @@ -54,20 +47,13 @@ function fetch_init(App $a) } // Fetch some data from the author (We could combine both queries - but I think this is more readable) - $r = q( - "SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user` - INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self` - WHERE `user`.`uid` = %d", - intval($item[0]["uid"]) - ); - - if (!$r) { + $user = User::getOwnerDataById($item["uid"]); + if (!$user) { header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found')); killme(); } - $user = $r[0]; - $status = Diaspora::buildStatus($item[0], $user); + $status = Diaspora::buildStatus($item, $user); $xml = Diaspora::buildPostXml($status["type"], $status["message"]); // Send the envelope diff --git a/mod/photos.php b/mod/photos.php index f6540c260..9cd348274 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -19,6 +19,7 @@ use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\Photo; use Friendica\Model\Profile; +use Friendica\Model\User; use Friendica\Network\Probe; use Friendica\Object\Image; use Friendica\Protocol\DFRN; @@ -175,19 +176,14 @@ function photos_post(App $a) killme(); } - $r = q("SELECT `contact`.*, `user`.`nickname` FROM `contact` LEFT JOIN `user` ON `user`.`uid` = `contact`.`uid` - WHERE `user`.`uid` = %d AND `self` = 1 LIMIT 1", - intval($page_owner_uid) - ); + $owner_record = User::getOwnerDataById($page_owner_uid); - if (!DBM::is_result($r)) { + if (!$owner_record) { notice(L10n::t('Contact information unavailable') . EOL); logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid); killme(); } - $owner_record = $r[0]; - if ($a->argc > 3 && $a->argv[2] === 'album') { $album = hex2bin($a->argv[3]); @@ -487,14 +483,11 @@ function photos_post(App $a) } if ($item_id) { - $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($item_id), - intval($page_owner_uid) - ); + $item = Item::selectFirst(['tag', 'inform'], ['id' => $item_id, 'uid' => $page_owner_uid]); } - if (DBM::is_result($r)) { - $old_tag = $r[0]['tag']; - $old_inform = $r[0]['inform']; + if (DBM::is_result($item)) { + $old_tag = $item['tag']; + $old_inform = $item['inform']; } if (strlen($rawtags)) { diff --git a/mod/tagrm.php b/mod/tagrm.php index b9991d68d..dbe6f1087 100644 --- a/mod/tagrm.php +++ b/mod/tagrm.php @@ -10,29 +10,25 @@ use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Model\Item; -function tagrm_post(App $a) { - +function tagrm_post(App $a) +{ if (!local_user()) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); } - if ((x($_POST,'submit')) && ($_POST['submit'] === L10n::t('Cancel'))) { + if (x($_POST,'submit') && ($_POST['submit'] === L10n::t('Cancel'))) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); } - $tag = ((x($_POST,'tag')) ? hex2bin(notags(trim($_POST['tag']))) : ''); - $item = ((x($_POST,'item')) ? intval($_POST['item']) : 0 ); + $tag = (x($_POST,'tag') ? hex2bin(notags(trim($_POST['tag']))) : ''); + $item_id = (x($_POST,'item') ? intval($_POST['item']) : 0); - $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($item), - intval(local_user()) - ); - - if (!DBM::is_result($r)) { + $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]); + if (!DBM::is_result($item)) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); } - $arr = explode(',', $r[0]['tag']); + $arr = explode(',', $item['tag']); for ($x = 0; $x < count($arr); $x ++) { if ($arr[$x] === $tag) { unset($arr[$x]); @@ -42,7 +38,7 @@ function tagrm_post(App $a) { $tag_str = implode(',',$arr); - Item::update(['tag' => $tag_str], ['id' => $item]); + Item::update(['tag' => $tag_str], ['id' => $item_id]); info(L10n::t('Tag removed') . EOL ); goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); @@ -52,8 +48,8 @@ function tagrm_post(App $a) { -function tagrm_content(App $a) { - +function tagrm_content(App $a) +{ $o = ''; if (!local_user()) { @@ -61,22 +57,18 @@ function tagrm_content(App $a) { // NOTREACHED } - $item = (($a->argc > 1) ? intval($a->argv[1]) : 0); - if (!$item) { + $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); + if (!$item_id) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); // NOTREACHED } - $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($item), - intval(local_user()) - ); - - if (!DBM::is_result($r)) { + $item = Item::selectFirst(['tag'], ['id' => $item_id, 'uid' => local_user()]); + if (!DBM::is_result($item)) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); } - $arr = explode(',', $r[0]['tag']); + $arr = explode(',', $item['tag']); if (!count($arr)) { goaway(System::baseUrl() . '/' . $_SESSION['photo_return']); @@ -87,7 +79,7 @@ function tagrm_content(App $a) { $o .= '

' . L10n::t('Select a tag to remove: ') . '

'; $o .= ''; - $o .= ''; + $o .= ''; $o .= '
    '; foreach ($arr as $x) { @@ -100,5 +92,4 @@ function tagrm_content(App $a) { $o .= ''; return $o; - } diff --git a/mod/viewsrc.php b/mod/viewsrc.php index d2f0d01a0..4b511eab1 100644 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@ -5,38 +5,33 @@ use Friendica\App; use Friendica\Core\L10n; use Friendica\Database\DBM; +use Friendica\Model\Item; -function viewsrc_content(App $a) { - - if (! local_user()) { +function viewsrc_content(App $a) +{ + if (!local_user()) { notice(L10n::t('Access denied.') . EOL); return; } - $o = ''; + $o = ''; $item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); - if(! $item_id) { + if (!$item_id) { $a->error = 404; notice(L10n::t('Item not found.') . EOL); return; } - $r = q("SELECT `item`.`body` FROM `item` - WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 - and `item`.`moderated` = 0 - AND `item`.`id` = '%s' LIMIT 1", - intval(local_user()), - dbesc($item_id) - ); + $item = Item::selectFirst(['body'], ['uid' => local_user(), 'id' => $item_id]); - if (DBM::is_result($r)) - if(is_ajax()) { - echo str_replace("\n",'
    ',$r[0]['body']); + if (DBM::is_result($item)) { + if (is_ajax()) { + echo str_replace("\n",'
    ',$item['body']); killme(); } else { - $o .= str_replace("\n",'
    ',$r[0]['body']); + $o .= str_replace("\n",'
    ',$item['body']); } + } return $o; } - diff --git a/src/Model/Item.php b/src/Model/Item.php index dcf944cc4..adb0baa68 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -38,8 +38,8 @@ class Item extends BaseObject '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', + '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', 'contact-id', 'contact-link', 'contact-name', 'contact-avatar', 'network', 'url', 'name', 'writable', 'self', 'cid', 'alias', @@ -250,17 +250,19 @@ class Item extends BaseObject 'private', 'pubmail', 'moderated', 'visible', 'starred', 'bookmark', 'unseen', 'deleted', 'origin', 'forum_mode', 'mention', 'rendered-hash', 'rendered-html', 'global', 'shadow', 'content-warning', - 'id' => 'item_id', 'network' => 'item_network']; + 'id' => 'item_id', 'network']; - $fields['author'] = ['url' => 'author-link', 'name' => 'author-name', 'thumb' => 'author-avatar']; + $fields['author'] = ['url' => 'author-link', 'name' => 'author-name', + 'thumb' => 'author-avatar', 'nick' => 'author-nick', 'network' => 'author-network']; - $fields['owner'] = ['url' => 'owner-link', 'name' => 'owner-name', 'thumb' => 'owner-avatar']; + $fields['owner'] = ['url' => 'owner-link', 'name' => 'owner-name', + 'thumb' => 'owner-avatar', 'nick' => 'owner-nick', 'network' => 'owner-network']; $fields['contact'] = ['url' => 'contact-link', 'name' => 'contact-name', 'thumb' => 'contact-avatar', 'network', 'url', 'name', 'writable', 'self', 'id' => 'cid', 'alias', 'uid' => 'contact-uid', - 'photo', 'name-date', 'uri-date', 'avatar-date', 'thumb', 'dfrn-id']; + 'photo', 'name-date', 'uri-date', 'avatar-date', 'thumb', 'dfrn-id', 'network' => 'contact-network']; - $fields['parent-item'] = ['guid' => 'parent-guid']; + $fields['parent-item'] = ['guid' => 'parent-guid', 'network' => 'parent-network']; $fields['parent-item-author'] = ['url' => 'parent-author-link', 'name' => 'parent-author-name']; diff --git a/src/Model/User.php b/src/Model/User.php index 39c544c3a..76769e14c 100644 --- a/src/Model/User.php +++ b/src/Model/User.php @@ -65,6 +65,21 @@ class User return $r; } + /** + * @brief Get owner data by nick name + * + * @param int $nick + * @return boolean|array + */ + public static function getOwnerDataByNick($nick) + { + $user = dba::selectFirst('user', ['uid'], ['nickname' => $nick]); + if (!DBM::is_result($user)) { + return false; + } + return self::getOwnerDataById($user['uid']); + } + /** * @brief Returns the default group for a given user and network * diff --git a/src/Object/Post.php b/src/Object/Post.php index a66e48a38..bceee3844 100644 --- a/src/Object/Post.php +++ b/src/Object/Post.php @@ -326,17 +326,17 @@ class Post extends BaseObject $owner_name_e = $this->getOwnerName(); // Disable features that aren't available in several networks - if (!in_array($item["item_network"], [NETWORK_DFRN, NETWORK_DIASPORA]) && isset($buttons["dislike"])) { + if (!in_array($item["network"], [NETWORK_DFRN, NETWORK_DIASPORA]) && isset($buttons["dislike"])) { unset($buttons["dislike"]); $isevent = false; $tagger = ''; } - if (($item["item_network"] == NETWORK_FEED) && isset($buttons["like"])) { + if (($item["network"] == NETWORK_FEED) && isset($buttons["like"])) { unset($buttons["like"]); } - if (($item["item_network"] == NETWORK_MAIL) && isset($buttons["like"])) { + if (($item["network"] == NETWORK_MAIL) && isset($buttons["like"])) { unset($buttons["like"]); } @@ -401,8 +401,8 @@ class Post extends BaseObject 'wait' => L10n::t('Please wait'), 'thread_level' => $thread_level, 'edited' => $edited, - 'network' => $item["item_network"], - 'network_name' => ContactSelector::networkToName($item['item_network'], $profile_link), + 'network' => $item["network"], + 'network_name' => ContactSelector::networkToName($item['network'], $profile_link), 'received' => $item['received'], 'commented' => $item['commented'], 'created_date' => $item['created'], diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index ce9e6642e..36ed3580e 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -15,6 +15,7 @@ use Friendica\Model\Contact; use Friendica\Model\Conversation; use Friendica\Model\GContact; use Friendica\Model\Item; +use Friendica\Model\User; use Friendica\Network\Probe; use Friendica\Object\Image; use Friendica\Util\DateTimeFormat; @@ -1619,22 +1620,14 @@ class OStatus $title = self::entryHeader($doc, $entry, $owner, $item, $toplevel); - $r = q( - "SELECT * FROM `item` WHERE `uid` = %d AND `guid` = '%s' AND NOT `private` AND `network` IN ('%s', '%s', '%s') LIMIT 1", - intval($owner["uid"]), - dbesc($repeated_guid), - dbesc(NETWORK_DFRN), - dbesc(NETWORK_DIASPORA), - dbesc(NETWORK_OSTATUS) - ); - if (DBM::is_result($r)) { - $repeated_item = $r[0]; - } else { + $condition = ['uid' => $owner["uid"], 'guid' => $repeated_guid, 'private' => false, + 'network' => [NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS]]; + $repeated_item = Item::selectFirst([], $condition); + if (!DBM::is_result($repeated_item)) { return false; } - $contact = self::contactEntry($repeated_item['author-link'], $owner); - $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); + $contact = self::contactEntry($repeated_item['author-link'], $owner); $title = $owner["nick"]." repeated a notice by ".$contact["nick"]; @@ -1695,16 +1688,11 @@ class OStatus $as_object = $doc->createElement("activity:object"); - $parent = q( - "SELECT * FROM `item` WHERE `uri` = '%s' AND `uid` = %d", - dbesc($item["thr-parent"]), - intval($item["uid"]) - ); - $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); + $parent = Item::selectFirst([], ['uri' => $item["thr-parent"], 'uid' => $item["uid"]]); - XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent[0])); + XML::addElement($doc, $as_object, "activity:object-type", self::constructObjecttype($parent)); - self::entryContent($doc, $as_object, $parent[0], $owner, "New entry"); + self::entryContent($doc, $as_object, $parent, $owner, "New entry"); $entry->appendChild($as_object); @@ -1952,22 +1940,19 @@ class OStatus $mentioned = []; if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { - $parent = q("SELECT `guid`, `author-link`, `owner-link` FROM `item` WHERE `id` = %d", intval($item["parent"])); + $parent = item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item["parent"]]); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); - $thrparent = q( - "SELECT `guid`, `author-link`, `owner-link`, `plink` FROM `item` WHERE `uid` = %d AND `uri` = '%s'", - intval($owner["uid"]), - dbesc($parent_item) - ); - if ($thrparent) { - $mentioned[$thrparent[0]["author-link"]] = $thrparent[0]["author-link"]; - $mentioned[$thrparent[0]["owner-link"]] = $thrparent[0]["owner-link"]; - $parent_plink = $thrparent[0]["plink"]; + $thrparent = item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]); + + if (DBM::is_result($thrparent)) { + $mentioned[$thrparent["author-link"]] = $thrparent["author-link"]; + $mentioned[$thrparent["owner-link"]] = $thrparent["owner-link"]; + $parent_plink = $thrparent["plink"]; } else { - $mentioned[$parent[0]["author-link"]] = $parent[0]["author-link"]; - $mentioned[$parent[0]["owner-link"]] = $parent[0]["owner-link"]; - $parent_plink = System::baseUrl()."/display/".$parent[0]["guid"]; + $mentioned[$parent["author-link"]] = $parent["author-link"]; + $mentioned[$parent["owner-link"]] = $parent["owner-link"]; + $parent_plink = System::baseUrl()."/display/".$parent["guid"]; } $attributes = [ @@ -2130,13 +2115,8 @@ class OStatus return $result['feed']; } - $owner = dba::fetch_first( - "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type` - FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid` - WHERE `contact`.`self` AND `user`.`nickname` = ? LIMIT 1", - $owner_nick - ); - if (!DBM::is_result($owner)) { + $owner = User::getOwnerDataByNick($owner_nick); + if (!$owner) { return; } @@ -2147,37 +2127,28 @@ class OStatus $check_date = DateTimeFormat::utc($last_update); $authorid = Contact::getIdForURL($owner["url"], 0, true); - $sql_extra = ''; + $condition = ["`uid` = ? AND `created` > ? AND NOT `deleted` + AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)", + $owner["uid"], $check_date, NETWORK_OSTATUS, NETWORK_DFRN]; + if ($filter === 'posts') { - $sql_extra .= ' AND `item`.`id` = `item`.`parent` '; + $condition[0] .= " AND `id` = `parent`"; } if ($filter === 'comments') { - $sql_extra .= sprintf(" AND `item`.`object-type` = '%s' ", dbesc(ACTIVITY_OBJ_COMMENT)); + $condition[0] .= " AND `object-type` = ? "; + $condition[] = ACTIVITY_OBJ_COMMENT; } if ($owner['account-type'] != ACCOUNT_TYPE_COMMUNITY) { - $sql_extra .= sprintf(" AND `item`.`contact-id` = %d AND `item`.`author-id` = %d ", intval($owner["id"]), intval($authorid)); + $condition[0] .= " AND `contact-id` = ? AND `author-id` = ?"; + $condition[] = $owner["id"]; + $condition[] = $authorid; } - $items = q( - "SELECT `item`.*, `item`.`id` AS `item_id` FROM `item` USE INDEX (`uid_contactid_created`) - STRAIGHT_JOIN `thread` ON `thread`.`iid` = `item`.`parent` - WHERE `item`.`uid` = %d - AND `item`.`created` > '%s' - AND NOT `item`.`deleted` - AND NOT `item`.`private` - AND `item`.`visible` - AND `item`.`wall` - AND `thread`.`network` IN ('%s', '%s') - $sql_extra - ORDER BY `item`.`created` DESC LIMIT %d", - intval($owner["uid"]), - dbesc($check_date), - dbesc(NETWORK_OSTATUS), - dbesc(NETWORK_DFRN), - intval($max_items) - ); + $params = ['order' => ['created' => true], 'limit' => $max_items]; + $ret = Item::select([], $condition, $params); + $items = dba::inArray($ret); $doc = new DOMDocument('1.0', 'utf-8'); $doc->formatOutput = true; From ebd76285d8842aa0c0de919182eae039039fc209 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Jun 2018 05:39:56 +0000 Subject: [PATCH 3/7] New item functions, improved feed cache behaviour --- src/Model/Item.php | 63 +++++++++++++++++++++++++++++++++++----- src/Protocol/OStatus.php | 35 ++++++++++++---------- 2 files changed, 75 insertions(+), 23 deletions(-) diff --git a/src/Model/Item.php b/src/Model/Item.php index adb0baa68..c3b759f65 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -164,21 +164,63 @@ class Item extends BaseObject return dba::p($sql, $condition); } + /** + * @brief Select rows from the starting post in the item table + * + * @param integer $uid User ID + * @param array $fields Array of selected fields, empty for all + * @param array $condition Array of fields for condition + * @param array $params Array of several parameters + * + * @return boolean|object + */ + public static function selectThreadForUser($uid, array $selected = [], array $condition = [], $params = []) + { + $params['uid'] = $uid; + + if (empty($selected)) { + $selected = Item::DISPLAY_FIELDLIST; + } + + return self::selectThread($selected, $condition, $params); + } + /** * Retrieve a single record from the starting post in the item table and returns it in an associative array * * @brief Retrieve a single record from a table * @param integer $uid User ID + * @param array $selected + * @param array $condition + * @param array $params + * @return bool|array + * @see dba::select + */ + public static function selectFirstThreadForUser($uid, array $selected = [], array $condition = [], $params = []) + { + $params['uid'] = $uid; + + if (empty($selected)) { + $selected = Item::DISPLAY_FIELDLIST; + } + + return self::selectFirstThread($selected, $condition, $params); + } + + /** + * Retrieve a single record from the starting post in the item table and returns it in an associative array + * + * @brief Retrieve a single record from a table * @param array $fields * @param array $condition * @param array $params * @return bool|array * @see dba::select */ - public static function selectFirstThreadForUser($uid, array $fields = [], array $condition = [], $params = []) + public static function selectFirstThread(array $fields = [], array $condition = [], $params = []) { $params['limit'] = 1; - $result = self::selectThreadForUser($uid, $fields, $condition, $params); + $result = self::selectThread($fields, $condition, $params); if (is_bool($result)) { return $result; @@ -192,17 +234,20 @@ class Item extends BaseObject /** * @brief Select rows from the starting post in the item table * - * @param integer $uid User ID - * @param array $fields Array of selected fields, empty for all + * @param array $selected Array of selected fields, empty for all * @param array $condition Array of fields for condition * @param array $params Array of several parameters * * @return boolean|object */ - public static function selectThreadForUser($uid, array $selected = [], array $condition = [], $params = []) + public static function selectThread(array $selected = [], array $condition = [], $params = []) { - if (empty($selected)) { - $selected = Item::DISPLAY_FIELDLIST; + $uid = 0; + $usermode = false; + + if (isset($params['uid'])) { + $uid = $params['uid']; + $usermode = true; } $fields = self::fieldlist($selected); @@ -219,7 +264,9 @@ class Item extends BaseObject $condition_string = self::addTablesToFields($condition_string, $threadfields); $condition_string = self::addTablesToFields($condition_string, $fields); - $condition_string = $condition_string . ' AND ' . self::condition(true); + if ($usermode) { + $condition_string = $condition_string . ' AND ' . self::condition(true); + } $param_string = dba::buildParameter($params); $param_string = self::addTablesToFields($param_string, $threadfields); diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 36ed3580e..3b3775c1e 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -2104,20 +2104,23 @@ class OStatus { $stamp = microtime(true); + $owner = User::getOwnerDataByNick($owner_nick); + if (!$owner) { + return; + } + $cachekey = "ostatus:feed:" . $owner_nick . ":" . $filter . ":" . $last_update; $previous_created = $last_update; - $result = Cache::get($cachekey); - if (!$nocache && !is_null($result)) { - logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', LOGGER_DEBUG); - $last_update = $result['last_update']; - return $result['feed']; - } - - $owner = User::getOwnerDataByNick($owner_nick); - if (!$owner) { - return; + // Don't cache when the last item was posted less then 15 minutes ago (Cache duration) + if ((time() - strtotime($owner['last-item'])) < 15*60) { + $result = Cache::get($cachekey); + if (!$nocache && !is_null($result)) { + logger('Feed duration: ' . number_format(microtime(true) - $stamp, 3) . ' - ' . $owner_nick . ' - ' . $filter . ' - ' . $previous_created . ' (cached)', LOGGER_DEBUG); + $last_update = $result['last_update']; + return $result['feed']; + } } if (!strlen($last_update)) { @@ -2131,10 +2134,6 @@ class OStatus AND NOT `private` AND `visible` AND `wall` AND `parent-network` IN (?, ?)", $owner["uid"], $check_date, NETWORK_OSTATUS, NETWORK_DFRN]; - if ($filter === 'posts') { - $condition[0] .= " AND `id` = `parent`"; - } - if ($filter === 'comments') { $condition[0] .= " AND `object-type` = ? "; $condition[] = ACTIVITY_OBJ_COMMENT; @@ -2147,7 +2146,13 @@ class OStatus } $params = ['order' => ['created' => true], 'limit' => $max_items]; - $ret = Item::select([], $condition, $params); + + if ($filter === 'posts') { + $ret = Item::selectThread([], $condition, $params); + } else { + $ret = Item::select([], $condition, $params); + } + $items = dba::inArray($ret); $doc = new DOMDocument('1.0', 'utf-8'); From ed00b636139e405c518f4b1e6ff43d07693133c5 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Jun 2018 13:26:03 +0000 Subject: [PATCH 4/7] Typo --- src/Protocol/OStatus.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Protocol/OStatus.php b/src/Protocol/OStatus.php index 3b3775c1e..e84dddcea 100644 --- a/src/Protocol/OStatus.php +++ b/src/Protocol/OStatus.php @@ -1940,10 +1940,10 @@ class OStatus $mentioned = []; if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) { - $parent = item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item["parent"]]); + $parent = Item::selectFirst(['guid', 'author-link', 'owner-link'], ['id' => $item["parent"]]); $parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']); - $thrparent = item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]); + $thrparent = Item::selectFirst(['guid', 'author-link', 'owner-link', 'plink'], ['uid' => $owner["uid"], 'uri' => $parent_item]); if (DBM::is_result($thrparent)) { $mentioned[$thrparent["author-link"]] = $thrparent["author-link"]; From e4adaa99009356e581fb9a4a5ceacf7ae3993ef0 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Jun 2018 17:11:59 +0000 Subject: [PATCH 5/7] Standards and variable renaming --- include/api.php | 10 +++++----- mod/editpost.php | 43 +++++++++++++++---------------------------- mod/viewsrc.php | 4 ++-- 3 files changed, 22 insertions(+), 35 deletions(-) diff --git a/include/api.php b/include/api.php index fa4293c1b..8b0d0c0d9 100644 --- a/include/api.php +++ b/include/api.php @@ -689,7 +689,7 @@ function api_get_user(App $a, $contact_id = null) $usr = dba::selectFirst('user', ['default-location'], ['uid' => api_user()]); $profile = dba::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]); } - $countitms = 0; + $countitems = 0; $countfriends = 0; $countfollowers = 0; $starred = 0; @@ -739,7 +739,7 @@ function api_get_user(App $a, $contact_id = null) 'time_zone' => 'UTC', 'geo_enabled' => false, 'verified' => true, - 'statuses_count' => intval($countitms), + 'statuses_count' => intval($countitems), 'lang' => '', 'contributors_enabled' => false, 'is_translator' => false, @@ -2728,13 +2728,13 @@ function api_format_items_activities(&$item, $type = "json") $condition = ['uid' => $item['uid'], 'thr-parent' => $item['uri']]; $ret = Item::selectForUser($item['uid'], ['author-id', 'verb'], $condition); - while ($i = dba::fetch($ret)) { + while ($item = dba::fetch($ret)) { // not used as result should be structured like other user data //builtin_activity_puller($i, $activities); // get user data and add it to the array of the activity - $user = api_get_user($a, $i['author-id']); - switch ($i['verb']) { + $user = api_get_user($a, $item['author-id']); + switch ($item['verb']) { case ACTIVITY_LIKE: $activities['like'][] = $user; break; diff --git a/mod/editpost.php b/mod/editpost.php index dc98e93d9..04caaf0a2 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -15,29 +15,29 @@ function editpost_content(App $a) { $o = ''; - if (! local_user()) { + if (!local_user()) { notice(L10n::t('Permission denied.') . EOL); return; } $post_id = (($a->argc > 1) ? intval($a->argv[1]) : 0); - if (! $post_id) { + if (!$post_id) { notice(L10n::t('Item not found') . EOL); return; } $fields = ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid', 'type', 'body', 'title', 'file']; - $itm = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]); - if (! DBM::is_result($itm)) { + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $post_id, 'uid' => local_user()]); + if (!DBM::is_result($item)) { notice(L10n::t('Item not found') . EOL); return; } $geotag = ''; - $o .= replace_macros(get_markup_template("section_title.tpl"),[ + $o .= replace_macros(get_markup_template("section_title.tpl"), [ '$title' => L10n::t('Edit post') ]); @@ -60,7 +60,7 @@ function editpost_content(App $a) { $tpl = get_markup_template("jot.tpl"); - if (strlen($itm['allow_cid']) || strlen($itm['allow_gid']) || strlen($itm['deny_cid']) || strlen($itm['deny_gid'])) { + if (strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) { $lockstate = 'lock'; } else { $lockstate = 'unlock'; @@ -69,40 +69,27 @@ function editpost_content(App $a) { $jotplugins = ''; $jotnets = ''; - $mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1); + $mail_disabled = ((function_exists('imap_open') && !Config::get('system','imap_disabled')) ? 0 : 1); $mail_enabled = false; $pubmail_enabled = false; - if(! $mail_disabled) { + if (!$mail_disabled) { $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval(local_user()) ); if (DBM::is_result($r)) { $mail_enabled = true; - if(intval($r[0]['pubmail'])) + if (intval($r[0]['pubmail'])) { $pubmail_enabled = true; + } } } - // I don't think there's any need for the $jotnets when editing the post, - // and including them makes it difficult for the JS-free theme, so let's - // disable them -/* if($mail_enabled) { - $selected = (($pubmail_enabled) ? ' checked="checked" ' : ''); - $jotnets .= '
    ' - . L10n::t("Post to Email") . '
    '; - }*/ - - - Addon::callHooks('jot_tool', $jotplugins); //Addon::callHooks('jot_networks', $jotnets); - - //$tpl = replace_macros($tpl,array('$jotplugins' => $jotplugins)); - - $o .= replace_macros($tpl,[ + $o .= replace_macros($tpl, [ '$is_edit' => true, '$return_path' => $_SESSION['return_url'], '$action' => 'item', @@ -123,8 +110,8 @@ function editpost_content(App $a) { '$shortnoloc' => L10n::t('clear location'), '$wait' => L10n::t('Please wait'), '$permset' => L10n::t('Permission settings'), - '$ptyp' => $itm['type'], - '$content' => undo_post_tagging($itm['body']), + '$ptyp' => $item['type'], + '$content' => undo_post_tagging($item['body']), '$post_id' => $post_id, '$baseurl' => System::baseUrl(), '$defloc' => $a->user['default-location'], @@ -133,9 +120,9 @@ function editpost_content(App $a) { '$emailcc' => L10n::t('CC: email addresses'), '$public' => L10n::t('Public post'), '$jotnets' => $jotnets, - '$title' => htmlspecialchars($itm['title']), + '$title' => htmlspecialchars($item['title']), '$placeholdertitle' => L10n::t('Set title'), - '$category' => file_tag_file_to_list($itm['file'], 'category'), + '$category' => file_tag_file_to_list($item['file'], 'category'), '$placeholdercategory' => (Feature::isEnabled(local_user(),'categories') ? L10n::t("Categories \x28comma-separated list\x29") : ''), '$emtitle' => L10n::t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, diff --git a/mod/viewsrc.php b/mod/viewsrc.php index 4b511eab1..087b9f3d2 100644 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@ -27,10 +27,10 @@ function viewsrc_content(App $a) if (DBM::is_result($item)) { if (is_ajax()) { - echo str_replace("\n",'
    ',$item['body']); + echo str_replace("\n", '
    ', $item['body']); killme(); } else { - $o .= str_replace("\n",'
    ',$item['body']); + $o .= str_replace("\n", '
    ', $item['body']); } } return $o; From a9a19cb8e63a35da3314d0c73755483f33c361ee Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Jun 2018 17:57:45 +0000 Subject: [PATCH 6/7] Display is reworked --- mod/display.php | 101 +++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 53 deletions(-) diff --git a/mod/display.php b/mod/display.php index ff1ae6741..8af52d6f3 100644 --- a/mod/display.php +++ b/mod/display.php @@ -41,59 +41,58 @@ function display_init(App $a) } } - $r = false; + $item = false; $fields = ['id', 'parent', 'author-id', 'body', 'uid']; // If there is only one parameter, then check if this parameter could be a guid if ($a->argc == 2) { $nick = ""; - $r = false; // Does the local user have this item? if (local_user()) { - $r = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]); - if (DBM::is_result($r)) { + $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'uid' => local_user()]); + if (DBM::is_result($item)) { $nick = $a->user["nickname"]; } } // Is it an item with uid=0? - if (!DBM::is_result($r)) { - $r = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => false, 'uid' => 0]); + if (!DBM::is_result($item)) { + $item = Item::selectFirstForUser(local_user(), $fields, ['guid' => $a->argv[1], 'private' => false, 'uid' => 0]); } } elseif (($a->argc == 3) && ($nick == 'feed-item')) { - $r = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => false, 'uid' => 0]); + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $a->argv[2], 'private' => false, 'uid' => 0]); } - if (!DBM::is_result($r) || $r['deleted']) { + if (!DBM::is_result($item) || $item['deleted']) { $a->error = 404; notice(L10n::t('Item not found.') . EOL); return; } if (strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) { - logger('Directly serving XML for id '.$r["id"], LOGGER_DEBUG); - displayShowFeed($r["id"], false); + logger('Directly serving XML for id '.$item["id"], LOGGER_DEBUG); + displayShowFeed($item["id"], false); } - if ($r["id"] != $r["parent"]) { - $r = Item::selectFirstForUser(local_user(), $fields, ['id' => $r["parent"]]); + if ($item["id"] != $item["parent"]) { + $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]); } - $profiledata = display_fetchauthor($a, $r); + $profiledata = display_fetchauthor($a, $item); if (strstr(normalise_link($profiledata["url"]), normalise_link(System::baseUrl()))) { $nickname = str_replace(normalise_link(System::baseUrl())."/profile/", "", normalise_link($profiledata["url"])); if (($nickname != $a->user["nickname"])) { - $r = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` + $profile = dba::fetch_first("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile` INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`nickname` = ? AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", $nickname ); - if (DBM::is_result($r)) { - $profiledata = $r; + if (DBM::is_result($profile)) { + $profiledata = $profile; } $profiledata["network"] = NETWORK_DFRN; } else { @@ -104,7 +103,8 @@ function display_init(App $a) Profile::load($a, $nick, 0, $profiledata); } -function display_fetchauthor($a, $item) { +function display_fetchauthor($a, $item) +{ $author = dba::selectFirst('contact', ['name', 'nick', 'photo', 'network', 'url'], ['id' => $item['author-id']]); $profiledata = []; @@ -188,7 +188,8 @@ function display_fetchauthor($a, $item) { return($profiledata); } -function display_content(App $a, $update = false, $update_uid = 0) { +function display_content(App $a, $update = false, $update_uid = 0) +{ if (Config::get('system','block_public') && !local_user() && !remote_user()) { notice(L10n::t('Public access denied.') . EOL); return; @@ -214,27 +215,25 @@ function display_content(App $a, $update = false, $update_uid = 0) { if ($a->argc == 2) { $item_parent = 0; + $fields = ['id', 'parent', 'parent-uri']; if (local_user()) { - $r = dba::fetch_first("SELECT `id`, `parent`, `parent-uri` FROM `item` - WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND `guid` = ? AND `uid` = ?", $a->argv[1], local_user()); - if (DBM::is_result($r)) { - $item_id = $r["id"]; - $item_parent = $r["parent"]; - $item_parent_uri = $r['parent-uri']; + $condition = ['guid' => $a->argv[1], 'uid' => local_user()]; + $item = Item::selectFirstForUser(local_user(), $fields, $condition); + if (DBM::is_result($item)) { + $item_id = $item["id"]; + $item_parent = $item["parent"]; + $item_parent_uri = $item['parent-uri']; } } if ($item_parent == 0) { - $r = dba::fetch_first("SELECT `item`.`id`, `item`.`parent`, `item`.`parent-uri` FROM `item` - WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` - AND NOT `item`.`private` AND `item`.`uid` = 0 - AND `item`.`guid` = ?", $a->argv[1]); - if (DBM::is_result($r)) { - $item_id = $r["id"]; - $item_parent = $r["parent"]; - $item_parent_uri = $r['parent-uri']; + $condition = ['private' => false, 'guid' => $a->argv[1], 'uid' => 0]; + $item = Item::selectFirstForUser(local_user(), $fields, $condition); + if (DBM::is_result($item)) { + $item_id = $item["id"]; + $item_parent = $item["parent"]; + $item_parent_uri = $item['parent-uri']; } } } @@ -264,7 +263,7 @@ function display_content(App $a, $update = false, $update_uid = 0) { $groups = []; $contact = null; - $remote_contact = false; + $is_remote_contact = false; $contact_id = 0; @@ -279,30 +278,27 @@ function display_content(App $a, $update = false, $update_uid = 0) { if ($contact_id) { $groups = Group::getIdsByContactId($contact_id); - $r = dba::fetch_first("SELECT * FROM `contact` WHERE `id` = ? AND `uid` = ? LIMIT 1", - $contact_id, - $a->profile['uid'] - ); - if (DBM::is_result($r)) { - $contact = $r; - $remote_contact = true; + $remote_contact = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => $a->profile['uid']]); + if (DBM::is_result($remote_contact)) { + $contact = $remote_contact; + $is_remote_contact = true; } } - if (!$remote_contact) { + if (!$is_remote_contact) { if (local_user()) { $contact_id = $_SESSION['cid']; $contact = $a->contact; } } - $r = dba::fetch_first("SELECT * FROM `contact` WHERE `uid` = ? AND `self` LIMIT 1", $a->profile['uid']); - if (DBM::is_result($r)) { - $a->page_contact = $r; + $page_contact = dba::selectFirst('contact', [], ['self' => true, 'uid' => $a->profile['uid']]); + if (DBM::is_result($page_contact)) { + $a->page_contact = $page_contact; } $is_owner = (local_user() && (in_array($a->profile['profile_uid'], [local_user(), 0])) ? true : false); - if (x($a->profile, 'hidewall') && !$is_owner && !$remote_contact) { + if (x($a->profile, 'hidewall') && !$is_owner && !$is_remote_contact) { notice(L10n::t('Access to this profile has been restricted.') . EOL); return; } @@ -323,7 +319,7 @@ function display_content(App $a, $update = false, $update_uid = 0) { $o .= status_editor($a, $x, 0, true); } - $sql_extra = item_permissions_sql($a->profile['uid'], $remote_contact, $groups); + $sql_extra = item_permissions_sql($a->profile['uid'], $is_remote_contact, $groups); if (local_user() && (local_user() == $a->profile['uid'])) { $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true]; @@ -339,21 +335,19 @@ 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::selectForUser(local_user(), [], $condition, $params); + $items_obj = Item::selectForUser(local_user(), [], $condition, $params); - if (!DBM::is_result($r)) { + if (!DBM::is_result($items_obj)) { notice(L10n::t('Item not found.') . EOL); return $o; } - $s = dba::inArray($r); - if ($unseen) { $condition = ['parent-uri' => $item_parent_uri, 'uid' => local_user(), 'unseen' => true]; Item::update(['unseen' => false], $condition); } - $items = conv_sort($s, "`commented`"); + $items = conv_sort(dba::inArray($items_obj), "`commented`"); if (!$update) { $o .= ""; @@ -415,7 +409,8 @@ function display_content(App $a, $update = false, $update_uid = 0) { return $o; } -function displayShowFeed($item_id, $conversation) { +function displayShowFeed($item_id, $conversation) +{ $xml = DFRN::itemFeed($item_id, $conversation); if ($xml == '') { System::httpExit(500); From 92650f9634f89650979bbf05c4c1971bba9bfa77 Mon Sep 17 00:00:00 2001 From: Michael Date: Tue, 19 Jun 2018 17:58:28 +0000 Subject: [PATCH 7/7] Null - not false --- mod/display.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/display.php b/mod/display.php index 8af52d6f3..6a07fa176 100644 --- a/mod/display.php +++ b/mod/display.php @@ -41,7 +41,7 @@ function display_init(App $a) } } - $item = false; + $item = null; $fields = ['id', 'parent', 'author-id', 'body', 'uid'];