X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=22a6ee432133e523108ce5cce4d5899af75b2b7e;hb=8a354dac8269d788f3f8ea90732530eeacf53d98;hp=7758a5eaf2dd02336726fa31f3782fc25896e81f;hpb=19c3e55ca88e43d4dee6ba49f4b435034b660ecd;p=friendica.git diff --git a/include/api.php b/include/api.php index 7758a5eaf2..22a6ee4321 100644 --- a/include/api.php +++ b/include/api.php @@ -24,15 +24,14 @@ */ use Friendica\App; +use Friendica\Collection\Api\Notifications as ApiNotifications; use Friendica\Content\ContactSelector; use Friendica\Content\Text\BBCode; use Friendica\Content\Text\HTML; use Friendica\Core\Hook; use Friendica\Core\Logger; use Friendica\Core\Protocol; -use Friendica\Core\Session; use Friendica\Core\System; -use Friendica\Core\Worker; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; @@ -54,6 +53,7 @@ use Friendica\Network\HTTPException\MethodNotAllowedException; use Friendica\Network\HTTPException\NotFoundException; use Friendica\Network\HTTPException\TooManyRequestsException; use Friendica\Network\HTTPException\UnauthorizedException; +use Friendica\Object\Api\Friendica\Notification as ApiNotification; use Friendica\Object\Image; use Friendica\Protocol\Activity; use Friendica\Protocol\Diaspora; @@ -492,9 +492,9 @@ function api_get_user(App $a, $contact_id = null) // Searching for contact URL if (!is_null($contact_id) && (intval($contact_id) == 0)) { - $user = DBA::escape(Strings::normaliseLink($contact_id)); + $user = Strings::normaliseLink($contact_id); $url = $user; - $extra_query = "AND `contact`.`nurl` = '%s' "; + $extra_query = "AND `contact`.`nurl` = ? "; if (api_user() !== false) { $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); } @@ -502,43 +502,43 @@ function api_get_user(App $a, $contact_id = null) // Searching for contact id with uid = 0 if (!is_null($contact_id) && (intval($contact_id) != 0)) { - $user = DBA::escape(api_unique_id_to_nurl(intval($contact_id))); + $user = api_unique_id_to_nurl(intval($contact_id)); if ($user == "") { throw new BadRequestException("User ID ".$contact_id." not found."); } $url = $user; - $extra_query = "AND `contact`.`nurl` = '%s' "; + $extra_query = "AND `contact`.`nurl` = ? "; if (api_user() !== false) { $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); } } if (is_null($user) && !empty($_GET['user_id'])) { - $user = DBA::escape(api_unique_id_to_nurl($_GET['user_id'])); + $user = api_unique_id_to_nurl($_GET['user_id']); if ($user == "") { throw new BadRequestException("User ID ".$_GET['user_id']." not found."); } $url = $user; - $extra_query = "AND `contact`.`nurl` = '%s' "; + $extra_query = "AND `contact`.`nurl` = ? "; if (api_user() !== false) { $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); } } if (is_null($user) && !empty($_GET['screen_name'])) { - $user = DBA::escape($_GET['screen_name']); - $extra_query = "AND `contact`.`nick` = '%s' "; + $user = $_GET['screen_name']; + $extra_query = "AND `contact`.`nick` = ? "; if (api_user() !== false) { $extra_query .= "AND `contact`.`uid`=".intval(api_user()); } } if (is_null($user) && !empty($_GET['profileurl'])) { - $user = DBA::escape(Strings::normaliseLink($_GET['profileurl'])); - $extra_query = "AND `contact`.`nurl` = '%s' "; + $user = Strings::normaliseLink($_GET['profileurl']); + $extra_query = "AND `contact`.`nurl` = ? "; if (api_user() !== false) { $extra_query .= "AND `contact`.`uid`=".intval(api_user()); } @@ -554,18 +554,17 @@ function api_get_user(App $a, $contact_id = null) } } if (is_numeric($user)) { - $user = DBA::escape(api_unique_id_to_nurl(intval($user))); + $user = api_unique_id_to_nurl(intval($user)); if ($user != "") { $url = $user; - $extra_query = "AND `contact`.`nurl` = '%s' "; + $extra_query = "AND `contact`.`nurl` = ? "; if (api_user() !== false) { $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); } } } else { - $user = DBA::escape($user); - $extra_query = "AND `contact`.`nick` = '%s' "; + $extra_query = "AND `contact`.`nick` = ? "; if (api_user() !== false) { $extra_query .= "AND `contact`.`uid`=" . intval(api_user()); } @@ -580,19 +579,19 @@ function api_get_user(App $a, $contact_id = null) return false; } else { $user = api_user(); - $extra_query = "AND `contact`.`uid` = %d AND `contact`.`self` "; + $extra_query = "AND `contact`.`uid` = ? AND `contact`.`self` "; } } Logger::info(API_LOG_PREFIX . 'found user {user}', ['module' => 'api', 'action' => 'get_user', 'user' => $user, 'extra_query' => $extra_query]); // user info - $uinfo = q( + $uinfo = DBA::toArray(DBA::p( "SELECT *, `contact`.`id` AS `cid` FROM `contact` WHERE 1 $extra_query", $user - ); + )); // Selecting the id by priority, friendica first if (is_array($uinfo)) { @@ -1001,7 +1000,7 @@ function api_statuses_mediap($type) $a = DI::app(); if (api_user() === false) { - Logger::log('api_statuses_update: no user'); + logger::notice('api_statuses_update: no user'); throw new ForbiddenException(); } $user_info = api_get_user($a); @@ -1055,7 +1054,7 @@ function api_statuses_update($type) $a = DI::app(); if (api_user() === false) { - Logger::log('api_statuses_update: no user'); + logger::notice('api_statuses_update: no user'); throw new ForbiddenException(); } @@ -1109,7 +1108,7 @@ function api_statuses_update($type) $posts_day = Post::count($condition); if ($posts_day > $throttle_day) { - Logger::log('Daily posting limit reached for user '.api_user(), Logger::DEBUG); + logger::info('Daily posting limit reached for user '.api_user()); // die(api_error($type, DI::l10n()->t("Daily posting limit of %d posts reached. The post was rejected.", $throttle_day)); throw new TooManyRequestsException(DI::l10n()->tt("Daily posting limit of %d post reached. The post was rejected.", "Daily posting limit of %d posts reached. The post was rejected.", $throttle_day)); } @@ -1123,7 +1122,7 @@ function api_statuses_update($type) $posts_week = Post::count($condition); if ($posts_week > $throttle_week) { - Logger::log('Weekly posting limit reached for user '.api_user(), Logger::DEBUG); + logger::info('Weekly posting limit reached for user '.api_user()); // die(api_error($type, DI::l10n()->t("Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week))); throw new TooManyRequestsException(DI::l10n()->tt("Weekly posting limit of %d post reached. The post was rejected.", "Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week)); } @@ -1137,7 +1136,7 @@ function api_statuses_update($type) $posts_month = Post::count($condition); if ($posts_month > $throttle_month) { - Logger::log('Monthly posting limit reached for user '.api_user(), Logger::DEBUG); + logger::info('Monthly posting limit reached for user '.api_user()); // die(api_error($type, DI::l10n()->t("Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month)); throw new TooManyRequestsException(DI::l10n()->t("Monthly posting limit of %d post reached. The post was rejected.", "Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month)); } @@ -1188,7 +1187,7 @@ function api_statuses_update($type) // We have to avoid that the post is rejected because of an empty body if (empty($_REQUEST['body'])) { - $_REQUEST['body'] = '[hr]'; + $_REQUEST['body'] = '[hr]'; } } @@ -1238,7 +1237,7 @@ function api_media_upload() $a = DI::app(); if (api_user() === false) { - Logger::log('no user'); + logger::notice('no user'); throw new ForbiddenException(); } @@ -1894,7 +1893,7 @@ function api_statuses_show($type) $id = intval(DI::args()->getArgv()[4] ?? 0); } - Logger::log('API: api_statuses_show: ' . $id); + logger::notice('API: api_statuses_show: ' . $id); $conversation = !empty($_REQUEST['conversation']); @@ -2056,7 +2055,7 @@ function api_statuses_repeat($type) $id = intval(DI::args()->getArgv()[4] ?? 0); } - Logger::log('API: api_statuses_repeat: '.$id); + logger::notice('API: api_statuses_repeat: ' . $id); $fields = ['uri-id', 'network', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink']; $item = Post::selectFirst($fields, ['id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED]]); @@ -2139,7 +2138,7 @@ function api_statuses_destroy($type) $id = intval(DI::args()->getArgv()[4] ?? 0); } - Logger::log('API: api_statuses_destroy: '.$id); + logger::notice('API: api_statuses_destroy: ' . $id); $ret = api_statuses_show($type); @@ -2193,11 +2192,14 @@ function api_statuses_mentions($type) (SELECT `uri-id` FROM `post-user-notification` WHERE `uid` = ? AND `notification-type` & ? != 0 ORDER BY `uri-id`) AND (`uid` = 0 OR (`uid` = ? AND NOT `global`)) AND `id` > ?"; - $condition = [GRAVITY_PARENT, GRAVITY_COMMENT, api_user(), - Post\UserNotification::NOTIF_EXPLICIT_TAGGED | Post\UserNotification::NOTIF_IMPLICIT_TAGGED | - Post\UserNotification::NOTIF_THREAD_COMMENT | Post\UserNotification::NOTIF_DIRECT_COMMENT | - Post\UserNotification::NOTIF_DIRECT_THREAD_COMMENT, - api_user(), $since_id]; + $condition = [ + GRAVITY_PARENT, GRAVITY_COMMENT, + api_user(), + Post\UserNotification::TYPE_EXPLICIT_TAGGED | Post\UserNotification::TYPE_IMPLICIT_TAGGED | + Post\UserNotification::TYPE_THREAD_COMMENT | Post\UserNotification::TYPE_DIRECT_COMMENT | + Post\UserNotification::TYPE_DIRECT_THREAD_COMMENT, + api_user(), $since_id, + ]; if ($max_id > 0) { $query .= " AND `id` <= ?"; @@ -2997,7 +2999,7 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item); } - localize_item($item); + DI::contentItem()->localize($item); $in_reply_to = api_in_reply_to($item); @@ -3053,15 +3055,6 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use $retweeted_item = []; $quoted_item = []; - if ($item['gravity'] == GRAVITY_PARENT) { - $body = $item['body']; - $retweeted_item = api_share_as_retweet($item); - if ($body != $item['body']) { - $quoted_item = $retweeted_item; - $retweeted_item = []; - } - } - if (empty($retweeted_item) && ($item['owner-id'] == $item['author-id'])) { $announce = api_get_announce($item); if (!empty($announce)) { @@ -3119,6 +3112,7 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use $retweeted_status['text'] = $rt_converted["text"]; $retweeted_status['statusnet_html'] = $rt_converted["html"]; + $retweeted_status['friendica_html'] = $rt_converted["html"]; $retweeted_status['created_at'] = api_date($retweeted_item['created']); if (!empty($quoted_status)) { @@ -3421,19 +3415,20 @@ function api_statuses_f($qtype) $sql_filter = 'AND (NOT `blocked` OR `pending`)'; } - $r = q( + // @todo This query most likely can be replaced with a Contact::select... + $r = DBA::toArray(DBA::p( "SELECT `nurl` FROM `contact` - WHERE `uid` = %d + WHERE `uid` = ? AND NOT `self` $sql_filter $sql_extra ORDER BY `nick` - LIMIT %d, %d", - intval(api_user()), - intval($start), - intval($count) - ); + LIMIT ?, ?", + api_user(), + $start, + $count + )); $ret = []; foreach ($r as $cid) { @@ -3635,17 +3630,12 @@ function api_direct_messages_new($type) $recipient = null; if (!empty($_POST['screen_name'])) { - $r = q( - "SELECT `id`, `nurl`, `network` FROM `contact` WHERE `uid`=%d AND `nick`='%s'", - intval(api_user()), - DBA::escape($_POST['screen_name']) - ); - - if (DBA::isResult($r)) { + $contacts = Contact::selectToArray(['id', 'nurl', 'network'], ['uid' => api_user(), 'nick' => $_POST['screen_name']]); + if (DBA::isResult($contacts)) { // Selecting the id by priority, friendica first - api_best_nickname($r); + api_best_nickname($contacts); - $recipient = api_get_user($a, $r[0]['nurl']); + $recipient = api_get_user($a, $contacts[0]['nurl']); } } else { $recipient = api_get_user($a, $_POST['user_id']); @@ -3657,13 +3647,9 @@ function api_direct_messages_new($type) $replyto = ''; if (!empty($_REQUEST['replyto'])) { - $r = q( - 'SELECT `parent-uri`, `title` FROM `mail` WHERE `uid`=%d AND `id`=%d', - intval(api_user()), - intval($_REQUEST['replyto']) - ); - $replyto = $r[0]['parent-uri']; - $sub = $r[0]['title']; + $mail = DBA::selectFirst('mail', ['parent-uri', 'title'], ['uid' => api_user(), 'id' => $_REQUEST['replyto']]); + $replyto = $mail['parent-uri']; + $sub = $mail['title']; } else { if (!empty($_REQUEST['title'])) { $sub = $_REQUEST['title']; @@ -3675,10 +3661,10 @@ function api_direct_messages_new($type) $id = Mail::send($recipient['cid'], $_POST['text'], $sub, $replyto); if ($id > -1) { - $r = q("SELECT * FROM `mail` WHERE id=%d", intval($id)); - $ret = api_format_messages($r[0], $recipient, $sender); + $mail = DBA::selectFirst('mail', [], ['id' => $id]); + $ret = api_format_messages($mail, $recipient, $sender); } else { - $ret = ["error"=>$id]; + $ret = ["error" => $id]; } $data = ['direct_message'=>$ret]; @@ -3741,15 +3727,8 @@ function api_direct_messages_destroy($type) // add parent-uri to sql command if specified by calling app $sql_extra = ($parenturi != "" ? " AND `parent-uri` = '" . DBA::escape($parenturi) . "'" : ""); - // get data of the specified message id - $r = q( - "SELECT `id` FROM `mail` WHERE `uid` = %d AND `id` = %d" . $sql_extra, - intval($uid), - intval($id) - ); - // error message if specified id is not in database - if (!DBA::isResult($r)) { + if (!DBA::exists('mail', ["`uid` = ? AND `id` = ? " . $sql_extra, $uid, $id])) { if ($verbose == "true") { $answer = ['result' => 'error', 'message' => 'message id not in database']; return api_format_data("direct_messages_delete", $type, ['$result' => $answer]); @@ -3759,11 +3738,7 @@ function api_direct_messages_destroy($type) } // delete message - $result = q( - "DELETE FROM `mail` WHERE `uid` = %d AND `id` = %d" . $sql_extra, - intval($uid), - intval($id) - ); + $result = DBA::delete('mail', ["`uid` = ? AND `id` = ? " . $sql_extra, $uid, $id]); if ($verbose == "true") { if ($result) { @@ -3786,11 +3761,11 @@ api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy', * * @param string $type Known types are 'atom', 'rss', 'xml' and 'json' * @return string|array - * @throws BadRequestException - * @throws ForbiddenException - * @throws ImagickException - * @throws InternalServerErrorException - * @throws NotFoundException + * @throws HTTPException\BadRequestException + * @throws HTTPException\ExpectationFailedException + * @throws HTTPException\ForbiddenException + * @throws HTTPException\InternalServerErrorException + * @throws HTTPException\NotFoundException * @see https://developer.twitter.com/en/docs/accounts-and-users/follow-search-get-users/api-reference/post-friendships-destroy.html */ function api_friendships_destroy($type) @@ -3798,25 +3773,31 @@ function api_friendships_destroy($type) $uid = api_user(); if ($uid === false) { - throw new ForbiddenException(); + throw new HTTPException\ForbiddenException(); + } + + $owner = User::getOwnerDataById($uid); + if (!$owner) { + Logger::notice(API_LOG_PREFIX . 'No owner {uid} found', ['module' => 'api', 'action' => 'friendships_destroy', 'uid' => $uid]); + throw new HTTPException\NotFoundException('Error Processing Request'); } $contact_id = $_REQUEST['user_id'] ?? 0; if (empty($contact_id)) { Logger::notice(API_LOG_PREFIX . 'No user_id specified', ['module' => 'api', 'action' => 'friendships_destroy']); - throw new BadRequestException("no user_id specified"); + throw new HTTPException\BadRequestException('no user_id specified'); } // Get Contact by given id $contact = DBA::selectFirst('contact', ['url'], ['id' => $contact_id, 'uid' => 0, 'self' => false]); if(!DBA::isResult($contact)) { - Logger::notice(API_LOG_PREFIX . 'No contact found for ID {contact}', ['module' => 'api', 'action' => 'friendships_destroy', 'contact' => $contact_id]); - throw new NotFoundException("no contact found to given ID"); + Logger::notice(API_LOG_PREFIX . 'No public contact found for ID {contact}', ['module' => 'api', 'action' => 'friendships_destroy', 'contact' => $contact_id]); + throw new HTTPException\NotFoundException('no contact found to given ID'); } - $url = $contact["url"]; + $url = $contact['url']; $condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)", $uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url), @@ -3825,40 +3806,33 @@ function api_friendships_destroy($type) if (!DBA::isResult($contact)) { Logger::notice(API_LOG_PREFIX . 'Not following contact', ['module' => 'api', 'action' => 'friendships_destroy']); - throw new NotFoundException("Not following Contact"); - } - - if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { - Logger::notice(API_LOG_PREFIX . 'Not supported for {network}', ['module' => 'api', 'action' => 'friendships_destroy', 'network' => $contact['network']]); - throw new ExpectationFailedException("Not supported"); + throw new HTTPException\NotFoundException('Not following Contact'); } - $dissolve = ($contact['rel'] == Contact::SHARING); + try { + $result = Contact::terminateFriendship($owner, $contact); - $owner = User::getOwnerDataById($uid); - if ($owner) { - Contact::terminateFriendship($owner, $contact, $dissolve); - } - else { - Logger::notice(API_LOG_PREFIX . 'No owner {uid} found', ['module' => 'api', 'action' => 'friendships_destroy', 'uid' => $uid]); - throw new NotFoundException("Error Processing Request"); - } + if ($result === null) { + Logger::notice(API_LOG_PREFIX . 'Not supported for {network}', ['module' => 'api', 'action' => 'friendships_destroy', 'network' => $contact['network']]); + throw new HTTPException\ExpectationFailedException('Unfollowing is currently not supported by this contact\'s network.'); + } - // Sharing-only contacts get deleted as there no relationship any more - if ($dissolve) { - Contact::remove($contact['id']); - } else { - Contact::update(['rel' => Contact::FOLLOWER], ['id' => $contact['id']]); + if ($result === false) { + throw new HTTPException\ServiceUnavailableException('Unable to unfollow this contact, please retry in a few minutes or contact your administrator.'); + } + } catch (Exception $e) { + Logger::error(API_LOG_PREFIX . $e->getMessage(), ['owner' => $owner, 'contact' => $contact]); + throw new HTTPException\InternalServerErrorException('Unable to unfollow this contact, please contact your administrator'); } // "uid" and "self" are only needed for some internal stuff, so remove it from here - unset($contact["uid"]); - unset($contact["self"]); + unset($contact['uid']); + unset($contact['self']); // Set screen_name since Twidere requests it - $contact["screen_name"] = $contact["nick"]; + $contact['screen_name'] = $contact['nick']; - return api_format_data("friendships-destroy", $type, ['user' => $contact]); + return api_format_data('friendships-destroy', $type, ['user' => $contact]); } api_register_func('api/friendships/destroy', 'api_friendships_destroy', true, API_METHOD_POST); @@ -3930,13 +3904,13 @@ function api_direct_messages_box($type, $box, $verbose) $sql_extra .= " AND `contact`.`nick` = '" . DBA::escape($screen_name). "'"; } - $r = q( - "SELECT `mail`.*, `contact`.`nurl` AS `contact-url` FROM `mail`,`contact` WHERE `mail`.`contact-id` = `contact`.`id` AND `mail`.`uid`=%d AND $sql_extra AND `mail`.`id` > %d ORDER BY `mail`.`id` DESC LIMIT %d,%d", - intval(api_user()), - intval($since_id), - intval($start), - intval($count) - ); + $r = DBA::toArray(DBA::p( + "SELECT `mail`.*, `contact`.`nurl` AS `contact-url` FROM `mail`,`contact` WHERE `mail`.`contact-id` = `contact`.`id` AND `mail`.`uid` = ? AND $sql_extra AND `mail`.`id` > ? ORDER BY `mail`.`id` DESC LIMIT ?,?", + api_user(), + $since_id, + $start, + $count + )); if ($verbose == "true" && !DBA::isResult($r)) { $answer = ['result' => 'error', 'message' => 'no mails available']; return api_format_data("direct_messages_all", $type, ['$result' => $answer]); @@ -4138,12 +4112,12 @@ function api_fr_photos_list($type) if (api_user() === false) { throw new ForbiddenException(); } - $r = q( + $r = DBA::toArray(DBA::p( "SELECT `resource-id`, MAX(scale) AS `scale`, `album`, `filename`, `type`, MAX(`created`) AS `created`, MAX(`edited`) AS `edited`, MAX(`desc`) AS `desc` FROM `photo` - WHERE `uid` = %d AND `album` != 'Contact Photos' GROUP BY `resource-id`, `album`, `filename`, `type`", - intval(local_user()) - ); + WHERE `uid` = ? AND NOT `photo-type` IN (?, ?) GROUP BY `resource-id`, `album`, `filename`, `type`", + local_user(), Photo::CONTACT_AVATAR, Photo::CONTACT_BANNER + )); $typetoext = [ 'image/jpeg' => 'jpg', 'image/png' => 'png', @@ -4238,7 +4212,7 @@ function api_fr_photo_create_update($type) // now let's upload the new media in create-mode if ($mode == "create") { $media = $_FILES['media']; - $data = save_media_to_database("photo", $media, $type, $album, trim($allow_cid), trim($deny_cid), trim($allow_gid), trim($deny_gid), $desc, $visibility); + $data = save_media_to_database("photo", $media, $type, $album, trim($allow_cid), trim($deny_cid), trim($allow_gid), trim($deny_gid), $desc, Photo::DEFAULT, $visibility); // return success of updating or error message if (!is_null($data)) { @@ -4291,7 +4265,7 @@ function api_fr_photo_create_update($type) if (!empty($_FILES['media'])) { $nothingtodo = false; $media = $_FILES['media']; - $data = save_media_to_database("photo", $media, $type, $album, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $desc, 0, $visibility, $photo_id); + $data = save_media_to_database("photo", $media, $type, $album, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $desc, Photo::DEFAULT, $visibility, $photo_id); if (!is_null($data)) { return api_format_data("photo_update", $type, $data); } @@ -4434,7 +4408,7 @@ function api_account_update_profile_image($type) $media = $_FILES['media']; } // save new profile image - $data = save_media_to_database("profileimage", $media, $type, DI::l10n()->t('Profile Photos'), "", "", "", "", "", $is_default_profile); + $data = save_media_to_database("profileimage", $media, $type, DI::l10n()->t(Photo::PROFILE_PHOTOS), "", "", "", "", "", Photo::USER_AVATAR); // get filetype if (is_array($media['type'])) { @@ -4453,7 +4427,7 @@ function api_account_update_profile_image($type) // change specified profile or all profiles to the new resource-id if ($is_default_profile) { $condition = ["`profile` AND `resource-id` != ? AND `uid` = ?", $data['photo']['id'], api_user()]; - Photo::update(['profile' => false], $condition); + Photo::update(['profile' => false, 'photo-type' => Photo::DEFAULT], $condition); } else { $fields = ['photo' => DI::baseUrl() . '/photo/' . $data['photo']['id'] . '-4.' . $fileext, 'thumb' => DI::baseUrl() . '/photo/' . $data['photo']['id'] . '-5.' . $fileext]; @@ -4560,7 +4534,7 @@ function check_acl_input($acl_string) * @param string $allow_gid * @param string $deny_gid * @param string $desc - * @param integer $profile + * @param integer $phototype * @param boolean $visibility * @param string $photo_id * @return array @@ -4571,7 +4545,7 @@ function check_acl_input($acl_string) * @throws NotFoundException * @throws UnauthorizedException */ -function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $desc, $profile = 0, $visibility = false, $photo_id = null) +function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $desc, $phototype = 0, $visibility = false, $photo_id = null) { $visitor = 0; $src = ""; @@ -4604,11 +4578,9 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ $filetype = Images::getMimeTypeBySource($src, $filename, $filetype); - Logger::log( + logger::info( "File upload src: " . $src . " - filename: " . $filename . - " - size: " . $filesize . " - type: " . $filetype, - Logger::DEBUG - ); + " - size: " . $filesize . " - type: " . $filetype); // check if there was a php upload error if ($filesize == 0 && $media['error'] == 1) { @@ -4639,7 +4611,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ } if ($max_length > 0) { $Image->scaleDown($max_length); - Logger::log("File upload: Scaling picture to new size " . $max_length, Logger::DEBUG); + logger::info("File upload: Scaling picture to new size " . $max_length); } $width = $Image->getWidth(); $height = $Image->getHeight(); @@ -4649,57 +4621,57 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $ if ($mediatype == "photo") { // upload normal image (scales 0, 1, 2) - Logger::log("photo upload: starting new photo upload", Logger::DEBUG); + logger::info("photo upload: starting new photo upload"); - $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 0, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 0, Photo::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { - Logger::log("photo upload: image upload with scale 0 (original size) failed"); + logger::notice("photo upload: image upload with scale 0 (original size) failed"); } if ($width > 640 || $height > 640) { $Image->scaleDown(640); - $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 1, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 1, Photo::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { - Logger::log("photo upload: image upload with scale 1 (640x640) failed"); + logger::notice("photo upload: image upload with scale 1 (640x640) failed"); } } if ($width > 320 || $height > 320) { $Image->scaleDown(320); - $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 2, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 2, Photo::DEFAULT, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { - Logger::log("photo upload: image upload with scale 2 (320x320) failed"); + logger::notice("photo upload: image upload with scale 2 (320x320) failed"); } } - Logger::log("photo upload: new photo upload ended", Logger::DEBUG); + logger::info("photo upload: new photo upload ended"); } elseif ($mediatype == "profileimage") { // upload profile image (scales 4, 5, 6) - Logger::log("photo upload: starting new profile image upload", Logger::DEBUG); + logger::info("photo upload: starting new profile image upload"); if ($width > 300 || $height > 300) { $Image->scaleDown(300); - $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 4, $phototype, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { - Logger::log("photo upload: profile image upload with scale 4 (300x300) failed"); + logger::notice("photo upload: profile image upload with scale 4 (300x300) failed"); } } if ($width > 80 || $height > 80) { $Image->scaleDown(80); - $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 5, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 5, $phototype, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { - Logger::log("photo upload: profile image upload with scale 5 (80x80) failed"); + logger::notice("photo upload: profile image upload with scale 5 (80x80) failed"); } } if ($width > 48 || $height > 48) { $Image->scaleDown(48); - $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 6, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); + $r = Photo::store($Image, local_user(), $visitor, $resource_id, $filename, $album, 6, $phototype, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc); if (!$r) { - Logger::log("photo upload: profile image upload with scale 6 (48x48) failed"); + logger::notice("photo upload: profile image upload with scale 6 (48x48) failed"); } } $Image->__destruct(); - Logger::log("photo upload: new profile image upload ended", Logger::DEBUG); + logger::info("photo upload: new profile image upload ended"); } if (!empty($r)) { @@ -4796,18 +4768,16 @@ function prepare_photo_data($type, $scale, $photo_id) // added allow_cid, allow_gid, deny_cid, deny_gid to output as string like stored in database // clients needs to convert this in their way for further processing - $r = q( - "SELECT %s `resource-id`, `created`, `edited`, `title`, `desc`, `album`, `filename`, + $r = DBA::toArray(DBA::p( + "SELECT $data_sql `resource-id`, `created`, `edited`, `title`, `desc`, `album`, `filename`, `type`, `height`, `width`, `datasize`, `profile`, `allow_cid`, `deny_cid`, `allow_gid`, `deny_gid`, MIN(`scale`) AS `minscale`, MAX(`scale`) AS `maxscale` - FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' %s GROUP BY + FROM `photo` WHERE `uid` = ? AND `resource-id` = ? $scale_sql GROUP BY `resource-id`, `created`, `edited`, `title`, `desc`, `album`, `filename`, `type`, `height`, `width`, `datasize`, `profile`, `allow_cid`, `deny_cid`, `allow_gid`, `deny_gid`", - $data_sql, - intval(local_user()), - DBA::escape($photo_id), - $scale_sql - ); + local_user(), + $photo_id + )); $typetoext = [ 'image/jpeg' => 'jpg', @@ -4920,76 +4890,6 @@ function api_get_announce($item) return array_merge($item, $announce); } -/** - * Return the item shared, if the item contains only the [share] tag - * - * @param array $item Sharer item - * @return array|false Shared item or false if not a reshare - * @throws ImagickException - * @throws InternalServerErrorException - */ -function api_share_as_retweet(&$item) -{ - $body = trim($item["body"]); - - if (Diaspora::isReshare($body, false) === false) { - if ($item['author-id'] == $item['owner-id']) { - return false; - } else { - // Reshares from OStatus, ActivityPub and Twitter - $reshared_item = $item; - $reshared_item['owner-id'] = $reshared_item['author-id']; - $reshared_item['owner-link'] = $reshared_item['author-link']; - $reshared_item['owner-name'] = $reshared_item['author-name']; - $reshared_item['owner-avatar'] = $reshared_item['author-avatar']; - return $reshared_item; - } - } - - $reshared = Item::getShareArray($item); - if (empty($reshared)) { - return false; - } - - $reshared_item = $item; - - if (empty($reshared['shared']) || empty($reshared['profile']) || empty($reshared['author']) || empty($reshared['avatar']) || empty($reshared['posted'])) { - return false; - } - - if (!empty($reshared['comment'])) { - $item['body'] = $reshared['comment']; - } - - $reshared_item["share-pre-body"] = $reshared['comment']; - $reshared_item["body"] = $reshared['shared']; - $reshared_item["author-id"] = Contact::getIdForURL($reshared['profile'], 0, false); - $reshared_item["author-name"] = $reshared['author']; - $reshared_item["author-link"] = $reshared['profile']; - $reshared_item["author-avatar"] = $reshared['avatar']; - $reshared_item["plink"] = $reshared['link'] ?? ''; - $reshared_item["created"] = $reshared['posted']; - $reshared_item["edited"] = $reshared['posted']; - - // Try to fetch the original item - if (!empty($reshared['guid'])) { - $condition = ['guid' => $reshared['guid'], 'uid' => [0, $item['uid']]]; - } elseif (!empty($reshared_item['plink']) && ($original_id = Item::searchByLink($reshared_item['plink']))) { - $condition = ['id' => $original_id]; - } else { - $condition = []; - } - - if (!empty($condition)) { - $original_item = Post::selectFirst([], $condition); - if (DBA::isResult($original_item)) { - $reshared_item = array_merge($reshared_item, $original_item); - } - } - - return $reshared_item; -} - /** * * @param array $item @@ -5163,25 +5063,19 @@ function api_friendica_group_show($type) // get data of the specified group id or all groups if not specified if ($gid != 0) { - $r = q( - "SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d AND `id` = %d", - intval($uid), - intval($gid) - ); + $groups = DBA::selectToArray('group', [], ['deleted' => false, 'uid' => $uid, 'id' => $gid]); + // error message if specified gid is not in database - if (!DBA::isResult($r)) { + if (!DBA::isResult($groups)) { throw new BadRequestException("gid not available"); } } else { - $r = q( - "SELECT * FROM `group` WHERE `deleted` = 0 AND `uid` = %d", - intval($uid) - ); + $groups = DBA::selectToArray('group', [], ['deleted' => false, 'uid' => $uid]); } // loop through all groups and retrieve all members for adding data in the user array $grps = []; - foreach ($r as $rr) { + foreach ($groups as $rr) { $members = Contact\Group::getById($rr['id']); $users = []; @@ -5237,26 +5131,13 @@ function api_friendica_group_delete($type) throw new BadRequestException('gid or name not specified'); } - // get data of the specified group id - $r = q( - "SELECT * FROM `group` WHERE `uid` = %d AND `id` = %d", - intval($uid), - intval($gid) - ); // error message if specified gid is not in database - if (!DBA::isResult($r)) { + if (!DBA::exists('group', ['uid' => $uid, 'id' => $gid])) { throw new BadRequestException('gid not available'); } - // get data of the specified group id and group name - $rname = q( - "SELECT * FROM `group` WHERE `uid` = %d AND `id` = %d AND `name` = '%s'", - intval($uid), - intval($gid), - DBA::escape($name) - ); // error message if specified gid is not in database - if (!DBA::isResult($rname)) { + if (!DBA::exists('group', ['uid' => $uid, 'id' => $gid, 'name' => $name])) { throw new BadRequestException('wrong group name'); } @@ -5340,25 +5221,13 @@ function group_create($name, $uid, $users = []) throw new BadRequestException('group name not specified'); } - // get data of the specified group name - $rname = q( - "SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 0", - intval($uid), - DBA::escape($name) - ); // error message if specified group name already exists - if (DBA::isResult($rname)) { + if (DBA::exists('group', ['uid' => $uid, 'name' => $name, 'deleted' => false])) { throw new BadRequestException('group name already exists'); } - // check if specified group name is a deleted group - $rname = q( - "SELECT * FROM `group` WHERE `uid` = %d AND `name` = '%s' AND `deleted` = 1", - intval($uid), - DBA::escape($name) - ); - // error message if specified group name already exists - if (DBA::isResult($rname)) { + // Check if the group needs to be reactivated + if (DBA::exists('group', ['uid' => $uid, 'name' => $name, 'deleted' => true])) { $reactivate_group = true; } @@ -5375,13 +5244,7 @@ function group_create($name, $uid, $users = []) $errorusers = []; foreach ($users as $user) { $cid = $user['cid']; - // check if user really exists as contact - $contact = q( - "SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d", - intval($cid), - intval($uid) - ); - if (count($contact)) { + if (DBA::exists('contact', ['id' => $cid, 'uid' => $uid])) { Group::addMember($gid, $cid); } else { $erroraddinguser = true; @@ -5523,14 +5386,8 @@ function api_friendica_group_update($type) $errorusers = []; foreach ($users as $user) { $cid = $user['cid']; - // check if user really exists as contact - $contact = q( - "SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d", - intval($cid), - intval($uid) - ); - if (count($contact)) { + if (DBA::exists('contact', ['id' => $cid, 'uid' => $uid])) { Group::addMember($gid, $cid); } else { $erroraddinguser = true; @@ -5659,23 +5516,24 @@ api_register_func('api/friendica/activity/unattendmaybe', 'api_friendica_activit */ function api_friendica_notification($type) { - $a = DI::app(); - if (api_user() === false) { throw new ForbiddenException(); } if (DI::args()->getArgc()!==3) { - throw new BadRequestException("Invalid argument count"); + throw new BadRequestException('Invalid argument count'); } - $notifications = DI::notification()->getApiList(local_user()); + $Notifies = DI::notify()->selectAllForUser(local_user(), 50); - if ($type == "xml") { - $xmlnotes = false; - if (!empty($notifications)) { - foreach ($notifications as $notification) { - $xmlnotes[] = ["@attributes" => $notification->toArray()]; - } + $notifications = new ApiNotifications(); + foreach ($Notifies as $Notify) { + $notifications[] = new ApiNotification($Notify); + } + + if ($type == 'xml') { + $xmlnotes = []; + foreach ($notifications as $notification) { + $xmlnotes[] = ['@attributes' => $notification->toArray()]; } $result = $xmlnotes; @@ -5685,7 +5543,7 @@ function api_friendica_notification($type) $result = false; } - return api_format_data("notes", $type, ['note' => $result]); + return api_format_data('notes', $type, ['note' => $result]); } /** @@ -5710,26 +5568,36 @@ function api_friendica_notification_seen($type) throw new ForbiddenException(); } if (DI::args()->getArgc() !== 4) { - throw new BadRequestException("Invalid argument count"); + throw new BadRequestException('Invalid argument count'); } - $id = (!empty($_REQUEST['id']) ? intval($_REQUEST['id']) : 0); + $id = intval($_REQUEST['id'] ?? 0); try { - $notify = DI::notify()->getByID($id, api_user()); - DI::notify()->setSeen(true, $notify); + $Notify = DI::notify()->selectOneById($id); + if ($Notify->uid !== api_user()) { + throw new NotFoundException(); + } - if ($notify->otype === Notification\ObjectType::ITEM) { - $item = Post::selectFirstForUser(api_user(), [], ['id' => $notify->iid, 'uid' => api_user()]); + if ($Notify->uriId) { + DI::notification()->setAllSeenForUser($Notify->uid, ['target-uri-id' => $Notify->uriId]); + } + + $Notify->setSeen(); + DI::notify()->save($Notify); + + if ($Notify->otype === Notification\ObjectType::ITEM) { + $item = Post::selectFirstForUser(api_user(), [], ['id' => $Notify->iid, 'uid' => api_user()]); if (DBA::isResult($item)) { // we found the item, return it to the user $ret = api_format_items([$item], $user_info, false, $type); $data = ['status' => $ret]; - return api_format_data("status", $type, $data); + return api_format_data('status', $type, $data); } // the item can't be found, but we set the notification as seen, so we count this as a success } - return api_format_data('result', $type, ['result' => "success"]); + + return api_format_data('result', $type, ['result' => 'success']); } catch (NotFoundException $e) { throw new BadRequestException('Invalid argument', $e); } catch (Exception $e) { @@ -5826,11 +5694,11 @@ function api_friendica_direct_messages_search($type, $box = "") } // get data for the specified searchstring - $r = q( - "SELECT `mail`.*, `contact`.`nurl` AS `contact-url` FROM `mail`,`contact` WHERE `mail`.`contact-id` = `contact`.`id` AND `mail`.`uid`=%d AND `body` LIKE '%s' ORDER BY `mail`.`id` DESC", - intval($uid), - DBA::escape('%'.$searchstring.'%') - ); + $r = DBA::toArray(DBA::p( + "SELECT `mail`.*, `contact`.`nurl` AS `contact-url` FROM `mail`,`contact` WHERE `mail`.`contact-id` = `contact`.`id` AND `mail`.`uid` = ? AND `body` LIKE ? ORDER BY `mail`.`id` DESC", + $uid, + '%'.$searchstring.'%' + )); $profile_url = $user_info["url"];