Added the method AddressBookGetContact and minor improvements in other implementations

This commit is contained in:
netkas 2025-01-24 19:12:03 -05:00
parent e2a0e2f27f
commit aba9adf916
4 changed files with 62 additions and 8 deletions

View file

@ -24,7 +24,7 @@
{ {
if(!$rpcRequest->containsParameter('peer')) if(!$rpcRequest->containsParameter('peer'))
{ {
return $rpcRequest->produceError(StandardError::RPC_INVALID_ARGUMENTS, 'Missing required \'peer\' parameter'); return $rpcRequest->produceError(StandardError::RPC_INVALID_ARGUMENTS, 'Missing required peer parameter');
} }
try try

View file

@ -0,0 +1,53 @@
<?php
namespace Socialbox\Classes\StandardMethods;
use InvalidArgumentException;
use Socialbox\Abstracts\Method;
use Socialbox\Enums\StandardError;
use Socialbox\Exceptions\DatabaseOperationException;
use Socialbox\Exceptions\StandardException;
use Socialbox\Interfaces\SerializableInterface;
use Socialbox\Managers\ContactManager;
use Socialbox\Objects\ClientRequest;
use Socialbox\Objects\PeerAddress;
use Socialbox\Objects\RpcRequest;
class AddressBookGetContact extends Method
{
/**
* @inheritDoc
*/
public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
{
if(!$rpcRequest->containsParameter('peer'))
{
return $rpcRequest->produceError(StandardError::RPC_INVALID_ARGUMENTS, 'Missing required peer parameter');
}
try
{
$address = PeerAddress::fromAddress($rpcRequest->getParameter('peer'));
}
catch(InvalidArgumentException $e)
{
throw new StandardException('Invalid peer address', StandardError::RPC_INVALID_ARGUMENTS, $e);
}
try
{
if(!ContactManager::isContact($request->getPeer(), $address))
{
return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Contact does not exist');
}
$contact = ContactManager::getContact($request->getPeer(), $address);
}
catch(DatabaseOperationException $e)
{
throw new StandardException('Failed to get contact', StandardError::INTERNAL_SERVER_ERROR, $e);
}
return $rpcRequest->produceResponse($contact->toStandard());
}
}

View file

@ -52,12 +52,7 @@
throw new StandardException('Failed to get contacts', StandardError::INTERNAL_SERVER_ERROR, $e); throw new StandardException('Failed to get contacts', StandardError::INTERNAL_SERVER_ERROR, $e);
} }
$results = [];
foreach($contacts as $contact)
{
$results[] = $contact->toStandard();
}
return $rpcRequest->produceResponse($results); return $rpcRequest->produceResponse(array_map(function($contact) {return $contact->toStandard();}, $contacts));
} }
} }

View file

@ -761,10 +761,11 @@
* Resolves an external peer based on the given peer address or string identifier. * Resolves an external peer based on the given peer address or string identifier.
* *
* @param PeerAddress|string $peerAddress The external peer address or string identifier to be resolved. * @param PeerAddress|string $peerAddress The external peer address or string identifier to be resolved.
* @param PeerAddress|string|null $identifiedAs Optional. The peer address or string identifier by which the caller is identified
* @return Peer The resolved external peer after synchronization. * @return Peer The resolved external peer after synchronization.
* @throws StandardException Thrown if there was an error with the resolution process * @throws StandardException Thrown if there was an error with the resolution process
*/ */
public static function resolvePeer(PeerAddress|string $peerAddress): Peer public static function resolvePeer(PeerAddress|string $peerAddress, null|PeerAddress|string $identifiedAs=null): Peer
{ {
if(is_string($peerAddress)) if(is_string($peerAddress))
{ {
@ -844,6 +845,11 @@
return $registeredPeer; return $registeredPeer;
} }
private static function localResolvePeer(PeerAddress|string $peerAddress, null|PeerAddress|string $identifiedAs=null)
{
}
/** /**
* Retrieves the server information by assembling data from the configuration settings. * Retrieves the server information by assembling data from the configuration settings.
* *