Conpherence - remove room vs message distinction as far as users are concerned

Summary:
Ref T8488, T8469, T8485.

This is done in regards to T8488 as far as users are concerned. There's still some classes, and etc. that should be re-named probably. T8469 and T8485 are basically moot now though.

Rather than having "Send Message" exposed, just expose "Create Room". Users get the full form. One change is "title" is now required.

This diff removes the concept of "isRoom" entirely.

Test Plan: Verifed a user with no conpherences had sensible data in both column view and full conpherence view. Created rooms with various policies and things worked well.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: chad, epriestley, Korvin

Maniphest Tasks: T8469, T8485, T8488

Differential Revision: https://secure.phabricator.com/D13351

Author: bobtrahan

resources/celerity/map.php

@@ -342,7 +342,7 @@
     'rsrc/js/application/conpherence/behavior-menu.js' => 'd3782c93',
     'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
     'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
-    'rsrc/js/application/conpherence/behavior-widget-pane.js' => '93568464',
+    'rsrc/js/application/conpherence/behavior-widget-pane.js' => 'cafc59ab',
     'rsrc/js/application/countdown/timer.js' => 'e4cc26b3',
     'rsrc/js/application/daemon/behavior-bulk-job-reload.js' => 'edf8a145',
     'rsrc/js/application/dashboard/behavior-dashboard-async-panel.js' => '469c0d9e',
@@ -550,7 +550,7 @@
     'javelin-behavior-conpherence-drag-and-drop-photo' => 'cf86d16a',
     'javelin-behavior-conpherence-menu' => 'd3782c93',
     'javelin-behavior-conpherence-pontificate' => '21ba5861',
-    'javelin-behavior-conpherence-widget-pane' => '93568464',
+    'javelin-behavior-conpherence-widget-pane' => 'cafc59ab',
     'javelin-behavior-countdown-timer' => 'e4cc26b3',
     'javelin-behavior-dark-console' => 'f411b6ae',
     'javelin-behavior-dashboard-async-panel' => '469c0d9e',
@@ -1501,19 +1501,6 @@
       'javelin-dom',
       'javelin-stratcom',
     ),
-    93568464 => array(
-      'javelin-behavior',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-workflow',
-      'javelin-util',
-      'phabricator-notification',
-      'javelin-behavior-device',
-      'phuix-dropdown-menu',
-      'phuix-action-list-view',
-      'phuix-action-view',
-      'conpherence-thread-manager',
-    ),
     '93d0c9e3' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1768,6 +1755,19 @@
       'javelin-stratcom',
       'phabricator-phtize',
     ),
