Page MenuHomePhabricator
Files F13215793

D12502.id.diff
No OneTemporary
Actions

D12502.id.diff
View Options

diff --git a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
--- a/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
+++ b/src/applications/diffusion/herald/HeraldPreCommitAdapter.php
@@ -101,9 +101,6 @@
true,
pht('Did nothing.'));
break;
- case self::ACTION_EMAIL:
- $result[] = $this->applyEmailEffect($effect);
- break;
case self::ACTION_BLOCK:
$result[] = new HeraldApplyTranscript(
$effect,
@@ -111,14 +108,7 @@
pht('Blocked push.'));
break;
default:
- $custom_result = parent::handleCustomHeraldEffect($effect);
- if ($custom_result === null) {
- throw new Exception(pht(
- "No rules to handle action '%s'.",
- $action));
- }
-
- $result[] = $custom_result;
+ $result[] = $this->applyStandardEffect($effect);
break;
}
}
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -1000,65 +1000,6 @@
);
}
-
- public static function applyFlagEffect(HeraldEffect $effect, $phid) {
- $color = $effect->getTarget();
-
- $rule = $effect->getRule();
- $user = $rule->getAuthor();
-
- $flag = PhabricatorFlagQuery::loadUserFlag($user, $phid);
- if ($flag) {
- return new HeraldApplyTranscript(
- $effect,
- false,
- pht('Object already flagged.'));
- }
-
- $handle = id(new PhabricatorHandleQuery())
- ->setViewer($user)
- ->withPHIDs(array($phid))
- ->executeOne();
-
- $flag = new PhabricatorFlag();
- $flag->setOwnerPHID($user->getPHID());
- $flag->setType($handle->getType());
- $flag->setObjectPHID($handle->getPHID());
-
- // TOOD: Should really be transcript PHID, but it doesn't exist yet.
- $flag->setReasonPHID($user->getPHID());
-
- $flag->setColor($color);
- $flag->setNote(
- pht('Flagged by Herald Rule "%s".', $rule->getName()));
- $flag->save();
-
- return new HeraldApplyTranscript(
- $effect,
- true,
- pht('Added flag.'));
- }
-
- protected function applyEmailEffect(HeraldEffect $effect) {
-
- foreach ($effect->getTarget() as $phid) {
- $this->emailPHIDs[$phid] = $phid;
-
- // If this is a personal rule, we'll force delivery of a real email. This
- // effect is stronger than notification preferences, so you get an actual
- // email even if your preferences are set to "Notify" or "Ignore".
- $rule = $effect->getRule();
- if ($rule->isPersonalRule()) {
- $this->forcedEmailPHIDs[$phid] = $phid;
- }
- }
-
- return new HeraldApplyTranscript(
- $effect,
- true,
- pht('Added mailable to mail targets.'));
- }
-
public static function getAllAdapters() {
static $adapters;
if (!$adapters) {
@@ -1532,4 +1473,101 @@
}
+/* -( Applying Effects )--------------------------------------------------- */
+
+
+ /**
+ * @task apply
+ */
+ protected function applyStandardEffect(HeraldEffect $effect) {
+ $action = $effect->getAction();
+
+ switch ($action) {
+ case self::ACTION_FLAG:
+ return $this->applyFlagEffect($effect);
+ case self::ACTION_EMAIL:
+ return $this->applyEmailEffect($effect);
+ default:
+ break;
+ }
+
+ $result = $this->handleCustomHeraldEffect($effect);
+
+ if (!$result) {
+ throw new Exception(
+ pht(
+ 'No custom action exists to handle rule action "%s".',
+ $action));
+ }
+
+ return $result;
+ }
+
+
+ /**
+ * @task apply
+ */
+ private function applyFlagEffect(HeraldEffect $effect) {
+ $phid = $this->getPHID();
+ $color = $effect->getTarget();
+
+ $rule = $effect->getRule();
+ $user = $rule->getAuthor();
+
+ $flag = PhabricatorFlagQuery::loadUserFlag($user, $phid);
+ if ($flag) {
+ return new HeraldApplyTranscript(
+ $effect,
+ false,
+ pht('Object already flagged.'));
+ }
+
+ $handle = id(new PhabricatorHandleQuery())
+ ->setViewer($user)
+ ->withPHIDs(array($phid))
+ ->executeOne();
+
+ $flag = new PhabricatorFlag();
+ $flag->setOwnerPHID($user->getPHID());
+ $flag->setType($handle->getType());
+ $flag->setObjectPHID($handle->getPHID());
+
+ // TOOD: Should really be transcript PHID, but it doesn't exist yet.
+ $flag->setReasonPHID($user->getPHID());
+
+ $flag->setColor($color);
+ $flag->setNote(
+ pht('Flagged by Herald Rule "%s".', $rule->getName()));
+ $flag->save();
+
+ return new HeraldApplyTranscript(
+ $effect,
+ true,
+ pht('Added flag.'));
+ }
+
+
+ /**
+ * @task apply
+ */
+ private function applyEmailEffect(HeraldEffect $effect) {
+ foreach ($effect->getTarget() as $phid) {
+ $this->emailPHIDs[$phid] = $phid;
+
+ // If this is a personal rule, we'll force delivery of a real email. This
+ // effect is stronger than notification preferences, so you get an actual
+ // email even if your preferences are set to "Notify" or "Ignore".
+ $rule = $effect->getRule();
+ if ($rule->isPersonalRule()) {
+ $this->forcedEmailPHIDs[$phid] = $phid;
+ }
+ }
+
+ return new HeraldApplyTranscript(
+ $effect,
+ true,
+ pht('Added mailable to mail targets.'));
+ }
+
+
}
diff --git a/src/applications/herald/adapter/HeraldCommitAdapter.php b/src/applications/herald/adapter/HeraldCommitAdapter.php
--- a/src/applications/herald/adapter/HeraldCommitAdapter.php
+++ b/src/applications/herald/adapter/HeraldCommitAdapter.php
@@ -493,9 +493,6 @@
true,
pht('Great success at doing nothing.'));
break;
- case self::ACTION_EMAIL:
- $result[] = $this->applyEmailEffect($effect);
- break;
case self::ACTION_ADD_CC:
foreach ($effect->getTarget() as $phid) {
if (empty($this->addCCPHIDs[$phid])) {
@@ -529,20 +526,8 @@
true,
pht('Applied build plans.'));
break;
- case self::ACTION_FLAG:
- $result[] = parent::applyFlagEffect(
- $effect,
- $this->commit->getPHID());
- break;
default:
- $custom_result = parent::handleCustomHeraldEffect($effect);
- if ($custom_result === null) {
- throw new Exception(pht(
- "No rules to handle action '%s'.",
- $action));
- }
-
- $result[] = $custom_result;
+ $result[] = $this->applyStandardEffect($effect);
break;
}
}
diff --git a/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php b/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php
--- a/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php
+++ b/src/applications/herald/adapter/HeraldDifferentialRevisionAdapter.php
@@ -322,14 +322,6 @@
true,
pht('OK, did nothing.'));
break;
- case self::ACTION_FLAG:
- $result[] = parent::applyFlagEffect(
- $effect,
- $this->revision->getPHID());
- break;
- case self::ACTION_EMAIL:
- $result[] = $this->applyEmailEffect($effect);
- break;
case self::ACTION_ADD_CC:
$base_target = $effect->getTarget();
$forbidden = array();
@@ -412,14 +404,7 @@
pht('Required signatures.'));
break;
default:
- $custom_result = parent::handleCustomHeraldEffect($effect);
- if ($custom_result === null) {
- throw new Exception(pht(
- "No rules to handle action '%s'.",
- $action));
- }
-
- $result[] = $custom_result;
+ $result[] = $this->applyStandardEffect($effect);
break;
}
}
diff --git a/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php b/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php
--- a/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php
+++ b/src/applications/herald/adapter/HeraldManiphestTaskAdapter.php
@@ -172,14 +172,6 @@
true,
pht('Added addresses to cc list.'));
break;
- case self::ACTION_EMAIL:
- $result[] = $this->applyEmailEffect($effect);
- break;
- case self::ACTION_FLAG:
- $result[] = parent::applyFlagEffect(
- $effect,
- $this->getTask()->getPHID());
- break;
case self::ACTION_ASSIGN_TASK:
$target_array = $effect->getTarget();
$assign_phid = reset($target_array);
@@ -199,14 +191,7 @@
pht('Added projects.'));
break;
default:
- $custom_result = parent::handleCustomHeraldEffect($effect);
- if ($custom_result === null) {
- throw new Exception(pht(
- "No rules to handle action '%s'.",
- $action));
- }
-
- $result[] = $custom_result;
+ $result[] = $this->applyStandardEffect($effect);
break;
}
}
diff --git a/src/applications/herald/adapter/HeraldPholioMockAdapter.php b/src/applications/herald/adapter/HeraldPholioMockAdapter.php
--- a/src/applications/herald/adapter/HeraldPholioMockAdapter.php
+++ b/src/applications/herald/adapter/HeraldPholioMockAdapter.php
@@ -131,20 +131,8 @@
true,
pht('Added address to cc list.'));
break;
- case self::ACTION_FLAG:
- $result[] = parent::applyFlagEffect(
- $effect,
- $this->getMock()->getPHID());
- break;
default:
- $custom_result = parent::handleCustomHeraldEffect($effect);
- if ($custom_result === null) {
- throw new Exception(pht(
- "No rules to handle action '%s'.",
- $action));
- }
-
- $result[] = $custom_result;
+ $result[] = $this->applyStandardEffect($effect);
break;
}
}
diff --git a/src/applications/phriction/herald/PhrictionDocumentHeraldAdapter.php b/src/applications/phriction/herald/PhrictionDocumentHeraldAdapter.php
--- a/src/applications/phriction/herald/PhrictionDocumentHeraldAdapter.php
+++ b/src/applications/phriction/herald/PhrictionDocumentHeraldAdapter.php
@@ -132,23 +132,8 @@
true,
pht('Added address to cc list.'));
break;
- case self::ACTION_FLAG:
- $result[] = parent::applyFlagEffect(
- $effect,
- $this->getDocument()->getPHID());
- break;
- case self::ACTION_EMAIL:
- $result[] = $this->applyEmailEffect($effect);
- break;
default:
- $custom_result = parent::handleCustomHeraldEffect($effect);
- if ($custom_result === null) {
- throw new Exception(pht(
- "No rules to handle action '%s'.",
- $action));
- }
-
- $result[] = $custom_result;
+ $result[] = $this->applyStandardEffect($effect);
break;
}
}

File Metadata

Mime Type
text/plain
Expires
Sat, May 18, 7:50 PM (2 w, 3 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6294086
Default Alt Text
D12502.id.diff (11 KB)

Event Timeline

Phabricator · Built by Phacility