+2

src/__phutil_library_map__.php

reviewed

··· 3242 3242 'PhabricatorTransactions' => 'applications/transactions/constants/PhabricatorTransactions.php', 3243 3243 'PhabricatorTransactionsApplication' => 'applications/transactions/application/PhabricatorTransactionsApplication.php', 3244 3244 'PhabricatorTransactionsDestructionEngineExtension' => 'applications/transactions/engineextension/PhabricatorTransactionsDestructionEngineExtension.php', 3245 3245 + 'PhabricatorTransactionsFulltextEngineExtension' => 'applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php', 3245 3246 'PhabricatorTransformedFile' => 'applications/files/storage/PhabricatorTransformedFile.php', 3246 3247 'PhabricatorTranslationsConfigOptions' => 'applications/config/option/PhabricatorTranslationsConfigOptions.php', 3247 3248 'PhabricatorTriggerAction' => 'infrastructure/daemon/workers/action/PhabricatorTriggerAction.php', ··· 7614 7615 'PhabricatorTransactions' => 'Phobject', 7615 7616 'PhabricatorTransactionsApplication' => 'PhabricatorApplication', 7616 7617 'PhabricatorTransactionsDestructionEngineExtension' => 'PhabricatorDestructionEngineExtension', 7618 7618 + 'PhabricatorTransactionsFulltextEngineExtension' => 'PhabricatorFulltextEngineExtension', 7617 7619 'PhabricatorTransformedFile' => 'PhabricatorFileDAO', 7618 7620 'PhabricatorTranslationsConfigOptions' => 'PhabricatorApplicationConfigOptions', 7619 7621 'PhabricatorTriggerAction' => 'Phobject',

-5

src/applications/calendar/search/PhabricatorCalendarEventSearchIndexer.php

reviewed

··· 41 41 PhabricatorCalendarEventPHIDType::TYPECONST, 42 42 time()); 43 43 44 44 - $this->indexTransactions( 45 45 - $doc, 46 46 - new PhabricatorCalendarEventTransactionQuery(), 47 47 - array($phid)); 48 48 - 49 44 return $doc; 50 45 } 51 46

-5

src/applications/differential/search/DifferentialSearchIndexer.php

reviewed

··· 43 43 DifferentialRevisionPHIDType::TYPECONST, 44 44 time()); 45 45 46 46 - $this->indexTransactions( 47 47 - $doc, 48 48 - new DifferentialTransactionQuery(), 49 49 - array($rev->getPHID())); 50 50 - 51 46 // If a revision needs review, the owners are the reviewers. Otherwise, the 52 47 // owner is the author (e.g., accepted, rejected, closed). 53 48 if ($rev->getStatus() == ArcanistDifferentialRevisionStatus::NEEDS_REVIEW) {

-5

src/applications/diviner/search/DivinerBookSearchIndexer.php

reviewed

··· 24 24 PhabricatorRepositoryRepositoryPHIDType::TYPECONST, 25 25 $book->getDateCreated()); 26 26 27 27 - $this->indexTransactions( 28 28 - $doc, 29 29 - new DivinerLiveBookTransactionQuery(), 30 30 - array($phid)); 31 31 - 32 27 return $doc; 33 28 } 34 29

-5

src/applications/fund/search/FundInitiativeIndexer.php

reviewed

··· 51 51 FundInitiativePHIDType::TYPECONST, 52 52 time()); 53 53 54 54 - $this->indexTransactions( 55 55 - $doc, 56 56 - new FundInitiativeTransactionQuery(), 57 57 - array($initiative->getPHID())); 58 58 - 59 54 return $doc; 60 55 } 61 56 }

-5

src/applications/maniphest/search/ManiphestSearchIndexer.php

reviewed

··· 34 34 ManiphestTaskPHIDType::TYPECONST, 35 35 time()); 36 36 37 37 - $this->indexTransactions( 38 38 - $doc, 39 39 - new ManiphestTransactionQuery(), 40 40 - array($phid)); 41 41 - 42 37 $owner = $task->getOwnerPHID(); 43 38 if ($owner) { 44 39 $doc->addRelationship(

-5

src/applications/passphrase/search/PassphraseSearchIndexer.php

reviewed

··· 28 28 PassphraseCredentialPHIDType::TYPECONST, 29 29 time()); 30 30 31 31 - $this->indexTransactions( 32 32 - $doc, 33 33 - new PassphraseCredentialTransactionQuery(), 34 34 - array($phid)); 35 35 - 36 31 return $doc; 37 32 } 38 33

