diff --git a/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php b/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php index b76b49fc9e..8e7b50f489 100644 --- a/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php +++ b/src/applications/repository/search/PhabricatorRepositoryCommitSearchIndexer.php @@ -1,82 +1,93 @@ loadDocumentByPHID($phid); $commit_data = id(new PhabricatorRepositoryCommitData())->loadOneWhere( 'commitID = %d', $commit->getID()); $date_created = $commit->getEpoch(); $commit_message = $commit_data->getCommitMessage(); $author_phid = $commit_data->getCommitDetail('authorPHID'); $repository = id(new PhabricatorRepositoryQuery()) ->setViewer($this->getViewer()) ->withIDs(array($commit->getRepositoryID())) ->executeOne(); if (!$repository) { throw new Exception("No such repository!"); } $title = 'r'.$repository->getCallsign().$commit->getCommitIdentifier(). " ".$commit_data->getSummary(); $doc = new PhabricatorSearchAbstractDocument(); $doc->setPHID($commit->getPHID()); $doc->setDocumentType(PhabricatorRepositoryPHIDTypeCommit::TYPECONST); $doc->setDocumentCreated($date_created); $doc->setDocumentModified($date_created); $doc->setDocumentTitle($title); $doc->addField( PhabricatorSearchField::FIELD_BODY, $commit_message); if ($author_phid) { $doc->addRelationship( PhabricatorSearchRelationship::RELATIONSHIP_AUTHOR, $author_phid, PhabricatorPeoplePHIDTypeUser::TYPECONST, $date_created); } $project_phids = PhabricatorEdgeQuery::loadDestinationPHIDs( $commit->getPHID(), PhabricatorEdgeConfig::TYPE_COMMIT_HAS_PROJECT); if ($project_phids) { foreach ($project_phids as $project_phid) { $doc->addRelationship( PhabricatorSearchRelationship::RELATIONSHIP_PROJECT, $project_phid, PhabricatorProjectPHIDTypeProject::TYPECONST, $date_created); } } $doc->addRelationship( PhabricatorSearchRelationship::RELATIONSHIP_REPOSITORY, $repository->getPHID(), PhabricatorRepositoryPHIDTypeRepository::TYPECONST, $date_created); $comments = id(new PhabricatorAuditComment())->loadAllWhere( 'targetPHID = %s', $commit->getPHID()); foreach ($comments as $comment) { if (strlen($comment->getContent())) { $doc->addField( PhabricatorSearchField::FIELD_COMMENT, $comment->getContent()); } } + $inlines = id(new PhabricatorAuditInlineComment())->loadAllWhere( + 'commitPHID = %s AND (auditCommentID IS NOT NULL)', + $commit->getPHID()); + foreach ($inlines as $inline) { + if (strlen($inline->getContent())) { + $doc->addField( + PhabricatorSearchField::FIELD_COMMENT, + $inline->getContent()); + } + } + return $doc; } }