X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=9b9850f6facef2afe5a004a8544e8bd67f017735;hb=34260fc619af9561e0b6ed357ee061618e83b239;hp=929102de3a272aac73146e6934954b285c61ccd5;hpb=fb47389c690a49cf76fea24a06b78524356ae86b;p=friendica.git

diff --git a/include/api.php b/include/api.php
index 929102de3a..9b9850f6fa 100644
--- a/include/api.php
+++ b/include/api.php
@@ -27,7 +27,6 @@ use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -38,24 +37,18 @@ use Friendica\Model\Mail;
 use Friendica\Model\Photo;
 use Friendica\Model\Post;
 use Friendica\Model\Profile;
-use Friendica\Model\User;
 use Friendica\Module\BaseApi;
 use Friendica\Network\HTTPException;
 use Friendica\Network\HTTPException\BadRequestException;
 use Friendica\Network\HTTPException\ForbiddenException;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Network\HTTPException\NotFoundException;
-use Friendica\Network\HTTPException\TooManyRequestsException;
 use Friendica\Network\HTTPException\UnauthorizedException;
 use Friendica\Object\Image;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
-require_once __DIR__ . '/../mod/item.php';
-require_once __DIR__ . '/../mod/wall_upload.php';
-
 $API = [];
 
 /**
@@ -391,6 +384,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 		return prepare_photo_data($type, false, $resource_id, $uid);
 	} else {
 		throw new InternalServerErrorException("image upload failed");
+		DI::page()->exit(DI::apiResponse());
 	}
 }
 
@@ -414,9 +408,9 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
 
 	$arr = [];
 	$arr['guid']          = System::createUUID();
-	$arr['uid']           = intval($uid);
+	$arr['uid']           = $uid;
 	$arr['uri']           = $uri;
-	$arr['type']          = 'photo';
+	$arr['post-type']     = Item::PT_IMAGE;
 	$arr['wall']          = 1;
 	$arr['resource-id']   = $hash;
 	$arr['contact-id']    = $owner_record['id'];
@@ -426,7 +420,7 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
 	$arr['author-name']   = $owner_record['name'];
 	$arr['author-link']   = $owner_record['url'];
 	$arr['author-avatar'] = $owner_record['thumb'];
-	$arr['title']         = "";
+	$arr['title']         = '';
 	$arr['allow_cid']     = $allow_cid;
 	$arr['allow_gid']     = $allow_gid;
 	$arr['deny_cid']      = $deny_cid;
@@ -434,11 +428,7 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
 	$arr['visible']       = $visibility;
 	$arr['origin']        = 1;
 
-	$typetoext = [
-			'image/jpeg' => 'jpg',
-			'image/png' => 'png',
-			'image/gif' => 'gif'
-			];
+	$typetoext = Images::supportedTypes();
 
 	// adds link to the thumbnail scale photo
 	$arr['body'] = '[url=' . DI::baseUrl() . '/photos/' . $owner_record['nick'] . '/image/' . $hash . ']'
@@ -521,7 +511,7 @@ function prepare_photo_data($type, $scale, $photo_id, $uid)
 
 	// retrieve item element for getting activities (like, dislike etc.) related to photo
 	$condition = ['uid' => $uid, 'resource-id' => $photo_id];
-	$item = Post::selectFirst(['id', 'uid', 'uri', 'parent', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'], $condition);
+	$item = Post::selectFirst(['id', 'uid', 'uri', 'uri-id', 'parent', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'], $condition);
 	if (!DBA::isResult($item)) {
 		throw new NotFoundException('Photo-related item not found.');
 	}
@@ -648,481 +638,6 @@ function group_create($name, $uid, $users = [])
  * TWITTER API
  */
 
-/**
- * Deprecated function to upload media.
- *
- * @param string $type Return type (atom, rss, xml, json)
- *
- * @return array|string
- * @throws BadRequestException
- * @throws ForbiddenException
- * @throws ImagickException
- * @throws InternalServerErrorException
- * @throws UnauthorizedException
- */
-function api_statuses_mediap($type)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
-	$uid = BaseApi::getCurrentUserID();
-
-	$a = DI::app();
-
-	$_REQUEST['profile_uid'] = $uid;
-	$_REQUEST['api_source'] = true;
-	$txt = $_REQUEST['status'] ?? '';
-
-	if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
-		$txt = HTML::toBBCodeVideo($txt);
-		$config = HTMLPurifier_Config::createDefault();
-		$config->set('Cache.DefinitionImpl', null);
-		$purifier = new HTMLPurifier($config);
-		$txt = $purifier->purify($txt);
-	}
-	$txt = HTML::toBBCode($txt);
-
-	$picture = wall_upload_post($a, false);
-
-	// now that we have the img url in bbcode we can add it to the status and insert the wall item.
-	$_REQUEST['body'] = $txt . "\n\n" . '[url=' . $picture["albumpage"] . '][img]' . $picture["preview"] . "[/img][/url]";
-	$item_id = item_post($a);
-
-	$include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
-
-	// output the post that we just posted.
-	$status_info = DI::twitterStatus()->createFromItemId($item_id, $include_entities)->toArray();
-	return DI::apiResponse()->formatData('statuses', $type, ['status' => $status_info]);
-}
-
-/// @TODO move this to top of file or somewhere better!
-api_register_func('api/statuses/mediap', 'api_statuses_mediap', true);
-
-/**
- * Updates the user’s current status.
- *
- * @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
- */
-function api_statuses_update($type)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
-	$uid = BaseApi::getCurrentUserID();
-
-	$a = DI::app();
-
-	// convert $_POST array items to the form we use for web posts.
-	if (!empty($_REQUEST['htmlstatus'])) {
-		$txt = $_REQUEST['htmlstatus'];
-		if ((strpos($txt, '<') !== false) || (strpos($txt, '>') !== false)) {
-			$txt = HTML::toBBCodeVideo($txt);
-
-			$config = HTMLPurifier_Config::createDefault();
-			$config->set('Cache.DefinitionImpl', null);
-
-			$purifier = new HTMLPurifier($config);
-			$txt = $purifier->purify($txt);
-
-			$_REQUEST['body'] = HTML::toBBCode($txt);
-		}
-	} else {
-		$_REQUEST['body'] = $_REQUEST['status'] ?? null;
-	}
-
-	$_REQUEST['title'] = $_REQUEST['title'] ?? null;
-
-	$parent = $_REQUEST['in_reply_to_status_id'] ?? null;
-
-	// Twidere sends "-1" if it is no reply ...
-	if ($parent == -1) {
-		$parent = "";
-	}
-
-	if (ctype_digit($parent)) {
-		$_REQUEST['parent'] = $parent;
-	} else {
-		$_REQUEST['parent_uri'] = $parent;
-	}
-
-	if (!empty($_REQUEST['lat']) && !empty($_REQUEST['long'])) {
-		$_REQUEST['coord'] = sprintf("%s %s", $_REQUEST['lat'], $_REQUEST['long']);
-	}
-	$_REQUEST['profile_uid'] = $uid;
-
-	if (!$parent) {
-		// Check for throttling (maximum posts per day, week and month)
-		$throttle_day = DI::config()->get('system', 'throttle_limit_day');
-		if ($throttle_day > 0) {
-			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
-
-			$condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, $uid, $datefrom];
-			$posts_day = Post::count($condition);
-
-			if ($posts_day > $throttle_day) {
-				logger::info('Daily posting limit reached for user ' . $uid);
-				// 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));
-			}
-		}
-
-		$throttle_week = DI::config()->get('system', 'throttle_limit_week');
-		if ($throttle_week > 0) {
-			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
-
-			$condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, $uid, $datefrom];
-			$posts_week = Post::count($condition);
-
-			if ($posts_week > $throttle_week) {
-				logger::info('Weekly posting limit reached for user ' . $uid);
-				// 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));
-			}
-		}
-
-		$throttle_month = DI::config()->get('system', 'throttle_limit_month');
-		if ($throttle_month > 0) {
-			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
-
-			$condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, $uid, $datefrom];
-			$posts_month = Post::count($condition);
-
-			if ($posts_month > $throttle_month) {
-				logger::info('Monthly posting limit reached for user ' . $uid);
-				// 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));
-			}
-		}
-	}
-
-	if (!empty($_REQUEST['media_ids'])) {
-		$ids = explode(',', $_REQUEST['media_ids']);
-	} elseif (!empty($_FILES['media'])) {
-		// upload the image if we have one
-		$picture = wall_upload_post($a, false);
-		if (is_array($picture)) {
-			$ids[] = $picture['id'];
-		}
-	}
-
-	$attachments = [];
-	$ressources = [];
-
-	if (!empty($ids)) {
-		foreach ($ids as $id) {
-			$media = DBA::toArray(DBA::p("SELECT `resource-id`, `scale`, `nickname`, `type`, `desc`, `filename`, `datasize`, `width`, `height` FROM `photo`
-					INNER JOIN `user` ON `user`.`uid` = `photo`.`uid` WHERE `resource-id` IN
-						(SELECT `resource-id` FROM `photo` WHERE `id` = ?) AND `photo`.`uid` = ?
-					ORDER BY `photo`.`width` DESC LIMIT 2", $id, $uid));
-
-			if (!empty($media)) {
-				$ressources[] = $media[0]['resource-id'];
-				$phototypes = Images::supportedTypes();
-				$ext = $phototypes[$media[0]['type']];
-
-				$attachment = ['type' => Post\Media::IMAGE, 'mimetype' => $media[0]['type'],
-					'url' => DI::baseUrl() . '/photo/' . $media[0]['resource-id'] . '-' . $media[0]['scale'] . '.' . $ext,
-					'size' => $media[0]['datasize'],
-					'name' => $media[0]['filename'] ?: $media[0]['resource-id'],
-					'description' => $media[0]['desc'] ?? '',
-					'width' => $media[0]['width'],
-					'height' => $media[0]['height']];
-
-				if (count($media) > 1) {
-					$attachment['preview'] = DI::baseUrl() . '/photo/' . $media[1]['resource-id'] . '-' . $media[1]['scale'] . '.' . $ext;
-					$attachment['preview-width'] = $media[1]['width'];
-					$attachment['preview-height'] = $media[1]['height'];
-				}
-				$attachments[] = $attachment;
-			}
-		}
-
-		// We have to avoid that the post is rejected because of an empty body
-		if (empty($_REQUEST['body'])) {
-			$_REQUEST['body'] = '[hr]';
-		}
-	}
-
-	if (!empty($attachments)) {
-		$_REQUEST['attachments'] = $attachments;
-	}
-
-	// set this so that the item_post() function is quiet and doesn't redirect or emit json
-
-	$_REQUEST['api_source'] = true;
-
-	if (empty($_REQUEST['source'])) {
-		$_REQUEST['source'] = BaseApi::getCurrentApplication()['name'] ?: 'API';
-	}
-
-	// call out normal post function
-	$item_id = item_post($a);
-
-	if (!empty($ressources) && !empty($item_id)) {
-		$item = Post::selectFirst(['uri-id', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'], ['id' => $item_id]);
-		foreach ($ressources as $ressource) {
-			Photo::setPermissionForRessource($ressource, $uid, $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']);
-		}
-	}
-
-	$include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
-
-	// output the post that we just posted.
-	$status_info = DI::twitterStatus()->createFromItemId($item_id, $include_entities)->toArray();
-	return DI::apiResponse()->formatData('statuses', $type, ['status' => $status_info]);
-}
-
-api_register_func('api/statuses/update', 'api_statuses_update', true);
-api_register_func('api/statuses/update_with_media', 'api_statuses_update', true);
-
-/**
- * Uploads an image to Friendica.
- *
- * @return array
- * @throws BadRequestException
- * @throws ForbiddenException
- * @throws ImagickException
- * @throws InternalServerErrorException
- * @throws UnauthorizedException
- * @see https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload
- */
-function api_media_upload()
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
-
-	if (empty($_FILES['media'])) {
-		// Output error
-		throw new BadRequestException("No media.");
-	}
-
-	$media = wall_upload_post(DI::app(), false);
-	if (!$media) {
-		// Output error
-		throw new InternalServerErrorException();
-	}
-
-	$returndata = [];
-	$returndata["media_id"] = $media["id"];
-	$returndata["media_id_string"] = (string)$media["id"];
-	$returndata["size"] = $media["size"];
-	$returndata["image"] = ["w" => $media["width"],
-				"h" => $media["height"],
-				"image_type" => $media["type"],
-				"friendica_preview_url" => $media["preview"]];
-
-	Logger::info('Media uploaded', ['return' => $returndata]);
-
-	return ["media" => $returndata];
-}
-
-api_register_func('api/media/upload', 'api_media_upload', true);
-
-/**
- * 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)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
-	$uid = BaseApi::getCurrentUserID();
-
-	$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' => $uid];
-	$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);
-
-/**
- * Repeats a status.
- *
- * @param string $type Return type (atom, rss, xml, json)
- *
- * @return array|string
- * @throws BadRequestException
- * @throws ForbiddenException
- * @throws ImagickException
- * @throws InternalServerErrorException
- * @throws UnauthorizedException
- * @see https://developer.twitter.com/en/docs/tweets/post-and-engage/api-reference/post-statuses-retweet-id
- */
-function api_statuses_repeat($type)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
-	$uid = BaseApi::getCurrentUserID();
-
-	// params
-	$id = intval(DI::args()->getArgv()[3] ?? 0);
-
-	if ($id == 0) {
-		$id = intval($_REQUEST['id'] ?? 0);
-	}
-
-	// Hotot workaround
-	if ($id == 0) {
-		$id = intval(DI::args()->getArgv()[4] ?? 0);
-	}
-
-	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]]);
-
-	if (DBA::isResult($item) && !empty($item['body'])) {
-		if (in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::TWITTER])) {
-			if (!Item::performActivity($id, 'announce', $uid)) {
-				throw new InternalServerErrorException();
-			}
-
-			$item_id = $id;
-		} else {
-			if (strpos($item['body'], "[/share]") !== false) {
-				$pos = strpos($item['body'], "[share");
-				$post = substr($item['body'], $pos);
-			} else {
-				$post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
-
-				if (!empty($item['title'])) {
-					$post .= '[h3]' . $item['title'] . "[/h3]\n";
-				}
-
-				$post .= $item['body'];
-				$post .= "[/share]";
-			}
-			$_REQUEST['body'] = $post;
-			$_REQUEST['profile_uid'] = $uid;
-			$_REQUEST['api_source'] = true;
-
-			if (empty($_REQUEST['source'])) {
-				$_REQUEST['source'] = BaseApi::getCurrentApplication()['name'] ?: 'API';
-			}
-
-			$item_id = item_post(DI::app());
-		}
-	} else {
-		throw new ForbiddenException();
-	}
-
-	$include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
-
-	// output the post that we just posted.
-	$status_info = DI::twitterStatus()->createFromItemId($item_id, $include_entities)->toArray();
-	return DI::apiResponse()->formatData('statuses', $type, ['status' => $status_info]);
-}
-
-api_register_func('api/statuses/retweet', 'api_statuses_repeat', true);
-
-/**
- * Star/unstar an item.
- * param: id : id of the item
- *
- * @param string $type Return type (atom, rss, xml, json)
- *
- * @return array|string
- * @throws BadRequestException
- * @throws ForbiddenException
- * @throws ImagickException
- * @throws InternalServerErrorException
- * @throws UnauthorizedException
- * @see https://web.archive.org/web/20131019055350/https://dev.twitter.com/docs/api/1/post/favorites/create/%3Aid
- */
-function api_favorites_create_destroy($type)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
-	$uid = BaseApi::getCurrentUserID();
-
-	// for versioned api.
-	/// @TODO We need a better global soluton
-	$action_argv_id = 2;
-	if (count(DI::args()->getArgv()) > 1 && DI::args()->getArgv()[1] == "1.1") {
-		$action_argv_id = 3;
-	}
-
-	if (DI::args()->getArgc() <= $action_argv_id) {
-		throw new BadRequestException("Invalid request.");
-	}
-	$action = str_replace("." . $type, "", DI::args()->getArgv()[$action_argv_id]);
-	if (DI::args()->getArgc() == $action_argv_id + 2) {
-		$itemid = intval(DI::args()->getArgv()[$action_argv_id + 1] ?? 0);
-	} else {
-		$itemid = intval($_REQUEST['id'] ?? 0);
-	}
-
-	$item = Post::selectFirstForUser($uid, [], ['id' => $itemid, 'uid' => $uid]);
-
-	if (!DBA::isResult($item)) {
-		throw new BadRequestException("Invalid item.");
-	}
-
-	switch ($action) {
-		case "create":
-			$item['starred'] = 1;
-			break;
-		case "destroy":
-			$item['starred'] = 0;
-			break;
-		default:
-			throw new BadRequestException("Invalid action ".$action);
-	}
-
-	$r = Item::update(['starred' => $item['starred']], ['id' => $itemid]);
-
-	if ($r === false) {
-		throw new InternalServerErrorException("DB error");
-	}
-
-	$include_entities = strtolower(($_REQUEST['include_entities'] ?? 'false') == 'true');
-
-	$ret = DI::twitterStatus()->createFromUriId($item['uri-id'], $item['uid'], $include_entities)->toArray();
-
-	return DI::apiResponse()->formatData("status", $type, ['status' => $ret], Contact::getPublicIdByUserId($uid));
-}
-
-api_register_func('api/favorites/create', 'api_favorites_create_destroy', true);
-api_register_func('api/favorites/destroy', 'api_favorites_create_destroy', true);
-
 /**
  * Returns all lists the user subscribes to.
  *
@@ -1186,182 +701,6 @@ function api_lists_ownerships($type)
 
 api_register_func('api/lists/ownerships', 'api_lists_ownerships', true);
 
-/**
- * Returns either the friends of the follower list
- *
- * Considers friends and followers lists to be private and won't return
- * anything if any user_id parameter is passed.
- *
- * @param string $qtype Either "friends" or "followers"
- * @return boolean|array
- * @throws BadRequestException
- * @throws ForbiddenException
- * @throws ImagickException
- * @throws InternalServerErrorException
- * @throws UnauthorizedException
- */
-function api_statuses_f($qtype)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
-	$uid = BaseApi::getCurrentUserID();
-
-	// pagination
-	$count = $_GET['count'] ?? 20;
-	$page = $_GET['page'] ?? 1;
-
-	$start = max(0, ($page - 1) * $count);
-
-	if (!empty($_GET['cursor']) && $_GET['cursor'] == 'undefined') {
-		/* this is to stop Hotot to load friends multiple times
-		*  I'm not sure if I'm missing return something or
-		*  is a bug in hotot. Workaround, meantime
-		*/
-
-		/*$ret=Array();
-		return array('$users' => $ret);*/
-		return false;
-	}
-
-	$sql_extra = '';
-	if ($qtype == 'friends') {
-		$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(Contact::SHARING), intval(Contact::FRIEND));
-	} elseif ($qtype == 'followers') {
-		$sql_extra = sprintf(" AND ( `rel` = %d OR `rel` = %d ) ", intval(Contact::FOLLOWER), intval(Contact::FRIEND));
-	}
-
-	if ($qtype == 'blocks') {
-		$sql_filter = 'AND `blocked` AND NOT `pending`';
-	} elseif ($qtype == 'incoming') {
-		$sql_filter = 'AND `pending`';
-	} else {
-		$sql_filter = 'AND (NOT `blocked` OR `pending`)';
-	}
-
-	// @todo This query most likely can be replaced with a Contact::select...
-	$r = DBA::toArray(DBA::p(
-		"SELECT `id`
-		FROM `contact`
-		WHERE `uid` = ?
-		AND NOT `self`
-		$sql_filter
-		$sql_extra
-		ORDER BY `nick`
-		LIMIT ?, ?",
-		$uid,
-		$start,
-		$count
-	));
-
-	$ret = [];
-	foreach ($r as $cid) {
-		$user = DI::twitterUser()->createFromContactId($cid['id'], $uid, false)->toArray();
-		// "uid" is only needed for some internal stuff, so remove it from here
-		unset($user['uid']);
-
-		if ($user) {
-			$ret[] = $user;
-		}
-	}
-
-	return ['user' => $ret];
-}
-
-/**
- * Returns the list of friends of the provided user
- *
- * @deprecated By Twitter API in favor of friends/list
- *
- * @param string $type Either "json" or "xml"
- * @return boolean|string|array
- * @throws BadRequestException
- * @throws ForbiddenException
- */
-function api_statuses_friends($type)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
-	$data =  api_statuses_f("friends");
-	if ($data === false) {
-		return false;
-	}
-	return DI::apiResponse()->formatData("users", $type, $data);
-}
-
-api_register_func('api/statuses/friends', 'api_statuses_friends', true);
-
-/**
- * Returns the list of followers of the provided user
- *
- * @deprecated By Twitter API in favor of friends/list
- *
- * @param string $type Either "json" or "xml"
- * @return boolean|string|array
- * @throws BadRequestException
- * @throws ForbiddenException
- */
-function api_statuses_followers($type)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
-	$data = api_statuses_f("followers");
-	if ($data === false) {
-		return false;
-	}
-	return DI::apiResponse()->formatData("users", $type, $data);
-}
-
-api_register_func('api/statuses/followers', 'api_statuses_followers', true);
-
-/**
- * Returns the list of blocked users
- *
- * @see https://developer.twitter.com/en/docs/accounts-and-users/mute-block-report-users/api-reference/get-blocks-list
- *
- * @param string $type Either "json" or "xml"
- *
- * @return boolean|string|array
- * @throws BadRequestException
- * @throws ForbiddenException
- */
-function api_blocks_list($type)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
-	$data =  api_statuses_f('blocks');
-	if ($data === false) {
-		return false;
-	}
-	return DI::apiResponse()->formatData("users", $type, $data);
-}
-
-api_register_func('api/blocks/list', 'api_blocks_list', true);
-
-/**
- * Returns the list of pending users IDs
- *
- * @see https://developer.twitter.com/en/docs/accounts-and-users/follow-search-get-users/api-reference/get-friendships-incoming
- *
- * @param string $type Either "json" or "xml"
- *
- * @return boolean|string|array
- * @throws BadRequestException
- * @throws ForbiddenException
- */
-function api_friendships_incoming($type)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
-	$data =  api_statuses_f('incoming');
-	if ($data === false) {
-		return false;
-	}
-
-	$ids = [];
-	foreach ($data['user'] as $user) {
-		$ids[] = $user['id'];
-	}
-
-	return DI::apiResponse()->formatData("ids", $type, ['id' => $ids]);
-}
-
-api_register_func('api/friendships/incoming', 'api_friendships_incoming', true);
-
 /**
  * Sends a new direct message.
  *
@@ -1381,13 +720,13 @@ function api_direct_messages_new($type)
 	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 	$uid = BaseApi::getCurrentUserID();
 
-	if (empty($_POST["text"]) || empty($_POST['screen_name']) && empty($_POST['user_id'])) {
+	if (empty($_POST["text"]) || empty($_REQUEST['screen_name']) && empty($_REQUEST['user_id'])) {
 		return;
 	}
 
 	$sender = DI::twitterUser()->createFromUserId($uid, true)->toArray();
 
-	$cid = BaseApi::getContactIDForSearchterm($_REQUEST['screen_name'] ?? '', $_REQUEST['profileurl'] ?? '', $_REQUEST['user_id'] ?? 0, $uid);
+	$cid = BaseApi::getContactIDForSearchterm($_REQUEST['screen_name'] ?? '', $_REQUEST['profileurl'] ?? '', $_REQUEST['user_id'] ?? 0, 0);
 	if (empty($cid)) {
 		throw new NotFoundException('Recipient not found');
 	}
@@ -1487,83 +826,6 @@ function api_direct_messages_destroy($type)
 
 api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy', true);
 
-/**
- * Unfollow Contact
- *
- * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
- * @return string|array
- * @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)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
-	$uid = BaseApi::getCurrentUserID();
-
-	$owner = User::getOwnerDataById($uid);
-	if (!$owner) {
-		Logger::notice(BaseApi::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(BaseApi::LOG_PREFIX . 'No user_id specified', ['module' => 'api', 'action' => 'friendships_destroy']);
-		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(BaseApi::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'];
-
-	$condition = ["`uid` = ? AND (`rel` = ? OR `rel` = ?) AND (`nurl` = ? OR `alias` = ? OR `alias` = ?)",
-			$uid, Contact::SHARING, Contact::FRIEND, Strings::normaliseLink($url),
-			Strings::normaliseLink($url), $url];
-	$contact = DBA::selectFirst('contact', [], $condition);
-
-	if (!DBA::isResult($contact)) {
-		Logger::notice(BaseApi::LOG_PREFIX . 'Not following contact', ['module' => 'api', 'action' => 'friendships_destroy']);
-		throw new HTTPException\NotFoundException('Not following Contact');
-	}
-
-	try {
-		$result = Contact::terminateFriendship($owner, $contact);
-
-		if ($result === null) {
-			Logger::notice(BaseApi::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.');
-		}
-
-		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(BaseApi::LOG_PREFIX . $e->getMessage(), ['owner' => $owner, 'contact' => $contact]);
-		throw new HTTPException\InternalServerErrorException('Unable to unfollow this contact, please contact your administrator');
-	}
-
-	// "uid" is only needed for some internal stuff, so remove it from here
-	unset($contact['uid']);
-
-	// Set screen_name since Twidere requests it
-	$contact['screen_name'] = $contact['nick'];
-
-	return DI::apiResponse()->formatData('friendships-destroy', $type, ['user' => $contact]);
-}
-
-api_register_func('api/friendships/destroy', 'api_friendships_destroy', true);
-
 /**
  *
  * @param string $type Return type (atom, rss, xml, json)
@@ -1799,7 +1061,9 @@ function api_fr_photo_create_update($type)
 	$deny_cid  = $_REQUEST['deny_cid' ] ?? null;
 	$allow_gid = $_REQUEST['allow_gid'] ?? null;
 	$deny_gid  = $_REQUEST['deny_gid' ] ?? null;
-	$visibility = !$allow_cid && !$deny_cid && !$allow_gid && !$deny_gid;
+	// Pictures uploaded via API never get posted as a visible status
+	// See https://github.com/friendica/friendica/issues/10990
+	$visibility = false;
 
 	// do several checks on input parameters
 	// we do not allow calls without album string
@@ -2215,74 +1479,6 @@ function api_lists_create($type)
 
 api_register_func('api/lists/create', 'api_lists_create', true);
 
-/**
- * Update the specified group with the posted array of contacts.
- *
- * @param string $type Return type (atom, rss, xml, json)
- *
- * @return array|string
- * @throws BadRequestException
- * @throws ForbiddenException
- * @throws ImagickException
- * @throws InternalServerErrorException
- * @throws UnauthorizedException
- */
-function api_friendica_group_update($type)
-{
-	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
-	$uid = BaseApi::getCurrentUserID();
-
-	// params
-	$gid = $_REQUEST['gid'] ?? 0;
-	$name = $_REQUEST['name'] ?? '';
-	$json = json_decode($_POST['json'], true);
-	$users = $json['user'];
-
-	// error if no name specified
-	if ($name == "") {
-		throw new BadRequestException('group name not specified');
-	}
-
-	// error if no gid specified
-	if ($gid == "") {
-		throw new BadRequestException('gid not specified');
-	}
-
-	// remove members
-	$members = Contact\Group::getById($gid);
-	foreach ($members as $member) {
-		$cid = $member['id'];
-		foreach ($users as $user) {
-			$found = ($user['cid'] == $cid ? true : false);
-		}
-		if (!isset($found) || !$found) {
-			$gid = Group::getIdByName($uid, $name);
-			Group::removeMember($gid, $cid);
-		}
-	}
-
-	// add members
-	$erroraddinguser = false;
-	$errorusers = [];
-	foreach ($users as $user) {
-		$cid = $user['cid'];
-
-		if (DBA::exists('contact', ['id' => $cid, 'uid' => $uid])) {
-			Group::addMember($gid, $cid);
-		} else {
-			$erroraddinguser = true;
-			$errorusers[] = $cid;
-		}
-	}
-
-	// return success message incl. missing users in array
-	$status = ($erroraddinguser ? "missing user" : "ok");
-	$success = ['success' => true, 'gid' => $gid, 'name' => $name, 'status' => $status, 'wrong users' => $errorusers];
-	return DI::apiResponse()->formatData("group_update", $type, ['result' => $success]);
-}
-
-api_register_func('api/friendica/group_update', 'api_friendica_group_update', true);
-
 /**
  * Update information about a group.
  *