-5

src/applications/pholio/search/PholioSearchIndexer.php

reviewed

··· 24 24 PhabricatorPeopleUserPHIDType::TYPECONST, 25 25 $mock->getDateCreated()); 26 26 27 27 - $this->indexTransactions( 28 28 - $doc, 29 29 - new PholioTransactionQuery(), 30 30 - array($phid)); 31 31 - 32 27 return $doc; 33 28 } 34 29

-9

src/applications/ponder/search/PonderSearchIndexer.php

reviewed

··· 37 37 } 38 38 } 39 39 40 40 - $this->indexTransactions( 41 41 - $doc, 42 42 - new PonderQuestionTransactionQuery(), 43 43 - array($phid)); 44 44 - $this->indexTransactions( 45 45 - $doc, 46 46 - new PonderAnswerTransactionQuery(), 47 47 - mpull($answers, 'getPHID')); 48 48 - 49 40 return $doc; 50 41 } 51 42 }

-5

src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php

reviewed

··· 53 53 PhabricatorRepositoryRepositoryPHIDType::TYPECONST, 54 54 $date_created); 55 55 56 56 - $this->indexTransactions( 57 57 - $doc, 58 58 - new PhabricatorAuditTransactionQuery(), 59 59 - array($commit->getPHID())); 60 60 - 61 56 return $doc; 62 57 } 63 58 }

-22

src/applications/search/index/PhabricatorSearchDocumentIndexer.php

reviewed

··· 75 75 ->setDocumentType(phid_get_type($phid)); 76 76 } 77 77 78 78 - protected function indexTransactions( 79 79 - PhabricatorSearchAbstractDocument $doc, 80 80 - PhabricatorApplicationTransactionQuery $query, 81 81 - array $phids) { 82 82 - 83 83 - $xactions = id(clone $query) 84 84 - ->setViewer($this->getViewer()) 85 85 - ->withObjectPHIDs($phids) 86 86 - ->execute(); 87 87 - 88 88 - foreach ($xactions as $xaction) { 89 89 - if (!$xaction->hasComment()) { 90 90 - continue; 91 91 - } 92 92 - 93 93 - $comment = $xaction->getComment(); 94 94 - $doc->addField( 95 95 - PhabricatorSearchDocumentFieldType::FIELD_COMMENT, 96 96 - $comment->getContent()); 97 97 - } 98 98 - } 99 99 - 100 78 }

+4 -17

src/applications/transactions/controller/PhabricatorApplicationTransactionShowOlderController.php

reviewed

