Page MenuHomePhabricator
Files F15462836

D12304.diff
No OneTemporary
Actions

D12304.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
@@ -3446,6 +3446,7 @@
'ConpherenceDAO',
'PhabricatorPolicyInterface',
'PhabricatorApplicationTransactionInterface',
+ 'PhabricatorDestructibleInterface',
),
'ConpherenceThreadIndexer' => 'PhabricatorSearchDocumentIndexer',
'ConpherenceThreadListView' => 'AphrontView',
diff --git a/src/applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php b/src/applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php
--- a/src/applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php
+++ b/src/applications/conpherence/phid/PhabricatorConpherenceThreadPHIDType.php
@@ -35,4 +35,34 @@
}
}
+ public function canLoadNamedObject($name) {
+ return preg_match('/^Z\d*[1-9]\d*$/i', $name);
+ }
+
+ public function loadNamedObjects(
+ PhabricatorObjectQuery $query,
+ array $names) {
+
+ $id_map = array();
+ foreach ($names as $name) {
+ $id = (int)substr($name, 1);
+ $id_map[$id][] = $name;
+ }
+
+ $objects = id(new ConpherenceThreadQuery())
+ ->setViewer($query->getViewer())
+ ->withIDs(array_keys($id_map))
+ ->execute();
+ $objects = mpull($objects, null, 'getID');
+
+ $results = array();
+ foreach ($objects as $id => $object) {
+ foreach (idx($id_map, $id, array()) as $name) {
+ $results[$name] = $object;
+ }
+ }
+
+ return $results;
+ }
+
}
diff --git a/src/applications/conpherence/query/ConpherenceThreadQuery.php b/src/applications/conpherence/query/ConpherenceThreadQuery.php
--- a/src/applications/conpherence/query/ConpherenceThreadQuery.php
+++ b/src/applications/conpherence/query/ConpherenceThreadQuery.php
@@ -133,7 +133,7 @@
}
$viewer = $this->getViewer();
- if ($viewer->isLoggedIn()) {
+ if ($this->shouldJoinForViewer($viewer)) {
$joins[] = qsprintf(
$conn_r,
'LEFT JOIN %T v ON v.conpherencePHID = conpherence_thread.phid '.
@@ -147,6 +147,15 @@
return implode(' ', $joins);
}
+ private function shouldJoinForViewer(PhabricatorUser $viewer) {
+ if ($viewer->isLoggedIn() &&
+ $this->ids === null &&
+ $this->phids === null) {
+ return true;
+ }
+ return false;
+ }
+
protected function buildWhereClause($conn_r) {
$where = array();
@@ -181,11 +190,11 @@
}
$viewer = $this->getViewer();
- if ($viewer->isLoggedIn()) {
+ if ($this->shouldJoinForViewer($viewer)) {
$where[] = qsprintf(
$conn_r,
'conpherence_thread.isRoom = 1 OR v.participantPHID IS NOT NULL');
- } else {
+ } else if ($this->phids === null && $this->ids === null) {
$where[] = qsprintf(
$conn_r,
'conpherence_thread.isRoom = 1');
diff --git a/src/applications/conpherence/storage/ConpherenceThread.php b/src/applications/conpherence/storage/ConpherenceThread.php
--- a/src/applications/conpherence/storage/ConpherenceThread.php
+++ b/src/applications/conpherence/storage/ConpherenceThread.php
@@ -3,7 +3,8 @@
final class ConpherenceThread extends ConpherenceDAO
implements
PhabricatorPolicyInterface,
- PhabricatorApplicationTransactionInterface {
+ PhabricatorApplicationTransactionInterface,
+ PhabricatorDestructibleInterface {
protected $title;
protected $isRoom = 0;
@@ -339,4 +340,23 @@
return $timeline;
}
+
+/* -( PhabricatorDestructibleInterface )----------------------------------- */
+
+
+ public function destroyObjectPermanently(
+ PhabricatorDestructionEngine $engine) {
+
+ $this->openTransaction();
+ $this->delete();
+
+ $participants = id(new ConpherenceParticipant())
+ ->loadAllWhere('conpherencePHID = %s', $this->getPHID());
+ foreach ($participants as $participant) {
+ $participant->delete();
+ }
+
+ $this->saveTransaction();
+
+ }
}

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 2, 5:59 PM (3 d, 4 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7613697
Default Alt Text
D12304.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility