Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14706177
D12232.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
8 KB
Referenced Files
None
Subscribers
None
D12232.diff
View Options
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
@@ -82,10 +82,11 @@
$data = queryfx_all(
$conn_r,
- 'SELECT conpherence_thread.* FROM %T conpherence_thread %Q %Q %Q %Q',
+ 'SELECT conpherence_thread.* FROM %T conpherence_thread %Q %Q %Q %Q %Q',
$table->getTableName(),
$this->buildJoinClause($conn_r),
$this->buildWhereClause($conn_r),
+ $this->buildGroupClause($conn_r),
$this->buildOrderClause($conn_r),
$this->buildLimitClause($conn_r));
@@ -131,6 +132,17 @@
id(new ConpherenceParticipant())->getTableName());
}
+ $viewer = $this->getViewer();
+ if ($viewer->isLoggedIn()) {
+ $joins[] = qsprintf(
+ $conn_r,
+ 'LEFT JOIN %T v ON v.conpherencePHID = conpherence_thread.phid '.
+ 'AND v.participantPHID = %s',
+ id(new ConpherenceParticipant())->getTableName(),
+ $viewer->getPHID());
+ }
+
+
$joins[] = $this->buildApplicationSearchJoinClause($conn_r);
return implode(' ', $joins);
}
@@ -168,6 +180,17 @@
(int)$this->isRoom);
}
+ $viewer = $this->getViewer();
+ if ($viewer->isLoggedIn()) {
+ $where[] = qsprintf(
+ $conn_r,
+ 'conpherence_thread.isRoom = 1 OR v.participantPHID IS NOT NULL');
+ } else {
+ $where[] = qsprintf(
+ $conn_r,
+ 'conpherence_thread.isRoom = 1');
+ }
+
return $this->formatWhereClause($where);
}
diff --git a/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php b/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php
--- a/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php
+++ b/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php
@@ -3,22 +3,8 @@
final class ConpherenceThreadSearchEngine
extends PhabricatorApplicationSearchEngine {
- // For now, we only search for rooms, but write this code so its easy to
- // change that decision later
- private $isRooms = true;
-
- public function setIsRooms($bool) {
- $this->isRooms = $bool;
- return $this;
- }
-
public function getResultTypeDescription() {
- if ($this->isRooms) {
- $type = pht('Rooms');
- } else {
- $type = pht('Threads');
- }
- return $type;
+ return pht('Threads');
}
public function getApplicationClassName() {
@@ -32,12 +18,15 @@
'participantPHIDs',
$this->readUsersFromRequest($request, 'participants'));
+ $saved->setParameter(
+ 'threadType',
+ $request->getStr('threadType'));
+
return $saved;
}
public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
$query = id(new ConpherenceThreadQuery())
- ->withIsRoom($this->isRooms)
->needParticipantCache(true);
$participant_phids = $saved->getParameter('participantPHIDs', array());
@@ -45,6 +34,21 @@
$query->withParticipantPHIDs($participant_phids);
}
+ $thread_type = $saved->getParameter('threadType');
+ if (idx($this->getTypeOptions(), $thread_type)) {
+ switch ($thread_type) {
+ case 'rooms':
+ $query->withIsRoom(true);
+ break;
+ case 'messages':
+ $query->withIsRoom(false);
+ break;
+ case 'both':
+ $query->withIsRoom(null);
+ break;
+ }
+ }
+
return $query;
}
@@ -60,7 +64,13 @@
->setDatasource(new PhabricatorPeopleDatasource())
->setName('participants')
->setLabel(pht('Participants'))
- ->setValue($participant_phids));
+ ->setValue($participant_phids))
+ ->appendControl(
+ id(new AphrontFormSelectControl())
+ ->setLabel(pht('Type'))
+ ->setName('threadType')
+ ->setOptions($this->getTypeOptions())
+ ->setValue($saved->getParameter('threadType')));
}
protected function getURI($path) {
@@ -70,15 +80,13 @@
protected function getBuiltinQueryNames() {
$names = array();
- if ($this->isRooms) {
- $names = array(
- 'all' => pht('All Rooms'),
- );
+ $names = array(
+ 'all' => pht('All Rooms'),
+ );
- if ($this->requireViewer()->isLoggedIn()) {
- $names['participant'] = pht('Joined Rooms');
- $names['messages'] = pht('All Messages');
- }
+ if ($this->requireViewer()->isLoggedIn()) {
+ $names['participant'] = pht('Joined Rooms');
+ $names['messages'] = pht('All Messages');
}
return $names;
@@ -91,13 +99,15 @@
switch ($query_key) {
case 'all':
+ $query->setParameter('threadType', 'rooms');
return $query;
case 'participant':
+ $query->setParameter('threadType', 'rooms');
return $query->setParameter(
'participantPHIDs',
array($this->requireViewer()->getPHID()));
case 'messages':
- $this->setIsRooms(false);
+ $query->setParameter('threadType', 'messages');
return $query->setParameter(
'participantPHIDs',
array($this->requireViewer()->getPHID()));
@@ -122,6 +132,10 @@
$viewer = $this->requireViewer();
+ $policy_objects = ConpherenceThread::loadPolicyObjects(
+ $viewer,
+ $conpherences);
+
$list = new PHUIObjectItemListView();
$list->setUser($viewer);
foreach ($conpherences as $conpherence) {
@@ -129,6 +143,13 @@
$data = $conpherence->getDisplayData($viewer);
$title = $data['title'];
+ if ($conpherence->getIsRoom()) {
+ $icon_name = $conpherence->getPolicyIconName($policy_objects);
+ } else {
+ $icon_name = 'fa-envelope-o';
+ }
+ $icon = id(new PHUIIconView())
+ ->setIconFont($icon_name);
$item = id(new PHUIObjectItemView())
->setObjectName($conpherence->getMonogram())
->setHeader($title)
@@ -140,7 +161,7 @@
pht('Messages: %d', $conpherence->getMessageCount()))
->addAttribute(
array(
- id(new PHUIIconView())->setIconFont('fa-envelope-o', 'green'),
+ $icon,
' ',
pht(
'Last updated %s',
@@ -152,4 +173,12 @@
return $list;
}
+
+ private function getTypeOptions() {
+ return array(
+ 'rooms' => pht('Rooms'),
+ 'messages' => pht('Messages'),
+ 'both' => pht('Both'),);
+ }
+
}
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
@@ -279,6 +279,30 @@
}
}
+ public static function loadPolicyObjects(
+ PhabricatorUser $viewer,
+ array $conpherences) {
+
+ assert_instances_of($conpherences, 'ConpherenceThread');
+
+ $grouped = mgroup($conpherences, 'getIsRoom');
+ $rooms = idx($grouped, 1, array());
+
+ $policies = array();
+ foreach ($rooms as $room) {
+ $policies[] = $room->getViewPolicy();
+ }
+ $policy_objects = array();
+ if ($policies) {
+ $policy_objects = id(new PhabricatorPolicyQuery())
+ ->setViewer($viewer)
+ ->withPHIDs($policies)
+ ->execute();
+ }
+
+ return $policy_objects;
+ }
+
public function getPolicyIconName(array $policy_objects) {
assert_instances_of($policy_objects, 'PhabricatorPolicy');
diff --git a/src/applications/conpherence/view/ConpherenceThreadListView.php b/src/applications/conpherence/view/ConpherenceThreadListView.php
--- a/src/applications/conpherence/view/ConpherenceThreadListView.php
+++ b/src/applications/conpherence/view/ConpherenceThreadListView.php
@@ -21,25 +21,16 @@
public function render() {
require_celerity_resource('conpherence-menu-css');
- $grouped = mgroup($this->threads, 'getIsRoom');
- $rooms = idx($grouped, 1, array());
-
- $policies = array();
- foreach ($rooms as $room) {
- $policies[] = $room->getViewPolicy();
- }
- $policy_objects = array();
- if ($policies) {
- $policy_objects = id(new PhabricatorPolicyQuery())
- ->setViewer($this->getUser())
- ->withPHIDs($policies)
- ->execute();
- }
-
$menu = id(new PHUIListView())
->addClass('conpherence-menu')
->setID('conpherence-menu');
+ $policy_objects = ConpherenceThread::loadPolicyObjects(
+ $this->getUser(),
+ $this->threads);
+
+ $grouped = mgroup($this->threads, 'getIsRoom');
+ $rooms = idx($grouped, 1, array());
$this->addRoomsToMenu($menu, $rooms, $policy_objects);
$messages = idx($grouped, 0, array());
$this->addMessagesToMenu($menu, $messages);
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Jan 17, 11:40 PM (16 h, 14 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6998196
Default Alt Text
D12232.diff (8 KB)
Attached To
Mode
D12232: Conpherence - finish basic application search
Attached
Detach File
Event Timeline
Log In to Comment