X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=8b938508bd64283943cbaeada6ff0fd15e40bab7;hb=d5dd12b8f8bc7d08813fee3e22831daf45c9052d;hp=0ca0bf838c983179e219b883dcfc3cf1c7aa19dc;hpb=6ceb74c3654a31f3c5bd51404121665e4bc36810;p=friendica.git diff --git a/include/api.php b/include/api.php index 0ca0bf838c..8b938508bd 100644 --- a/include/api.php +++ b/include/api.php @@ -27,6 +27,7 @@ use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\Mail; use Friendica\Model\Photo; +use Friendica\Model\Profile; use Friendica\Model\User; use Friendica\Network\FKOAuth1; use Friendica\Network\HTTPException; @@ -47,9 +48,9 @@ use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Strings; use Friendica\Util\XML; -require_once 'mod/share.php'; -require_once 'mod/item.php'; -require_once 'mod/wall_upload.php'; +require_once __DIR__ . '/../mod/share.php'; +require_once __DIR__ . '/../mod/item.php'; +require_once __DIR__ . '/../mod/wall_upload.php'; define('API_METHOD_ANY', '*'); define('API_METHOD_GET', 'GET'); @@ -236,7 +237,7 @@ function api_login(App $a) if ($addon_auth['authenticated'] && count($addon_auth['user_record'])) { $record = $addon_auth['user_record']; } else { - $user_id = User::authenticate(trim($user), trim($password)); + $user_id = User::authenticate(trim($user), trim($password), true); if ($user_id !== false) { $record = DBA::selectFirst('user', [], ['uid' => $user_id]); } @@ -342,11 +343,13 @@ function api_call(App $a) break; case "json": header("Content-Type: application/json"); - $json = json_encode(end($return)); - if (!empty($_GET['callback'])) { - $json = $_GET['callback'] . "(" . $json . ")"; + if (!empty($return)) { + $json = json_encode(end($return)); + if (!empty($_GET['callback'])) { + $json = $_GET['callback'] . "(" . $json . ")"; + } + $return = $json; } - $return = $json; break; case "rss": header("Content-Type: application/rss+xml"); @@ -611,7 +614,7 @@ function api_get_user(App $a, $contact_id = null) 'name' => $contact["name"], 'screen_name' => (($contact['nick']) ? $contact['nick'] : $contact['name']), 'location' => ($contact["location"] != "") ? $contact["location"] : ContactSelector::networkToName($contact['network'], $contact['url']), - 'description' => $contact["about"], + 'description' => BBCode::toPlaintext($contact["about"]), 'profile_image_url' => $contact["micro"], 'profile_image_url_https' => $contact["micro"], 'profile_image_url_profile_size' => $contact["thumb"], @@ -690,7 +693,7 @@ function api_get_user(App $a, $contact_id = null) 'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']), 'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']), 'location' => $location, - 'description' => $description, + 'description' => BBCode::toPlaintext($description), 'profile_image_url' => $uinfo[0]['micro'], 'profile_image_url_https' => $uinfo[0]['micro'], 'profile_image_url_profile_size' => $uinfo[0]["thumb"], @@ -1107,7 +1110,7 @@ function api_statuses_update($type) if ($throttle_day > 0) { $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60); - $condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom]; + $condition = ["`uid` = ? AND `wall` AND `received` > ?", api_user(), $datefrom]; $posts_day = DBA::count('thread', $condition); if ($posts_day > $throttle_day) { @@ -1121,7 +1124,7 @@ function api_statuses_update($type) if ($throttle_week > 0) { $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7); - $condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom]; + $condition = ["`uid` = ? AND `wall` AND `received` > ?", api_user(), $datefrom]; $posts_week = DBA::count('thread', $condition); if ($posts_week > $throttle_week) { @@ -1135,7 +1138,7 @@ function api_statuses_update($type) if ($throttle_month > 0) { $datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30); - $condition = ["`uid` = ? AND `wall` AND `created` > ?", api_user(), $datefrom]; + $condition = ["`uid` = ? AND `wall` AND `received` > ?", api_user(), $datefrom]; $posts_month = DBA::count('thread', $condition); if ($posts_month > $throttle_month) { @@ -1154,18 +1157,21 @@ function api_statuses_update($type) } } - // To-Do: Multiple IDs if (requestdata('media_ids')) { - $r = q( - "SELECT `resource-id`, `scale`, `nickname`, `type` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1", - intval(requestdata('media_ids')), - api_user() - ); - if (DBA::isResult($r)) { - $phototypes = Image::supportedTypes(); - $ext = $phototypes[$r[0]['type']]; - $_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']'; - $_REQUEST['body'] .= '[img]' . System::baseUrl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . '[/img][/url]'; + $ids = explode(',', requestdata('media_ids')); + foreach ($ids as $id) { + $r = q( + "SELECT `resource-id`, `scale`, `nickname`, `type`, `desc` FROM `photo` INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN (SELECT `resource-id` FROM `photo` WHERE `id` = %d) AND `scale` > 0 AND `photo`.`uid` = %d ORDER BY `photo`.`width` DESC LIMIT 1", + intval($id), + api_user() + ); + if (DBA::isResult($r)) { + $phototypes = Image::supportedTypes(); + $ext = $phototypes[$r[0]['type']]; + $description = $r[0]['desc'] ?? ''; + $_REQUEST['body'] .= "\n\n" . '[url=' . System::baseUrl() . '/photos/' . $r[0]['nickname'] . '/image/' . $r[0]['resource-id'] . ']'; + $_REQUEST['body'] .= '[img=' . System::baseUrl() . '/photo/' . $r[0]['resource-id'] . '-' . $r[0]['scale'] . '.' . $ext . ']' . $description . '[/img][/url]'; + } } } @@ -1238,6 +1244,65 @@ function api_media_upload() /// @TODO move to top of file or somewhere better api_register_func('api/media/upload', 'api_media_upload', true, API_METHOD_POST); +/** + * Updates media meta data (picture descriptions) + * + * @param string $type Return type (atom, rss, xml, json) + * + * @return array|string + * @throws BadRequestException + * @throws ForbiddenException + * @throws ImagickException + * @throws InternalServerErrorException + * @throws TooManyRequestsException + * @throws UnauthorizedException + * @see https://developer.twitter.com/en/docs/tweets/post-and-engage/api-reference/post-statuses-update + * + * @todo Compare the corresponding Twitter function for correct return values + */ +function api_media_metadata_create($type) +{ + $a = \get_app(); + + if (api_user() === false) { + Logger::info('no user'); + throw new ForbiddenException(); + } + + api_get_user($a); + + $postdata = Network::postdata(); + + if (empty($postdata)) { + throw new BadRequestException("No post data"); + } + + $data = json_decode($postdata, true); + if (empty($data)) { + throw new BadRequestException("Invalid post data"); + } + + if (empty($data['media_id']) || empty($data['alt_text'])) { + throw new BadRequestException("Missing post data values"); + } + + if (empty($data['alt_text']['text'])) { + throw new BadRequestException("No alt text."); + } + + Logger::info('Updating metadata', ['media_id' => $data['media_id']]); + + $condition = ['id' => $data['media_id'], 'uid' => api_user()]; + $photo = DBA::selectFirst('photo', ['resource-id'], $condition); + if (!DBA::isResult($photo)) { + throw new BadRequestException("Metadata not found."); + } + + DBA::update('photo', ['desc' => $data['alt_text']['text']], ['resource-id' => $photo['resource-id']]); +} + +api_register_func('api/media/metadata/create', 'api_media_metadata_create', true, API_METHOD_POST); + /** * @param string $type Return format (atom, rss, xml, json) * @param int $item_id @@ -1271,7 +1336,7 @@ function api_status_show($type, $item_id) function api_get_last_status($ownerId, $uid) { $condition = [ - 'owner-id' => $ownerId, + 'author-id'=> $ownerId, 'uid' => $uid, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'private' => false @@ -2444,8 +2509,8 @@ function api_convert_item($item) $statustext = trim($statustitle."\n\n".$statusbody); } - if ((defaults($item, 'network', Protocol::PHANTOM) == Protocol::FEED) && (strlen($statustext)> 1000)) { - $statustext = substr($statustext, 0, 1000) . "... \n" . defaults($item, 'plink', ''); + if ((defaults($item, 'network', Protocol::PHANTOM) == Protocol::FEED) && (mb_strlen($statustext)> 1000)) { + $statustext = mb_substr($statustext, 0, 1000) . "... \n" . defaults($item, 'plink', ''); } $statushtml = BBCode::convert(api_clean_attachments($body), false); @@ -2630,19 +2695,29 @@ function api_get_entitities(&$text, $bbcode) } } - preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images); + preg_match_all("/\[img\=(.*?)\](.*?)\[\/img\]/ism", $bbcode, $images, PREG_SET_ORDER); $ordered_images = []; + foreach ($images as $image) { + $start = iconv_strpos($text, $image[1], 0, "UTF-8"); + if (!($start === false)) { + $ordered_images[$start] = ['url' => $image[1], 'alt' => $image[2]]; + } + } + + preg_match_all("/\[img](.*?)\[\/img\]/ism", $bbcode, $images); foreach ($images[1] as $image) { - //$start = strpos($text, $url, $offset); $start = iconv_strpos($text, $image, 0, "UTF-8"); if (!($start === false)) { - $ordered_images[$start] = $image; + $ordered_images[$start] = ['url' => $image, 'alt' => '']; } } //$entities["media"] = array(); $offset = 0; - foreach ($ordered_images as $url) { + foreach ($ordered_images as $image) { + $url = $image['url']; + $ext_alt_text = $image['alt']; + $display_url = str_replace(["http://www.", "https://www."], ["", ""], $url); $display_url = str_replace(["http://", "https://"], ["", ""], $display_url); @@ -2689,6 +2764,7 @@ function api_get_entitities(&$text, $bbcode) "url" => $url, "display_url" => $display_url, "expanded_url" => $url, + "ext_alt_text" => $ext_alt_text, "type" => "photo", "sizes" => $sizes]; } @@ -2964,6 +3040,8 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use 'statusnet_conversation_id' => $item['parent'], 'external_url' => System::baseUrl() . "/display/" . $item['guid'], 'friendica_activities' => api_format_items_activities($item, $type), + 'friendica_title' => $item['title'], + 'friendica_html' => BBCode::convert($item['body'], false) ]; if (count($converted["attachments"]) > 0) { @@ -4207,7 +4285,7 @@ function api_fr_photos_list($type) $r = q( "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`", + WHERE `uid` = %d AND `album` != 'Contact Photos' GROUP BY `resource-id`, `album`, `filename`, `type`", intval(local_user()) ); $typetoext = [ @@ -4888,7 +4966,9 @@ function prepare_photo_data($type, $scale, $photo_id) "SELECT %s `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 `resource-id`", + FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' %s 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), @@ -5057,7 +5137,7 @@ function api_get_announce($item) $fields = ['author-id', 'author-name', 'author-link', 'author-avatar']; $activity = Item::activityToIndex(ACTIVITY2_ANNOUNCE); $condition = ['parent-uri' => $item['uri'], 'gravity' => GRAVITY_ACTIVITY, 'uid' => [0, $item['uid']], 'activity' => $activity]; - $announce = Item::selectFirstForUser($item['uid'], $fields, $condition, ['order' => ['created' => true]]); + $announce = Item::selectFirstForUser($item['uid'], $fields, $condition, ['order' => ['received' => true]]); if (!DBA::isResult($announce)) { return []; } @@ -5160,17 +5240,22 @@ function api_share_as_retweet(&$item) $posted = $matches[1]; } - $pre_body = trim(preg_replace("/(.*?)\[share.*?\]\s?.*?\s?\[\/share\]\s?/ism", "$1", $body)); + if (!preg_match("/(.*?)\[share.*?\]\s?(.*?)\s?\[\/share\]\s?(.*?)/ism", $body, $matches)) { + return false; + } + + $pre_body = trim($matches[1]); if ($pre_body != '') { $item['body'] = $pre_body; } - $shared_body = trim(preg_replace("/(.*?)\[share.*?\]\s?(.*?)\s?\[\/share\]\s?/ism", "$2", $body)); + $shared_body = trim($matches[2]); if (($shared_body == "") || ($profile == "") || ($author == "") || ($avatar == "") || ($posted == "")) { return false; } + $reshared_item["share-pre-body"] = $pre_body; $reshared_item["body"] = $shared_body; $reshared_item["author-id"] = Contact::getIdForURL($profile, 0, true); $reshared_item["author-name"] = $author; @@ -6198,47 +6283,36 @@ function api_friendica_profile_show($type) // get data of the specified profile id or all profiles of the user if not specified if ($profile_id != 0) { - $r = q( - "SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d", - intval(api_user()), - intval($profile_id) - ); - + $r = Profile::getById(api_user(), $profile_id); // error message if specified gid is not in database if (!DBA::isResult($r)) { throw new BadRequestException("profile_id not available"); } } else { - $r = q( - "SELECT * FROM `profile` WHERE `uid` = %d", - intval(api_user()) - ); + $r = Profile::getListByUser(api_user()); } // loop through all returned profiles and retrieve data and users $k = 0; $profiles = []; - foreach ($r as $rr) { - $profile = api_format_items_profiles($rr); - - // select all users from contact table, loop and prepare standard return for user data - $users = []; - $nurls = q( - "SELECT `id`, `nurl` FROM `contact` WHERE `uid`= %d AND `profile-id` = %d", - intval(api_user()), - intval($rr['id']) - ); - - foreach ($nurls as $nurl) { - $user = api_get_user($a, $nurl['nurl']); - ($type == "xml") ? $users[$k++ . ":user"] = $user : $users[] = $user; - } - $profile['users'] = $users; + if (DBA::isResult($r)) { + foreach ($r as $rr) { + $profile = api_format_items_profiles($rr); + + // select all users from contact table, loop and prepare standard return for user data + $users = []; + $nurls = Contact::selectToArray(['id', 'nurl'], ['uid' => api_user(), 'profile-id' => $rr['id']]); + foreach ($nurls as $nurl) { + $user = api_get_user($a, $nurl['nurl']); + ($type == "xml") ? $users[$k++ . ":user"] = $user : $users[] = $user; + } + $profile['users'] = $users; - // add prepared profile data to array for final return - if ($type == "xml") { - $profiles[$k++ . ":profile"] = $profile; - } else { - $profiles[] = $profile; + // add prepared profile data to array for final return + if ($type == "xml") { + $profiles[$k++ . ":profile"] = $profile; + } else { + $profiles[] = $profile; + } } } @@ -6268,7 +6342,7 @@ function api_saved_searches_list($type) $terms = DBA::select('search', ['id', 'term'], ['uid' => local_user()]); $result = []; - while ($term = $terms->fetch()) { + while ($term = DBA::fetch($terms)) { $result[] = [ 'created_at' => api_date(time()), 'id' => intval($term['id']),