clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

renaming

This commit is contained in:
Philipp Holzer 2019-05-19 05:13:06 +02:00
parent a7aae9603a
commit 419cc81ef1
No known key found for this signature in database
GPG Key ID: D8365C3D36B77D90
5 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Model/Search.php
View File

@ -7,8 +7,8 @@ use Friendica\Core\Protocol;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Network\Probe; use Friendica\Network\Probe;
use Friendica\Object\Search\Result; use Friendica\Object\Search\ContactResult;
use Friendica\Object\Search\ResultList; use Friendica\Object\Search\ContactResultList;
use Friendica\Protocol\PortableContact; use Friendica\Protocol\PortableContact;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -46,7 +46,7 @@ class Search extends BaseObject
* *
* @param string $user The user to search for * @param string $user The user to search for
* *
* @return ResultList|null * @return ContactResultList|null
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
@ -67,7 +67,7 @@ class Search extends BaseObject
$contactDetails = Contact::getDetailsByURL(defaults($user_data, 'url', ''), local_user()); $contactDetails = Contact::getDetailsByURL(defaults($user_data, 'url', ''), local_user());
$itemurl = (($contactDetails["addr"] != "") ? $contactDetails["addr"] : defaults($user_data, 'url', '')); $itemurl = (($contactDetails["addr"] != "") ? $contactDetails["addr"] : defaults($user_data, 'url', ''));
$result = new Result( $result = new ContactResult(
defaults($user_data, 'name', ''), defaults($user_data, 'name', ''),
defaults($user_data, 'addr', ''), defaults($user_data, 'addr', ''),
$itemurl, $itemurl,
@ -79,7 +79,7 @@ class Search extends BaseObject
defaults($user_data, 'tags', '') defaults($user_data, 'tags', '')
); );
return new ResultList(1, 1, 1, [$result]); return new ContactResultList(1, 1, 1, [$result]);
} else { } else {
return null; return null;
@ -93,7 +93,7 @@ class Search extends BaseObject
* @param string $search * @param string $search
* @param int $page * @param int $page
* *
* @return ResultList|null * @return ContactResultList|null
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function searchDirectory($search, $page = 1) public static function searchDirectory($search, $page = 1)
@ -112,7 +112,7 @@ class Search extends BaseObject
$results = json_decode($resultJson, true); $results = json_decode($resultJson, true);
$resultList = new ResultList( $resultList = new ContactResultList(
defaults($results, 'page', 1), defaults($results, 'page', 1),
defaults($results, 'count', 1), defaults($results, 'count', 1),
defaults($results, 'itemsperpage', 1) defaults($results, 'itemsperpage', 1)
@ -124,7 +124,7 @@ class Search extends BaseObject
$contactDetails = Contact::getDetailsByURL(defaults($profile, 'profile_url', ''), local_user()); $contactDetails = Contact::getDetailsByURL(defaults($profile, 'profile_url', ''), local_user());
$itemurl = (!empty($contactDetails['addr']) ? $contactDetails['addr'] : defaults($profile, 'profile_url', '')); $itemurl = (!empty($contactDetails['addr']) ? $contactDetails['addr'] : defaults($profile, 'profile_url', ''));
$result = new Result( $result = new ContactResult(
defaults($profile, 'name', ''), defaults($profile, 'name', ''),
defaults($profile, 'addr', ''), defaults($profile, 'addr', ''),
$itemurl, $itemurl,
@ -149,7 +149,7 @@ class Search extends BaseObject
* @param int $itemPage * @param int $itemPage
* @param bool $community * @param bool $community
* *
* @return ResultList|null * @return ContactResultList|null
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
public static function searchLocal($search, $start = 0, $itemPage = 80, $community = false) public static function searchLocal($search, $start = 0, $itemPage = 80, $community = false)
@ -199,7 +199,7 @@ class Search extends BaseObject
return null; return null;
} }
$resultList = new ResultList($start, $itemPage, $count); $resultList = new ContactResultList($start, $itemPage, $count);
while ($row = DBA::fetch($data)) { while ($row = DBA::fetch($data)) {
if (PortableContact::alternateOStatusUrl($row["nurl"])) { if (PortableContact::alternateOStatusUrl($row["nurl"])) {
@ -220,7 +220,7 @@ class Search extends BaseObject
$contact["name"] = end(explode("/", $urlparts["path"])); $contact["name"] = end(explode("/", $urlparts["path"]));
} }
$result = new Result( $result = new ContactResult(
$contact["name"], $contact["name"],
$contact["addr"], $contact["addr"],
$contact["addr"], $contact["addr"],

10
src/Module/BaseSearchModule.php
View File

@ -7,7 +7,7 @@ use Friendica\Content\ContactSelector;
use Friendica\Content\Pager; use Friendica\Content\Pager;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Object\Search\ResultList; use Friendica\Object\Search\ContactResultList;
use Friendica\Util\Proxy as ProxyUtils; use Friendica\Util\Proxy as ProxyUtils;
use Friendica\Model; use Friendica\Model;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -72,7 +72,7 @@ class BaseSearchModule extends BaseModule
/** /**
* Prints a human readable search result * Prints a human readable search result
* *
* @param ResultList $results * @param ContactResultList $results
* @param Pager $pager * @param Pager $pager
* @param string $header * @param string $header
* *
@ -80,7 +80,7 @@ class BaseSearchModule extends BaseModule
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException * @throws \ImagickException
*/ */
protected static function printResult(ResultList $results, Pager $pager, $header = '') protected static function printResult(ContactResultList $results, Pager $pager, $header = '')
{ {
if (empty($results) || empty($results->getResults())) { if (empty($results) || empty($results->getResults())) {
info(L10n::t('No matches') . EOL); info(L10n::t('No matches') . EOL);
@ -100,11 +100,11 @@ class BaseSearchModule extends BaseModule
$photo_menu = []; $photo_menu = [];
// If We already know this contact then don't show the "connect" button // If We already know this contact then don't show the "connect" button
if ($result->getCid() > 0 || $result->getPcid() > 0) { if ($result->getCid() > 0 || $result->getPCid() > 0) {
$connLink = ""; $connLink = "";
$connTxt = ""; $connTxt = "";
$contact = Model\Contact::getById( $contact = Model\Contact::getById(
($result->getCid() > 0) ? $result->getCid() : $result->getPcid() ($result->getCid() > 0) ? $result->getCid() : $result->getPCid()
); );
if (!empty($contact)) { if (!empty($contact)) {

14
src/Object/Search/Result.php → src/Object/Search/ContactResult.php
View File

@ -5,11 +5,11 @@ namespace Friendica\Object\Search;
use Friendica\Model\Search; use Friendica\Model\Search;
/** /**
* A search result * A search result for contact searching
* *
* @see Search for defails * @see Search for details
*/ */
class Result class ContactResult
{ {
/** /**
* @var int * @var int
@ -18,7 +18,7 @@ class Result
/** /**
* @var int * @var int
*/ */
private $pcid; private $pCid;
/** /**
* @var string * @var string
*/ */
@ -59,9 +59,9 @@ class Result
/** /**
* @return int * @return int
*/ */
public function getPcid() public function getPCid()
{ {
return $this->pcid; return $this->pCid;
} }
/** /**
@ -140,7 +140,7 @@ class Result
$this->network = $network; $this->network = $network;
$this->cid = $cid; $this->cid = $cid;
$this->pcid = $pcid; $this->pCid = $pcid;
$this->tags = $tags; $this->tags = $tags;
} }
} }

15
src/Object/Search/ResultList.php → src/Object/Search/ContactResultList.php
View File

@ -5,11 +5,11 @@ namespace Friendica\Object\Search;
use Friendica\Model\Search; use Friendica\Model\Search;
/** /**
* A list of search results with details * A list of search results for contacts with metadata
* *
* @see Search for details * @see Search for details
*/ */
class ResultList class ContactResultList
{ {
/** /**
* Page of the result list * Page of the result list
@ -28,7 +28,8 @@ class ResultList
private $itemsPage; private $itemsPage;
/** /**
* Array of results * Array of results
* @var Result[] *
* @var ContactResult[]
*/ */
private $results; private $results;
@ -57,7 +58,7 @@ class ResultList
} }
/** /**
* @return Result[] * @return ContactResult[]
*/ */
public function getResults() public function getResults()
{ {
@ -68,7 +69,7 @@ class ResultList
* @param int $page * @param int $page
* @param int $total * @param int $total
* @param int $itemsPage * @param int $itemsPage
* @param Result[] $results * @param ContactResult[] $results
*/ */
public function __construct($page = 0, $total = 0, $itemsPage = 0, array $results = []) public function __construct($page = 0, $total = 0, $itemsPage = 0, array $results = [])
{ {
@ -82,9 +83,9 @@ class ResultList
/** /**
* Adds a result to the result list * Adds a result to the result list
* *
* @param Result $result * @param ContactResult $result
*/ */
public function addResult(Result $result) public function addResult(ContactResult $result)
{ {
$this->results[] = $result; $this->results[] = $result;
} }