+    'cafc59ab' => array(
+      'javelin-behavior',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-workflow',
+      'javelin-util',
+      'phabricator-notification',
+      'javelin-behavior-device',
+      'phuix-dropdown-menu',
+      'phuix-action-list-view',
+      'phuix-action-view',
+      'conpherence-thread-manager',
+    ),
     'ccf1cbf8' => array(
       'javelin-install',
       'javelin-dom',

resources/sql/autopatches/20150619.conpherencerooms.1.sql

@@ -0,0 +1,6 @@
+UPDATE {$NAMESPACE}_conpherence.conpherence_thread
+  SET
+    viewPolicy = 'obj.conpherence.members',
+    editPolicy = 'obj.conpherence.members',
+    joinPolicy = 'obj.conpherence.members'
+  WHERE isRoom = 0;

resources/sql/autopatches/20150619.conpherencerooms.2.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_conpherence.conpherence_thread
+  DROP KEY `key_room`;

resources/sql/autopatches/20150619.conpherencerooms.3.sql

@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_conpherence.conpherence_thread
+  DROP COLUMN isRoom;

src/__phutil_library_map__.php

@@ -238,7 +238,6 @@
     'ConpherenceLayoutView' => 'applications/conpherence/view/ConpherenceLayoutView.php',
     'ConpherenceListController' => 'applications/conpherence/controller/ConpherenceListController.php',
     'ConpherenceMenuItemView' => 'applications/conpherence/view/ConpherenceMenuItemView.php',
-    'ConpherenceNewController' => 'applications/conpherence/controller/ConpherenceNewController.php',
     'ConpherenceNewRoomController' => 'applications/conpherence/controller/ConpherenceNewRoomController.php',
     'ConpherenceNotificationPanelController' => 'applications/conpherence/controller/ConpherenceNotificationPanelController.php',
     'ConpherenceParticipant' => 'applications/conpherence/storage/ConpherenceParticipant.php',
@@ -263,7 +262,6 @@
     'ConpherenceThreadQuery' => 'applications/conpherence/query/ConpherenceThreadQuery.php',
     'ConpherenceThreadRemarkupRule' => 'applications/conpherence/remarkup/ConpherenceThreadRemarkupRule.php',
     'ConpherenceThreadSearchEngine' => 'applications/conpherence/query/ConpherenceThreadSearchEngine.php',
-    'ConpherenceThreadTestCase' => 'applications/conpherence/__tests__/ConpherenceThreadTestCase.php',
     'ConpherenceTransaction' => 'applications/conpherence/storage/ConpherenceTransaction.php',
     'ConpherenceTransactionComment' => 'applications/conpherence/storage/ConpherenceTransactionComment.php',
     'ConpherenceTransactionQuery' => 'applications/conpherence/query/ConpherenceTransactionQuery.php',
@@ -3609,7 +3607,6 @@
     'ConpherenceLayoutView' => 'AphrontView',
     'ConpherenceListController' => 'ConpherenceController',
     'ConpherenceMenuItemView' => 'AphrontTagView',
-    'ConpherenceNewController' => 'ConpherenceController',
     'ConpherenceNewRoomController' => 'ConpherenceController',
     'ConpherenceNotificationPanelController' => 'ConpherenceController',
     'ConpherenceParticipant' => 'ConpherenceDAO',
@@ -3640,7 +3637,6 @@
     'ConpherenceThreadQuery' => 'PhabricatorCursorPagedPolicyAwareQuery',
     'ConpherenceThreadRemarkupRule' => 'PhabricatorObjectRemarkupRule',
     'ConpherenceThreadSearchEngine' => 'PhabricatorApplicationSearchEngine',
-    'ConpherenceThreadTestCase' => 'ConpherenceTestCase',
     'ConpherenceTransaction' => 'PhabricatorApplicationTransaction',
     'ConpherenceTransactionComment' => 'PhabricatorApplicationTransactionComment',
     'ConpherenceTransactionQuery' => 'PhabricatorApplicationTransactionQuery',

src/applications/conpherence/__tests__/ConpherenceRoomTestCase.php

@@ -69,20 +69,6 @@ public function testRoomParticipantAddition() {
       $participant_phids,
       $conpherence->getRecentParticipantPHIDs());
 
-    // test policy error as another user tries to add
-    $caught = null;
-    try {
-      $this->addParticipants(
-        $friend_2,
-        $conpherence,
-        array($friend_3->getPHID()));
-    } catch (PhabricatorPolicyException $ex) {
-      $caught = $ex;
-    }
-    $this->assertTrue($caught instanceof PhabricatorPolicyException);
-
-    // update edit policy so user has a chance
-    $this->changeEditPolicy($creator, $conpherence, 'users');
     // test add by other participant, so recent participation should
     // meaningfully change
     $participant_phids = array(
@@ -129,7 +115,6 @@ public function testRoomParticipantDeletion() {
   public function testAddMessageWithFileAttachments() {
     $creator = $this->generateNewTestUser();
     $friend_1 = $this->generateNewTestUser();
-    $join_via_add = $this->generateNewTestUser();
 
     $participant_map = array(
       $creator->getPHID() => $creator,
@@ -144,9 +129,6 @@ public function testAddMessageWithFileAttachments() {
       $xactions = $this->addMessageWithFile($user, $conpherence);
       $this->assertEqual(2, count($xactions));
     }
-
-    $xactions = $this->addMessageWithFile($join_via_add, $conpherence);
-    $this->assertEqual(2, count($xactions));
   }
 
   private function createRoom(

src/applications/conpherence/__tests__/ConpherenceThreadTestCase.php

@@ -11,7 +11,7 @@ public function getName() {
   }
 
   public function getShortDescription() {
-    return pht('Send Messages');
+    return pht('Chat with Others');
   }
 
   public function getFontIcon() {
@@ -44,8 +44,7 @@ public function getRoutes() {
         '(?P<id>[1-9]\d*)/(?P<messageID>[1-9]\d*)/'
                                    => 'ConpherenceViewController',
         'columnview/'              => 'ConpherenceColumnViewController',
-        'new/'                     => 'ConpherenceNewController',
-        'room/new/'                => 'ConpherenceNewRoomController',
+        'new/'                     => 'ConpherenceNewRoomController',
         'search/(?:query/(?P<queryKey>[^/]+)/)?'
            => 'ConpherenceRoomListController',
         'panel/'                   => 'ConpherenceNotificationPanelController',
@@ -59,7 +58,7 @@ public function getQuickCreateItems(PhabricatorUser $viewer) {
     $items = array();
 
     $item = id(new PHUIListItemView())
-      ->setName(pht('Conpherence Thread'))
+      ->setName(pht('Conpherence Room'))
       ->setIcon('fa-comments')
       ->setWorkflow(true)
       ->setHref($this->getBaseURI().'new/');