jdormit/activitypub-php
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle Undo(Block)

Browse Source
This commit is contained in:
Jeremy Dormitzer 2019-03-23 14:17:58 -04:00
parent 917d86342e
commit 6527a29f3d
3 changed files with 134 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Objects/BlockService.php
View File

@ -2,6 +2,8 @@
namespace ActivityPub\Objects; namespace ActivityPub\Objects;
use ActivityPub\Entities\ActivityPubObject;
class BlockService class BlockService
{ {
/** /**
@ -23,15 +25,42 @@ class BlockService
*/ */
public function getBlockedActorIds( $blockingActorId ) public function getBlockedActorIds( $blockingActorId )
{ {
$q = array( $blockQuery = array(
'type' => 'Block', 'type' => 'Block',
'actor' => array( 'actor' => array(
'id' => $blockingActorId, 'id' => $blockingActorId,
), ),
); );
$blocks = $this->objectsService->query( $q ); $blocks = $this->objectsService->query( $blockQuery );
// TODO this is janky and slow - there's probably a better way
$undoQuery = array(
'type' => 'Undo',
'actor' => array(
'id' => $blockingActorId,
),
'object' => array(
'type' => 'Block',
),
);
$undos = $this->objectsService->query( $undoQuery );
$undoneBlocks = array();
foreach ( $undos as $undo ) {
if ( $undo->hasField( 'object' ) ) {
$undoObject = $undo['object'];
if ( is_string( $undoObject ) ) {
$undoneBlocks[$undoObject] = 1;
} else if ( $undoObject instanceof ActivityPubObject && $undoObject->hasField( 'id' ) ) {
$undoneBlocks[$undoObject['id']] = 1;
}
}
}
$blockedIds = array(); $blockedIds = array();
foreach ( $blocks as $block ) { foreach ( $blocks as $block ) {
if ( array_key_exists( $block['id'], $undoneBlocks ) ) {
continue;
}
if ( $block->hasField( 'object' ) ) { if ( $block->hasField( 'object' ) ) {
$blockedActor = $block['object']; $blockedActor = $block['object'];
if ( is_string( $blockedActor ) ) { if ( is_string( $blockedActor ) ) {

18
src/Objects/ObjectsService.php
View File

@ -27,6 +27,11 @@ class ObjectsService
*/ */
protected $httpClient; protected $httpClient;
/**
* @var int
*/
protected $nonce;
public function __construct( EntityManager $entityManager, public function __construct( EntityManager $entityManager,
DateTimeProvider $dateTimeProvider, DateTimeProvider $dateTimeProvider,
Client $client ) Client $client )
@ -34,6 +39,7 @@ class ObjectsService
$this->entityManager = $entityManager; $this->entityManager = $entityManager;
$this->dateTimeProvider = $dateTimeProvider; $this->dateTimeProvider = $dateTimeProvider;
$this->httpClient = $client; $this->httpClient = $client;
$this->nonce = 0;
} }
/** /**
@ -97,6 +103,12 @@ class ObjectsService
return $query->getResult(); return $query->getResult();
} }
protected function getNextNonce()
{
$this->nonce = $this->nonce + 1;
return $this->nonce;
}
/** /**
* Generates the Doctrine QueryBuilder that represents the query * Generates the Doctrine QueryBuilder that represents the query
* *
@ -104,16 +116,16 @@ class ObjectsService
* final expression * final expression
* *
* @param array $queryTerms The query terms from which to generate the expressions * @param array $queryTerms The query terms from which to generate the expressions
* @param int $nonce A nonce value to differentiate field names
* @return QueryBuilder The expression * @return QueryBuilder The expression
*/ */
protected function getObjectQuery( $queryTerms, $nonce = 0 ) protected function getObjectQuery( $queryTerms )
{ {
$nonce = $this->getNextNonce();
$qb = $this->entityManager->createQueryBuilder(); $qb = $this->entityManager->createQueryBuilder();
$exprs = array(); $exprs = array();
foreach ( $queryTerms as $fieldName => $fieldValue ) { foreach ( $queryTerms as $fieldName => $fieldValue ) {
if ( is_array( $fieldValue ) ) { if ( is_array( $fieldValue ) ) {
$subQuery = $this->getObjectQuery( $fieldValue, $nonce + 1 ); $subQuery = $this->getObjectQuery( $fieldValue );
$exprs[] = $qb->expr()->andX( $exprs[] = $qb->expr()->andX(
$qb->expr()->like( $qb->expr()->like(
"field$nonce.name", "field$nonce.name",

88
test/Objects/BlockServiceTest.php
View File

@ -156,6 +156,94 @@ class BlockServiceTest extends SQLiteTestCase
'blockingActorId' => 'https://example.com/actors/1', 'blockingActorId' => 'https://example.com/actors/1',
'expectedBlockedActorIds' => array( 'https://elsewhere.com/actors/2' ), 'expectedBlockedActorIds' => array( 'https://elsewhere.com/actors/2' ),
), ),
array(
'id' => 'undoneBlocks',
'initialData' => array(
array(
'id' => 'https://example.com/blocks/1',
'type' => 'Block',
'actor' => array(
'id' => 'https://example.com/actors/1',
),
'object' => array(
'id' => 'https://elsewhere.com/actors/1',
)
),
array(
'id' => 'https://example.com/blocks/2',
'type' => 'Block',
'actor' => array(
'id' => 'https://example.com/actors/1',
),
'object' => array(
'id' => 'https://elsewhere.com/actors/2',
)
),
array(
'id' => 'https://example.com/undos/1',
'type' => 'Undo',
'actor' => array(
'id' => 'https://example.com/actors/1',
),
'object' => array(
'id' => 'https://example.com/blocks/1',
'type' => 'Block',
'actor' => array(
'id' => 'https://example.com/actors/1',
),
'object' => array(
'id' => 'https://elsewhere.com/actors/1',
)
)
),
),
'blockingActorId' => 'https://example.com/actors/1',
'expectedBlockedActorIds' => array( 'https://elsewhere.com/actors/2' ),
),
array(
'id' => 'irrelevantUndonBlocks',
'initialData' => array(
array(
'id' => 'https://example.com/blocks/1',
'type' => 'Block',
'actor' => array(
'id' => 'https://example.com/actors/1',
),
'object' => array(
'id' => 'https://elsewhere.com/actors/1',
)
),
array(
'id' => 'https://example.com/blocks/2',
'type' => 'Block',
'actor' => array(
'id' => 'https://example.com/actors/1',
),
'object' => array(
'id' => 'https://elsewhere.com/actors/2',
)
),
array(
'id' => 'https://example.com/undos/1',
'type' => 'Undo',
'actor' => array(
'id' => 'https://example.com/actors/1',
),
'object' => array(
'id' => 'https://example.com/blocks/3',
'type' => 'Block',
'actor' => array(
'id' => 'https://example.com/actors/1',
),
'object' => array(
'id' => 'https://elsewhere.com/actors/3',
)
)
),
),
'blockingActorId' => 'https://example.com/actors/1',
'expectedBlockedActorIds' => array( 'https://elsewhere.com/actors/1', 'https://elsewhere.com/actors/2' ),
)
); );
foreach ( $testCases as $testCase ) { foreach ( $testCases as $testCase ) {
self::setUp(); self::setUp();