Merge remote-tracking branch 'upstream/develop' into api-tags

src/Module/Api/Mastodon/Accounts/UpdateCredentials.php

@@ -21,8 +21,12 @@
 
 namespace Friendica\Module\Api\Mastodon\Accounts;
 
-use Friendica\App\Router;
 use Friendica\Core\Logger;
+use Friendica\DI;
+use Friendica\Model\Contact;
+use Friendica\Model\Photo;
+use Friendica\Model\Profile;
+use Friendica\Model\User;
 use Friendica\Module\BaseApi;
 
 /**
@@ -35,8 +39,72 @@ class UpdateCredentials extends BaseApi
 		self::checkAllowedScope(self::SCOPE_WRITE);
 		$uid = self::getCurrentUserID();
 
-		Logger::info('Patch data', ['data' => $request]);
+		$owner = User::getOwnerDataById($uid);
 
-		$this->response->unsupported(Router::PATCH, $request);
+		$request = $this->getRequest([
+			'bot'               => ($owner['contact-type'] == Contact::TYPE_NEWS),
+			'discoverable'      => $owner['net-publish'],
+			'display_name'      => $owner['name'],
+			'fields_attributes' => [],
+			'locked'            => $owner['manually-approve'],
+			'note'              => $owner['about'],
+			'avatar'            => [],
+			'header'            => [],
+		], $request);
+
+		$user    = [];
+		$profile = [];
+
+		if ($request['bot']) {
+			$user['account-type'] = Contact::TYPE_NEWS;
+			$user['page-flags']   = User::PAGE_FLAGS_SOAPBOX;
+		} elseif ($owner['contact-type'] == Contact::TYPE_NEWS) {
+			$user['account-type'] = Contact::TYPE_PERSON;
+		} else {
+			$user['account-type'] = $owner['contact-type'];
+		}
+
+		$profile['net-publish'] = $request['discoverable'];
+
+		if (!empty($request['display_name'])) {
+			$user['username'] = $request['display_name'];
+		}
+
+		if ($user['account-type'] == Contact::TYPE_COMMUNITY) {
+			$user['page-flags'] = $request['locked'] ? User::PAGE_FLAGS_PRVGROUP : User::PAGE_FLAGS_COMMUNITY;
+		} elseif ($user['account-type'] == Contact::TYPE_PERSON) {
+			if ($request['locked']) {
+				$user['page-flags'] = User::PAGE_FLAGS_NORMAL;
+			} elseif ($owner['page-flags'] == User::PAGE_FLAGS_NORMAL) {
+				$user['page-flags'] = User::PAGE_FLAGS_SOAPBOX;
+			}
+		}
+
+		if (!empty($request['note'])) {
+			$profile['about'] = $request['note'];
+		}
+
+		Logger::debug('Patch data', ['data' => $request, 'files' => $_FILES]);
+
+		Logger::info('Update profile and user', ['uid' => $uid, 'user' => $user, 'profile' => $profile]);
+
+		if (!empty($request['avatar'])) {
+			Photo::uploadAvatar(1, $request['avatar']);
+		}
+
+		if (!empty($request['header'])) {
+			Photo::uploadBanner(1, $request['header']);
+		}
+
+		User::update($user, $uid);
+		Profile::update($profile, $uid);
+
+		$cdata = Contact::getPublicAndUserContactID($owner['id'], $uid);
+		if (empty($cdata)) {
+			DI::mstdnError()->InternalError();
+		}
+
+		$account = DI::mstdnAccount()->createFromContactId($cdata['user'], $uid);
+		$this->response->exitWithJson($account->toArray());
 	}
 }

src/Module/Api/Mastodon/Search.php

@@ -26,6 +26,7 @@ use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
+use Friendica\Model\Item;
 use Friendica\Model\Post;
 use Friendica\Model\Tag;
 use Friendica\Module\BaseApi;
@@ -67,10 +68,24 @@ class Search extends BaseApi
 
 		if (empty($request['type']) || ($request['type'] == 'accounts')) {
 			$result['accounts'] = self::searchAccounts($uid, $request['q'], $request['resolve'], $limit, $request['offset'], $request['following']);
+
+			if (!is_array($result['accounts'])) {
+				// Curbing the search if we got an exact result
+				$request['type'] = 'accounts';
+				$result['accounts'] = [$result['accounts']];
+			}
 		}
+
 		if ((empty($request['type']) || ($request['type'] == 'statuses')) && (strpos($request['q'], '@') == false)) {
 			$result['statuses'] = self::searchStatuses($uid, $request['q'], $request['account_id'], $request['max_id'], $request['min_id'], $limit, $request['offset']);
+
+			if (!is_array($result['statuses'])) {
+				// Curbing the search if we got an exact result
+				$request['type'] = 'statuses';
+				$result['statuses'] = [$result['statuses']];
+			}
 		}
+
 		if ((empty($request['type']) || ($request['type'] == 'hashtags')) && (strpos($request['q'], '@') == false)) {
 			$result['hashtags'] = self::searchHashtags($request['q'], $request['exclude_unreviewed'], $limit, $request['offset'], $this->parameters['version']);
 		}
@@ -78,31 +93,59 @@ class Search extends BaseApi
 		System::jsonExit($result);
 	}
 
+	/**
+	 * @param int    $uid
+	 * @param string $q
+	 * @param bool   $resolve
+	 * @param int    $limit
+	 * @param int    $offset
+	 * @param bool   $following
+	 * @return array|\Friendica\Object\Api\Mastodon\Account Object if result is absolute (exact account match), list if not
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Friendica\Network\HTTPException\NotFoundException
+	 * @throws \ImagickException
+	 */
 	private static function searchAccounts(int $uid, string $q, bool $resolve, int $limit, int $offset, bool $following)
 	{
-		$accounts = [];
-
-		if ((strrpos($q, '@') > 0) || Network::isValidHttpUrl($q)) {
-			$id = Contact::getIdForURL($q, 0, $resolve ? null : false);
-
-			if (!empty($id)) {
-				$accounts[] = DI::mstdnAccount()->createFromContactId($id, $uid);
-			}
+		if (
+			(strrpos($q, '@') > 0 || Network::isValidHttpUrl($q))
+			&& $id = Contact::getIdForURL($q, 0, $resolve ? null : false)
+		) {
+			return DI::mstdnAccount()->createFromContactId($id, $uid);
 		}
 
-		if (empty($accounts)) {
-			$contacts = Contact::searchByName($q, '', $following ? $uid : 0, $limit, $offset);
-			foreach ($contacts as $contact) {
-				$accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);
-			}
-			DBA::close($contacts);
+		$accounts = [];
+		foreach (Contact::searchByName($q, '', $following ? $uid : 0, $limit, $offset) as $contact) {
+			$accounts[] = DI::mstdnAccount()->createFromContactId($contact['id'], $uid);
 		}
 
 		return $accounts;
 	}
 
+	/**
+	 * @param int    $uid
+	 * @param string $q
+	 * @param string $account_id
+	 * @param int    $max_id
+	 * @param int    $min_id
+	 * @param int    $limit
+	 * @param int    $offset
+	 * @return array|\Friendica\Object\Api\Mastodon\Status Object is result is absolute (exact post match), list if not
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+	 * @throws \Friendica\Network\HTTPException\NotFoundException
+	 * @throws \ImagickException
+	 */
 	private static function searchStatuses(int $uid, string $q, string $account_id, int $max_id, int $min_id, int $limit, int $offset)
 	{
+		if (Network::isValidHttpUrl($q)) {
+			$q = Network::convertToIdn($q);
+			// If the user-specific search failed, we search and probe a public post
+			$item_id = Item::fetchByLink($q, $uid) ?: Item::fetchByLink($q);
+			if ($item_id && $item = Post::selectFirst(['uri-id'], ['id' => $item_id])) {
+				return DI::mstdnStatus()->createFromUriId($item['uri-id'], $uid);
+			}
+		}
+
 		$params = ['order' => ['uri-id' => true], 'limit' => [$offset, $limit]];
 
 		if (substr($q, 0, 1) == '#') {
@@ -148,7 +191,7 @@ class Search extends BaseApi
 		return $statuses;
 	}
 
-	private static function searchHashtags(string $q, bool $exclude_unreviewed, int $limit, int $offset, int $version)
+	private static function searchHashtags(string $q, bool $exclude_unreviewed, int $limit, int $offset, int $version): array
 	{
 		$q = ltrim($q, '#');