Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 13:50:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some more removed functions and parameters

Browse source
This commit is contained in:
Michael 2021-11-20 09:36:17 +00:00
parent d576e920d5
commit 4327ccddcb
3 changed files with 73 additions and 248 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Module/BaseApi.php
View file

@ -27,6 +27,7 @@ use Friendica\Core\System;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Post;
use Friendica\Model\User;
use Friendica\Network\HTTPException;
use Friendica\Security\BasicAuth;
use Friendica\Security\OAuth;
@ -292,12 +293,23 @@ class BaseApi extends BaseModule
}
}
public static function getContactIDForSearchterm($searchterm)
public static function getContactIDForSearchterm(string $screen_name, int $cid, int $uid)
{
if (intval($searchterm) == 0) {
$cid = Contact::getIdForURL($searchterm, 0, false);
if (!empty($cid)) {
return $cid;
}
if (strpos($screen_name, '@') !== false) {
$cid = Contact::getIdForURL($screen_name, 0, false);
} else {
$cid = intval($searchterm);
$user = User::getByNickname($screen_name, ['uid']);
if (!empty($user['uid'])) {
$cid = Contact::getPublicIdByUserId($user['uid']);
}
}
if (empty($cid) && ($uid != 0)) {
$cid = Contact::getPublicIdByUserId($uid);
}
return $cid;