1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-19 13:22:42 +01:00

Make packages mailable and subscribable

Summary:
Ref T10939. Fixes T7834.

  - Make packages into mailable objects, like projects and users.
  - Packages resolve recipients by resolving project and user owners into recipients.

Test Plan:
  - Added a comment to a revision with a package subscriber.
  - Used `bin/mail show-outbound` to see that owners got mail.

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T7834, T10939

Differential Revision: https://secure.phabricator.com/D15912
This commit is contained in:
epriestley 2016-05-13 08:24:31 -07:00
parent 3ea47d967a
commit 547abfe873
10 changed files with 69 additions and 14 deletions

View file

@ -24,6 +24,8 @@ final class PhabricatorMetaMTAMemberQuery extends PhabricatorQuery {
}
public function execute() {
$viewer = $this->getViewer();
$phids = array_fuse($this->phids);
$actors = array();
$type_map = array();
@ -33,6 +35,33 @@ final class PhabricatorMetaMTAMemberQuery extends PhabricatorQuery {
// TODO: Generalize this somewhere else.
// If we have packages, break them down into their constituent user and
// project owners first. Then we'll resolve those and build the packages
// back up from the pieces.
$package_type = PhabricatorOwnersPackagePHIDType::TYPECONST;
$package_phids = idx($type_map, $package_type, array());
unset($type_map[$package_type]);
$package_map = array();
if ($package_phids) {
$packages = id(new PhabricatorOwnersPackageQuery())
->setViewer($viewer)
->withPHIDs($package_phids)
->execute();
foreach ($packages as $package) {
$package_owners = array();
foreach ($package->getOwners() as $owner) {
$owner_phid = $owner->getUserPHID();
$owner_type = phid_get_type($owner_phid);
$type_map[$owner_type][] = $owner_phid;
$package_owners[] = $owner_phid;
}
$package_map[$package->getPHID()] = $package_owners;
}
}
$results = array();
foreach ($type_map as $type => $phids) {
switch ($type) {
@ -40,7 +69,7 @@ final class PhabricatorMetaMTAMemberQuery extends PhabricatorQuery {
// NOTE: We're loading the projects here in order to respect policies.
$projects = id(new PhabricatorProjectQuery())
->setViewer($this->getViewer())
->setViewer($viewer)
->withPHIDs($phids)
->needMembers(true)
->needWatchers(true)
@ -96,6 +125,21 @@ final class PhabricatorMetaMTAMemberQuery extends PhabricatorQuery {
}
}
// For any packages, stitch them back together from the resolved users
// and projects.
if ($package_map) {
foreach ($package_map as $package_phid => $owner_phids) {
$resolved = array();
foreach ($owner_phids as $owner_phid) {
$resolved_phids = idx($results, $owner_phid, array());
foreach ($resolved_phids as $resolved_phid) {
$resolved[] = $resolved_phid;
}
}
$results[$package_phid] = $resolved;
}
}
return $results;
}

View file

@ -107,11 +107,15 @@ final class PhabricatorMailTarget extends Phobject {
$cc_handles = iterator_to_array($cc_handles);
$body = '';
if ($to_handles) {
$body .= "To: ".implode(', ', mpull($to_handles, 'getName'))."\n";
$to_names = mpull($to_handles, 'getCommandLineObjectName');
$body .= "To: ".implode(', ', $to_names)."\n";
}
if ($cc_handles) {
$body .= "Cc: ".implode(', ', mpull($cc_handles, 'getName'))."\n";
$cc_names = mpull($cc_handles, 'getCommandLineObjectName');
$body .= "Cc: ".implode(', ', $cc_names)."\n";
}
return $body;

View file

@ -8,7 +8,7 @@ final class PhabricatorMetaMTAMailableDatasource
}
public function getPlaceholderText() {
return pht('Type a user, project, or mailing list name...');
return pht('Type a user, project, package, or mailing list name...');
}
public function getDatasourceApplicationClass() {
@ -19,6 +19,7 @@ final class PhabricatorMetaMTAMailableDatasource
return array(
new PhabricatorPeopleDatasource(),
new PhabricatorProjectDatasource(),
new PhabricatorOwnersPackageDatasource(),
);
}

View file

@ -64,7 +64,7 @@ final class PhabricatorOwnersPathsController
$editor->applyTransactions($package, $xactions);
return id(new AphrontRedirectResponse())
->setURI('/owners/package/'.$package->getID().'/');
->setURI($package->getURI());
} else {
$paths = $package->getPaths();
$path_refs = mpull($paths, 'getRef');
@ -106,7 +106,7 @@ final class PhabricatorOwnersPathsController
require_celerity_resource('owners-path-editor-css');
$cancel_uri = '/owners/package/'.$package->getID().'/';
$cancel_uri = $package->getURI();
$form = id(new AphrontFormView())
->setUser($viewer)

View file

@ -51,8 +51,7 @@ final class PhabricatorOwnersPackageEditEngine
}
protected function getObjectViewURI($object) {
$id = $object->getID();
return "/owners/package/{$id}/";
return $object->getURI();
}
protected function buildCustomEditFields($object) {

View file

@ -346,8 +346,7 @@ final class PhabricatorOwnersPackageTransactionEditor
$body = parent::buildMailBody($object, $xactions);
$detail_uri = PhabricatorEnv::getProductionURI(
'/owners/package/'.$object->getID().'/');
$detail_uri = PhabricatorEnv::getProductionURI($object->getURI());
$body->addLinkSection(
pht('PACKAGE DETAIL'),

View file

@ -39,12 +39,13 @@ final class PhabricatorOwnersPackagePHIDType extends PhabricatorPHIDType {
$monogram = $package->getMonogram();
$name = $package->getName();
$id = $package->getID();
$uri = $package->getURI();
$handle
->setName($monogram)
->setFullName("{$monogram}: {$name}")
->setCommandLineObjectName("{$monogram} {$name}")
->setURI("/owners/package/{$id}/");
->setURI($uri);
if ($package->isArchived()) {
$handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);

View file

@ -138,7 +138,7 @@ final class PhabricatorOwnersPackageSearchEngine
->setObject($package)
->setObjectName($package->getMonogram())
->setHeader($package->getName())
->setHref('/owners/package/'.$id.'/');
->setHref($package->getURI());
if ($package->isArchived()) {
$item->setDisabled(true);

View file

@ -293,6 +293,10 @@ final class PhabricatorOwnersPackage
return 'O'.$this->getID();
}
public function getURI() {
// TODO: Move these to "/O123" for consistency.
return '/owners/package/'.$this->getID().'/';
}
/* -( PhabricatorPolicyInterface )----------------------------------------- */

View file

@ -27,9 +27,12 @@ final class PhabricatorOwnersPackageDatasource
$packages = $this->executeQuery($query);
foreach ($packages as $package) {
$name = $package->getName();
$monogram = $package->getMonogram();
$results[] = id(new PhabricatorTypeaheadResult())
->setName($package->getName())
->setURI('/owners/package/'.$package->getID().'/')
->setName("{$monogram}: {$name}")
->setURI($package->getURI())
->setPHID($package->getPHID());
}