+27

resources/sql/autopatches/20150724.herald.1.sql

reviewed

··· 1 1 + UPDATE {$NAMESPACE}_herald.herald_actionrecord a 2 2 + JOIN {$NAMESPACE}_herald.herald_rule r 3 3 + ON a.ruleID = r.id 4 4 + SET a.action = 'subscribers.add' 5 5 + WHERE r.ruleType != 'personal' 6 6 + AND a.action = 'addcc'; 7 7 + 8 8 + UPDATE {$NAMESPACE}_herald.herald_actionrecord a 9 9 + JOIN {$NAMESPACE}_herald.herald_rule r 10 10 + ON a.ruleID = r.id 11 11 + SET a.action = 'subscribers.self.add' 12 12 + WHERE r.ruleType = 'personal' 13 13 + AND a.action = 'addcc'; 14 14 + 15 15 + UPDATE {$NAMESPACE}_herald.herald_actionrecord a 16 16 + JOIN {$NAMESPACE}_herald.herald_rule r 17 17 + ON a.ruleID = r.id 18 18 + SET a.action = 'subscribers.remove' 19 19 + WHERE r.ruleType != 'personal' 20 20 + AND a.action = 'remcc'; 21 21 + 22 22 + UPDATE {$NAMESPACE}_herald.herald_actionrecord a 23 23 + JOIN {$NAMESPACE}_herald.herald_rule r 24 24 + ON a.ruleID = r.id 25 25 + SET a.action = 'subscribers.self.remove' 26 26 + WHERE r.ruleType = 'personal' 27 27 + AND a.action = 'remcc';

+10

src/__phutil_library_map__.php

reviewed

··· 2880 2880 'PhabricatorSubscribedToObjectEdgeType' => 'applications/transactions/edges/PhabricatorSubscribedToObjectEdgeType.php', 2881 2881 'PhabricatorSubscribersQuery' => 'applications/subscriptions/query/PhabricatorSubscribersQuery.php', 2882 2882 'PhabricatorSubscriptionTriggerClock' => 'infrastructure/daemon/workers/clock/PhabricatorSubscriptionTriggerClock.php', 2883 2883 + 'PhabricatorSubscriptionsAddSelfHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsAddSelfHeraldAction.php', 2884 2884 + 'PhabricatorSubscriptionsAddSubscribersHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsAddSubscribersHeraldAction.php', 2883 2885 'PhabricatorSubscriptionsApplication' => 'applications/subscriptions/application/PhabricatorSubscriptionsApplication.php', 2884 2886 'PhabricatorSubscriptionsEditController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsEditController.php', 2885 2887 'PhabricatorSubscriptionsEditor' => 'applications/subscriptions/editor/PhabricatorSubscriptionsEditor.php', 2888 2888 + 'PhabricatorSubscriptionsHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsHeraldAction.php', 2886 2889 'PhabricatorSubscriptionsListController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsListController.php', 2890 2890 + 'PhabricatorSubscriptionsRemoveSelfHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsRemoveSelfHeraldAction.php', 2891 2891 + 'PhabricatorSubscriptionsRemoveSubscribersHeraldAction' => 'applications/subscriptions/herald/PhabricatorSubscriptionsRemoveSubscribersHeraldAction.php', 2887 2892 'PhabricatorSubscriptionsSubscribeEmailCommand' => 'applications/subscriptions/command/PhabricatorSubscriptionsSubscribeEmailCommand.php', 2888 2893 'PhabricatorSubscriptionsSubscribersPolicyRule' => 'applications/subscriptions/policyrule/PhabricatorSubscriptionsSubscribersPolicyRule.php', 2889 2894 'PhabricatorSubscriptionsTransactionController' => 'applications/subscriptions/controller/PhabricatorSubscriptionsTransactionController.php', ··· 6894 6899 'PhabricatorSubscribedToObjectEdgeType' => 'PhabricatorEdgeType', 6895 6900 'PhabricatorSubscribersQuery' => 'PhabricatorQuery', 6896 6901 'PhabricatorSubscriptionTriggerClock' => 'PhabricatorTriggerClock', 6902 6902 + 'PhabricatorSubscriptionsAddSelfHeraldAction' => 'PhabricatorSubscriptionsHeraldAction', 6903 6903 + 'PhabricatorSubscriptionsAddSubscribersHeraldAction' => 'PhabricatorSubscriptionsHeraldAction', 6897 6904 'PhabricatorSubscriptionsApplication' => 'PhabricatorApplication', 6898 6905 'PhabricatorSubscriptionsEditController' => 'PhabricatorController', 6899 6906 'PhabricatorSubscriptionsEditor' => 'PhabricatorEditor', 6907 6907 + 'PhabricatorSubscriptionsHeraldAction' => 'HeraldAction', 6900 6908 'PhabricatorSubscriptionsListController' => 'PhabricatorController', 6909 6909 + 'PhabricatorSubscriptionsRemoveSelfHeraldAction' => 'PhabricatorSubscriptionsHeraldAction', 6910 6910 + 'PhabricatorSubscriptionsRemoveSubscribersHeraldAction' => 'PhabricatorSubscriptionsHeraldAction', 6901 6911 'PhabricatorSubscriptionsSubscribeEmailCommand' => 'MetaMTAEmailTransactionCommand', 6902 6912 'PhabricatorSubscriptionsSubscribersPolicyRule' => 'PhabricatorPolicyRule', 6903 6913 'PhabricatorSubscriptionsTransactionController' => 'PhabricatorController',

-4

src/applications/differential/herald/HeraldDifferentialRevisionAdapter.php

reviewed

··· 162 162 case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL: 163 163 return array_merge( 164 164 array( 165 165 - self::ACTION_ADD_CC, 166 166 - self::ACTION_REMOVE_CC, 167 165 self::ACTION_EMAIL, 168 166 self::ACTION_ADD_REVIEWERS, 169 167 self::ACTION_ADD_BLOCKING_REVIEWERS, ··· 174 172 case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL: 175 173 return array_merge( 176 174 array( 177 177 - self::ACTION_ADD_CC, 178 178 - self::ACTION_REMOVE_CC, 179 175 self::ACTION_EMAIL, 180 176 self::ACTION_ADD_REVIEWERS, 181 177 self::ACTION_ADD_BLOCKING_REVIEWERS,

-4

src/applications/diffusion/herald/HeraldCommitAdapter.php

reviewed

··· 89 89 case HeraldRuleTypeConfig::RULE_TYPE_OBJECT: 90 90 return array_merge( 91 91 array( 92 92 - self::ACTION_ADD_CC, 93 93 - self::ACTION_REMOVE_CC, 94 92 self::ACTION_EMAIL, 95 93 self::ACTION_AUDIT, 96 94 self::ACTION_APPLY_BUILD_PLANS, ··· 99 97 case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL: 100 98 return array_merge( 101 99 array( 102 102 - self::ACTION_ADD_CC, 103 103 - self::ACTION_REMOVE_CC, 104 100 self::ACTION_EMAIL, 105 101 self::ACTION_AUDIT, 106 102 ),

+23 -1

src/applications/herald/action/HeraldAction.php

reviewed

··· 41 41 return new HeraldEmptyFieldValue(); 42 42 case self::STANDARD_PHID_LIST: 43 43 $tokenizer = id(new HeraldTokenizerFieldValue()) 44 44 - ->setKey($this->getHeraldFieldName()) 44 44 + ->setKey($this->getHeraldActionName()) 45 45 ->setDatasource($this->getDatasource()); 46 46 47 47 $value_map = $this->getDatasourceValueMap(); ··· 56 56 } 57 57 58 58 public function willSaveActionValue($value) { 59 59 + try { 60 60 + $type = $this->getHeraldActionStandardType(); 61 61 + } catch (PhutilMethodNotImplementedException $ex) { 62 62 + return $value; 63 63 + } 64 64 + 65 65 + switch ($type) { 66 66 + case self::STANDARD_PHID_LIST: 67 67 + return array_keys($value); 68 68 + } 69 69 + 59 70 return $value; 60 71 } 61 72 ··· 160 171 public function renderActionEffectName($type, $data) { 161 172 $map = $this->getActionEffectSpec($type); 162 173 return idx($map, 'name'); 174 174 + } 175 175 + 176 176 + protected function renderHandleList($phids) { 177 177 + if (!is_array($phids)) { 178 178 + return pht('(Invalid List)'); 179 179 + } 180 180 + 181 181 + return $this->getViewer() 182 182 + ->renderHandleList($phids) 183 183 + ->setAsInline(true) 184 184 + ->render(); 163 185 } 164 186 165 187 }

+30 -114

src/applications/herald/adapter/HeraldAdapter.php

reviewed

··· 26 26 const CONDITION_IS_TRUE = 'true'; 27 27 const CONDITION_IS_FALSE = 'false'; 28 28 29 29 - const ACTION_ADD_CC = 'addcc'; 30 30 - const ACTION_REMOVE_CC = 'remcc'; 31 29 const ACTION_EMAIL = 'email'; 32 30 const ACTION_AUDIT = 'audit'; 33 31 const ACTION_ASSIGN_TASK = 'assigntask'; ··· 46 44 private $queuedTransactions = array(); 47 45 private $emailPHIDs = array(); 48 46 private $forcedEmailPHIDs = array(); 49 49 - private $unsubscribedPHIDs; 50 47 private $fieldMap; 51 48 private $actionMap; 49 49 + private $edgeCache = array(); 52 50 53 51 public function getEmailPHIDs() { 54 52 return array_values($this->emailPHIDs); ··· 179 177 return $this->queuedTransactions; 180 178 } 181 179 182 182 - protected function newTransaction() { 180 180 + public function newTransaction() { 183 181 $object = $this->newObject(); 184 182 185 183 if (!($object instanceof PhabricatorApplicationTransactionInterface)) { ··· 723 721 case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL: 724 722 case HeraldRuleTypeConfig::RULE_TYPE_OBJECT: 725 723 $standard = array( 726 726 - self::ACTION_ADD_CC => pht('Add Subscribers'), 727 727 - self::ACTION_REMOVE_CC => pht('Remove Subscribers'), 728 724 self::ACTION_EMAIL => pht('Send an email to'), 729 725 self::ACTION_AUDIT => pht('Trigger an Audit by'), 730 726 self::ACTION_ASSIGN_TASK => pht('Assign task to'), ··· 739 735 break; 740 736 case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL: 741 737 $standard = array( 742 742 - self::ACTION_ADD_CC => pht('Add me as a subscriber'), 743 743 - self::ACTION_REMOVE_CC => pht('Remove me as a subscriber'), 744 738 self::ACTION_EMAIL => pht('Send me an email'), 745 739 self::ACTION_AUDIT => pht('Trigger an Audit by me'), 746 740 self::ACTION_ASSIGN_TASK => pht('Assign task to me'), ··· 786 780 if ($rule_type == HeraldRuleTypeConfig::RULE_TYPE_PERSONAL) { 787 781 switch ($action->getAction()) { 788 782 case self::ACTION_EMAIL: 789 789 - case self::ACTION_ADD_CC: 790 790 - case self::ACTION_REMOVE_CC: 791 783 case self::ACTION_AUDIT: 792 784 case self::ACTION_ASSIGN_TASK: 793 785 case self::ACTION_ADD_REVIEWERS: ··· 828 820 829 821 if ($is_personal) { 830 822 switch ($action) { 831 831 - case self::ACTION_ADD_CC: 832 832 - case self::ACTION_REMOVE_CC: 833 823 case self::ACTION_EMAIL: 834 824 case self::ACTION_AUDIT: 835 825 case self::ACTION_ASSIGN_TASK: ··· 843 833 } 844 834 } else { 845 835 switch ($action) { 846 846 - case self::ACTION_ADD_CC: 847 847 - case self::ACTION_REMOVE_CC: 848 836 case self::ACTION_EMAIL: 849 837 return $this->buildTokenizerFieldValue( 850 838 new PhabricatorMetaMTAMailableDatasource()); ··· 1048 1036 PhabricatorUser $viewer) { 1049 1037 1050 1038 $field_type = $condition->getFieldName(); 1039 1039 + $field = $this->getFieldImplementation($field_type); 1051 1040 1052 1052 - $default = pht('(Unknown Field "%s")', $field_type); 1041 1041 + if (!$field) { 1042 1042 + return pht('Unknown Field: "%s"', $field_type); 1043 1043 + } 1053 1044 1054 1054 - $field_name = idx($this->getFieldNameMap(), $field_type, $default); 1045 1045 + $field_name = $field->getHeraldFieldName(); 1055 1046 1056 1047 $condition_type = $condition->getFieldCondition(); 1057 1048 $condition_name = idx($this->getConditionNameMap(), $condition_type); 1058 1049 1059 1050 $value = $this->renderConditionValueAsText($condition, $handles, $viewer); 1060 1051 1061 1061 - return hsprintf(' %s %s %s', $field_name, $condition_name, $value); 1052 1052 + return array( 1053 1053 + $field_name, 1054 1054 + $condition_name, 1055 1055 + $value, 1056 1056 + ); 1062 1057 } 1063 1058 1064 1059 private function renderActionAsText( ··· 1068 1063 1069 1064 $impl = $this->getActionImplementation($action->getAction()); 1070 1065 if ($impl) { 1066 1066 + $impl->setViewer($viewer); 1067 1067 + 1071 1068 $value = $action->getTarget(); 1072 1072 - return $impl->renderActionDescription($viewer, $value); 1069 1069 + return $impl->renderActionDescription($value); 1073 1070 } 1074 1071 1075 1072 $rule_global = HeraldRuleTypeConfig::RULE_TYPE_GLOBAL; ··· 1180 1177 */ 1181 1178 protected function applyStandardEffect(HeraldEffect $effect) { 1182 1179 $action = $effect->getAction(); 1180 1180 + $rule_type = $effect->getRule()->getRuleType(); 1183 1181 1184 1182 $impl = $this->getActionImplementation($action); 1185 1183 if ($impl) { 1186 1186 - $impl->applyEffect($this->getObject(), $effect); 1187 1187 - return $impl->getApplyTranscript($effect); 1184 1184 + if ($impl->supportsRuleType($rule_type)) { 1185 1185 + $impl->applyEffect($this->getObject(), $effect); 1186 1186 + return $impl->getApplyTranscript($effect); 1187 1187 + } 1188 1188 } 1189 1189 1190 1190 - $rule_type = $effect->getRule()->getRuleType(); 1191 1190 $supported = $this->getActions($rule_type); 1192 1191 $supported = array_fuse($supported); 1193 1192 if (empty($supported[$action])) { ··· 1205 1204 case self::ACTION_ADD_PROJECTS: 1206 1205 case self::ACTION_REMOVE_PROJECTS: 1207 1206 return $this->applyProjectsEffect($effect); 1208 1208 - case self::ACTION_ADD_CC: 1209 1209 - case self::ACTION_REMOVE_CC: 1210 1210 - return $this->applySubscribersEffect($effect); 1211 1207 case self::ACTION_EMAIL: 1212 1208 return $this->applyEmailEffect($effect); 1213 1209 default: ··· 1257 1253 pht('Added projects.')); 1258 1254 } 1259 1255 1260 1260 - /** 1261 1261 - * @task apply 1262 1262 - */ 1263 1263 - private function applySubscribersEffect(HeraldEffect $effect) { 1264 1264 - if ($effect->getAction() == self::ACTION_ADD_CC) { 1265 1265 - $kind = '+'; 1266 1266 - $is_add = true; 1267 1267 - } else { 1268 1268 - $kind = '-'; 1269 1269 - $is_add = false; 1270 1270 - } 1271 1271 - 1272 1272 - $subscriber_phids = array_fuse($effect->getTarget()); 1273 1273 - if (!$subscriber_phids) { 1274 1274 - return new HeraldApplyTranscript( 1275 1275 - $effect, 1276 1276 - false, 1277 1277 - pht('This action lists no users or objects to affect.')); 1278 1278 - } 1279 1279 - 1280 1280 - // The "Add Subscribers" rule only adds subscribers who haven't previously 1281 1281 - // unsubscribed from the object explicitly. Filter these subscribers out 1282 1282 - // before continuing. 1283 1283 - $unsubscribed = array(); 1284 1284 - if ($is_add) { 1285 1285 - if ($this->unsubscribedPHIDs === null) { 1286 1286 - $this->unsubscribedPHIDs = PhabricatorEdgeQuery::loadDestinationPHIDs( 1287 1287 - $this->getObject()->getPHID(), 1288 1288 - PhabricatorObjectHasUnsubscriberEdgeType::EDGECONST); 1289 1289 - } 1290 1290 - 1291 1291 - foreach ($this->unsubscribedPHIDs as $phid) { 1292 1292 - if (isset($subscriber_phids[$phid])) { 1293 1293 - $unsubscribed[$phid] = $phid; 1294 1294 - unset($subscriber_phids[$phid]); 1295 1295 - } 1296 1296 - } 1297 1297 - } 1298 1298 - 1299 1299 - if (!$subscriber_phids) { 1300 1300 - return new HeraldApplyTranscript( 1301 1301 - $effect, 1302 1302 - false, 1303 1303 - pht('All targets have previously unsubscribed explicitly.')); 1304 1304 - } 1305 1305 - 1306 1306 - // Filter out PHIDs which aren't valid subscribers. Lower levels of the 1307 1307 - // stack will fail loudly if we try to add subscribers with invalid PHIDs 1308 1308 - // or unknown PHID types, so drop them here. 1309 1309 - $invalid = array(); 1310 1310 - foreach ($subscriber_phids as $phid) { 1311 1311 - $type = phid_get_type($phid); 1312 1312 - switch ($type) { 1313 1313 - case PhabricatorPeopleUserPHIDType::TYPECONST: 1314 1314 - case PhabricatorProjectProjectPHIDType::TYPECONST: 1315 1315 - break; 1316 1316 - default: 1317 1317 - $invalid[$phid] = $phid; 1318 1318 - unset($subscriber_phids[$phid]); 1319 1319 - break; 1320 1320 - } 1321 1321 - } 1322 1322 - 1323 1323 - if (!$subscriber_phids) { 1324 1324 - return new HeraldApplyTranscript( 1325 1325 - $effect, 1326 1326 - false, 1327 1327 - pht('All targets are invalid as subscribers.')); 1328 1328 - } 1329 1329 - 1330 1330 - $xaction = $this->newTransaction() 1331 1331 - ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS) 1332 1332 - ->setNewValue( 1333 1333 - array( 1334 1334 - $kind => $subscriber_phids, 1335 1335 - )); 1336 1336 - 1337 1337 - $this->queueTransaction($xaction); 1338 1338 - 1339 1339 - // TODO: We could be more detailed about this, but doing it meaningfully 1340 1340 - // probably requires substantial changes to how transactions are rendered 1341 1341 - // first. 1342 1342 - if ($is_add) { 1343 1343 - $message = pht('Subscribed targets.'); 1344 1344 - } else { 1345 1345 - $message = pht('Unsubscribed targets.'); 1346 1346 - } 1347 1347 - 1348 1348 - return new HeraldApplyTranscript($effect, true, $message); 1349 1349 - } 1350 1256 1351 1257 /** 1352 1258 * @task apply ··· 1370 1276 pht('Added mailable to mail targets.')); 1371 1277 } 1372 1278 1279 1279 + public function loadEdgePHIDs($type) { 1280 1280 + if (!isset($this->edgeCache[$type])) { 1281 1281 + $phids = PhabricatorEdgeQuery::loadDestinationPHIDs( 1282 1282 + $this->getObject()->getPHID(), 1283 1283 + $type); 1284 1284 + 1285 1285 + $this->edgeCache[$type] = array_fuse($phids); 1286 1286 + } 1287 1287 + return $this->edgeCache[$type]; 1288 1288 + } 1373 1289 1374 1290 }

-4

src/applications/maniphest/herald/HeraldManiphestTaskAdapter.php

reviewed

··· 72 72 case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL: 73 73 return array_merge( 74 74 array( 75 75 - self::ACTION_ADD_CC, 76 76 - self::ACTION_REMOVE_CC, 77 75 self::ACTION_EMAIL, 78 76 self::ACTION_ASSIGN_TASK, 79 77 ), ··· 81 79 case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL: 82 80 return array_merge( 83 81 array( 84 84 - self::ACTION_ADD_CC, 85 85 - self::ACTION_REMOVE_CC, 86 82 self::ACTION_EMAIL, 87 83 self::ACTION_ASSIGN_TASK, 88 84 ),

-19

src/applications/pholio/herald/HeraldPholioMockAdapter.php

reviewed

··· 47 47 } 48 48 } 49 49 50 50 - public function getActions($rule_type) { 51 51 - switch ($rule_type) { 52 52 - case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL: 53 53 - return array_merge( 54 54 - array( 55 55 - self::ACTION_ADD_CC, 56 56 - self::ACTION_REMOVE_CC, 57 57 - ), 58 58 - parent::getActions($rule_type)); 59 59 - case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL: 60 60 - return array_merge( 61 61 - array( 62 62 - self::ACTION_ADD_CC, 63 63 - self::ACTION_REMOVE_CC, 64 64 - ), 65 65 - parent::getActions($rule_type)); 66 66 - } 67 67 - } 68 68 - 69 50 public function getHeraldName() { 70 51 return 'M'.$this->getMock()->getID(); 71 52 }

-4

src/applications/phriction/herald/PhrictionDocumentHeraldAdapter.php

reviewed

··· 53 53 case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL: 54 54 return array_merge( 55 55 array( 56 56 - self::ACTION_ADD_CC, 57 57 - self::ACTION_REMOVE_CC, 58 56 self::ACTION_EMAIL, 59 57 ), 60 58 parent::getActions($rule_type)); 61 59 case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL: 62 60 return array_merge( 63 61 array( 64 64 - self::ACTION_ADD_CC, 65 65 - self::ACTION_REMOVE_CC, 66 62 self::ACTION_EMAIL, 67 63 ), 68 64 parent::getActions($rule_type));

+37

src/applications/subscriptions/herald/PhabricatorSubscriptionsAddSelfHeraldAction.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PhabricatorSubscriptionsAddSelfHeraldAction 4 4 + extends PhabricatorSubscriptionsHeraldAction { 5 5 + 6 6 + const ACTIONCONST = 'subscribers.self.add'; 7 7 + 8 8 + public function getHeraldActionName() { 9 9 + return pht('Add me as a subscriber'); 10 10 + } 11 11 + 12 12 + public function getActionGroupKey() { 13 13 + return HeraldSupportActionGroup::ACTIONGROUPKEY; 14 14 + } 15 15 + 16 16 + public function supportsObject($object) { 17 17 + return ($object instanceof PhabricatorSubscribableInterface); 18 18 + } 19 19 + 20 20 + public function supportsRuleType($rule_type) { 21 21 + return ($rule_type == HeraldRuleTypeConfig::RULE_TYPE_PERSONAL); 22 22 + } 23 23 + 24 24 + public function applyEffect($object, HeraldEffect $effect) { 25 25 + $phid = $effect->getRule()->getAuthorPHID(); 26 26 + return $this->applySubscribe(array($phid), $is_add = true); 27 27 + } 28 28 + 29 29 + public function getHeraldActionStandardType() { 30 30 + return self::STANDARD_NONE; 31 31 + } 32 32 + 33 33 + public function renderActionDescription($value) { 34 34 + return pht('Add rule author as subscriber.'); 35 35 + } 36 36 + 37 37 + }

+40

src/applications/subscriptions/herald/PhabricatorSubscriptionsAddSubscribersHeraldAction.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PhabricatorSubscriptionsAddSubscribersHeraldAction 4 4 + extends PhabricatorSubscriptionsHeraldAction { 5 5 + 6 6 + const ACTIONCONST = 'subscribers.add'; 7 7 + 8 8 + public function getHeraldActionName() { 9 9 + return pht('Add subscribers'); 10 10 + } 11 11 + 12 12 + public function getActionGroupKey() { 13 13 + return HeraldSupportActionGroup::ACTIONGROUPKEY; 14 14 + } 15 15 + 16 16 + public function supportsObject($object) { 17 17 + return ($object instanceof PhabricatorSubscribableInterface); 18 18 + } 19 19 + 20 20 + public function supportsRuleType($rule_type) { 21 21 + return ($rule_type != HeraldRuleTypeConfig::RULE_TYPE_PERSONAL); 22 22 + } 23 23 + 24 24 + public function applyEffect($object, HeraldEffect $effect) { 25 25 + return $this->applySubscribe($effect->getTarget(), $is_add = true); 26 26 + } 27 27 + 28 28 + public function getHeraldActionStandardType() { 29 29 + return self::STANDARD_PHID_LIST; 30 30 + } 31 31 + 32 32 + protected function getDatasource() { 33 33 + return new PhabricatorMetaMTAMailableDatasource(); 34 34 + } 35 35 + 36 36 + public function renderActionDescription($value) { 37 37 + return pht('Add subscribers: %s.', $this->renderHandleList($value)); 38 38 + } 39 39 + 40 40 + }

+235

src/applications/subscriptions/herald/PhabricatorSubscriptionsHeraldAction.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + abstract class PhabricatorSubscriptionsHeraldAction 4 4 + extends HeraldAction { 5 5 + 6 6 + const DO_NO_TARGETS = 'do.no-targets'; 7 7 + const DO_PREVIOUSLY_UNSUBSCRIBED = 'do.previously-unsubscribed'; 8 8 + const DO_INVALID = 'do.invalid'; 9 9 + const DO_AUTOSUBSCRIBED = 'do.autosubscribed'; 10 10 + const DO_ALREADY_SUBSCRIBED = 'do.already-subscribed'; 11 11 + const DO_ALREADY_UNSUBSCRIBED = 'do.already-unsubscribed'; 12 12 + const DO_SUBSCRIBED = 'do.subscribed'; 13 13 + const DO_UNSUBSCRIBED = 'do.unsubscribed'; 14 14 + 15 15 + protected function applySubscribe(array $phids, $is_add) { 16 16 + $adapter = $this->getAdapter(); 17 17 + 18 18 + if ($is_add) { 19 19 + $kind = '+'; 20 20 + } else { 21 21 + $kind = '-'; 22 22 + } 23 23 + 24 24 + $subscriber_phids = array_fuse($phids); 25 25 + if (!$subscriber_phids) { 26 26 + $this->logEffect(self::DO_NO_TARGETS); 27 27 + return; 28 28 + } 29 29 + 30 30 + // The "Add Subscribers" rule only adds subscribers who haven't previously 31 31 + // unsubscribed from the object explicitly. Filter these subscribers out 32 32 + // before continuing. 33 33 + if ($is_add) { 34 34 + $unsubscribed = $adapter->loadEdgePHIDs( 35 35 + PhabricatorObjectHasUnsubscriberEdgeType::EDGECONST); 36 36 + 37 37 + foreach ($unsubscribed as $phid) { 38 38 + if (isset($subscriber_phids[$phid])) { 39 39 + $unsubscribed[$phid] = $phid; 40 40 + unset($subscriber_phids[$phid]); 41 41 + } 42 42 + } 43 43 + 44 44 + if ($unsubscribed) { 45 45 + $this->logEffect( 46 46 + self::DO_PREVIOUSLY_UNSUBSCRIBED, 47 47 + array_values($unsubscribed)); 48 48 + } 49 49 + } 50 50 + 51 51 + if (!$subscriber_phids) { 52 52 + return; 53 53 + } 54 54 + 55 55 + // Filter out PHIDs which aren't valid subscribers. Lower levels of the 56 56 + // stack will fail loudly if we try to add subscribers with invalid PHIDs 57 57 + // or unknown PHID types, so drop them here. 58 58 + $invalid = array(); 59 59 + foreach ($subscriber_phids as $phid) { 60 60 + $type = phid_get_type($phid); 61 61 + switch ($type) { 62 62 + case PhabricatorPeopleUserPHIDType::TYPECONST: 63 63 + case PhabricatorProjectProjectPHIDType::TYPECONST: 64 64 + break; 65 65 + default: 66 66 + $invalid[$phid] = $phid; 67 67 + unset($subscriber_phids[$phid]); 68 68 + break; 69 69 + } 70 70 + } 71 71 + 72 72 + if ($invalid) { 73 73 + $this->logEffect(self::DO_INVALID, array_values($invalid)); 74 74 + } 75 75 + 76 76 + if (!$subscriber_phids) { 77 77 + return; 78 78 + } 79 79 + 80 80 + $auto = array(); 81 81 + $object = $adapter->getObject(); 82 82 + foreach ($subscriber_phids as $phid) { 83 83 + if ($object->isAutomaticallySubscribed($phid)) { 84 84 + $auto[$phid] = $phid; 85 85 + unset($subscriber_phids[$phid]); 86 86 + } 87 87 + } 88 88 + 89 89 + if ($auto) { 90 90 + $this->logEffect(self::DO_AUTOSUBSCRIBED, array_values($auto)); 91 91 + } 92 92 + 93 93 + if (!$subscriber_phids) { 94 94 + return; 95 95 + } 96 96 + 97 97 + $current = $adapter->loadEdgePHIDs( 98 98 + PhabricatorObjectHasSubscriberEdgeType::EDGECONST); 99 99 + 100 100 + if ($is_add) { 101 101 + $already = array(); 102 102 + foreach ($subscriber_phids as $phid) { 103 103 + if (isset($current[$phid])) { 104 104 + $already[$phid] = $phid; 105 105 + unset($subscriber_phids[$phid]); 106 106 + } 107 107 + } 108 108 + 109 109 + if ($already) { 110 110 + $this->logEffect(self::DO_ALREADY_SUBSCRIBED, $already); 111 111 + } 112 112 + } else { 113 113 + $already = array(); 114 114 + foreach ($subscriber_phids as $phid) { 115 115 + if (empty($current[$phid])) { 116 116 + $already[$phid] = $phid; 117 117 + unset($subscriber_phids[$phid]); 118 118 + } 119 119 + } 120 120 + 121 121 + if ($already) { 122 122 + $this->logEffect(self::DO_ALREADY_UNSUBSCRIBED, $already); 123 123 + } 124 124 + } 125 125 + 126 126 + if (!$subscriber_phids) { 127 127 + return; 128 128 + } 129 129 + 130 130 + $xaction = $adapter->newTransaction() 131 131 + ->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS) 132 132 + ->setNewValue( 133 133 + array( 134 134 + $kind => $subscriber_phids, 135 135 + )); 136 136 + 137 137 + $adapter->queueTransaction($xaction); 138 138 + 139 139 + if ($is_add) { 140 140 + $this->logEffect(self::DO_SUBSCRIBED, $subscriber_phids); 141 141 + } else { 142 142 + $this->logEffect(self::DO_UNSUBSCRIBED, $subscriber_phids); 143 143 + } 144 144 + } 145 145 + 146 146 + protected function getActionEffectMap() { 147 147 + return array( 148 148 + self::DO_NO_TARGETS => array( 149 149 + 'icon' => 'fa-ban', 150 150 + 'color' => 'grey', 151 151 + 'name' => pht('No Targets'), 152 152 + ), 153 153 + self::DO_PREVIOUSLY_UNSUBSCRIBED => array( 154 154 + 'icon' => 'fa-minus-circle', 155 155 + 'color' => 'grey', 156 156 + 'name' => pht('Previously Unsubscribed'), 157 157 + ), 158 158 + self::DO_AUTOSUBSCRIBED => array( 159 159 + 'icon' => 'fa-envelope', 160 160 + 'color' => 'grey', 161 161 + 'name' => pht('Automatically Subscribed'), 162 162 + ), 163 163 + self::DO_INVALID => array( 164 164 + 'icon' => 'fa-ban', 165 165 + 'color' => 'red', 166 166 + 'name' => pht('Invalid Targets'), 167 167 + ), 168 168 + self::DO_ALREADY_SUBSCRIBED => array( 169 169 + 'icon' => 'fa-chevron-right', 170 170 + 'color' => 'grey', 171 171 + 'name' => pht('Already Subscribed'), 172 172 + ), 173 173 + self::DO_ALREADY_UNSUBSCRIBED => array( 174 174 + 'icon' => 'fa-chevron-right', 175 175 + 'color' => 'grey', 176 176 + 'name' => pht('Already Unsubscribed'), 177 177 + ), 178 178 + self::DO_SUBSCRIBED => array( 179 179 + 'icon' => 'fa-envelope', 180 180 + 'color' => 'green', 181 181 + 'name' => pht('Added Subscribers'), 182 182 + ), 183 183 + self::DO_UNSUBSCRIBED => array( 184 184 + 'icon' => 'fa-minus-circle', 185 185 + 'color' => 'green', 186 186 + 'name' => pht('Removed Subscribers'), 187 187 + ), 188 188 + ); 189 189 + } 190 190 + 191 191 + public function renderActionEffectDescription($type, $data) { 192 192 + switch ($type) { 193 193 + case self::DO_NO_TARGETS: 194 194 + return pht('Rule lists no targets.'); 195 195 + case self::DO_PREVIOUSLY_UNSUBSCRIBED: 196 196 + return pht( 197 197 + 'Declined to resubscribe %s target(s) because they previously '. 198 198 + 'unsubscribed: %s.', 199 199 + new PhutilNumber(count($data)), 200 200 + $this->renderHandleList($data)); 201 201 + case self::DO_INVALID: 202 202 + return pht( 203 203 + 'Declined to act on %s invalid target(s): %s.', 204 204 + new PhutilNumber(count($data)), 205 205 + $this->renderHandleList($data)); 206 206 + case self::DO_AUTOSUBSCRIBED: 207 207 + return pht( 208 208 + '%s automatically subscribed target(s) were not affected: %s.', 209 209 + new PhutilNumber(count($data)), 210 210 + $this->renderHandleList($data)); 211 211 + case self::DO_ALREADY_SUBSCRIBED: 212 212 + return pht( 213 213 + '%s target(s) are already subscribed: %s.', 214 214 + new PhutilNumber(count($data)), 215 215 + $this->renderHandleList($data)); 216 216 + case self::DO_ALREADY_UNSUBSCRIBED: 217 217 + return pht( 218 218 + '%s target(s) are not subscribed: %s.', 219 219 + new PhutilNumber(count($data)), 220 220 + $this->renderHandleList($data)); 221 221 + case self::DO_SUBSCRIBED: 222 222 + return pht( 223 223 + 'Added %s subscriber(s): %s.', 224 224 + new PhutilNumber(count($data)), 225 225 + $this->renderHandleList($data)); 226 226 + case self::DO_UNSUBSCRIBED: 227 227 + return pht( 228 228 + 'Removed %s subscriber(s): %s.', 229 229 + new PhutilNumber(count($data)), 230 230 + $this->renderHandleList($data)); 231 231 + } 232 232 + } 233 233 + 234 234 + 235 235 + }

+37

src/applications/subscriptions/herald/PhabricatorSubscriptionsRemoveSelfHeraldAction.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PhabricatorSubscriptionsRemoveSelfHeraldAction 4 4 + extends PhabricatorSubscriptionsHeraldAction { 5 5 + 6 6 + const ACTIONCONST = 'subscribers.self.remove'; 7 7 + 8 8 + public function getHeraldActionName() { 9 9 + return pht('Remove me as a subscriber'); 10 10 + } 11 11 + 12 12 + public function getActionGroupKey() { 13 13 + return HeraldSupportActionGroup::ACTIONGROUPKEY; 14 14 + } 15 15 + 16 16 + public function supportsObject($object) { 17 17 + return ($object instanceof PhabricatorSubscribableInterface); 18 18 + } 19 19 + 20 20 + public function supportsRuleType($rule_type) { 21 21 + return ($rule_type == HeraldRuleTypeConfig::RULE_TYPE_PERSONAL); 22 22 + } 23 23 + 24 24 + public function applyEffect($object, HeraldEffect $effect) { 25 25 + $phid = $effect->getRule()->getAuthorPHID(); 26 26 + return $this->applySubscribe(array($phid), $is_add = false); 27 27 + } 28 28 + 29 29 + public function getHeraldActionStandardType() { 30 30 + return self::STANDARD_NONE; 31 31 + } 32 32 + 33 33 + public function renderActionDescription($value) { 34 34 + return pht('Remove rule author as subscriber.'); 35 35 + } 36 36 + 37 37 + }

+40

src/applications/subscriptions/herald/PhabricatorSubscriptionsRemoveSubscribersHeraldAction.php

reviewed

··· 1 1 + <?php 2 2 + 3 3 + final class PhabricatorSubscriptionsRemoveSubscribersHeraldAction 4 4 + extends PhabricatorSubscriptionsHeraldAction { 5 5 + 6 6 + const ACTIONCONST = 'subscribers.remove'; 7 7 + 8 8 + public function getHeraldActionName() { 9 9 + return pht('Remove subscribers'); 10 10 + } 11 11 + 12 12 + public function getActionGroupKey() { 13 13 + return HeraldSupportActionGroup::ACTIONGROUPKEY; 14 14 + } 15 15 + 16 16 + public function supportsObject($object) { 17 17 + return ($object instanceof PhabricatorSubscribableInterface); 18 18 + } 19 19 + 20 20 + public function supportsRuleType($rule_type) { 21 21 + return ($rule_type != HeraldRuleTypeConfig::RULE_TYPE_PERSONAL); 22 22 + } 23 23 + 24 24 + public function applyEffect($object, HeraldEffect $effect) { 25 25 + return $this->applySubscribe($effect->getTarget(), $is_add = false); 26 26 + } 27 27 + 28 28 + public function getHeraldActionStandardType() { 29 29 + return self::STANDARD_PHID_LIST; 30 30 + } 31 31 + 32 32 + protected function getDatasource() { 33 33 + return new PhabricatorMetaMTAMailableDatasource(); 34 34 + } 35 35 + 36 36 + public function renderActionDescription($value) { 37 37 + return pht('Remove subscribers: %s.', $this->renderHandleList($value)); 38 38 + } 39 39 + 40 40 + }

+34

src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php

reviewed

··· 1182 1182 '%s Task', 1183 1183 '%s Tasks', 1184 1184 ), 1185 1185 + 1185 1186 '%s added %s badge(s) for %s: %s.' => array( 1186 1187 array( 1187 1188 '%s added a badge for %s: %3$s.', ··· 1254 1255 '%s revoked a recipient: %3$s.', 1255 1256 '%s revoked multiple recipients: %3$s.', 1256 1257 ), 1258 1258 + ), 1259 1259 + 1260 1260 + '%s automatically subscribed target(s) were not affected: %s.' => array( 1261 1261 + 'An automatically subscribed target was not affected: %2$s.', 1262 1262 + 'Automatically subscribed targets were not affected: %2$s.', 1263 1263 + ), 1264 1264 + 1265 1265 + 'Declined to resubscribe %s target(s) because they previously '. 1266 1266 + 'unsubscribed: %s.' => array( 1267 1267 + 'Delined to resubscribe a target because they previously '. 1268 1268 + 'unsubscribed: %2$s.', 1269 1269 + 'Declined to resubscribe targets because they previously '. 1270 1270 + 'unsubscribed: %2$s.', 1271 1271 + ), 1272 1272 + 1273 1273 + '%s target(s) are not subscribed: %s.' => array( 1274 1274 + 'A target is not subscribed: %2$s.', 1275 1275 + 'Targets are not subscribed: %2$s.', 1276 1276 + ), 1277 1277 + 1278 1278 + '%s target(s) are already subscribed: %s.' => array( 1279 1279 + 'A target is already subscribed: %2$s.', 1280 1280 + 'Targets are already subscribed: %2$s.', 1281 1281 + ), 1282 1282 + 1283 1283 + 'Added %s subscriber(s): %s.' => array( 1284 1284 + 'Added a subscriber: %2$s.', 1285 1285 + 'Added subscribers: %2$s.', 1286 1286 + ), 1287 1287 + 1288 1288 + 'Removed %s subscriber(s): %s.' => array( 1289 1289 + 'Removed a subscriber: %2$s.', 1290 1290 + 'Removed subscribers: %2$s.', 1257 1291 ), 1258 1292 1259 1293 );