No OneTemporary
Actions

Size

32 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
	index 671497a10e..54f005bbe7 100644
	--- a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
	+++ b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
	@@ -1,553 +1,336 @@
	<?php

	final class PhabricatorAuditCommentEditor extends PhabricatorEditor {

	private $commit;
	private $attachInlineComments;
	private $noEmail;

	public function __construct(PhabricatorRepositoryCommit $commit) {
	$this->commit = $commit;
	return $this;
	}

	public function setAttachInlineComments($attach_inline_comments) {
	$this->attachInlineComments = $attach_inline_comments;
	return $this;
	}

	public function setNoEmail($no_email) {
	$this->noEmail = $no_email;
	return $this;
	}

	public function addComments(array $comments) {
	assert_instances_of($comments, 'PhabricatorAuditComment');

	$commit = $this->commit;
	$actor = $this->getActor();

	$other_comments = PhabricatorAuditComment::loadComments(
	$actor,
	$commit->getPHID());

	$inline_comments = array();
	if ($this->attachInlineComments) {
	$inline_comments = PhabricatorAuditInlineComment::loadDraftComments(
	$actor,
	$commit->getPHID());
	}

	// When an actor submits an audit comment, we update all the audit requests
	// they have authority over to reflect the most recent status. The general
	// idea here is that if audit has triggered for, e.g., several packages, but
	// a user owns all of them, they can clear the audit requirement in one go
	// without auditing the commit for each trigger.

	$audit_phids = self::loadAuditPHIDsForUser($actor);
	$audit_phids = array_fill_keys($audit_phids, true);

	$requests = id(new PhabricatorRepositoryAuditRequest())
	->loadAllWhere(
	'commitPHID = %s',
	$commit->getPHID());

	// TODO: We should validate the action, currently we allow anyone to, e.g.,
	// close an audit if they muck with form parameters. I'll followup with this
	// and handle the no-effect cases (e.g., closing and already-closed audit).

	$actor_is_author = ($actor->getPHID() == $commit->getAuthorPHID());

	// Pick a meaningful action, if we have one.
	$action = PhabricatorAuditActionConstants::COMMENT;
	foreach ($comments as $comment) {
	switch ($comment->getAction()) {
	case PhabricatorAuditActionConstants::CLOSE:
	case PhabricatorAuditActionConstants::RESIGN:
	case PhabricatorAuditActionConstants::ACCEPT:
	case PhabricatorAuditActionConstants::CONCERN:
	$action = $comment->getAction();
	break;
	}
	}

	if ($action == PhabricatorAuditActionConstants::CLOSE) {
	if (!PhabricatorEnv::getEnvConfig('audit.can-author-close-audit')) {
	throw new Exception('Cannot Close Audit without enabling'.
	'audit.can-author-close-audit');
	}
	// "Close" means wipe out all the concerns.
	$concerned_status = PhabricatorAuditStatusConstants::CONCERNED;
	foreach ($requests as $request) {
	if ($request->getAuditStatus() == $concerned_status) {
	$request->setAuditStatus(PhabricatorAuditStatusConstants::CLOSED);
	$request->save();
	}
	}
	} else if ($action == PhabricatorAuditActionConstants::RESIGN) {
	// "Resign" has unusual rules for writing user rows, only affects the
	// user row (never package/project rows), and always affects the user
	// row (other actions don't, if they were able to affect a package/project
	// row).
	$actor_request = null;
	foreach ($requests as $request) {
	if ($request->getAuditorPHID() == $actor->getPHID()) {
	$actor_request = $request;
	break;
	}
	}
	if (!$actor_request) {
	$actor_request = id(new PhabricatorRepositoryAuditRequest())
	->setCommitPHID($commit->getPHID())
	->setAuditorPHID($actor->getPHID())
	->setAuditReasons(array('Resigned'));
	}

	$actor_request
	->setAuditStatus(PhabricatorAuditStatusConstants::RESIGNED)
	->save();

	$requests[] = $actor_request;
	} else {
	$have_any_requests = false;
	foreach ($requests as $request) {
	if (empty($audit_phids[$request->getAuditorPHID()])) {
	continue;
	}

	$request_is_for_actor =
	($request->getAuditorPHID() == $actor->getPHID());

	$have_any_requests = true;
	$new_status = null;
	switch ($action) {
	case PhabricatorAuditActionConstants::COMMENT:
	case PhabricatorAuditActionConstants::ADD_CCS:
	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	// Commenting or adding cc's/auditors doesn't change status.
	break;
	case PhabricatorAuditActionConstants::ACCEPT:
	if (!$actor_is_author \|\| $request_is_for_actor) {
	// When modifying your own commits, you act only on behalf of
	// yourself, not your packages/projects -- the idea being that
	// you can't accept your own commits.
	$new_status = PhabricatorAuditStatusConstants::ACCEPTED;
	}
	break;
	case PhabricatorAuditActionConstants::CONCERN:
	if (!$actor_is_author \|\| $request_is_for_actor) {
	// See above.
	$new_status = PhabricatorAuditStatusConstants::CONCERNED;
	}
	break;
	default:
	throw new Exception("Unknown action '{$action}'!");
	}
	if ($new_status !== null) {
	$request->setAuditStatus($new_status);
	$request->save();
	}
	}

	// If the actor has no current authority over any audit trigger, make a
	// new one to represent their audit state.
	if (!$have_any_requests) {
	$new_status = null;
	switch ($action) {
	case PhabricatorAuditActionConstants::COMMENT:
	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	case PhabricatorAuditActionConstants::ADD_CCS:
	break;
	case PhabricatorAuditActionConstants::ACCEPT:
	$new_status = PhabricatorAuditStatusConstants::ACCEPTED;
	break;
	case PhabricatorAuditActionConstants::CONCERN:
	$new_status = PhabricatorAuditStatusConstants::CONCERNED;
	break;
	case PhabricatorAuditActionConstants::CLOSE:
	// Impossible to reach this block with 'close'.
	default:
	throw new Exception("Unknown or invalid action '{$action}'!");
	}

	if ($new_status !== null) {
	$request = id(new PhabricatorRepositoryAuditRequest())
	->setCommitPHID($commit->getPHID())
	->setAuditorPHID($actor->getPHID())
	->setAuditStatus($new_status)
	->setAuditReasons(array('Voluntary Participant'))
	->save();
	$requests[] = $request;
	}
	}
	}

	$auditors = array();

	foreach ($comments as $comment) {
	$meta = $comment->getMetadata();

	$auditor_phids = idx(
	$meta,
	PhabricatorAuditComment::METADATA_ADDED_AUDITORS,
	array());
	foreach ($auditor_phids as $phid) {
	$auditors[] = $phid;
	}
	}

	$requests_by_auditor = mpull($requests, null, 'getAuditorPHID');
	$requests_phids = array_keys($requests_by_auditor);

	$auditors = array_diff($auditors, $requests_phids);

	if ($auditors) {
	foreach ($auditors as $auditor_phid) {
	$audit_requested = PhabricatorAuditStatusConstants::AUDIT_REQUESTED;
	$requests[] = id (new PhabricatorRepositoryAuditRequest())
	->setCommitPHID($commit->getPHID())
	->setAuditorPHID($auditor_phid)
	->setAuditStatus($audit_requested)
	->setAuditReasons(
	array('Added by '.$actor->getUsername()))
	->save();
	}
	}

	$commit->updateAuditStatus($requests);
	$commit->save();

	+ $commit->attachAudits($requests);
	+
	// Convert old comments into real transactions and apply them with a
	// normal editor.

	$xactions = array();
	foreach ($comments as $comment) {
	$xactions[] = $comment->getTransactionForSave();
	}

	foreach ($inline_comments as $inline) {
	$xactions[] = id(new PhabricatorAuditTransaction())
	->setTransactionType(PhabricatorAuditActionConstants::INLINE)
	->attachComment($inline->getTransactionComment());
	}

	$content_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_LEGACY,
	array());

	$editor = id(new PhabricatorAuditEditor())
	->setActor($actor)
	->setContinueOnNoEffect(true)
	->setContinueOnMissingFields(true)
	->setContentSource($content_source)
	+ ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
	+ ->setDisableEmail($this->noEmail)
	->applyTransactions($commit, $xactions);

	$feed_dont_publish_phids = array();
	foreach ($requests as $request) {
	$status = $request->getAuditStatus();
	switch ($status) {
	case PhabricatorAuditStatusConstants::RESIGNED:
	case PhabricatorAuditStatusConstants::NONE:
	case PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED:
	$feed_dont_publish_phids[$request->getAuditorPHID()] = 1;
	break;
	default:
	unset($feed_dont_publish_phids[$request->getAuditorPHID()]);
	break;
	}
	}
	$feed_dont_publish_phids = array_keys($feed_dont_publish_phids);

	$feed_phids = array_diff($requests_phids, $feed_dont_publish_phids);
	foreach ($comments as $comment) {
	$this->publishFeedStory($comment, $feed_phids);
	}
	-
	- if (!$this->noEmail) {
	- $this->sendMail(
	- $comments,
	- $other_comments,
	- $inline_comments,
	- $requests);
	- }
	}


	/**
	* Load the PHIDs for all objects the user has the authority to act as an
	* audit for. This includes themselves, and any packages they are an owner
	* of.
	*/
	public static function loadAuditPHIDsForUser(PhabricatorUser $user) {
	$phids = array();

	// TODO: This method doesn't really use the right viewer, but in practice we
	// never issue this query of this type on behalf of another user and are
	// unlikely to do so in the future. This entire method should be refactored
	// into a Query class, however, and then we should use a proper viewer.

	// The user can audit on their own behalf.
	$phids[$user->getPHID()] = true;

	$owned_packages = id(new PhabricatorOwnersPackageQuery())
	->setViewer($user)
	->withOwnerPHIDs(array($user->getPHID()))
	->execute();
	foreach ($owned_packages as $package) {
	$phids[$package->getPHID()] = true;
	}

	// The user can audit on behalf of all projects they are a member of.
	$projects = id(new PhabricatorProjectQuery())
	->setViewer($user)
	->withMemberPHIDs(array($user->getPHID()))
	->execute();
	foreach ($projects as $project) {
	$phids[$project->getPHID()] = true;
	}

	return array_keys($phids);
	}

	private function publishFeedStory(
	PhabricatorAuditComment $comment,
	array $more_phids) {

	$commit = $this->commit;
	$actor = $this->getActor();

	$related_phids = array_merge(
	array(
	$actor->getPHID(),
	$commit->getPHID(),
	),
	$more_phids);

	id(new PhabricatorFeedStoryPublisher())
	->setRelatedPHIDs($related_phids)
	->setStoryAuthorPHID($actor->getPHID())
	->setStoryTime(time())
	->setStoryType(PhabricatorFeedStoryTypeConstants::STORY_AUDIT)
	->setStoryData(
	array(
	'commitPHID' => $commit->getPHID(),
	'action' => $comment->getAction(),
	'content' => $comment->getContent(),
	))
	->publish();
	}

	- private function sendMail(
	- array $comments,
	- array $other_comments,
	- array $inline_comments,
	- array $requests) {
	-
	- assert_instances_of($comments, 'PhabricatorAuditComment');
	- assert_instances_of($other_comments, 'PhabricatorAuditComment');
	- assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface');
	-
	- $commit = $this->commit;
	-
	- $data = $commit->loadCommitData();
	- $summary = $data->getSummary();
	-
	- $commit_phid = $commit->getPHID();
	- $phids = array($commit_phid);
	- $handles = id(new PhabricatorHandleQuery())
	- ->setViewer($this->getActor())
	- ->withPHIDs($phids)
	- ->execute();
	- $handle = $handles[$commit_phid];
	-
	- $name = $handle->getName();
	-
	- $map = array(
	- PhabricatorAuditActionConstants::CONCERN => 'Raised Concern',
	- PhabricatorAuditActionConstants::ACCEPT => 'Accepted',
	- PhabricatorAuditActionConstants::RESIGN => 'Resigned',
	- PhabricatorAuditActionConstants::CLOSE => 'Closed',
	- PhabricatorAuditActionConstants::ADD_CCS => 'Added CCs',
	- PhabricatorAuditActionConstants::ADD_AUDITORS => 'Added Auditors',
	- );
	- if ($comments) {
	- $any_action = head($comments)->getAction();
	- } else {
	- $any_action = null;
	- }
	- $verb = idx($map, $any_action, 'Commented On');
	-
	- $reply_handler = self::newReplyHandlerForCommit($commit);
	-
	- $prefix = PhabricatorEnv::getEnvConfig('metamta.diffusion.subject-prefix');
	-
	- $repository = id(new PhabricatorRepositoryQuery())
	- ->setViewer($this->getActor())
	- ->withIDs(array($commit->getRepositoryID()))
	- ->executeOne();
	- $threading = self::getMailThreading($repository, $commit);
	- list($thread_id, $thread_topic) = $threading;
	-
	- $body = $this->renderMailBody(
	- $comments,
	- "{$name}: {$summary}",
	- $handle,
	- $reply_handler,
	- $inline_comments);
	-
	- $email_to = array();
	- $email_cc = array();
	-
	- $email_to[$this->getActor()->getPHID()] = true;
	-
	- $author_phid = $data->getCommitDetail('authorPHID');
	- if ($author_phid) {
	- $email_to[$author_phid] = true;
	- }
	-
	- foreach ($other_comments as $other_comment) {
	- $email_cc[$other_comment->getActorPHID()] = true;
	- }
	-
	- $subscribers = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	- $commit->getPHID());
	- foreach ($subscribers as $subscriber) {
	- $email_cc[$subscriber] = true;
	- }
	-
	- foreach ($requests as $request) {
	- switch ($request->getAuditStatus()) {
	- case PhabricatorAuditStatusConstants::AUDIT_REQUIRED:
	- $email_cc[$request->getAuditorPHID()] = true;
	- break;
	- case PhabricatorAuditStatusConstants::RESIGNED:
	- unset($email_cc[$request->getAuditorPHID()]);
	- break;
	- case PhabricatorAuditStatusConstants::CONCERNED:
	- case PhabricatorAuditStatusConstants::AUDIT_REQUESTED:
	- $email_to[$request->getAuditorPHID()] = true;
	- break;
	- }
	- }
	-
	- $email_to = array_keys($email_to);
	- $email_cc = array_keys($email_cc);
	-
	- $phids = array_merge($email_to, $email_cc);
	- $handles = id(new PhabricatorHandleQuery())
	- ->setViewer($this->getActor())
	- ->withPHIDs($phids)
	- ->execute();
	-
	- // NOTE: Always set $is_new to false, because the "first" mail in the
	- // thread is the Herald notification of the commit.
	- $is_new = false;
	-
	- $template = id(new PhabricatorMetaMTAMail())
	- ->setSubject("{$name}: {$summary}")
	- ->setSubjectPrefix($prefix)
	- ->setVarySubjectPrefix("[{$verb}]")
	- ->setFrom($this->getActor()->getPHID())
	- ->setThreadID($thread_id, $is_new)
	- ->addHeader('Thread-Topic', $thread_topic)
	- ->setRelatedPHID($commit->getPHID())
	- ->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
	- ->setIsBulk(true)
	- ->setBody($body);
	-
	- $mails = $reply_handler->multiplexMail(
	- $template,
	- array_select_keys($handles, $email_to),
	- array_select_keys($handles, $email_cc));
	-
	- foreach ($mails as $mail) {
	- $mail->saveAndSend();
	- }
	- }
	-
	- public static function getMailThreading(
	- PhabricatorRepository $repository,
	- PhabricatorRepositoryCommit $commit) {
	-
	- return array(
	- 'diffusion-audit-'.$commit->getPHID(),
	- 'Commit r'.$repository->getCallsign().$commit->getCommitIdentifier(),
	- );
	- }
	-
	- public static function newReplyHandlerForCommit($commit) {
	- $reply_handler = PhabricatorEnv::newObjectFromConfig(
	- 'metamta.diffusion.reply-handler');
	- $reply_handler->setMailReceiver($commit);
	- return $reply_handler;
	- }
	-
	- private function renderMailBody(
	- array $comments,
	- $cname,
	- PhabricatorObjectHandle $handle,
	- PhabricatorMailReplyHandler $reply_handler,
	- array $inline_comments) {
	-
	- assert_instances_of($comments, 'PhabricatorAuditComment');
	- assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface');
	-
	- $commit = $this->commit;
	- $actor = $this->getActor();
	- $name = $actor->getUsername();
	-
	- $body = new PhabricatorMetaMTAMailBody();
	- foreach ($comments as $comment) {
	- if ($comment->getAction() == PhabricatorAuditActionConstants::INLINE) {
	- continue;
	- }
	-
	- $verb = PhabricatorAuditActionConstants::getActionPastTenseVerb(
	- $comment->getAction());
	-
	- $body->addRawSection("{$name} {$verb} commit {$cname}.");
	-
	- $content = $comment->getContent();
	- if (strlen($content)) {
	- $body->addRawSection($comment->getContent());
	- }
	- }
	-
	- if ($inline_comments) {
	- $block = array();
	-
	- $path_map = id(new DiffusionPathQuery())
	- ->withPathIDs(mpull($inline_comments, 'getPathID'))
	- ->execute();
	- $path_map = ipull($path_map, 'path', 'id');
	-
	- foreach ($inline_comments as $inline) {
	- $path = idx($path_map, $inline->getPathID());
	- if ($path === null) {
	- continue;
	- }
	-
	- $start = $inline->getLineNumber();
	- $len = $inline->getLineLength();
	- if ($len) {
	- $range = $start.'-'.($start + $len);
	- } else {
	- $range = $start;
	- }
	-
	- $content = $inline->getContent();
	- $block[] = "{$path}:{$range} {$content}";
	- }
	-
	- $body->addTextSection(pht('INLINE COMMENTS'), implode("\n", $block));
	- }
	-
	- $body->addTextSection(
	- pht('COMMIT'),
	- PhabricatorEnv::getProductionURI($handle->getURI()));
	- $body->addReplySection($reply_handler->getReplyHandlerInstructions());
	-
	- return $body->render();
	- }
	-
	}
	diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
	index b16864bad2..5aef278637 100644
	--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
	+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
	@@ -1,118 +1,237 @@
	<?php

	final class PhabricatorAuditEditor
	extends PhabricatorApplicationTransactionEditor {

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorTransactions::TYPE_COMMENT;

	// TODO: These will get modernized eventually, but that can happen one
	// at a time later on.
	$types[] = PhabricatorAuditActionConstants::ACTION;
	$types[] = PhabricatorAuditActionConstants::INLINE;
	$types[] = PhabricatorAuditActionConstants::ADD_AUDITORS;

	return $types;
	}

	protected function transactionHasEffect(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditActionConstants::INLINE:
	return $xaction->hasComment();
	}

	return parent::transactionHasEffect($object, $xaction);
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditActionConstants::ACTION:
	case PhabricatorAuditActionConstants::INLINE:
	return null;
	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	// TODO: For now, just record the added PHIDs. Eventually, turn these
	// into real edge transactions, probably?
	return array();
	}

	return parent::getCustomTransactionOldValue($object, $xaction);
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditActionConstants::ACTION:
	case PhabricatorAuditActionConstants::INLINE:
	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	return $xaction->getNewValue();
	}

	return parent::getCustomTransactionNewValue($object, $xaction);
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	case PhabricatorAuditActionConstants::ACTION:
	case PhabricatorAuditActionConstants::INLINE:
	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	return;
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	case PhabricatorAuditActionConstants::ACTION:
	case PhabricatorAuditActionConstants::INLINE:
	return;
	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	// TODO: For now, these are applied externally.
	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	protected function sortTransactions(array $xactions) {
	$xactions = parent::sortTransactions($xactions);

	$head = array();
	$tail = array();

	foreach ($xactions as $xaction) {
	$type = $xaction->getTransactionType();
	if ($type == PhabricatorAuditActionConstants::INLINE) {
	$tail[] = $xaction;
	} else {
	$head[] = $xaction;
	}
	}

	return array_values(array_merge($head, $tail));
	}

	protected function supportsSearch() {
	return true;
	}

	+ protected function shouldSendMail(
	+ PhabricatorLiskDAO $object,
	+ array $xactions) {
	+ return true;
	+ }
	+
	+ protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	+ $reply_handler = PhabricatorEnv::newObjectFromConfig(
	+ 'metamta.diffusion.reply-handler');
	+ $reply_handler->setMailReceiver($object);
	+ return $reply_handler;
	+ }
	+
	+ protected function getMailSubjectPrefix() {
	+ return PhabricatorEnv::getEnvConfig('metamta.diffusion.subject-prefix');
	+ }
	+
	+ protected function getMailThreadID(PhabricatorLiskDAO $object) {
	+ // For backward compatibility, use this legacy thread ID.
	+ return 'diffusion-audit-'.$object->getPHID();
	+ }
	+
	+ protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	+ $identifier = $object->getCommitIdentifier();
	+ $repository = $object->getRepository();
	+ $monogram = $repository->getMonogram();
	+
	+ $summary = $object->getSummary();
	+ $name = $repository->formatCommitName($identifier);
	+
	+ $subject = "{$name}: {$summary}";
	+ $thread_topic = "Commit {$monogram}{$identifier}";
	+
	+ return id(new PhabricatorMetaMTAMail())
	+ ->setSubject($subject)
	+ ->addHeader('Thread-Topic', $thread_topic);
	+ }
	+
	+ protected function getMailTo(PhabricatorLiskDAO $object) {
	+ $phids = array();
	+ if ($object->getAuthorPHID()) {
	+ $phids[] = $object->getAuthorPHID();
	+ }
	+
	+ $status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
	+ foreach ($object->getAudits() as $audit) {
	+ if ($audit->getAuditStatus() != $status_resigned) {
	+ $phids[] = $audit->getAuditorPHID();
	+ }
	+ }
	+
	+ return $phids;
	+ }
	+
	+ protected function buildMailBody(
	+ PhabricatorLiskDAO $object,
	+ array $xactions) {
	+
	+ $body = parent::buildMailBody($object, $xactions);
	+
	+ $type_inline = PhabricatorAuditActionConstants::INLINE;
	+
	+ $inlines = array();
	+ foreach ($xactions as $xaction) {
	+ if ($xaction->getTransactionType() == $type_inline) {
	+ $inlines[] = $xaction;
	+ }
	+ }
	+
	+ if ($inlines) {
	+ $body->addTextSection(
	+ pht('INLINE COMMENTS'),
	+ $this->renderInlineCommentsForMail($object, $inlines));
	+ }
	+
	+ $monogram = $object->getRepository()->formatCommitName(
	+ $object->getCommitIdentifier());
	+
	+ $body->addTextSection(
	+ pht('COMMIT'),
	+ PhabricatorEnv::getProductionURI('/'.$monogram));
	+
	+ return $body;
	+ }
	+
	+ private function renderInlineCommentsForMail(
	+ PhabricatorLiskDAO $object,
	+ array $inline_xactions) {
	+
	+ $inlines = mpull($inline_xactions, 'getComment');
	+
	+ $block = array();
	+
	+ $path_map = id(new DiffusionPathQuery())
	+ ->withPathIDs(mpull($inlines, 'getPathID'))
	+ ->execute();
	+ $path_map = ipull($path_map, 'path', 'id');
	+
	+ foreach ($inlines as $inline) {
	+ $path = idx($path_map, $inline->getPathID());
	+ if ($path === null) {
	+ continue;
	+ }
	+
	+ $start = $inline->getLineNumber();
	+ $len = $inline->getLineLength();
	+ if ($len) {
	+ $range = $start.'-'.($start + $len);
	+ } else {
	+ $range = $start;
	+ }
	+
	+ $content = $inline->getContent();
	+ $block[] = "{$path}:{$range} {$content}";
	+ }
	+
	+ return implode("\n", $block);
	+ }
	+
	}
	diff --git a/src/applications/audit/storage/PhabricatorAuditTransaction.php b/src/applications/audit/storage/PhabricatorAuditTransaction.php
	index 10b1a3ecf0..80b1ef6433 100644
	--- a/src/applications/audit/storage/PhabricatorAuditTransaction.php
	+++ b/src/applications/audit/storage/PhabricatorAuditTransaction.php
	@@ -1,160 +1,209 @@
	<?php

	final class PhabricatorAuditTransaction
	extends PhabricatorApplicationTransaction {

	public function getApplicationName() {
	return 'audit';
	}

	public function getApplicationTransactionType() {
	return PhabricatorRepositoryCommitPHIDType::TYPECONST;
	}

	public function getApplicationTransactionCommentObject() {
	return new PhabricatorAuditTransactionComment();
	}

	public function getRequiredHandlePHIDs() {
	$phids = parent::getRequiredHandlePHIDs();

	$type = $this->getTransactionType();

	switch ($type) {
	case PhabricatorAuditActionConstants::ADD_CCS:
	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	if (!is_array($old)) {
	$old = array();
	}
	if (!is_array($new)) {
	$new = array();
	}

	foreach (array_keys($old + $new) as $phid) {
	$phids[] = $phid;
	}
	break;
	}

	return $phids;
	}

	+ public function getActionName() {
	+
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorAuditActionConstants::ACTION:
	+ switch ($this->getNewValue()) {
	+ case PhabricatorAuditActionConstants::CONCERN:
	+ return pht('Raised Concern');
	+ case PhabricatorAuditActionConstants::ACCEPT:
	+ return pht('Accepted');
	+ case PhabricatorAuditActionConstants::RESIGN:
	+ return pht('Resigned');
	+ case PhabricatorAuditActionConstants::CLOSE:
	+ return pht('Clsoed');
	+ }
	+ break;
	+ case PhabricatorAuditActionConstants::ADD_AUDITORS:
	+ return pht('Added Auditors');
	+ }
	+
	+ return parent::getActionName();
	+ }
	+
	public function getColor() {

	$type = $this->getTransactionType();

	switch ($type) {
	case PhabricatorAuditActionConstants::ACTION:
	switch ($this->getNewValue()) {
	case PhabricatorAuditActionConstants::CONCERN:
	return 'red';
	case PhabricatorAuditActionConstants::ACCEPT:
	return 'green';
	}
	}

	return parent::getColor();
	}

	public function getTitle() {
	$old = $this->getOldValue();
	$new = $this->getNewValue();

	- $author_handle = $this->getHandle($this->getAuthorPHID())->renderLink();
	+ $author_handle = $this->renderHandleLink($this->getAuthorPHID());

	$type = $this->getTransactionType();

	switch ($type) {
	case PhabricatorAuditActionConstants::ADD_CCS:
	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	if (!is_array($old)) {
	$old = array();
	}
	if (!is_array($new)) {
	$new = array();
	}
	$add = array_keys(array_diff_key($new, $old));
	$rem = array_keys(array_diff_key($old, $new));
	break;
	}

	switch ($type) {
	case PhabricatorAuditActionConstants::INLINE:
	return pht(
	'%s added inline comments.',
	$author_handle);
	case PhabricatorAuditActionConstants::ADD_CCS:
	if ($add && $rem) {
	return pht(
	'%s edited subscribers; added: %s, removed: %s.',
	$author_handle,
	$this->renderHandleList($add),
	$this->renderHandleList($rem));
	} else if ($add) {
	return pht(
	'%s added subscribers: %s.',
	$author_handle,
	$this->renderHandleList($add));
	} else if ($rem) {
	return pht(
	'%s removed subscribers: %s.',
	$author_handle,
	$this->renderHandleList($rem));
	} else {
	return pht(
	'%s added subscribers...',
	$author_handle);
	}

	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	if ($add && $rem) {
	return pht(
	'%s edited auditors; added: %s, removed: %s.',
	$author_handle,
	$this->renderHandleList($add),
	$this->renderHandleList($rem));
	} else if ($add) {
	return pht(
	'%s added auditors: %s.',
	$author_handle,
	$this->renderHandleList($add));
	} else if ($rem) {
	return pht(
	'%s removed auditors: %s.',
	$author_handle,
	$this->renderHandleList($rem));
	} else {
	return pht(
	'%s added auditors...',
	$author_handle);
	}

	case PhabricatorAuditActionConstants::ACTION:
	switch ($new) {
	case PhabricatorAuditActionConstants::ACCEPT:
	return pht(
	'%s accepted this commit.',
	$author_handle);
	case PhabricatorAuditActionConstants::CONCERN:
	return pht(
	'%s raised a concern with this commit.',
	$author_handle);
	case PhabricatorAuditActionConstants::RESIGN:
	return pht(
	'%s resigned from this audit.',
	$author_handle);
	case PhabricatorAuditActionConstants::CLOSE:
	return pht(
	'%s closed this audit.',
	$author_handle);
	}

	}

	return parent::getTitle();
	}

	+ // TODO: These two mail methods can likely be abstracted by introducing a
	+ // formal concept of "inline comment" transactions.
	+
	+ public function shouldHideForMail(array $xactions) {
	+ $type_inline = PhabricatorAuditActionConstants::INLINE;
	+ switch ($this->getTransactionType()) {
	+ case $type_inline:
	+ foreach ($xactions as $xaction) {
	+ if ($xaction->getTransactionType() != $type_inline) {
	+ return true;
	+ }
	+ }
	+ return ($this !== head($xactions));
	+ }
	+
	+ return parent::shouldHideForMail($xactions);
	+ }
	+
	+ public function getBodyForMail() {
	+ switch ($this->getTransactionType()) {
	+ case PhabricatorAuditActionConstants::INLINE:
	+ return null;
	+ }
	+
	+ return parent::getBodyForMail();
	+ }
	+
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jul 29, 2:53 AM (2 w, 2 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 187895
Default Alt Text: (32 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions