Page MenuHomePhabricator
Files F13197255

D12028.diff
No OneTemporary
Actions

D12028.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -491,6 +491,7 @@
'DiffusionDefaultPushCapability' => 'applications/diffusion/capability/DiffusionDefaultPushCapability.php',
'DiffusionDefaultViewCapability' => 'applications/diffusion/capability/DiffusionDefaultViewCapability.php',
'DiffusionDiffController' => 'applications/diffusion/controller/DiffusionDiffController.php',
+ 'DiffusionDiffInlineCommentQuery' => 'applications/diffusion/query/DiffusionDiffInlineCommentQuery.php',
'DiffusionDiffQueryConduitAPIMethod' => 'applications/diffusion/conduit/DiffusionDiffQueryConduitAPIMethod.php',
'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'applications/diffusion/doorkeeper/DiffusionDoorkeeperCommitFeedStoryPublisher.php',
'DiffusionEmptyResultView' => 'applications/diffusion/view/DiffusionEmptyResultView.php',
@@ -3644,6 +3645,7 @@
'DiffusionDefaultPushCapability' => 'PhabricatorPolicyCapability',
'DiffusionDefaultViewCapability' => 'PhabricatorPolicyCapability',
'DiffusionDiffController' => 'DiffusionController',
+ 'DiffusionDiffInlineCommentQuery' => 'PhabricatorDiffInlineCommentQuery',
'DiffusionDiffQueryConduitAPIMethod' => 'DiffusionQueryConduitAPIMethod',
'DiffusionDoorkeeperCommitFeedStoryPublisher' => 'DoorkeeperFeedStoryPublisher',
'DiffusionEmptyResultView' => 'DiffusionView',
diff --git a/src/applications/audit/storage/PhabricatorAuditInlineComment.php b/src/applications/audit/storage/PhabricatorAuditInlineComment.php
--- a/src/applications/audit/storage/PhabricatorAuditInlineComment.php
+++ b/src/applications/audit/storage/PhabricatorAuditInlineComment.php
@@ -61,16 +61,15 @@
PhabricatorUser $viewer,
$commit_phid) {
- $inlines = id(new PhabricatorAuditTransactionComment())->loadAllWhere(
- 'authorPHID = %s AND commitPHID = %s AND transactionPHID IS NULL
- AND pathID IS NOT NULL
- AND isDeleted = 0',
- $viewer->getPHID(),
- $commit_phid);
-
- $inlines = PhabricatorInlineCommentController::loadAndAttachReplies(
- $viewer,
- $inlines);
+ $inlines = id(new DiffusionDiffInlineCommentQuery())
+ ->setViewer($viewer)
+ ->withAuthorPHIDs(array($viewer->getPHID()))
+ ->withCommitPHIDs(array($commit_phid))
+ ->withHasTransaction(false)
+ ->withHasPath(true)
+ ->withIsDeleted(false)
+ ->needReplyToComments(true)
+ ->execute();
return self::buildProxies($inlines);
}
@@ -79,10 +78,12 @@
PhabricatorUser $viewer,
$commit_phid) {
- $inlines = id(new PhabricatorAuditTransactionComment())->loadAllWhere(
- 'commitPHID = %s AND transactionPHID IS NOT NULL
- AND pathID IS NOT NULL',
- $commit_phid);
+ $inlines = id(new DiffusionDiffInlineCommentQuery())
+ ->setViewer($viewer)
+ ->withCommitPHIDs(array($commit_phid))
+ ->withHasTransaction(true)
+ ->withHasPath(true)
+ ->execute();
return self::buildProxies($inlines);
}
diff --git a/src/applications/diffusion/query/DiffusionDiffInlineCommentQuery.php b/src/applications/diffusion/query/DiffusionDiffInlineCommentQuery.php
new file mode 100644
--- /dev/null
+++ b/src/applications/diffusion/query/DiffusionDiffInlineCommentQuery.php
@@ -0,0 +1,62 @@
+<?php
+
+final class DiffusionDiffInlineCommentQuery
+ extends PhabricatorDiffInlineCommentQuery {
+
+ private $commitPHIDs;
+ private $hasPath;
+ private $pathIDs;
+
+ public function withCommitPHIDs(array $phids) {
+ $this->commitPHIDs = $phids;
+ return $this;
+ }
+
+ public function withHasPath($has_path) {
+ $this->hasPath = $has_path;
+ return $this;
+ }
+
+ public function withPathIDs(array $path_ids) {
+ $this->pathIDs = $path_ids;
+ return $this;
+ }
+
+ protected function getTemplate() {
+ return new PhabricatorAuditTransactionComment();
+ }
+
+ protected function buildWhereClauseComponents(
+ AphrontDatabaseConnection $conn_r) {
+ $where = parent::buildWhereClauseComponents($conn_r);
+
+ if ($this->commitPHIDs !== null) {
+ $where[] = qsprintf(
+ $conn_r,
+ 'xcomment.commitPHID IN (%Ls)',
+ $this->commitPHIDs);
+ }
+
+ if ($this->hasPath !== null) {
+ if ($this->hasPath) {
+ $where[] = qsprintf(
+ $conn_r,
+ 'xcomment.pathID IS NOT NULL');
+ } else {
+ $where[] = qsprintf(
+ $conn_r,
+ 'xcomment.pathID IS NULL');
+ }
+ }
+
+ if ($this->pathIDs !== null) {
+ $where[] = qsprintf(
+ $conn_r,
+ 'xcomment.pathID IN (%Ld)',
+ $this->pathIDs);
+ }
+
+ return $where;
+ }
+
+}
diff --git a/src/infrastructure/diff/PhabricatorInlineCommentController.php b/src/infrastructure/diff/PhabricatorInlineCommentController.php
--- a/src/infrastructure/diff/PhabricatorInlineCommentController.php
+++ b/src/infrastructure/diff/PhabricatorInlineCommentController.php
@@ -309,45 +309,4 @@
->addRowScaffold($view);
}
- public static function loadAndAttachReplies(
- PhabricatorUser $viewer,
- array $comments) {
- // TODO: This code doesn't really belong here, but we don't have a much
- // better place to put it at the moment.
-
- if (!$comments) {
- return $comments;
- }
-
- $template = head($comments);
-
- $reply_phids = array();
- foreach ($comments as $comment) {
- $reply_phid = $comment->getReplyToCommentPHID();
- if ($reply_phid) {
- $reply_phids[] = $reply_phid;
- }
- }
-
- if ($reply_phids) {
- $reply_comments =
- id(new PhabricatorApplicationTransactionTemplatedCommentQuery())
- ->setTemplate($template)
- ->setViewer($viewer)
- ->withPHIDs($reply_phids)
- ->execute();
- $reply_comments = mpull($reply_comments, null, 'getPHID');
- } else {
- $reply_comments = array();
- }
-
- foreach ($comments as $comment) {
- $reply_phid = $comment->getReplyToCommentPHID();
- $reply = idx($reply_comments, $reply_phid);
- $comment->attachReplyToComment($reply);
- }
-
- return $comments;
- }
-
}

File Metadata

Mime Type
text/plain
Expires
Mon, May 13, 11:57 PM (2 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6294261
Default Alt Text
D12028.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility