]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/develop' into more-abstraction
authorMichael <heluecht@pirati.ca>
Tue, 19 Jun 2018 13:48:19 +0000 (13:48 +0000)
committerMichael <heluecht@pirati.ca>
Tue, 19 Jun 2018 13:48:19 +0000 (13:48 +0000)
1  2 
include/api.php

diff --combined include/api.php
index 8f3dea6167da20723add51ba24cd59987325ac6e,c89a5b16441c1447a086eef90c82573bcf323696..fa4293c1bcaf0a7458dcf4f4d9181239b308bf3d
@@@ -688,8 -688,59 +688,8 @@@ function api_get_user(App $a, $contact_
  
                $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;
@@@ -1122,8 -1173,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);
                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);
                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);
@@@ -2725,10 -2806,14 +2725,10 @@@ function api_format_items_activities(&$
                '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);
  
                }
        }
  
 +      dba::close($ret);
 +
        if ($type == "xml") {
                $xml_activities = [];
                foreach ($activities as $k => $v) {
@@@ -3617,12 -3700,9 +3617,9 @@@ api_register_func('api/direct_messages/
  function api_direct_messages_box($type, $box, $verbose)
  {
        $a = get_app();
-       $user_info = api_get_user($a);
-       if (api_user() === false || $user_info === false) {
+       if (api_user() === false) {
                throw new ForbiddenException();
        }
        // params
        $count = (x($_GET, 'count') ? $_GET['count'] : 20);
        $page = (x($_REQUEST, 'page') ? $_REQUEST['page'] -1 : 0);
        unset($_REQUEST["screen_name"]);
        unset($_GET["screen_name"]);
  
+       $user_info = api_get_user($a);
+       if ($user_info === false) {
+               throw new ForbiddenException();
+       }
        $profile_url = $user_info["url"];
  
        // pagination
@@@ -3840,13 -3924,16 +3841,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
@@@ -4127,15 -4214,18 +4128,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]);
@@@ -4623,10 -4713,12 +4624,10 @@@ function prepare_photo_data($type, $sca
        }
  
        // 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')",
@@@ -4921,26 -5013,35 +4922,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: