X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fapi.php;h=5f89b7ecf8dbf0ffbcbc58c4c08e3c591c2682c8;hb=0c26ae31f6ca925cd88a53a47c2484c7078950e8;hp=c5363e2845be5c73f874919e053ee7586670ccc4;hpb=02210f285ba5f9a4b8e9da82ccf8c720e7bb4ca7;p=friendica.git

diff --git a/include/api.php b/include/api.php
index c5363e2845..5f89b7ecf8 100644
--- a/include/api.php
+++ b/include/api.php
@@ -58,7 +58,6 @@ use Friendica\Security\OAuth;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Images;
 use Friendica\Util\Network;
-use Friendica\Util\Proxy;
 use Friendica\Util\Strings;
 
 require_once __DIR__ . '/../mod/item.php';
@@ -229,7 +228,7 @@ function api_call(App $a, App\Arguments $args = null)
 
 				$called_api = explode("/", $p);
 
-				if (!empty($info['auth']) && api_user() === false) {
+				if (!empty($info['auth']) && BaseApi::getCurrentUserID() === false) {
 					BasicAuth::getCurrentUserID(true);
 					Logger::info(API_LOG_PREFIX . 'nickname {nickname}', ['module' => 'api', 'action' => 'call', 'nickname' => $a->getLoggedInUserNickname()]);
 				}
@@ -282,14 +281,13 @@ function api_call(App $a, App\Arguments $args = null)
 		Logger::warning(API_LOG_PREFIX . 'not implemented', ['module' => 'api', 'action' => 'call', 'query' => DI::args()->getQueryString()]);
 		throw new NotFoundException();
 	} catch (HTTPException $e) {
-		BaseApi::error($e->getCode(), $e->getDescription(), $e->getMessage(), $type);
+		DI::apiResponse()->error($e->getCode(), $e->getDescription(), $e->getMessage(), $type);
 	}
 }
 
 /**
  * Set values for RSS template
  *
- * @param App   $a
  * @param array $arr       Array to be passed to template
  * @param array $user_info User info
  * @return array
@@ -299,10 +297,15 @@ function api_call(App $a, App\Arguments $args = null)
  * @throws UnauthorizedException
  * @todo  find proper type-hints
  */
-function api_rss_extra(App $a, $arr, $user_info)
+function api_rss_extra($arr, $user_info)
 {
 	if (is_null($user_info)) {
-		$user_info = api_get_user();
+		$uid = BaseApi::getCurrentUserID();
+		if (empty($uid)) {
+			throw new ForbiddenException();
+		}
+
+		$user_info = DI::twitterUser()->createFromUserId($uid)->toArray();
 	}
 
 	$arr['$user'] = $user_info;
@@ -365,8 +368,8 @@ function api_get_user($contact_id = null)
 		$user = Strings::normaliseLink($contact_id);
 		$url = $user;
 		$extra_query = "AND `contact`.`nurl` = ? ";
-		if (api_user() !== false) {
-			$extra_query .= "AND `contact`.`uid`=" . intval(api_user());
+		if (BaseApi::getCurrentUserID() !== false) {
+			$extra_query .= "AND `contact`.`uid`=" . intval(BaseApi::getCurrentUserID());
 		}
 	}
 
@@ -380,8 +383,8 @@ function api_get_user($contact_id = null)
 
 		$url = $user;
 		$extra_query = "AND `contact`.`nurl` = ? ";
-		if (api_user() !== false) {
-			$extra_query .= "AND `contact`.`uid`=" . intval(api_user());
+		if (BaseApi::getCurrentUserID() !== false) {
+			$extra_query .= "AND `contact`.`uid`=" . intval(BaseApi::getCurrentUserID());
 		}
 	}
 
@@ -394,23 +397,23 @@ function api_get_user($contact_id = null)
 
 		$url = $user;
 		$extra_query = "AND `contact`.`nurl` = ? ";
-		if (api_user() !== false) {
-			$extra_query .= "AND `contact`.`uid`=" . intval(api_user());
+		if (BaseApi::getCurrentUserID() !== false) {
+			$extra_query .= "AND `contact`.`uid`=" . intval(BaseApi::getCurrentUserID());
 		}
 	}
 	if (is_null($user) && !empty($_GET['screen_name'])) {
 		$user = $_GET['screen_name'];
 		$extra_query = "AND `contact`.`nick` = ? ";
-		if (api_user() !== false) {
-			$extra_query .= "AND `contact`.`uid`=".intval(api_user());
+		if (BaseApi::getCurrentUserID() !== false) {
+			$extra_query .= "AND `contact`.`uid`=".intval(BaseApi::getCurrentUserID());
 		}
 	}
 
 	if (is_null($user) && !empty($_GET['profileurl'])) {
 		$user = Strings::normaliseLink($_GET['profileurl']);
 		$extra_query = "AND `contact`.`nurl` = ? ";
-		if (api_user() !== false) {
-			$extra_query .= "AND `contact`.`uid`=".intval(api_user());
+		if (BaseApi::getCurrentUserID() !== false) {
+			$extra_query .= "AND `contact`.`uid`=".intval(BaseApi::getCurrentUserID());
 		}
 	}
 
@@ -420,7 +423,7 @@ function api_get_user($contact_id = null)
 		if (!empty(DI::args()->getArgv()[$argid])) {
 			$data = explode(".", DI::args()->getArgv()[$argid]);
 			if (count($data) > 1) {
-				list($user, $null) = $data;
+				[$user, $null] = $data;
 			}
 		}
 		if (is_numeric($user)) {
@@ -429,14 +432,14 @@ function api_get_user($contact_id = null)
 			if ($user != "") {
 				$url = $user;
 				$extra_query = "AND `contact`.`nurl` = ? ";
-				if (api_user() !== false) {
-					$extra_query .= "AND `contact`.`uid`=" . intval(api_user());
+				if (BaseApi::getCurrentUserID() !== false) {
+					$extra_query .= "AND `contact`.`uid`=" . intval(BaseApi::getCurrentUserID());
 				}
 			}
 		} else {
 			$extra_query = "AND `contact`.`nick` = ? ";
-			if (api_user() !== false) {
-				$extra_query .= "AND `contact`.`uid`=" . intval(api_user());
+			if (BaseApi::getCurrentUserID() !== false) {
+				$extra_query .= "AND `contact`.`uid`=" . intval(BaseApi::getCurrentUserID());
 			}
 		}
 	}
@@ -444,11 +447,11 @@ function api_get_user($contact_id = null)
 	Logger::info(API_LOG_PREFIX . 'getting user {user}', ['module' => 'api', 'action' => 'get_user', 'user' => $user]);
 
 	if (!$user) {
-		if (api_user() === false) {
+		if (empty(BaseApi::getCurrentUserID())) {
 			BasicAuth::getCurrentUserID(true);
 			return false;
 		} else {
-			$user = api_user();
+			$user = BaseApi::getCurrentUserID();
 			$extra_query = "AND `contact`.`uid` = ? AND `contact`.`self` ";
 		}
 	}
@@ -463,168 +466,23 @@ function api_get_user($contact_id = null)
 		$user
 	));
 
-	// Selecting the id by priority, friendica first
-	if (is_array($uinfo)) {
+	if (DBA::isResult($uinfo)) {
+		// Selecting the id by priority, friendica first
 		api_best_nickname($uinfo);
+		return DI::twitterUser()->createFromContactId($uinfo[0]['cid'], $uinfo[0]['uid'])->toArray();
 	}
 
-	// if the contact wasn't found, fetch it from the contacts with uid = 0
-	if (!DBA::isResult($uinfo)) {
-		if ($url == "") {
-			throw new BadRequestException("User not found.");
-		}
-
-		$contact = DBA::selectFirst('contact', [], ['uid' => 0, 'nurl' => Strings::normaliseLink($url)]);
-
-		if (DBA::isResult($contact)) {
-			$ret = [
-				'id' => $contact["id"],
-				'id_str' => (string) $contact["id"],
-				'name' => $contact["name"],
-				'screen_name' => (($contact['nick']) ? $contact['nick'] : $contact['name']),
-				'location' => ($contact["location"] != "") ? $contact["location"] : ContactSelector::networkToName($contact['network'], $contact['url'], $contact['protocol']),
-				'description' => BBCode::toPlaintext($contact["about"] ?? ''),
-				'profile_image_url' => Contact::getAvatarUrlForUrl($contact['url'], api_user(), Proxy::SIZE_MICRO),
-				'profile_image_url_https' => Contact::getAvatarUrlForUrl($contact['url'], api_user(), Proxy::SIZE_MICRO),
-				'profile_image_url_profile_size' => Contact::getAvatarUrlForUrl($contact['url'], api_user(), Proxy::SIZE_THUMB),
-				'profile_image_url_large' => Contact::getAvatarUrlForUrl($contact['url'], api_user(), Proxy::SIZE_SMALL),
-				'url' => $contact["url"],
-				'protected' => false,
-				'followers_count' => 0,
-				'friends_count' => 0,
-				'listed_count' => 0,
-				'created_at' => api_date($contact["created"]),
-				'favourites_count' => 0,
-				'utc_offset' => 0,
-				'time_zone' => 'UTC',
-				'geo_enabled' => false,
-				'verified' => false,
-				'statuses_count' => 0,
-				'lang' => '',
-				'contributors_enabled' => false,
-				'is_translator' => false,
-				'is_translation_enabled' => false,
-				'following' => false,
-				'follow_request_sent' => false,
-				'statusnet_blocking' => false,
-				'notifications' => false,
-				'statusnet_profile_url' => $contact["url"],
-				'uid' => 0,
-				'cid' => Contact::getIdForURL($contact["url"], api_user(), false),
-				'pid' => Contact::getIdForURL($contact["url"], 0, false),
-				'self' => 0,
-				'network' => $contact["network"],
-			];
-
-			return $ret;
-		} else {
-			throw new BadRequestException("User ".$url." not found.");
-		}
+	if ($url == "") {
+		throw new BadRequestException("User not found.");
 	}
 
-	if ($uinfo[0]['self']) {
-		if ($uinfo[0]['network'] == "") {
-			$uinfo[0]['network'] = Protocol::DFRN;
-		}
-
-		$usr = DBA::selectFirst('user', ['default-location'], ['uid' => api_user()]);
-		$profile = DBA::selectFirst('profile', ['about'], ['uid' => api_user(), 'is-default' => true]);
-	}
-	$countitems = 0;
-	$countfriends = 0;
-	$countfollowers = 0;
-	$starred = 0;
-
-	$pcontact_id  = Contact::getIdForURL($uinfo[0]['url'], 0, false);
-
-	if (!empty($profile['about'])) {
-		$description = $profile['about'];
-	} else {
-		$description = $uinfo[0]["about"];
-	}
+	$cid = Contact::getIdForURL($url, 0, false);
 
-	if (!empty($usr['default-location'])) {
-		$location = $usr['default-location'];
-	} elseif (!empty($uinfo[0]["location"])) {
-		$location = $uinfo[0]["location"];
+	if (!empty($cid)) {
+		return DI::twitterUser()->createFromContactId($cid, 0)->toArray();
 	} else {
-		$location = ContactSelector::networkToName($uinfo[0]['network'], $uinfo[0]['url'], $uinfo[0]['protocol']);
-	}
-
-	$ret = [
-		'id' => intval($pcontact_id),
-		'id_str' => (string) intval($pcontact_id),
-		'name' => (($uinfo[0]['name']) ? $uinfo[0]['name'] : $uinfo[0]['nick']),
-		'screen_name' => (($uinfo[0]['nick']) ? $uinfo[0]['nick'] : $uinfo[0]['name']),
-		'location' => $location,
-		'description' => BBCode::toPlaintext($description ?? ''),
-		'profile_image_url' => Contact::getAvatarUrlForUrl($uinfo[0]['url'], api_user(), Proxy::SIZE_MICRO),
-		'profile_image_url_https' => Contact::getAvatarUrlForUrl($uinfo[0]['url'], api_user(), Proxy::SIZE_MICRO),
-		'profile_image_url_profile_size' => Contact::getAvatarUrlForUrl($uinfo[0]['url'], api_user(), Proxy::SIZE_THUMB),
-		'profile_image_url_large' => Contact::getAvatarUrlForUrl($uinfo[0]['url'], api_user(), Proxy::SIZE_SMALL),
-		'url' => $uinfo[0]['url'],
-		'protected' => false,
-		'followers_count' => intval($countfollowers),
-		'friends_count' => intval($countfriends),
-		'listed_count' => 0,
-		'created_at' => api_date($uinfo[0]['created']),
-		'favourites_count' => intval($starred),
-		'utc_offset' => "0",
-		'time_zone' => 'UTC',
-		'geo_enabled' => false,
-		'verified' => true,
-		'statuses_count' => intval($countitems),
-		'lang' => '',
-		'contributors_enabled' => false,
-		'is_translator' => false,
-		'is_translation_enabled' => false,
-		'following' => (($uinfo[0]['rel'] == Contact::FOLLOWER) || ($uinfo[0]['rel'] == Contact::FRIEND)),
-		'follow_request_sent' => false,
-		'statusnet_blocking' => false,
-		'notifications' => false,
-		/// @TODO old way?
-		//'statusnet_profile_url' => DI::baseUrl()."/contact/".$uinfo[0]['cid'],
-		'statusnet_profile_url' => $uinfo[0]['url'],
-		'uid' => intval($uinfo[0]['uid']),
-		'cid' => intval($uinfo[0]['cid']),
-		'pid' => Contact::getIdForURL($uinfo[0]["url"], 0, false),
-		'self' => $uinfo[0]['self'],
-		'network' => $uinfo[0]['network'],
-	];
-
-	// If this is a local user and it uses Frio, we can get its color preferences.
-	if ($ret['self']) {
-		$theme_info = DBA::selectFirst('user', ['theme'], ['uid' => $ret['uid']]);
-		if ($theme_info['theme'] === 'frio') {
-			$schema = DI::pConfig()->get($ret['uid'], 'frio', 'schema');
-
-			if ($schema && ($schema != '---')) {
-				if (file_exists('view/theme/frio/schema/'.$schema.'.php')) {
-					$schemefile = 'view/theme/frio/schema/'.$schema.'.php';
-					require_once $schemefile;
-				}
-			} else {
-				$nav_bg = DI::pConfig()->get($ret['uid'], 'frio', 'nav_bg');
-				$link_color = DI::pConfig()->get($ret['uid'], 'frio', 'link_color');
-				$bgcolor = DI::pConfig()->get($ret['uid'], 'frio', 'background_color');
-			}
-			if (empty($nav_bg)) {
-				$nav_bg = "#708fa0";
-			}
-			if (empty($link_color)) {
-				$link_color = "#6fdbe8";
-			}
-			if (empty($bgcolor)) {
-				$bgcolor = "#ededed";
-			}
-
-			$ret['profile_sidebar_fill_color'] = str_replace('#', '', $nav_bg);
-			$ret['profile_link_color'] = str_replace('#', '', $link_color);
-			$ret['profile_background_color'] = str_replace('#', '', $bgcolor);
-		}
+		throw new BadRequestException("User ".$url." not found.");
 	}
-
-	return $ret;
 }
 
 /**
@@ -640,14 +498,20 @@ function api_get_user($contact_id = null)
  */
 function api_item_get_user(App $a, $item)
 {
-	$status_user = api_get_user($item['author-id'] ?? null);
+	if (empty($item['author-id'])) {
+		$item['author-id'] = Contact::getPublicIdByUserId(BaseApi::getCurrentUserID());
+	}
+	$status_user = DI::twitterUser()->createFromContactId($item['author-id'], BaseApi::getCurrentUserID())->toArray();
 
 	$author_user = $status_user;
 
 	$status_user["protected"] = isset($item['private']) && ($item['private'] == Item::PRIVATE);
 
 	if (($item['thr-parent'] ?? '') == ($item['uri'] ?? '')) {
-		$owner_user = api_get_user($item['owner-id'] ?? null);
+		if (empty($item['owner-id'])) {
+			$item['owner-id'] = Contact::getPublicIdByUserId(BaseApi::getCurrentUserID());
+		}
+		$owner_user = DI::twitterUser()->createFromContactId($item['owner-id'], BaseApi::getCurrentUserID())->toArray();
 	} else {
 		$owner_user = $author_user;
 	}
@@ -675,11 +539,10 @@ function api_item_get_user(App $a, $item)
  */
 function api_account_verify_credentials($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
 
 	unset($_REQUEST["user_id"]);
 	unset($_GET["user_id"]);
@@ -689,7 +552,7 @@ function api_account_verify_credentials($type)
 
 	$skip_status = $_REQUEST['skip_status'] ?? false;
 
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	// "verified" isn't used here in the standard
 	unset($user_info["verified"]);
@@ -706,7 +569,7 @@ function api_account_verify_credentials($type)
 	unset($user_info["uid"]);
 	unset($user_info["self"]);
 
-	return BaseApi::formatData("user", $type, ['user' => $user_info]);
+	return DI::apiResponse()->formatData("user", $type, ['user' => $user_info]);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -745,13 +608,15 @@ function api_statuses_mediap($type)
 {
 	$a = DI::app();
 
-	if (api_user() === false) {
-		logger::notice('api_statuses_update: no user');
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
-	$user_info = api_get_user();
 
-	$_REQUEST['profile_uid'] = api_user();
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
+
+	$_REQUEST['profile_uid'] = BaseApi::getCurrentUserID();
 	$_REQUEST['api_source'] = true;
 	$txt = requestdata('status') ?? '';
 	/// @TODO old-lost code?
@@ -799,12 +664,11 @@ function api_statuses_update($type)
 {
 	$a = DI::app();
 
-	if (api_user() === false) {
-		logger::notice('api_statuses_update: no user');
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
 
-	api_get_user();
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
 	// convert $_POST array items to the form we use for web posts.
 	if (requestdata('htmlstatus')) {
@@ -842,7 +706,7 @@ function api_statuses_update($type)
 	if (requestdata('lat') && requestdata('long')) {
 		$_REQUEST['coord'] = sprintf("%s %s", requestdata('lat'), requestdata('long'));
 	}
-	$_REQUEST['profile_uid'] = api_user();
+	$_REQUEST['profile_uid'] = BaseApi::getCurrentUserID();
 
 	if (!$parent) {
 		// Check for throttling (maximum posts per day, week and month)
@@ -850,11 +714,11 @@ function api_statuses_update($type)
 		if ($throttle_day > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60);
 
-			$condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, api_user(), $datefrom];
+			$condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, BaseApi::getCurrentUserID(), $datefrom];
 			$posts_day = Post::count($condition);
 
 			if ($posts_day > $throttle_day) {
-				logger::info('Daily posting limit reached for user '.api_user());
+				logger::info('Daily posting limit reached for user '.BaseApi::getCurrentUserID());
 				// 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));
 			}
@@ -864,11 +728,11 @@ function api_statuses_update($type)
 		if ($throttle_week > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*7);
 
-			$condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, api_user(), $datefrom];
+			$condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, BaseApi::getCurrentUserID(), $datefrom];
 			$posts_week = Post::count($condition);
 
 			if ($posts_week > $throttle_week) {
-				logger::info('Weekly posting limit reached for user '.api_user());
+				logger::info('Weekly posting limit reached for user '.BaseApi::getCurrentUserID());
 				// 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));
 			}
@@ -878,11 +742,11 @@ function api_statuses_update($type)
 		if ($throttle_month > 0) {
 			$datefrom = date(DateTimeFormat::MYSQL, time() - 24*60*60*30);
 
-			$condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, api_user(), $datefrom];
+			$condition = ["`gravity` = ? AND `uid` = ? AND `wall` AND `received` > ?", GRAVITY_PARENT, BaseApi::getCurrentUserID(), $datefrom];
 			$posts_month = Post::count($condition);
 
 			if ($posts_month > $throttle_month) {
-				logger::info('Monthly posting limit reached for user '.api_user());
+				logger::info('Monthly posting limit reached for user '.BaseApi::getCurrentUserID());
 				// 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));
 			}
@@ -907,7 +771,7 @@ function api_statuses_update($type)
 			$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, api_user()));
+					ORDER BY `photo`.`width` DESC LIMIT 2", $id, BaseApi::getCurrentUserID()));
 
 			if (!empty($media)) {
 				$ressources[] = $media[0]['resource-id'];
@@ -955,7 +819,7 @@ function api_statuses_update($type)
 	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, api_user(), $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']);
+			Photo::setPermissionForRessource($ressource, BaseApi::getCurrentUserID(), $item['allow_cid'], $item['allow_gid'], $item['deny_cid'], $item['deny_gid']);
 		}
 	}
 
@@ -982,12 +846,11 @@ function api_media_upload()
 {
 	$a = DI::app();
 
-	if (api_user() === false) {
-		logger::notice('no user');
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
 
-	api_get_user();
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
 	if (empty($_FILES['media'])) {
 		// Output error
@@ -1035,14 +898,7 @@ api_register_func('api/media/upload', 'api_media_upload', true, API_METHOD_POST)
  */
 function api_media_metadata_create($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
-		Logger::info('no user');
-		throw new ForbiddenException();
-	}
-
-	api_get_user();
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
 	$postdata = Network::postdata();
 
@@ -1065,7 +921,7 @@ function api_media_metadata_create($type)
 
 	Logger::info('Updating metadata', ['media_id' => $data['media_id']]);
 
-	$condition =  ['id' => $data['media_id'], 'uid' => api_user()];
+	$condition =  ['id' => $data['media_id'], 'uid' => BaseApi::getCurrentUserID()];
 	$photo = DBA::selectFirst('photo', ['resource-id'], $condition);
 	if (!DBA::isResult($photo)) {
 		throw new BadRequestException("Metadata not found.");
@@ -1095,7 +951,7 @@ function api_status_show($type, $item_id)
 
 	Logger::info(API_LOG_PREFIX . 'End', ['action' => 'get_status', 'status_info' => $status_info]);
 
-	return BaseApi::formatData('statuses', $type, ['status' => $status_info]);
+	return DI::apiResponse()->formatData('statuses', $type, ['status' => $status_info]);
 }
 
 /**
@@ -1148,9 +1004,9 @@ function api_get_item(array $condition)
  */
 function api_users_show($type)
 {
-	$a = Friendica\DI::app();
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
 
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	$item = api_get_last_status($user_info['pid'], $user_info['uid']);
 	if (!empty($item)) {
@@ -1161,7 +1017,7 @@ function api_users_show($type)
 	unset($user_info['uid']);
 	unset($user_info['self']);
 
-	return BaseApi::formatData('user', $type, ['user' => $user_info]);
+	return DI::apiResponse()->formatData('user', $type, ['user' => $user_info]);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -1182,8 +1038,6 @@ api_register_func('api/externalprofile/show', 'api_users_show');
  */
 function api_users_search($type)
 {
-	$a = DI::app();
-
 	$userlist = [];
 
 	if (!empty($_GET['q'])) {
@@ -1201,7 +1055,7 @@ function api_users_search($type)
 		if (DBA::isResult($contacts)) {
 			$k = 0;
 			foreach ($contacts as $contact) {
-				$user_info = api_get_user($contact['id']);
+				$user_info = DI::twitterUser()->createFromContactId($contact['id'], BaseApi::getCurrentUserID())->toArray();
 
 				if ($type == 'xml') {
 					$userlist[$k++ . ':user'] = $user_info;
@@ -1217,7 +1071,7 @@ function api_users_search($type)
 		throw new BadRequestException('No search term specified.');
 	}
 
-	return BaseApi::formatData('users', $type, $userlist);
+	return DI::apiResponse()->formatData('users', $type, $userlist);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -1253,7 +1107,7 @@ function api_users_lookup($type)
 		throw new NotFoundException;
 	}
 
-	return BaseApi::formatData("users", $type, ['users' => $users]);
+	return DI::apiResponse()->formatData("users", $type, ['users' => $users]);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -1275,12 +1129,12 @@ api_register_func('api/users/lookup', 'api_users_lookup', true);
  */
 function api_search($type)
 {
-	$a = DI::app();
-	$user_info = api_get_user();
-
-	if (api_user() === false || $user_info === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	if (empty($_REQUEST['q'])) {
 		throw new BadRequestException('q parameter is required.');
@@ -1316,7 +1170,7 @@ function api_search($type)
 		DBA::close($tags);
 
 		if (empty($uriids)) {
-			return BaseApi::formatData('statuses', $type, $data);
+			return DI::apiResponse()->formatData('statuses', $type, $data);
 		}
 
 		$condition = ['uri-id' => $uriids];
@@ -1330,7 +1184,7 @@ function api_search($type)
 			" . ($exclude_replies ? " AND `gravity` = " . GRAVITY_PARENT : ' ') . "
 			AND (`uid` = 0 OR (`uid` = ? AND NOT `global`))
 			AND `body` LIKE CONCAT('%',?,'%')",
-			$since_id, api_user(), $_REQUEST['q']];
+			$since_id, BaseApi::getCurrentUserID(), $_REQUEST['q']];
 		if ($max_id > 0) {
 			$condition[0] .= ' AND `id` <= ?';
 			$condition[] = $max_id;
@@ -1340,7 +1194,7 @@ function api_search($type)
 	$statuses = [];
 
 	if (parse_url($searchTerm, PHP_URL_SCHEME) != '') {
-		$id = Item::fetchByLink($searchTerm, api_user());
+		$id = Item::fetchByLink($searchTerm, BaseApi::getCurrentUserID());
 		if (!$id) {
 			// Public post
 			$id = Item::fetchByLink($searchTerm);
@@ -1351,13 +1205,13 @@ function api_search($type)
 		}
 	}
 
-	$statuses = $statuses ?: Post::selectForUser(api_user(), [], $condition, $params);
+	$statuses = $statuses ?: Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition, $params);
 
 	$data['status'] = api_format_items(Post::toArray($statuses), $user_info);
 
 	bindComments($data['status']);
 
-	return BaseApi::formatData('statuses', $type, $data);
+	return DI::apiResponse()->formatData('statuses', $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -1382,12 +1236,12 @@ api_register_func('api/search', 'api_search', true);
  */
 function api_statuses_home_timeline($type)
 {
-	$a = DI::app();
-	$user_info = api_get_user();
-
-	if (api_user() === false || $user_info === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	unset($_REQUEST["user_id"]);
 	unset($_GET["user_id"]);
@@ -1408,7 +1262,7 @@ function api_statuses_home_timeline($type)
 	$start = max(0, ($page - 1) * $count);
 
 	$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ?",
-		api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
+		BaseApi::getCurrentUserID(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
 
 	if ($max_id > 0) {
 		$condition[0] .= " AND `id` <= ?";
@@ -1424,7 +1278,7 @@ function api_statuses_home_timeline($type)
 	}
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Post::selectForUser(api_user(), [], $condition, $params);
+	$statuses = Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition, $params);
 
 	$items = Post::toArray($statuses);
 
@@ -1450,11 +1304,11 @@ function api_statuses_home_timeline($type)
 		case "atom":
 			break;
 		case "rss":
-			$data = api_rss_extra($a, $data, $user_info);
+			$data = api_rss_extra($data, $user_info);
 			break;
 	}
 
-	return BaseApi::formatData("statuses", $type, $data);
+	return DI::apiResponse()->formatData("statuses", $type, $data);
 }
 
 
@@ -1476,12 +1330,12 @@ api_register_func('api/statuses/friends_timeline', 'api_statuses_home_timeline',
  */
 function api_statuses_public_timeline($type)
 {
-	$a = DI::app();
-	$user_info = api_get_user();
-
-	if (api_user() === false || $user_info === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	// get last network messages
 
@@ -1505,7 +1359,7 @@ function api_statuses_public_timeline($type)
 		}
 
 		$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-		$statuses = Post::selectForUser(api_user(), [], $condition, $params);
+		$statuses = Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition, $params);
 
 		$r = Post::toArray($statuses);
 	} else {
@@ -1522,7 +1376,7 @@ function api_statuses_public_timeline($type)
 		}
 
 		$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-		$statuses = Post::selectForUser(api_user(), [], $condition, $params);
+		$statuses = Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition, $params);
 
 		$r = Post::toArray($statuses);
 	}
@@ -1536,11 +1390,11 @@ function api_statuses_public_timeline($type)
 		case "atom":
 			break;
 		case "rss":
-			$data = api_rss_extra($a, $data, $user_info);
+			$data = api_rss_extra($data, $user_info);
 			break;
 	}
 
-	return BaseApi::formatData("statuses", $type, $data);
+	return DI::apiResponse()->formatData("statuses", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -1559,12 +1413,12 @@ api_register_func('api/statuses/public_timeline', 'api_statuses_public_timeline'
  */
 function api_statuses_networkpublic_timeline($type)
 {
-	$a = DI::app();
-	$user_info = api_get_user();
-
-	if (api_user() === false || $user_info === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	$since_id        = $_REQUEST['since_id'] ?? 0;
 	$max_id          = $_REQUEST['max_id'] ?? 0;
@@ -1584,7 +1438,7 @@ function api_statuses_networkpublic_timeline($type)
 	}
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Post::toArray(Post::selectForUser(api_user(), Item::DISPLAY_FIELDLIST, $condition, $params));
+	$statuses = Post::toArray(Post::selectForUser(BaseApi::getCurrentUserID(), Item::DISPLAY_FIELDLIST, $condition, $params));
 
 	$ret = api_format_items($statuses, $user_info, false, $type);
 
@@ -1595,11 +1449,11 @@ function api_statuses_networkpublic_timeline($type)
 		case "atom":
 			break;
 		case "rss":
-			$data = api_rss_extra($a, $data, $user_info);
+			$data = api_rss_extra($data, $user_info);
 			break;
 	}
 
-	return BaseApi::formatData("statuses", $type, $data);
+	return DI::apiResponse()->formatData("statuses", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -1620,12 +1474,12 @@ api_register_func('api/statuses/networkpublic_timeline', 'api_statuses_networkpu
  */
 function api_statuses_show($type)
 {
-	$a = DI::app();
-	$user_info = api_get_user();
-
-	if (api_user() === false || $user_info === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	// params
 	$id = intval(DI::args()->getArgv()[3] ?? 0);
@@ -1649,7 +1503,7 @@ function api_statuses_show($type)
 		throw new BadRequestException(sprintf("There is no status with the id %d", $id));
 	}
 
-	$item = Post::selectFirst(['id'], ['uri-id' => $uri_item['uri-id'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
+	$item = Post::selectFirst(['id'], ['uri-id' => $uri_item['uri-id'], 'uid' => [0, BaseApi::getCurrentUserID()]], ['order' => ['uid' => true]]);
 	if (!DBA::isResult($item)) {
 		throw new BadRequestException(sprintf("There is no status with the uri-id %d for the given user.", $uri_item['uri-id']));
 	}
@@ -1664,7 +1518,7 @@ function api_statuses_show($type)
 		$params = [];
 	}
 
-	$statuses = Post::selectForUser(api_user(), [], $condition, $params);
+	$statuses = Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition, $params);
 
 	/// @TODO How about copying this to above methods which don't check $r ?
 	if (!DBA::isResult($statuses)) {
@@ -1675,10 +1529,10 @@ function api_statuses_show($type)
 
 	if ($conversation) {
 		$data = ['status' => $ret];
-		return BaseApi::formatData("statuses", $type, $data);
+		return DI::apiResponse()->formatData("statuses", $type, $data);
 	} else {
 		$data = ['status' => $ret[0]];
-		return BaseApi::formatData("status", $type, $data);
+		return DI::apiResponse()->formatData("status", $type, $data);
 	}
 }
 
@@ -1699,12 +1553,12 @@ api_register_func('api/statuses/show', 'api_statuses_show', true);
  */
 function api_conversation_show($type)
 {
-	$a = DI::app();
-	$user_info = api_get_user();
-
-	if (api_user() === false || $user_info === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	// params
 	$id       = intval(DI::args()->getArgv()[3]           ?? 0);
@@ -1732,7 +1586,7 @@ function api_conversation_show($type)
 		throw new BadRequestException("There is no status with the id $id.");
 	}
 
-	$parent = Post::selectFirst(['id'], ['uri-id' => $item['parent-uri-id'], 'uid' => [0, api_user()]], ['order' => ['uid' => true]]);
+	$parent = Post::selectFirst(['id'], ['uri-id' => $item['parent-uri-id'], 'uid' => [0, BaseApi::getCurrentUserID()]], ['order' => ['uid' => true]]);
 	if (!DBA::isResult($parent)) {
 		throw new BadRequestException("There is no status with this id.");
 	}
@@ -1740,7 +1594,7 @@ function api_conversation_show($type)
 	$id = $parent['id'];
 
 	$condition = ["`parent` = ? AND `uid` IN (0, ?) AND `gravity` IN (?, ?) AND `id` > ?",
-		$id, api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
+		$id, BaseApi::getCurrentUserID(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
 
 	if ($max_id > 0) {
 		$condition[0] .= " AND `id` <= ?";
@@ -1748,7 +1602,7 @@ function api_conversation_show($type)
 	}
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Post::selectForUser(api_user(), [], $condition, $params);
+	$statuses = Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition, $params);
 
 	if (!DBA::isResult($statuses)) {
 		throw new BadRequestException("There is no status with id $id.");
@@ -1757,7 +1611,7 @@ function api_conversation_show($type)
 	$ret = api_format_items(Post::toArray($statuses), $user_info, false, $type);
 
 	$data = ['status' => $ret];
-	return BaseApi::formatData("statuses", $type, $data);
+	return DI::apiResponse()->formatData("statuses", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -1783,11 +1637,11 @@ function api_statuses_repeat($type)
 
 	$a = DI::app();
 
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
 
-	api_get_user();
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
 	// params
 	$id = intval(DI::args()->getArgv()[3] ?? 0);
@@ -1828,7 +1682,7 @@ function api_statuses_repeat($type)
 				$post .= "[/share]";
 			}
 			$_REQUEST['body'] = $post;
-			$_REQUEST['profile_uid'] = api_user();
+			$_REQUEST['profile_uid'] = BaseApi::getCurrentUserID();
 			$_REQUEST['api_source'] = true;
 
 			if (empty($_REQUEST['source'])) {
@@ -1864,13 +1718,11 @@ api_register_func('api/statuses/retweet', 'api_statuses_repeat', true, API_METHO
  */
 function api_statuses_destroy($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
 
-	api_get_user();
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
 	// params
 	$id = intval(DI::args()->getArgv()[3] ?? 0);
@@ -1888,7 +1740,7 @@ function api_statuses_destroy($type)
 
 	$ret = api_statuses_show($type);
 
-	Item::deleteForUser(['id' => $id], api_user());
+	Item::deleteForUser(['id' => $id], BaseApi::getCurrentUserID());
 
 	return $ret;
 }
@@ -1911,12 +1763,12 @@ api_register_func('api/statuses/destroy', 'api_statuses_destroy', true, API_METH
  */
 function api_statuses_mentions($type)
 {
-	$a = DI::app();
-	$user_info = api_get_user();
-
-	if (api_user() === false || $user_info === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	unset($_REQUEST["user_id"]);
 	unset($_GET["user_id"]);
@@ -1940,11 +1792,11 @@ function api_statuses_mentions($type)
 
 	$condition = [
 		GRAVITY_PARENT, GRAVITY_COMMENT,
-		api_user(),
+		BaseApi::getCurrentUserID(),
 		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,
+		BaseApi::getCurrentUserID(), $since_id,
 	];
 
 	if ($max_id > 0) {
@@ -1955,7 +1807,7 @@ function api_statuses_mentions($type)
 	array_unshift($condition, $query);
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Post::selectForUser(api_user(), [], $condition, $params);
+	$statuses = Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition, $params);
 
 	$ret = api_format_items(Post::toArray($statuses), $user_info, false, $type);
 
@@ -1964,11 +1816,11 @@ function api_statuses_mentions($type)
 		case "atom":
 			break;
 		case "rss":
-			$data = api_rss_extra($a, $data, $user_info);
+			$data = api_rss_extra($data, $user_info);
 			break;
 	}
 
-	return BaseApi::formatData("statuses", $type, $data);
+	return DI::apiResponse()->formatData("statuses", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -1989,14 +1841,14 @@ api_register_func('api/statuses/replies', 'api_statuses_mentions', true);
  */
 function api_statuses_user_timeline($type)
 {
-	$a = DI::app();
-	$user_info = api_get_user();
-
-	if (api_user() === false || $user_info === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
 
-	Logger::info('api_statuses_user_timeline', ['api_user' => api_user(), 'user_info' => $user_info, '_REQUEST' => $_REQUEST]);
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
+
+	Logger::info('api_statuses_user_timeline', ['api_user' => BaseApi::getCurrentUserID(), 'user_info' => $user_info, '_REQUEST' => $_REQUEST]);
 
 	$since_id        = $_REQUEST['since_id'] ?? 0;
 	$max_id          = $_REQUEST['max_id'] ?? 0;
@@ -2010,7 +1862,7 @@ function api_statuses_user_timeline($type)
 	$start = max(0, ($page - 1) * $count);
 
 	$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `contact-id` = ?",
-		api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $user_info['cid']];
+		BaseApi::getCurrentUserID(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id, $user_info['cid']];
 
 	if ($user_info['self'] == 1) {
 		$condition[0] .= ' AND `wall` ';
@@ -2031,7 +1883,7 @@ function api_statuses_user_timeline($type)
 		$condition[] = $max_id;
 	}
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Post::selectForUser(api_user(), [], $condition, $params);
+	$statuses = Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition, $params);
 
 	$ret = api_format_items(Post::toArray($statuses), $user_info, true, $type);
 
@@ -2042,11 +1894,11 @@ function api_statuses_user_timeline($type)
 		case "atom":
 			break;
 		case "rss":
-			$data = api_rss_extra($a, $data, $user_info);
+			$data = api_rss_extra($data, $user_info);
 			break;
 	}
 
-	return BaseApi::formatData("statuses", $type, $data);
+	return DI::apiResponse()->formatData("statuses", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -2068,12 +1920,12 @@ api_register_func('api/statuses/user_timeline', 'api_statuses_user_timeline', tr
  */
 function api_favorites_create_destroy($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
 
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+
 	// for versioned api.
 	/// @TODO We need a better global soluton
 	$action_argv_id = 2;
@@ -2091,7 +1943,7 @@ function api_favorites_create_destroy($type)
 		$itemid = intval($_REQUEST['id'] ?? 0);
 	}
 
-	$item = Post::selectFirstForUser(api_user(), [], ['id' => $itemid, 'uid' => api_user()]);
+	$item = Post::selectFirstForUser(BaseApi::getCurrentUserID(), [], ['id' => $itemid, 'uid' => BaseApi::getCurrentUserID()]);
 
 	if (!DBA::isResult($item)) {
 		throw new BadRequestException("Invalid item.");
@@ -2114,8 +1966,7 @@ function api_favorites_create_destroy($type)
 		throw new InternalServerErrorException("DB error");
 	}
 
-
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 	$rets = api_format_items([$item], $user_info, false, $type);
 	$ret = $rets[0];
 
@@ -2124,11 +1975,11 @@ function api_favorites_create_destroy($type)
 		case "atom":
 			break;
 		case "rss":
-			$data = api_rss_extra($a, $data, $user_info);
+			$data = api_rss_extra($data, $user_info);
 			break;
 	}
 
-	return BaseApi::formatData("status", $type, $data);
+	return DI::apiResponse()->formatData("status", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -2151,12 +2002,12 @@ function api_favorites($type)
 {
 	global $called_api;
 
-	$a = DI::app();
-	$user_info = api_get_user();
-
-	if (api_user() === false || $user_info === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	$called_api = [];
 
@@ -2176,7 +2027,7 @@ function api_favorites($type)
 		$start = max(0, ($page - 1) * $count);
 
 		$condition = ["`uid` = ? AND `gravity` IN (?, ?) AND `id` > ? AND `starred`",
-			api_user(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
+			BaseApi::getCurrentUserID(), GRAVITY_PARENT, GRAVITY_COMMENT, $since_id];
 
 		$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
 
@@ -2185,7 +2036,7 @@ function api_favorites($type)
 			$condition[] = $max_id;
 		}
 
-		$statuses = Post::selectForUser(api_user(), [], $condition, $params);
+		$statuses = Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition, $params);
 
 		$ret = api_format_items(Post::toArray($statuses), $user_info, false, $type);
 	}
@@ -2197,11 +2048,11 @@ function api_favorites($type)
 		case "atom":
 			break;
 		case "rss":
-			$data = api_rss_extra($a, $data, $user_info);
+			$data = api_rss_extra($data, $user_info);
 			break;
 	}
 
-	return BaseApi::formatData("statuses", $type, $data);
+	return DI::apiResponse()->formatData("statuses", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -2623,8 +2474,6 @@ function api_contactlink_to_array($txt)
  */
 function api_format_items_activities($item, $type = "json")
 {
-	$a = DI::app();
-
 	$activities = [
 		'like' => [],
 		'dislike' => [],
@@ -2642,7 +2491,7 @@ function api_format_items_activities($item, $type = "json")
 		//builtin_activity_puller($i, $activities);
 
 		// get user data and add it to the array of the activity
-		$user = api_get_user($parent_item['author-id']);
+		$user = DI::twitterUser()->createFromContactId($parent_item['author-id'], BaseApi::getCurrentUserID())->toArray();
 		switch ($parent_item['verb']) {
 			case Activity::LIKE:
 				$activities['like'][] = $user;
@@ -2701,7 +2550,7 @@ function api_format_items_activities($item, $type = "json")
  */
 function api_format_items($items, $user_info, $filter_user = false, $type = "json")
 {
-	$a = Friendica\DI::app();
+	$a = DI::app();
 
 	$ret = [];
 
@@ -2710,7 +2559,7 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso
 	}
 
 	foreach ((array)$items as $item) {
-		list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item);
+		[$status_user, $author_user, $owner_user] = api_item_get_user($a, $item);
 
 		// Look if the posts are matching if they should be filtered by user id
 		if ($filter_user && ($status_user["id"] != $user_info["id"])) {
@@ -2739,10 +2588,10 @@ function api_format_items($items, $user_info, $filter_user = false, $type = "jso
  */
 function api_format_item($item, $type = "json", $status_user = null, $author_user = null, $owner_user = null)
 {
-	$a = Friendica\DI::app();
+	$a = DI::app();
 
 	if (empty($status_user) || empty($author_user) || empty($owner_user)) {
-		list($status_user, $author_user, $owner_user) = api_item_get_user($a, $item);
+		[$status_user, $author_user, $owner_user] = api_item_get_user($a, $item);
 	}
 
 	DI::contentItem()->localize($item);
@@ -2806,7 +2655,7 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
 		if (!empty($announce)) {
 			$retweeted_item = $item;
 			$item = $announce;
-			$status['friendica_owner'] = api_get_user($announce['author-id']);
+			$status['friendica_owner'] = DI::twitterUser()->createFromContactId($announce['author-id'], BaseApi::getCurrentUserID())->toArray();
 		}
 	}
 
@@ -2825,7 +2674,7 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
 			$quoted_status['text'] = $conv_quoted['text'];
 			$quoted_status['statusnet_html'] = $conv_quoted['html'];
 			try {
-				$quoted_status["user"] = api_get_user($quoted_item["author-id"]);
+				$quoted_status["user"] = DI::twitterUser()->createFromContactId($quoted_item['author-id'], BaseApi::getCurrentUserID())->toArray();
 			} catch (BadRequestException $e) {
 				// user not found. should be found?
 				/// @todo check if the user should be always found
@@ -2847,7 +2696,7 @@ function api_format_item($item, $type = "json", $status_user = null, $author_use
 		unset($retweeted_status['statusnet_conversation_id']);
 		$status['user'] = $status['friendica_owner'];
 		try {
-			$retweeted_status["user"] = api_get_user($retweeted_item["author-id"]);
+			$retweeted_status["user"] = DI::twitterUser()->createFromContactId($retweeted_item['author-id'], BaseApi::getCurrentUserID())->toArray();
 		} catch (BadRequestException $e) {
 			// user not found. should be found?
 			/// @todo check if the user should be always found
@@ -2907,7 +2756,7 @@ function api_lists_list($type)
 {
 	$ret = [];
 	/// @TODO $ret is not filled here?
-	return BaseApi::formatData('lists', $type, ["lists_list" => $ret]);
+	return DI::apiResponse()->formatData('lists', $type, ["lists_list" => $ret]);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -2929,14 +2778,13 @@ api_register_func('api/lists/subscriptions', 'api_lists_list', true);
  */
 function api_lists_ownerships($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
 
 	// params
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 	$uid = $user_info['uid'];
 
 	$groups = DBA::select('group', [], ['deleted' => 0, 'uid' => $uid]);
@@ -2957,7 +2805,7 @@ function api_lists_ownerships($type)
 			'mode' => $mode
 		];
 	}
-	return BaseApi::formatData("lists", $type, ['lists' => ['lists' => $lists]]);
+	return DI::apiResponse()->formatData("lists", $type, ['lists' => ['lists' => $lists]]);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -2978,12 +2826,12 @@ api_register_func('api/lists/ownerships', 'api_lists_ownerships', true);
  */
 function api_lists_statuses($type)
 {
-	$a = DI::app();
-
-	$user_info = api_get_user();
-	if (api_user() === false || $user_info === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	unset($_REQUEST["user_id"]);
 	unset($_GET["user_id"]);
@@ -3007,7 +2855,7 @@ function api_lists_statuses($type)
 
 	$groups = DBA::selectToArray('group_member', ['contact-id'], ['gid' => 1]);
 	$gids = array_column($groups, 'contact-id');
-	$condition = ['uid' => api_user(), 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'group-id' => $gids];
+	$condition = ['uid' => BaseApi::getCurrentUserID(), 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT], 'group-id' => $gids];
 	$condition = DBA::mergeConditions($condition, ["`id` > ?", $since_id]);
 
 	if ($max_id > 0) {
@@ -3024,7 +2872,7 @@ function api_lists_statuses($type)
 	}
 
 	$params = ['order' => ['id' => true], 'limit' => [$start, $count]];
-	$statuses = Post::selectForUser(api_user(), [], $condition, $params);
+	$statuses = Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition, $params);
 
 	$items = api_format_items(Post::toArray($statuses), $user_info, false, $type);
 
@@ -3033,11 +2881,11 @@ function api_lists_statuses($type)
 		case "atom":
 			break;
 		case "rss":
-			$data = api_rss_extra($a, $data, $user_info);
+			$data = api_rss_extra($data, $user_info);
 			break;
 	}
 
-	return BaseApi::formatData("statuses", $type, $data);
+	return DI::apiResponse()->formatData("statuses", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -3059,11 +2907,7 @@ api_register_func('api/lists/statuses', 'api_lists_statuses', true);
  */
 function api_statuses_f($qtype)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
-		throw new ForbiddenException();
-	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
 
 	// pagination
 	$count = $_GET['count'] ?? 20;
@@ -3071,7 +2915,7 @@ function api_statuses_f($qtype)
 
 	$start = max(0, ($page - 1) * $count);
 
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	if (!empty($_GET['cursor']) && $_GET['cursor'] == 'undefined') {
 		/* this is to stop Hotot to load friends multiple times
@@ -3106,7 +2950,7 @@ function api_statuses_f($qtype)
 
 	// @todo This query most likely can be replaced with a Contact::select...
 	$r = DBA::toArray(DBA::p(
-		"SELECT `nurl`
+		"SELECT `id`
 		FROM `contact`
 		WHERE `uid` = ?
 		AND NOT `self`
@@ -3114,14 +2958,14 @@ function api_statuses_f($qtype)
 		$sql_extra
 		ORDER BY `nick`
 		LIMIT ?, ?",
-		api_user(),
+		BaseApi::getCurrentUserID(),
 		$start,
 		$count
 	));
 
 	$ret = [];
 	foreach ($r as $cid) {
-		$user = api_get_user($cid['nurl']);
+		$user = DI::twitterUser()->createFromContactId($cid['id'], BaseApi::getCurrentUserID())->toArray();
 		// "uid" and "self" are only needed for some internal stuff, so remove it from here
 		unset($user["uid"]);
 		unset($user["self"]);
@@ -3151,7 +2995,7 @@ function api_statuses_friends($type)
 	if ($data === false) {
 		return false;
 	}
-	return BaseApi::formatData("users", $type, $data);
+	return DI::apiResponse()->formatData("users", $type, $data);
 }
 
 /**
@@ -3170,7 +3014,7 @@ function api_statuses_followers($type)
 	if ($data === false) {
 		return false;
 	}
-	return BaseApi::formatData("users", $type, $data);
+	return DI::apiResponse()->formatData("users", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -3194,7 +3038,7 @@ function api_blocks_list($type)
 	if ($data === false) {
 		return false;
 	}
-	return BaseApi::formatData("users", $type, $data);
+	return DI::apiResponse()->formatData("users", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -3223,54 +3067,12 @@ function api_friendships_incoming($type)
 		$ids[] = $user['id'];
 	}
 
-	return BaseApi::formatData("ids", $type, ['id' => $ids]);
+	return DI::apiResponse()->formatData("ids", $type, ['id' => $ids]);
 }
 
 /// @TODO move to top of file or somewhere better
 api_register_func('api/friendships/incoming', 'api_friendships_incoming', true);
 
-/**
- * Returns the instance's configuration information.
- *
- * @param string $type Return type (atom, rss, xml, json)
- *
- * @return array|string
- * @throws InternalServerErrorException
- */
-function api_statusnet_config($type)
-{
-	$name      = DI::config()->get('config', 'sitename');
-	$server    = DI::baseUrl()->getHostname();
-	$logo      = DI::baseUrl() . '/images/friendica-64.png';
-	$email     = DI::config()->get('config', 'admin_email');
-	$closed    = intval(DI::config()->get('config', 'register_policy')) === \Friendica\Module\Register::CLOSED ? 'true' : 'false';
-	$private   = DI::config()->get('system', 'block_public') ? 'true' : 'false';
-	$textlimit = (string) DI::config()->get('config', 'api_import_size', DI::config()->get('config', 'max_import_size', 200000));
-	$ssl       = DI::config()->get('system', 'have_ssl') ? 'true' : 'false';
-	$sslserver = DI::config()->get('system', 'have_ssl') ? str_replace('http:', 'https:', DI::baseUrl()) : '';
-
-	$config = [
-		'site' => ['name' => $name,'server' => $server, 'theme' => 'default', 'path' => '',
-			'logo' => $logo, 'fancy' => true, 'language' => 'en', 'email' => $email, 'broughtby' => '',
-			'broughtbyurl' => '', 'timezone' => 'UTC', 'closed' => $closed, 'inviteonly' => false,
-			'private' => $private, 'textlimit' => $textlimit, 'sslserver' => $sslserver, 'ssl' => $ssl,
-			'shorturllength' => '30',
-			'friendica' => [
-					'FRIENDICA_PLATFORM' => FRIENDICA_PLATFORM,
-					'FRIENDICA_VERSION' => FRIENDICA_VERSION,
-					'DFRN_PROTOCOL_VERSION' => DFRN_PROTOCOL_VERSION,
-					'DB_UPDATE_VERSION' => DB_UPDATE_VERSION
-					]
-		],
-	];
-
-	return BaseApi::formatData('config', $type, ['config' => $config]);
-}
-
-/// @TODO move to top of file or somewhere better
-api_register_func('api/gnusocial/config', 'api_statusnet_config', false);
-api_register_func('api/statusnet/config', 'api_statusnet_config', false);
-
 /**
  * Sends a new direct message.
  *
@@ -3287,9 +3089,14 @@ api_register_func('api/statusnet/config', 'api_statusnet_config', false);
  */
 function api_direct_messages_new($type)
 {
-	$a = DI::app();
+	if (empty(BaseApi::getCurrentUserID())) {
+		throw new ForbiddenException();
+	}
 
-	if (api_user() === false) {
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+
+	$uid = BaseApi::getCurrentUserID();
+	if (empty($uid)) {
 		throw new ForbiddenException();
 	}
 
@@ -3297,16 +3104,16 @@ function api_direct_messages_new($type)
 		return;
 	}
 
-	$sender = api_get_user();
+	$sender = DI::twitterUser()->createFromUserId($uid)->toArray();
 
 	$recipient = null;
 	if (!empty($_POST['screen_name'])) {
-		$contacts = Contact::selectToArray(['id', 'nurl', 'network'], ['uid' => api_user(), 'nick' => $_POST['screen_name']]);
+		$contacts = Contact::selectToArray(['id', 'nurl', 'network'], ['uid' => BaseApi::getCurrentUserID(), 'nick' => $_POST['screen_name']]);
 		if (DBA::isResult($contacts)) {
 			// Selecting the id by priority, friendica first
 			api_best_nickname($contacts);
 
-			$recipient = api_get_user($contacts[0]['nurl']);
+			$recipient = DI::twitterUser()->createFromContactId($contacts[0]['id'], $uid)->toArray();
 		}
 	} else {
 		$recipient = api_get_user($_POST['user_id']);
@@ -3318,7 +3125,7 @@ function api_direct_messages_new($type)
 
 	$replyto = '';
 	if (!empty($_REQUEST['replyto'])) {
-		$mail = DBA::selectFirst('mail', ['parent-uri', 'title'], ['uid' => api_user(), 'id' => $_REQUEST['replyto']]);
+		$mail = DBA::selectFirst('mail', ['parent-uri', 'title'], ['uid' => BaseApi::getCurrentUserID(), 'id' => $_REQUEST['replyto']]);
 		$replyto = $mail['parent-uri'];
 		$sub     = $mail['title'];
 	} else {
@@ -3344,11 +3151,11 @@ function api_direct_messages_new($type)
 		case "atom":
 			break;
 		case "rss":
-			$data = api_rss_extra($a, $data, $sender);
+			$data = api_rss_extra($data, $sender);
 			break;
 	}
 
-	return BaseApi::formatData("direct-messages", $type, $data);
+	return DI::apiResponse()->formatData("direct-messages", $type, $data);
 }
 
 /// @TODO move to top of file or somewhere better
@@ -3368,14 +3175,14 @@ api_register_func('api/direct_messages/new', 'api_direct_messages_new', true, AP
  */
 function api_direct_messages_destroy($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
 
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+
 	// params
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 	//required
 	$id = $_REQUEST['id'] ?? 0;
 	// optional
@@ -3387,7 +3194,7 @@ function api_direct_messages_destroy($type)
 	// error if no id or parenturi specified (for clients posting parent-uri as well)
 	if ($verbose == "true" && ($id == 0 || $parenturi == "")) {
 		$answer = ['result' => 'error', 'message' => 'message id or parenturi not specified'];
-		return BaseApi::formatData("direct_messages_delete", $type, ['$result' => $answer]);
+		return DI::apiResponse()->formatData("direct_messages_delete", $type, ['$result' => $answer]);
 	}
 
 	// BadRequestException if no id specified (for clients using Twitter API)
@@ -3402,7 +3209,7 @@ function api_direct_messages_destroy($type)
 	if (!DBA::exists('mail', ["`uid` = ? AND `id` = ? " . $sql_extra, $uid, $id])) {
 		if ($verbose == "true") {
 			$answer = ['result' => 'error', 'message' => 'message id not in database'];
-			return BaseApi::formatData("direct_messages_delete", $type, ['$result' => $answer]);
+			return DI::apiResponse()->formatData("direct_messages_delete", $type, ['$result' => $answer]);
 		}
 		/// @todo BadRequestException ok for Twitter API clients?
 		throw new BadRequestException('message id not in database');
@@ -3415,10 +3222,10 @@ function api_direct_messages_destroy($type)
 		if ($result) {
 			// return success
 			$answer = ['result' => 'ok', 'message' => 'message deleted'];
-			return BaseApi::formatData("direct_message_delete", $type, ['$result' => $answer]);
+			return DI::apiResponse()->formatData("direct_message_delete", $type, ['$result' => $answer]);
 		} else {
 			$answer = ['result' => 'error', 'message' => 'unknown error'];
-			return BaseApi::formatData("direct_messages_delete", $type, ['$result' => $answer]);
+			return DI::apiResponse()->formatData("direct_messages_delete", $type, ['$result' => $answer]);
 		}
 	}
 	/// @todo return JSON data like Twitter API not yet implemented
@@ -3441,7 +3248,7 @@ api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy',
  */
 function api_friendships_destroy($type)
 {
-	$uid = api_user();
+	$uid = BaseApi::getCurrentUserID();
 
 	if ($uid === false) {
 		throw new HTTPException\ForbiddenException();
@@ -3503,8 +3310,9 @@ function api_friendships_destroy($type)
 	// Set screen_name since Twidere requests it
 	$contact['screen_name'] = $contact['nick'];
 
-	return BaseApi::formatData('friendships-destroy', $type, ['user' => $contact]);
+	return DI::apiResponse()->formatData('friendships-destroy', $type, ['user' => $contact]);
 }
+
 api_register_func('api/friendships/destroy', 'api_friendships_destroy', true, API_METHOD_POST);
 
 /**
@@ -3522,10 +3330,11 @@ api_register_func('api/friendships/destroy', 'api_friendships_destroy', true, AP
  */
 function api_direct_messages_box($type, $box, $verbose)
 {
-	$a = DI::app();
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
+
 	// params
 	$count = $_GET['count'] ?? 20;
 	$page = $_REQUEST['page'] ?? 1;
@@ -3543,10 +3352,8 @@ function api_direct_messages_box($type, $box, $verbose)
 	unset($_REQUEST["screen_name"]);
 	unset($_GET["screen_name"]);
 
-	$user_info = api_get_user();
-	if ($user_info === false) {
-		throw new ForbiddenException();
-	}
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
+
 	$profile_url = $user_info["url"];
 
 	// pagination
@@ -3577,23 +3384,23 @@ function api_direct_messages_box($type, $box, $verbose)
 
 	$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(),
+		BaseApi::getCurrentUserID(),
 		$since_id,
 		$start,
 		$count
 	));
 	if ($verbose == "true" && !DBA::isResult($r)) {
 		$answer = ['result' => 'error', 'message' => 'no mails available'];
-		return BaseApi::formatData("direct_messages_all", $type, ['$result' => $answer]);
+		return DI::apiResponse()->formatData("direct_messages_all", $type, ['$result' => $answer]);
 	}
 
 	$ret = [];
 	foreach ($r as $item) {
 		if ($box == "inbox" || $item['from-url'] != $profile_url) {
 			$recipient = $user_info;
-			$sender = api_get_user(Strings::normaliseLink($item['contact-url']));
+			$sender = DI::twitterUser()->createFromContactId($item['contact-id'], BaseApi::getCurrentUserID())->toArray();
 		} elseif ($box == "sentbox" || $item['from-url'] == $profile_url) {
-			$recipient = api_get_user(Strings::normaliseLink($item['contact-url']));
+			$recipient = DI::twitterUser()->createFromContactId($item['contact-id'], BaseApi::getCurrentUserID())->toArray();
 			$sender = $user_info;
 		}
 
@@ -3608,11 +3415,11 @@ function api_direct_messages_box($type, $box, $verbose)
 		case "atom":
 			break;
 		case "rss":
-			$data = api_rss_extra($a, $data, $user_info);
+			$data = api_rss_extra($data, $user_info);
 			break;
 	}
 
-	return BaseApi::formatData("direct-messages", $type, $data);
+	return DI::apiResponse()->formatData("direct-messages", $type, $data);
 }
 
 /**
@@ -3691,7 +3498,7 @@ api_register_func('api/direct_messages', 'api_direct_messages_inbox', true);
  */
 function api_fr_photos_list($type)
 {
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
 	$r = DBA::toArray(DBA::p(
@@ -3726,7 +3533,7 @@ function api_fr_photos_list($type)
 			}
 		}
 	}
-	return BaseApi::formatData("photos", $type, $data);
+	return DI::apiResponse()->formatData("photos", $type, $data);
 }
 
 /**
@@ -3742,7 +3549,7 @@ function api_fr_photos_list($type)
  */
 function api_fr_photo_create_update($type)
 {
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
 	// input params
@@ -3777,7 +3584,7 @@ function api_fr_photo_create_update($type)
 		$mode = "update";
 
 		// check if photo is existing in databasei
-		if (!Photo::exists(['resource-id' => $photo_id, 'uid' => api_user(), 'album' => $album])) {
+		if (!Photo::exists(['resource-id' => $photo_id, 'uid' => BaseApi::getCurrentUserID(), 'album' => $album])) {
 			throw new BadRequestException("photo not available");
 		}
 	}
@@ -3798,7 +3605,7 @@ function api_fr_photo_create_update($type)
 
 		// return success of updating or error message
 		if (!is_null($data)) {
-			return BaseApi::formatData("photo_create", $type, $data);
+			return DI::apiResponse()->formatData("photo_create", $type, $data);
 		} else {
 			throw new InternalServerErrorException("unknown error - uploading photo failed, see Friendica log for more information");
 		}
@@ -3839,7 +3646,7 @@ function api_fr_photo_create_update($type)
 		$result = false;
 		if (count($updated_fields) > 0) {
 			$nothingtodo = false;
-			$result = Photo::update($updated_fields, ['uid' => api_user(), 'resource-id' => $photo_id, 'album' => $album]);
+			$result = Photo::update($updated_fields, ['uid' => BaseApi::getCurrentUserID(), 'resource-id' => $photo_id, 'album' => $album]);
 		} else {
 			$nothingtodo = true;
 		}
@@ -3849,18 +3656,18 @@ function api_fr_photo_create_update($type)
 			$media = $_FILES['media'];
 			$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 BaseApi::formatData("photo_update", $type, $data);
+				return DI::apiResponse()->formatData("photo_update", $type, $data);
 			}
 		}
 
 		// return success of updating or error message
 		if ($result) {
 			$answer = ['result' => 'updated', 'message' => 'Image id `' . $photo_id . '` has been updated.'];
-			return BaseApi::formatData("photo_update", $type, ['$result' => $answer]);
+			return DI::apiResponse()->formatData("photo_update", $type, ['$result' => $answer]);
 		} else {
 			if ($nothingtodo) {
 				$answer = ['result' => 'cancelled', 'message' => 'Nothing to update for image id `' . $photo_id . '`.'];
-				return BaseApi::formatData("photo_update", $type, ['$result' => $answer]);
+				return DI::apiResponse()->formatData("photo_update", $type, ['$result' => $answer]);
 			}
 			throw new InternalServerErrorException("unknown error - update photo entry in database failed");
 		}
@@ -3868,53 +3675,6 @@ function api_fr_photo_create_update($type)
 	throw new InternalServerErrorException("unknown error - this error on uploading or updating a photo should never happen");
 }
 
-/**
- * delete a single photo from the database through api
- *
- * @param string $type Known types are 'atom', 'rss', 'xml' and 'json'
- * @return string|array
- * @throws BadRequestException
- * @throws ForbiddenException
- * @throws InternalServerErrorException
- */
-function api_fr_photo_delete($type)
-{
-	if (api_user() === false) {
-		throw new ForbiddenException();
-	}
-
-	// input params
-	$photo_id = $_REQUEST['photo_id'] ?? null;
-
-	// do several checks on input parameters
-	// we do not allow calls without photo id
-	if ($photo_id == null) {
-		throw new BadRequestException("no photo_id specified");
-	}
-
-	// check if photo is existing in database
-	if (!Photo::exists(['resource-id' => $photo_id, 'uid' => api_user()])) {
-		throw new BadRequestException("photo not available");
-	}
-
-	// now we can perform on the deletion of the photo
-	$result = Photo::delete(['uid' => api_user(), 'resource-id' => $photo_id]);
-
-	// return success of deletion or error message
-	if ($result) {
-		// 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)
-		$condition = ['uid' => api_user(), 'resource-id' => $photo_id, 'type' => 'photo'];
-		Item::deleteForUser($condition, api_user());
-
-		$result = ['result' => 'deleted', 'message' => 'photo with id `' . $photo_id . '` has been deleted from server.'];
-		return BaseApi::formatData("photo_delete", $type, ['$result' => $result]);
-	} else {
-		throw new InternalServerErrorException("unknown error on deleting photo from database table");
-	}
-}
-
-
 /**
  * returns the details of a specified photo id, if scale is given, returns the photo data in base 64
  *
@@ -3927,7 +3687,7 @@ function api_fr_photo_delete($type)
  */
 function api_fr_photo_detail($type)
 {
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
 	if (empty($_REQUEST['photo_id'])) {
@@ -3940,7 +3700,7 @@ function api_fr_photo_detail($type)
 	// prepare json/xml output with data from database for the requested photo
 	$data = prepare_photo_data($type, $scale, $photo_id);
 
-	return BaseApi::formatData("photo_detail", $type, $data);
+	return DI::apiResponse()->formatData("photo_detail", $type, $data);
 }
 
 
@@ -3959,7 +3719,7 @@ function api_fr_photo_detail($type)
  */
 function api_account_update_profile_image($type)
 {
-	if (api_user() === false) {
+	if (empty(BaseApi::getCurrentUserID())) {
 		throw new ForbiddenException();
 	}
 	// input params
@@ -3972,7 +3732,7 @@ function api_account_update_profile_image($type)
 
 	// check if specified profile id is valid
 	if ($profile_id != 0) {
-		$profile = DBA::selectFirst('profile', ['is-default'], ['uid' => api_user(), 'id' => $profile_id]);
+		$profile = DBA::selectFirst('profile', ['is-default'], ['uid' => BaseApi::getCurrentUserID(), 'id' => $profile_id]);
 		// error message if specified profile id is not in database
 		if (!DBA::isResult($profile)) {
 			throw new BadRequestException("profile_id not available");
@@ -4008,18 +3768,18 @@ 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()];
+		$condition = ["`profile` AND `resource-id` != ? AND `uid` = ?", $data['photo']['id'], BaseApi::getCurrentUserID()];
 		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];
-		DBA::update('profile', $fields, ['id' => $_REQUEST['profile'], 'uid' => api_user()]);
+		DBA::update('profile', $fields, ['id' => $_REQUEST['profile'], 'uid' => BaseApi::getCurrentUserID()]);
 	}
 
-	Contact::updateSelfFromUserID(api_user(), true);
+	Contact::updateSelfFromUserID(BaseApi::getCurrentUserID(), true);
 
 	// Update global directory in background
-	Profile::publishUpdate(api_user());
+	Profile::publishUpdate(BaseApi::getCurrentUserID());
 
 	// output for client
 	if ($data) {
@@ -4034,7 +3794,6 @@ function api_account_update_profile_image($type)
 api_register_func('api/friendica/photos/list', 'api_fr_photos_list', true);
 api_register_func('api/friendica/photo/create', 'api_fr_photo_create_update', true, API_METHOD_POST);
 api_register_func('api/friendica/photo/update', 'api_fr_photo_create_update', true, API_METHOD_POST);
-api_register_func('api/friendica/photo/delete', 'api_fr_photo_delete', true, API_METHOD_DELETE);
 api_register_func('api/friendica/photo', 'api_fr_photo_detail', true);
 api_register_func('api/account/update_profile_image', 'api_account_update_profile_image', true, API_METHOD_POST);
 
@@ -4052,8 +3811,11 @@ api_register_func('api/account/update_profile_image', 'api_account_update_profil
  */
 function api_account_update_profile($type)
 {
-	$local_user = api_user();
-	$api_user = api_get_user();
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+
+	$local_user = BaseApi::getCurrentUserID();
+
+	$api_user = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	if (!empty($_POST['name'])) {
 		DBA::update('profile', ['name' => $_POST['name']], ['uid' => $local_user]);
@@ -4098,7 +3860,7 @@ function check_acl_input($acl_string)
 	foreach ($cid_array as $cid) {
 		$cid = str_replace("<", "", $cid);
 		$cid = str_replace(">", "", $cid);
-		$condition = ['id' => $cid, 'uid' => api_user()];
+		$condition = ['id' => $cid, 'uid' => BaseApi::getCurrentUserID()];
 		$contact_not_found |= !DBA::exists('contact', $condition);
 	}
 	return $contact_not_found;
@@ -4277,12 +4039,12 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
 function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $filetype, $visibility = false)
 {
 	// get data about the api authenticated user
-	$uri = Item::newURI(intval(api_user()));
-	$owner_record = DBA::selectFirst('contact', [], ['uid' => api_user(), 'self' => true]);
+	$uri = Item::newURI(intval(BaseApi::getCurrentUserID()));
+	$owner_record = DBA::selectFirst('contact', [], ['uid' => BaseApi::getCurrentUserID(), 'self' => true]);
 
 	$arr = [];
 	$arr['guid']          = System::createUUID();
-	$arr['uid']           = intval(api_user());
+	$arr['uid']           = intval(BaseApi::getCurrentUserID());
 	$arr['uri']           = $uri;
 	$arr['type']          = 'photo';
 	$arr['wall']          = 1;
@@ -4333,12 +4095,9 @@ function post_photo_item($hash, $allow_cid, $deny_cid, $allow_gid, $deny_gid, $f
  */
 function prepare_photo_data($type, $scale, $photo_id)
 {
-	$a = DI::app();
-	$user_info = api_get_user();
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
-	if ($user_info === false) {
-		throw new ForbiddenException();
-	}
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
 	$scale_sql = ($scale === false ? "" : sprintf("AND scale=%d", intval($scale)));
 	$data_sql = ($scale === false ? "" : "data, ");
@@ -4395,7 +4154,7 @@ function prepare_photo_data($type, $scale, $photo_id)
 	}
 
 	// retrieve item element for getting activities (like, dislike etc.) related to photo
-	$condition = ['uid' => api_user(), 'resource-id' => $photo_id];
+	$condition = ['uid' => BaseApi::getCurrentUserID(), 'resource-id' => $photo_id];
 	$item = Post::selectFirst(['id', 'uid', 'uri', 'parent', 'allow_cid', 'deny_cid', 'allow_gid', 'deny_gid'], $condition);
 	if (!DBA::isResult($item)) {
 		throw new NotFoundException('Photo-related item not found.');
@@ -4405,9 +4164,9 @@ function prepare_photo_data($type, $scale, $photo_id)
 
 	// retrieve comments on photo
 	$condition = ["`parent` = ? AND `uid` = ? AND `gravity` IN (?, ?)",
-		$item['parent'], api_user(), GRAVITY_PARENT, GRAVITY_COMMENT];
+		$item['parent'], BaseApi::getCurrentUserID(), GRAVITY_PARENT, GRAVITY_COMMENT];
 
-	$statuses = Post::selectForUser(api_user(), [], $condition);
+	$statuses = Post::selectForUser(BaseApi::getCurrentUserID(), [], $condition);
 
 	// prepare output of comments
 	$commentData = api_format_items(Post::toArray($statuses), $user_info, false, $type);
@@ -4627,14 +4386,10 @@ function api_best_nickname(&$contacts)
  */
 function api_friendica_group_show($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
-		throw new ForbiddenException();
-	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
 
 	// params
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 	$gid = $_REQUEST['gid'] ?? 0;
 	$uid = $user_info['uid'];
 
@@ -4660,81 +4415,22 @@ function api_friendica_group_show($type)
 			$user_element = "users";
 			$k = 0;
 			foreach ($members as $member) {
-				$user = api_get_user($member['nurl']);
+				$user = DI::twitterUser()->createFromContactId($member['contact-id'], BaseApi::getCurrentUserID())->toArray();
 				$users[$k++.":user"] = $user;
 			}
 		} else {
 			$user_element = "user";
 			foreach ($members as $member) {
-				$user = api_get_user($member['nurl']);
+				$user = DI::twitterUser()->createFromContactId($member['contact-id'], BaseApi::getCurrentUserID())->toArray();
 				$users[] = $user;
 			}
 		}
 		$grps[] = ['name' => $rr['name'], 'gid' => $rr['id'], $user_element => $users];
 	}
-	return BaseApi::formatData("groups", $type, ['group' => $grps]);
+	return DI::apiResponse()->formatData("groups", $type, ['group' => $grps]);
 }
-api_register_func('api/friendica/group_show', 'api_friendica_group_show', true);
-
-
-/**
- * Delete the specified group of the user.
- *
- * @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_delete($type)
-{
-	$a = DI::app();
 
-	if (api_user() === false) {
-		throw new ForbiddenException();
-	}
-
-	// params
-	$user_info = api_get_user();
-	$gid = $_REQUEST['gid'] ?? 0;
-	$name = $_REQUEST['name'] ?? '';
-	$uid = $user_info['uid'];
-
-	// error if no gid specified
-	if ($gid == 0 || $name == "") {
-		throw new BadRequestException('gid or name not specified');
-	}
-
-	// error message if specified gid is not in database
-	if (!DBA::exists('group', ['uid' => $uid, 'id' => $gid])) {
-		throw new BadRequestException('gid not available');
-	}
-
-	// error message if specified gid is not in database
-	if (!DBA::exists('group', ['uid' => $uid, 'id' => $gid, 'name' => $name])) {
-		throw new BadRequestException('wrong group name');
-	}
-
-	// delete group
-	$gid = Group::getIdByName($uid, $name);
-	if (empty($gid)) {
-		throw new BadRequestException('other API error');
-	}
-
-	$ret = Group::remove($gid);
-
-	if ($ret) {
-		// return success
-		$success = ['success' => $ret, 'gid' => $gid, 'name' => $name, 'status' => 'deleted', 'wrong users' => []];
-		return BaseApi::formatData("group_delete", $type, ['result' => $success]);
-	} else {
-		throw new BadRequestException('other API error');
-	}
-}
-api_register_func('api/friendica/group_delete', 'api_friendica_group_delete', true, API_METHOD_DELETE);
+api_register_func('api/friendica/group_show', 'api_friendica_group_show', true);
 
 /**
  * Delete a group.
@@ -4751,14 +4447,10 @@ api_register_func('api/friendica/group_delete', 'api_friendica_group_delete', tr
  */
 function api_lists_destroy($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
-		throw new ForbiddenException();
-	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
 	// params
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 	$gid = $_REQUEST['list_id'] ?? 0;
 	$uid = $user_info['uid'];
 
@@ -4782,9 +4474,10 @@ function api_lists_destroy($type)
 			'user' => $user_info
 		];
 
-		return BaseApi::formatData("lists", $type, ['lists' => $list]);
+		return DI::apiResponse()->formatData("lists", $type, ['lists' => $list]);
 	}
 }
+
 api_register_func('api/lists/destroy', 'api_lists_destroy', true, API_METHOD_DELETE);
 
 /**
@@ -4855,14 +4548,10 @@ function group_create($name, $uid, $users = [])
  */
 function api_friendica_group_create($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
-		throw new ForbiddenException();
-	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
 	// params
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 	$name = $_REQUEST['name'] ?? '';
 	$uid = $user_info['uid'];
 	$json = json_decode($_POST['json'], true);
@@ -4870,8 +4559,9 @@ function api_friendica_group_create($type)
 
 	$success = group_create($name, $uid, $users);
 
-	return BaseApi::formatData("group_create", $type, ['result' => $success]);
+	return DI::apiResponse()->formatData("group_create", $type, ['result' => $success]);
 }
+
 api_register_func('api/friendica/group_create', 'api_friendica_group_create', true, API_METHOD_POST);
 
 /**
@@ -4889,14 +4579,10 @@ api_register_func('api/friendica/group_create', 'api_friendica_group_create', tr
  */
 function api_lists_create($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
-		throw new ForbiddenException();
-	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
 	// params
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 	$name = $_REQUEST['name'] ?? '';
 	$uid = $user_info['uid'];
 
@@ -4909,9 +4595,10 @@ function api_lists_create($type)
 			'user' => $user_info
 		];
 
-		return BaseApi::formatData("lists", $type, ['lists'=>$grp]);
+		return DI::apiResponse()->formatData("lists", $type, ['lists' => $grp]);
 	}
 }
+
 api_register_func('api/lists/create', 'api_lists_create', true, API_METHOD_POST);
 
 /**
@@ -4928,14 +4615,10 @@ api_register_func('api/lists/create', 'api_lists_create', true, API_METHOD_POST)
  */
 function api_friendica_group_update($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
-		throw new ForbiddenException();
-	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
 	// params
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 	$uid = $user_info['uid'];
 	$gid = $_REQUEST['gid'] ?? 0;
 	$name = $_REQUEST['name'] ?? '';
@@ -4982,7 +4665,7 @@ function api_friendica_group_update($type)
 	// 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 BaseApi::formatData("group_update", $type, ['result' => $success]);
+	return DI::apiResponse()->formatData("group_update", $type, ['result' => $success]);
 }
 
 api_register_func('api/friendica/group_update', 'api_friendica_group_update', true, API_METHOD_POST);
@@ -5002,14 +4685,10 @@ api_register_func('api/friendica/group_update', 'api_friendica_group_update', tr
  */
 function api_lists_update($type)
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
-		throw new ForbiddenException();
-	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
 
 	// params
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 	$gid = $_REQUEST['list_id'] ?? 0;
 	$name = $_REQUEST['name'] ?? '';
 	$uid = $user_info['uid'];
@@ -5034,7 +4713,7 @@ function api_lists_update($type)
 			'user' => $user_info
 		];
 
-		return BaseApi::formatData("lists", $type, ['lists' => $list]);
+		return DI::apiResponse()->formatData("lists", $type, ['lists' => $list]);
 	}
 }
 
@@ -5055,12 +4734,10 @@ api_register_func('api/lists/update', 'api_lists_update', true, API_METHOD_POST)
  */
 function api_friendica_notification_seen($type)
 {
-	$a         = DI::app();
-	$user_info = api_get_user();
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_WRITE);
+
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 
-	if (api_user() === false || $user_info === false) {
-		throw new ForbiddenException();
-	}
 	if (DI::args()->getArgc() !== 4) {
 		throw new BadRequestException('Invalid argument count');
 	}
@@ -5069,7 +4746,7 @@ function api_friendica_notification_seen($type)
 
 	try {
 		$Notify = DI::notify()->selectOneById($id);
-		if ($Notify->uid !== api_user()) {
+		if ($Notify->uid !== BaseApi::getCurrentUserID()) {
 			throw new NotFoundException();
 		}
 
@@ -5081,17 +4758,17 @@ function api_friendica_notification_seen($type)
 		DI::notify()->save($Notify);
 
 		if ($Notify->otype === Notification\ObjectType::ITEM) {
-			$item = Post::selectFirstForUser(api_user(), [], ['id' => $Notify->iid, 'uid' => api_user()]);
+			$item = Post::selectFirstForUser(BaseApi::getCurrentUserID(), [], ['id' => $Notify->iid, 'uid' => BaseApi::getCurrentUserID()]);
 			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 BaseApi::formatData('status', $type, $data);
+				return DI::apiResponse()->formatData('status', $type, $data);
 			}
 			// the item can't be found, but we set the notification as seen, so we count this as a success
 		}
 
-		return BaseApi::formatData('result', $type, ['result' => 'success']);
+		return DI::apiResponse()->formatData('result', $type, ['result' => 'success']);
 	} catch (NotFoundException $e) {
 		throw new BadRequestException('Invalid argument', $e);
 	} catch (Exception $e) {
@@ -5118,21 +4795,17 @@ api_register_func('api/friendica/notification/seen', 'api_friendica_notification
  */
 function api_friendica_direct_messages_search($type, $box = "")
 {
-	$a = DI::app();
-
-	if (api_user() === false) {
-		throw new ForbiddenException();
-	}
+	BaseApi::checkAllowedScope(BaseApi::SCOPE_READ);
 
 	// params
-	$user_info = api_get_user();
+	$user_info = DI::twitterUser()->createFromUserId(BaseApi::getCurrentUserID())->toArray();
 	$searchstring = $_REQUEST['searchstring'] ?? '';
 	$uid = $user_info['uid'];
 
 	// error if no searchstring specified
 	if ($searchstring == "") {
 		$answer = ['result' => 'error', 'message' => 'searchstring not specified'];
-		return BaseApi::formatData("direct_messages_search", $type, ['$result' => $answer]);
+		return DI::apiResponse()->formatData("direct_messages_search", $type, ['$result' => $answer]);
 	}
 
 	// get data for the specified searchstring
@@ -5154,9 +4827,9 @@ function api_friendica_direct_messages_search($type, $box = "")
 		foreach ($r as $item) {
 			if ($box == "inbox" || $item['from-url'] != $profile_url) {
 				$recipient = $user_info;
-				$sender = api_get_user(Strings::normaliseLink($item['contact-url']));
+				$sender = DI::twitterUser()->createFromContactId($item['contact-id'], BaseApi::getCurrentUserID())->toArray();
 			} elseif ($box == "sentbox" || $item['from-url'] == $profile_url) {
-				$recipient = api_get_user(Strings::normaliseLink($item['contact-url']));
+				$recipient = DI::twitterUser()->createFromContactId($item['contact-id'], BaseApi::getCurrentUserID())->toArray();
 				$sender = $user_info;
 			}
 
@@ -5167,7 +4840,7 @@ function api_friendica_direct_messages_search($type, $box = "")
 		$success = ['success' => true, 'search_results' => $ret];
 	}
 
-	return BaseApi::formatData("direct_message_search", $type, ['$result' => $success]);
+	return DI::apiResponse()->formatData("direct_message_search", $type, ['$result' => $success]);
 }
 
 /// @TODO move to top of file or somewhere better