Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15461174
D8784.id20874.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
16 KB
Referenced Files
None
Subscribers
None
D8784.id20874.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
@@ -778,6 +778,7 @@
'HeraldCondition' => 'applications/herald/storage/HeraldCondition.php',
'HeraldConditionTranscript' => 'applications/herald/storage/transcript/HeraldConditionTranscript.php',
'HeraldController' => 'applications/herald/controller/HeraldController.php',
+ 'HeraldCustomAction' => 'applications/herald/extension/HeraldCustomAction.php',
'HeraldDAO' => 'applications/herald/storage/HeraldDAO.php',
'HeraldDifferentialRevisionAdapter' => 'applications/herald/adapter/HeraldDifferentialRevisionAdapter.php',
'HeraldDisableController' => 'applications/herald/controller/HeraldDisableController.php',
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
@@ -100,6 +100,24 @@
private $isNewObject;
private $customFields = false;
+ private $queuedTransactions = array();
+
+ private static $customActions = null;
+
+ public function __construct() {
+ if (self::$customActions === null) {
+ $symbols = id(new PhutilSymbolLoader())
+ ->setAncestorClass('HeraldCustomAction')
+ ->selectAndLoadSymbols();
+
+ self::$customActions = array();
+ foreach ($symbols as $symbol) {
+ $name = $symbol['name'];
+ self::$customActions[] = new $name();
+ }
+ }
+ }
+
public function setContentSource(PhabricatorContentSource $content_source) {
$this->contentSource = $content_source;
return $this;
@@ -143,7 +161,22 @@
}
}
- abstract public function applyHeraldEffects(array $effects);
+ public abstract function applyHeraldEffects(array $effects);
+
+ protected function handleCustomHeraldEffect(HeraldEffect $effect) {
+ foreach (self::$customActions as $customAction) {
+ $result = $customAction->applyEffect(
+ $this,
+ $this->getObject(),
+ $effect);
+
+ if ($result !== null) {
+ return $result;
+ }
+ }
+
+ return null;
+ }
public function isAvailableToUser(PhabricatorUser $viewer) {
$applications = id(new PhabricatorApplicationQuery())
@@ -155,6 +188,14 @@
return !empty($applications);
}
+ public function queueTransaction($transaction) {
+ $this->queuedTransactions[] = $transaction;
+ }
+
+ public function getQueuedTransactions() {
+ return $this->queuedTransactions;
+ }
+
/**
* NOTE: You generally should not override this; it exists to support legacy
@@ -643,13 +684,24 @@
/* -( Actions )------------------------------------------------------------ */
- abstract public function getActions($rule_type);
+ public function getActions($rule_type) {
+ $arrays = array();
+ foreach (self::$customActions as $custom_action) {
+ $result = array();
+ $actions = $custom_action->getActions($this, $rule_type);
+ foreach ($actions as $key => $action) {
+ $result[] = 'custom:'.$key;
+ }
+ $arrays = array_merge($arrays, $result);
+ }
+ return $arrays;
+ }
public function getActionNameMap($rule_type) {
switch ($rule_type) {
case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
- return array(
+ $standard = array(
self::ACTION_NOTHING => pht('Do nothing'),
self::ACTION_ADD_CC => pht('Add emails to CC'),
self::ACTION_REMOVE_CC => pht('Remove emails from CC'),
@@ -663,8 +715,9 @@
self::ACTION_APPLY_BUILD_PLANS => pht('Run build plans'),
self::ACTION_BLOCK => pht('Block change with message'),
);
+ break;
case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
- return array(
+ $standard = array(
self::ACTION_NOTHING => pht('Do nothing'),
self::ACTION_ADD_CC => pht('Add me to CC'),
self::ACTION_REMOVE_CC => pht('Remove me from CC'),
@@ -677,9 +730,21 @@
self::ACTION_ADD_BLOCKING_REVIEWERS =>
pht('Add me as a blocking reviewer'),
);
+ break;
default:
throw new Exception("Unknown rule type '{$rule_type}'!");
}
+
+ foreach (self::$customActions as $custom_action) {
+ $result = array();
+ $actions = $custom_action->getActions($this, $rule_type);
+ foreach ($actions as $key => $action) {
+ $result['custom:'.$key] = $action['name'];
+ }
+ $standard = array_merge($standard, $result);
+ }
+
+ return $standard;
}
public function willSaveAction(
@@ -811,7 +876,7 @@
}
}
- public static function getValueTypeForAction($action, $rule_type) {
+ public function getValueTypeForAction($action, $rule_type) {
$is_personal = ($rule_type == HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);
if ($is_personal) {
@@ -829,8 +894,6 @@
return self::VALUE_FLAG_COLOR;
case self::ACTION_ADD_PROJECTS:
return self::VALUE_PROJECT;
- default:
- throw new Exception("Unknown or invalid action '{$action}'.");
}
} else {
switch ($action) {
@@ -854,10 +917,18 @@
return self::VALUE_BUILD_PLAN;
case self::ACTION_BLOCK:
return self::VALUE_TEXT;
- default:
- throw new Exception("Unknown or invalid action '{$action}'.");
}
}
+
+ foreach (self::$customActions as $customAction) {
+ foreach ($customAction->getActions($this, $rule_type) as $key => $act) {
+ if ('custom:'.$key === $action) {
+ return $act['type'];
+ }
+ }
+ }
+
+ throw new Exception("Unknown or invalid action '".$action."'.");
}
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
@@ -139,21 +139,25 @@
switch ($rule_type) {
case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
- return array(
- self::ACTION_ADD_CC,
- self::ACTION_EMAIL,
- self::ACTION_AUDIT,
- self::ACTION_APPLY_BUILD_PLANS,
- self::ACTION_NOTHING
- );
+ return array_merge(
+ array(
+ self::ACTION_ADD_CC,
+ self::ACTION_EMAIL,
+ self::ACTION_AUDIT,
+ self::ACTION_APPLY_BUILD_PLANS,
+ self::ACTION_NOTHING
+ ),
+ parent::getActions($rule_type));
case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
- return array(
- self::ACTION_ADD_CC,
- self::ACTION_EMAIL,
- self::ACTION_FLAG,
- self::ACTION_AUDIT,
- self::ACTION_NOTHING,
- );
+ return array_merge(
+ array(
+ self::ACTION_ADD_CC,
+ self::ACTION_EMAIL,
+ self::ACTION_FLAG,
+ self::ACTION_AUDIT,
+ self::ACTION_NOTHING,
+ ),
+ parent::getActions($rule_type));
}
}
@@ -544,7 +548,13 @@
$this->commit->getPHID());
break;
default:
- throw new Exception("No rules to handle action '{$action}'.");
+ $custom_result = parent::handleCustomHeraldEffect($effect);
+ if ($custom_result === null) {
+ throw new Exception("No rules to handle action '{$action}'.");
+ }
+
+ $result[] = $custom_result;
+ break;
}
}
return $result;
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
@@ -366,25 +366,29 @@
public function getActions($rule_type) {
switch ($rule_type) {
case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
- return array(
- self::ACTION_ADD_CC,
- self::ACTION_REMOVE_CC,
- self::ACTION_EMAIL,
- self::ACTION_ADD_REVIEWERS,
- self::ACTION_ADD_BLOCKING_REVIEWERS,
- self::ACTION_APPLY_BUILD_PLANS,
- self::ACTION_NOTHING,
- );
+ return array_merge(
+ array(
+ self::ACTION_ADD_CC,
+ self::ACTION_REMOVE_CC,
+ self::ACTION_EMAIL,
+ self::ACTION_ADD_REVIEWERS,
+ self::ACTION_ADD_BLOCKING_REVIEWERS,
+ self::ACTION_APPLY_BUILD_PLANS,
+ self::ACTION_NOTHING,
+ ),
+ parent::getActions($rule_type));
case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
- return array(
- self::ACTION_ADD_CC,
- self::ACTION_REMOVE_CC,
- self::ACTION_EMAIL,
- self::ACTION_FLAG,
- self::ACTION_ADD_REVIEWERS,
- self::ACTION_ADD_BLOCKING_REVIEWERS,
- self::ACTION_NOTHING,
- );
+ return array_merge(
+ array(
+ self::ACTION_ADD_CC,
+ self::ACTION_REMOVE_CC,
+ self::ACTION_EMAIL,
+ self::ACTION_FLAG,
+ self::ACTION_ADD_REVIEWERS,
+ self::ACTION_ADD_BLOCKING_REVIEWERS,
+ self::ACTION_NOTHING,
+ ),
+ parent::getActions($rule_type));
}
}
@@ -502,7 +506,13 @@
pht('Applied build plans.'));
break;
default:
- throw new Exception("No rules to handle action '{$action}'.");
+ $custom_result = parent::handleCustomHeraldEffect($effect);
+ if ($custom_result === null) {
+ throw new Exception("No rules to handle action '{$action}'.");
+ }
+
+ $result[] = $custom_result;
+ break;
}
}
return $result;
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
@@ -98,21 +98,25 @@
public function getActions($rule_type) {
switch ($rule_type) {
case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
- return array(
- self::ACTION_ADD_CC,
- self::ACTION_EMAIL,
- self::ACTION_ASSIGN_TASK,
- self::ACTION_ADD_PROJECTS,
- self::ACTION_NOTHING,
- );
+ return array_merge(
+ array(
+ self::ACTION_ADD_CC,
+ self::ACTION_EMAIL,
+ self::ACTION_ASSIGN_TASK,
+ self::ACTION_ADD_PROJECTS,
+ self::ACTION_NOTHING,
+ ),
+ parent::getActions($rule_type));
case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
- return array(
- self::ACTION_ADD_CC,
- self::ACTION_EMAIL,
- self::ACTION_FLAG,
- self::ACTION_ASSIGN_TASK,
- self::ACTION_NOTHING,
- );
+ return array_merge(
+ array(
+ self::ACTION_ADD_CC,
+ self::ACTION_EMAIL,
+ self::ACTION_FLAG,
+ self::ACTION_ASSIGN_TASK,
+ self::ACTION_NOTHING,
+ ),
+ parent::getActions($rule_type));
}
}
@@ -200,7 +204,13 @@
pht('Added projects.'));
break;
default:
- throw new Exception("No rules to handle action '{$action}'.");
+ $custom_result = parent::handleCustomHeraldEffect($effect);
+ if ($custom_result === null) {
+ throw new Exception("No rules to handle action '{$action}'.");
+ }
+
+ $result[] = $custom_result;
+ break;
}
}
return $result;
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
@@ -67,16 +67,20 @@
public function getActions($rule_type) {
switch ($rule_type) {
case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
- return array(
- self::ACTION_ADD_CC,
- self::ACTION_NOTHING,
- );
+ return array_merge(
+ array(
+ self::ACTION_ADD_CC,
+ self::ACTION_NOTHING,
+ ),
+ parent::getActions($rule_type));
case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
- return array(
- self::ACTION_ADD_CC,
- self::ACTION_FLAG,
- self::ACTION_NOTHING,
- );
+ return array_merge(
+ array(
+ self::ACTION_ADD_CC,
+ self::ACTION_FLAG,
+ self::ACTION_NOTHING,
+ ),
+ parent::getActions($rule_type));
}
}
@@ -132,7 +136,13 @@
$this->getMock()->getPHID());
break;
default:
- throw new Exception("No rules to handle action '{$action}'.");
+ $custom_result = parent::handleCustomHeraldEffect($effect);
+ if ($custom_result === null) {
+ throw new Exception("No rules to handle action '{$action}'.");
+ }
+
+ $result[] = $custom_result;
+ break;
}
}
return $result;
diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -398,11 +398,15 @@
$current_value = $action->getTarget();
break;
default:
- $target_map = array();
- foreach ((array)$action->getTarget() as $fbid) {
- $target_map[$fbid] = $handles[$fbid]->getName();
+ if (is_array($action->getTarget())) {
+ $target_map = array();
+ foreach ((array)$action->getTarget() as $fbid) {
+ $target_map[$fbid] = $handles[$fbid]->getName();
+ }
+ $current_value = $target_map;
+ } else {
+ $current_value = $action->getTarget();
}
- $current_value = $target_map;
break;
}
diff --git a/src/applications/herald/controller/HeraldTranscriptController.php b/src/applications/herald/controller/HeraldTranscriptController.php
--- a/src/applications/herald/controller/HeraldTranscriptController.php
+++ b/src/applications/herald/controller/HeraldTranscriptController.php
@@ -310,13 +310,15 @@
$target = $target;
break;
default:
- if ($target) {
+ if (is_array($target) && $target) {
foreach ($target as $k => $phid) {
if (isset($handles[$phid])) {
$target[$k] = $handles[$phid]->getName();
}
}
$target = implode("\n", $target);
+ } elseif (is_string($target)) {
+ $target = $target;
} else {
$target = '<empty>';
}
diff --git a/src/applications/herald/extension/HeraldCustomAction.php b/src/applications/herald/extension/HeraldCustomAction.php
new file mode 100644
--- /dev/null
+++ b/src/applications/herald/extension/HeraldCustomAction.php
@@ -0,0 +1,9 @@
+<?php
+
+abstract class HeraldCustomAction {
+
+ public abstract function getActions(HeraldAdapter $adapter, $rule_type);
+
+ public abstract function applyEffect(HeraldAdapter $adapter, $object, HeraldEffect $effect);
+
+}
diff --git a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
--- a/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
+++ b/src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
@@ -2060,7 +2060,9 @@
$this->setHeraldAdapter($adapter);
$this->setHeraldTranscript($xscript);
- return $this->didApplyHeraldRules($object, $adapter, $xscript);
+ return array_merge(
+ $this->didApplyHeraldRules($object, $adapter, $xscript),
+ $adapter->getQueuedTransactions());
}
protected function didApplyHeraldRules(
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Apr 2, 5:55 AM (3 d, 17 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7712594
Default Alt Text
D8784.id20874.diff (16 KB)
Attached To
Mode
D8784: Support custom actions in Herald
Attached
Detach File
Event Timeline
Log In to Comment