··· 17 17 if (!$object) { 18 18 return new Aphront404Response(); 19 19 } 20 20 + 20 21 if (!$object instanceof PhabricatorApplicationTransactionInterface) { 21 22 return new Aphront404Response(); 22 23 } 23 24 24 24 - $template = $object->getApplicationTransactionTemplate(); 25 25 - $queries = id(new PhutilClassMapQuery()) 26 26 - ->setAncestorClass('PhabricatorApplicationTransactionQuery') 27 27 - ->execute(); 28 28 - 29 29 - $object_query = null; 30 30 - foreach ($queries as $query) { 31 31 - if ($query->getTemplateApplicationTransaction() == $template) { 32 32 - $object_query = $query; 33 33 - break; 34 34 - } 35 35 - } 36 36 - 37 37 - if (!$object_query) { 25 25 + $query = PhabricatorApplicationTransactionQuery::newQueryForObject($object); 26 26 + if (!$query) { 38 27 return new Aphront404Response(); 39 28 } 40 29 41 41 - $timeline = $this->buildTransactionTimeline( 42 42 - $object, 43 43 - $query); 30 30 + $timeline = $this->buildTransactionTimeline($object, $query); 44 31 45 32 $phui_timeline = $timeline->buildPHUITimelineView($with_hiding = false); 46 33 $phui_timeline->setShouldAddSpacers(false);

+44

src/applications/transactions/engineextension/PhabricatorTransactionsFulltextEngineExtension.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PhabricatorTransactionsFulltextEngineExtension 4 4 + extends PhabricatorFulltextEngineExtension { 5 5 + 6 6 + const EXTENSIONKEY = 'transactions'; 7 7 + 8 8 + public function getExtensionName() { 9 9 + return pht('Comments'); 10 10 + } 11 11 + 12 12 + public function shouldIndexFulltextObject($object) { 13 13 + return ($object instanceof PhabricatorApplicationTransactionInterface); 14 14 + } 15 15 + 16 16 + public function indexFulltextObject( 17 17 + $object, 18 18 + PhabricatorSearchAbstractDocument $document) { 19 19 + 20 20 + $query = PhabricatorApplicationTransactionQuery::newQueryForObject($object); 21 21 + if (!$query) { 22 22 + return; 23 23 + } 24 24 + 25 25 + $xactions = $query 26 26 + ->setViewer($this->getViewer()) 27 27 + ->withObjectPHIDs(array($object->getPHID())) 28 28 + ->needComments(true) 29 29 + ->execute(); 30 30 + 31 31 + foreach ($xactions as $xaction) { 32 32 + if (!$xaction->hasComment()) { 33 33 + continue; 34 34 + } 35 35 + 36 36 + $comment = $xaction->getComment(); 37 37 + 38 38 + $document->addField( 39 39 + PhabricatorSearchDocumentFieldType::FIELD_COMMENT, 40 40 + $comment->getContent()); 41 41 + } 42 42 + } 43 43 + 44 44 + }

+21

src/applications/transactions/query/PhabricatorApplicationTransactionQuery.php

reviewed

··· 11 11 private $needComments = true; 12 12 private $needHandles = true; 13 13 14 14 + final public static function newQueryForObject( 15 15 + PhabricatorApplicationTransactionInterface $object) { 16 16 + 17 17 + $xaction = $object->getApplicationTransactionTemplate(); 18 18 + $target_class = get_class($xaction); 19 19 + 20 20 + $queries = id(new PhutilClassMapQuery()) 21 21 + ->setAncestorClass(__CLASS__) 22 22 + ->execute(); 23 23 + foreach ($queries as $query) { 24 24 + $query_xaction = $query->getTemplateApplicationTransaction(); 25 25 + $query_class = get_class($query_xaction); 26 26 + 27 27 + if ($query_class === $target_class) { 28 28 + return id(clone $query); 29 29 + } 30 30 + } 31 31 + 32 32 + return null; 33 33 + } 34 34 + 14 35 abstract public function getTemplateApplicationTransaction(); 15 36 16 37 protected function buildMoreWhereClauses(AphrontDatabaseConnection $conn_r) {

+9 -27

src/applications/transactions/worker/PhabricatorApplicationTransactionPublishWorker.php

reviewed

··· 92 92 93 93 $viewer = PhabricatorUser::getOmnipotentUser(); 94 94 95 95 - $type = phid_get_subtype(head($xaction_phids)); 96 96 - $xactions = $this->buildTransactionQuery($type) 95 95 + $query = PhabricatorApplicationTransactionQuery::newQueryForObject($object); 96 96 + if (!$query) { 97 97 + throw new PhabricatorWorkerPermanentFailureException( 98 98 + pht( 99 99 + 'Unable to load query for transaction object "%s"!', 100 100 + $object->getPHID())); 101 101 + } 102 102 + 103 103 + $xactions = $query 97 104 ->setViewer($viewer) 98 105 ->withPHIDs($xaction_phids) 99 106 ->needComments(true) ··· 109 116 } 110 117 111 118 return array_select_keys($xactions, $xaction_phids); 112 112 - } 113 113 - 114 114 - 115 115 - /** 116 116 - * Build a new transaction query of the appropriate class so we can load 117 117 - * the transactions. 118 118 - */ 119 119 - private function buildTransactionQuery($type) { 120 120 - $queries = id(new PhutilClassMapQuery()) 121 121 - ->setAncestorClass('PhabricatorApplicationTransactionQuery') 122 122 - ->execute(); 123 123 - 124 124 - foreach ($queries as $query) { 125 125 - $query_type = $query 126 126 - ->getTemplateApplicationTransaction() 127 127 - ->getApplicationTransactionType(); 128 128 - if ($query_type == $type) { 129 129 - return $query; 130 130 - } 131 131 - } 132 132 - 133 133 - throw new PhabricatorWorkerPermanentFailureException( 134 134 - pht( 135 135 - 'Unable to load query for transaction type "%s"!', 136 136 - $type)); 137 119 } 138 120 139 121 }