Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F15529286
D9486.id22707.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
14 KB
Referenced Files
None
Subscribers
None
D9486.id22707.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -8,7 +8,7 @@
'names' =>
array(
'core.pkg.css' => 'd82d2f53',
- 'core.pkg.js' => '4af4aa9d',
+ 'core.pkg.js' => '0627d27e',
'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '4a93db37',
'differential.pkg.js' => 'eca39a2c',
@@ -336,11 +336,11 @@
'rsrc/image/texture/table_header_tall.png' => 'd56b434f',
'rsrc/js/application/aphlict/Aphlict.js' => '08be8878',
'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => '2a2dba85',
- 'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => 'acda9f51',
+ 'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => '1da67f34',
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
'rsrc/js/application/config/behavior-reorder-fields.js' => '938aed89',
'rsrc/js/application/conpherence/behavior-menu.js' => '7ee23816',
- 'rsrc/js/application/conpherence/behavior-pontificate.js' => '53f6f2dd',
+ 'rsrc/js/application/conpherence/behavior-pontificate.js' => 'b9153567',
'rsrc/js/application/conpherence/behavior-widget-pane.js' => '40b1ff90',
'rsrc/js/application/countdown/timer.js' => '361e3ed3',
'rsrc/js/application/dashboard/behavior-dashboard-async-panel.js' => '469c0d9e',
@@ -528,7 +528,7 @@
'javelin-aphlict' => '08be8878',
'javelin-behavior' => '8a3ed18b',
'javelin-behavior-aphlict-dropdown' => '2a2dba85',
- 'javelin-behavior-aphlict-listen' => 'acda9f51',
+ 'javelin-behavior-aphlict-listen' => '1da67f34',
'javelin-behavior-aphront-basic-tokenizer' => 'b3a4b884',
'javelin-behavior-aphront-crop' => 'b98fc918',
'javelin-behavior-aphront-drag-and-drop-textarea' => '4a11ea9c',
@@ -540,7 +540,7 @@
'javelin-behavior-boards-filter' => '22f113af',
'javelin-behavior-config-reorder-fields' => '938aed89',
'javelin-behavior-conpherence-menu' => '7ee23816',
- 'javelin-behavior-conpherence-pontificate' => '53f6f2dd',
+ 'javelin-behavior-conpherence-pontificate' => 'b9153567',
'javelin-behavior-conpherence-widget-pane' => '40b1ff90',
'javelin-behavior-countdown-timer' => '361e3ed3',
'javelin-behavior-dark-console' => 'e9fdb5e5',
@@ -956,6 +956,18 @@
1 => 'javelin-util',
2 => 'phabricator-keyboard-shortcut-manager',
),
+ '1da67f34' =>
+ array(
+ 0 => 'javelin-behavior',
+ 1 => 'javelin-aphlict',
+ 2 => 'javelin-stratcom',
+ 3 => 'javelin-request',
+ 4 => 'javelin-uri',
+ 5 => 'javelin-dom',
+ 6 => 'javelin-json',
+ 7 => 'javelin-router',
+ 8 => 'phabricator-notification',
+ ),
'1e1c8a59' =>
array(
0 => 'javelin-behavior',
@@ -1192,14 +1204,6 @@
1 => 'javelin-dom',
2 => 'phabricator-prefab',
),
- '53f6f2dd' =>
- array(
- 0 => 'javelin-behavior',
- 1 => 'javelin-dom',
- 2 => 'javelin-util',
- 3 => 'javelin-workflow',
- 4 => 'javelin-stratcom',
- ),
'54b612ba' =>
array(
0 => 'javelin-color',
@@ -1250,11 +1254,6 @@
2 => 'javelin-util',
3 => 'phabricator-shaped-request',
),
- '7319e029' =>
- array(
- 0 => 'javelin-behavior',
- 1 => 'javelin-dom',
- ),
'62e18640' =>
array(
0 => 'javelin-install',
@@ -1327,6 +1326,11 @@
1 => 'javelin-stratcom',
2 => 'javelin-dom',
),
+ '7319e029' =>
+ array(
+ 0 => 'javelin-behavior',
+ 1 => 'javelin-dom',
+ ),
'76f4ebed' =>
array(
0 => 'javelin-install',
@@ -1608,18 +1612,6 @@
1 => 'javelin-dom',
2 => 'javelin-stratcom',
),
- 'acda9f51' =>
- array(
- 0 => 'javelin-behavior',
- 1 => 'javelin-aphlict',
- 2 => 'javelin-stratcom',
- 3 => 'javelin-request',
- 4 => 'javelin-uri',
- 5 => 'javelin-dom',
- 6 => 'javelin-json',
- 7 => 'javelin-router',
- 8 => 'phabricator-notification',
- ),
'ad7a69ca' =>
array(
0 => 'javelin-install',
@@ -1694,6 +1686,14 @@
4 => 'javelin-install',
5 => 'javelin-util',
),
+ 'b9153567' =>
+ array(
+ 0 => 'javelin-behavior',
+ 1 => 'javelin-dom',
+ 2 => 'javelin-util',
+ 3 => 'javelin-workflow',
+ 4 => 'javelin-stratcom',
+ ),
'b98fc918' =>
array(
0 => 'javelin-behavior',
diff --git a/src/applications/conpherence/constants/ConpherenceUpdateActions.php b/src/applications/conpherence/constants/ConpherenceUpdateActions.php
--- a/src/applications/conpherence/constants/ConpherenceUpdateActions.php
+++ b/src/applications/conpherence/constants/ConpherenceUpdateActions.php
@@ -9,4 +9,5 @@
const REMOVE_PERSON = 'remove_person';
const NOTIFICATIONS = 'notifications';
const ADD_STATUS = 'add_status';
+ const LOAD = 'load';
}
diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php
--- a/src/applications/conpherence/controller/ConpherenceUpdateController.php
+++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php
@@ -31,6 +31,7 @@
->executeOne();
$action = $request->getStr('action', ConpherenceUpdateActions::METADATA);
+
$latest_transaction_id = null;
$response_mode = $request->isAjax() ? 'ajax' : 'redirect';
$error_view = null;
@@ -38,7 +39,7 @@
$errors = array();
$delete_draft = false;
$xactions = array();
- if ($request->isFormPost()) {
+ if ($request->isFormPost() || ($action == ConpherenceUpdateActions::LOAD)) {
$editor = id(new ConpherenceEditor())
->setContinueOnNoEffect($request->isContinueRequest())
->setContentSourceFromRequest($request)
@@ -114,24 +115,32 @@
'That was a non-update. Try cancel.');
}
break;
+ case ConpherenceUpdateActions::LOAD:
+ $updated = false;
+ $response_mode = 'ajax';
+ break;
default:
throw new Exception('Unknown action: '.$action);
break;
}
- if ($xactions) {
- try {
- $xactions = $editor->applyTransactions($conpherence, $xactions);
- if ($delete_draft) {
- $draft = PhabricatorDraft::newFromUserAndKey(
- $user,
- $conpherence->getPHID());
- $draft->delete();
+
+ if ($xactions || ($action == ConpherenceUpdateActions::LOAD)) {
+ if ($xactions) {
+ try {
+ $xactions = $editor->applyTransactions($conpherence, $xactions);
+ if ($delete_draft) {
+ $draft = PhabricatorDraft::newFromUserAndKey(
+ $user,
+ $conpherence->getPHID());
+ $draft->delete();
+ }
+ } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
+ return id(new PhabricatorApplicationTransactionNoEffectResponse())
+ ->setCancelURI($this->getApplicationURI($conpherence_id.'/'))
+ ->setException($ex);
}
- } catch (PhabricatorApplicationTransactionNoEffectException $ex) {
- return id(new PhabricatorApplicationTransactionNoEffectResponse())
- ->setCancelURI($this->getApplicationURI($conpherence_id.'/'))
- ->setException($ex);
}
+
switch ($response_mode) {
case 'ajax':
$latest_transaction_id = $request->getInt('latest_transaction_id');
@@ -266,6 +275,7 @@
$need_transactions = false;
switch ($action) {
case ConpherenceUpdateActions::METADATA:
+ case ConpherenceUpdateActions::LOAD:
$need_transactions = true;
break;
case ConpherenceUpdateActions::MESSAGE:
diff --git a/src/applications/conpherence/controller/ConpherenceViewController.php b/src/applications/conpherence/controller/ConpherenceViewController.php
--- a/src/applications/conpherence/controller/ConpherenceViewController.php
+++ b/src/applications/conpherence/controller/ConpherenceViewController.php
@@ -97,6 +97,7 @@
array(
'title' => $title,
'device' => true,
+ 'pageObjects' => array($conpherence->getPHID()),
));
}
@@ -156,7 +157,11 @@
'type' => 'hidden',
'name' => 'latest_transaction_id',
'value' => $latest_transaction_id,
- 'sigil' => 'latest-transaction-id'
+ 'sigil' => 'latest-transaction-id',
+ 'meta' => array(
+ 'threadPHID' => $conpherence->getPHID(),
+ 'threadID' => $conpherence->getID(),
+ ),
),
''))
->render();
diff --git a/src/applications/conpherence/editor/ConpherenceEditor.php b/src/applications/conpherence/editor/ConpherenceEditor.php
--- a/src/applications/conpherence/editor/ConpherenceEditor.php
+++ b/src/applications/conpherence/editor/ConpherenceEditor.php
@@ -306,6 +306,25 @@
$participant->save();
}
+ $last_comment = null;
+ $type_comment = PhabricatorTransactions::TYPE_COMMENT;
+ foreach ($xactions as $xaction) {
+ if ($xaction->getTransactionType() == $type_comment) {
+ $last_comment = $xaction;
+ }
+ }
+
+ if ($last_comment) {
+ $data = array(
+ 'type' => 'message',
+ 'threadPHID' => $object->getPHID(),
+ 'messageID' => $last_comment->getID(),
+ 'subscribers' => array($object->getPHID()),
+ );
+
+ PhabricatorNotificationClient::tryToPostMessage($data);
+ }
+
return $xactions;
}
diff --git a/src/applications/feed/PhabricatorFeedStoryPublisher.php b/src/applications/feed/PhabricatorFeedStoryPublisher.php
--- a/src/applications/feed/PhabricatorFeedStoryPublisher.php
+++ b/src/applications/feed/PhabricatorFeedStoryPublisher.php
@@ -112,9 +112,7 @@
}
$this->insertNotifications($chrono_key);
- if (PhabricatorEnv::getEnvConfig('notification.enabled')) {
- $this->sendNotification($chrono_key);
- }
+ $this->sendNotification($chrono_key);
PhabricatorWorker::scheduleTask(
'FeedPublisherWorker',
@@ -181,11 +179,7 @@
'subscribers' => $this->subscribedPHIDs,
);
- try {
- PhabricatorNotificationClient::postMessage($data);
- } catch (Exception $ex) {
- // Ignore, these are not critical.
- }
+ PhabricatorNotificationClient::tryToPostMessage($data);
}
/**
diff --git a/src/applications/notification/client/PhabricatorNotificationClient.php b/src/applications/notification/client/PhabricatorNotificationClient.php
--- a/src/applications/notification/client/PhabricatorNotificationClient.php
+++ b/src/applications/notification/client/PhabricatorNotificationClient.php
@@ -25,7 +25,19 @@
return $status;
}
- public static function postMessage(array $data) {
+ public static function tryToPostMessage(array $data) {
+ if (!PhabricatorEnv::getEnvConfig('notification.enabled')) {
+ return;
+ }
+
+ try {
+ self::postMessage($data);
+ } catch (Exception $ex) {
+ // Just ignore any issues here.
+ }
+ }
+
+ private static function postMessage(array $data) {
$server_uri = PhabricatorEnv::getEnvConfig('notification.server-uri');
id(new HTTPSFuture($server_uri, json_encode($data)))
diff --git a/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js b/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
--- a/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
+++ b/webroot/rsrc/js/application/aphlict/behavior-aphlict-listen.js
@@ -27,6 +27,29 @@
.start();
}
+ JX.Stratcom.listen('aphlict-receive-message', null, function(e) {
+ var message = e.getData();
+
+ if (message.type != 'notification') {
+ return;
+ }
+
+ var request = new JX.Request(
+ '/notification/individual/',
+ onnotification);
+
+ var routable = request
+ .addData({key: message.key})
+ .getRoutable();
+
+ routable
+ .setType('notification')
+ .setPriority(250);
+
+ JX.Router.getInstance().queue(routable);
+ });
+
+
// Respond to a notification from the Aphlict notification server. We send
// a request to Phabricator to get notification details.
function onaphlictmessage(type, message) {
@@ -40,19 +63,7 @@
break;
case 'receive':
- var request = new JX.Request(
- '/notification/individual/',
- onnotification);
-
- var routable = request
- .addData({key: message.key})
- .getRoutable();
-
- routable
- .setType('notification')
- .setPriority(250);
-
- JX.Router.getInstance().queue(routable);
+ JX.Stratcom.invoke('aphlict-receive-message', null, message);
break;
default:
diff --git a/webroot/rsrc/js/application/conpherence/behavior-pontificate.js b/webroot/rsrc/js/application/conpherence/behavior-pontificate.js
--- a/webroot/rsrc/js/application/conpherence/behavior-pontificate.js
+++ b/webroot/rsrc/js/application/conpherence/behavior-pontificate.js
@@ -8,6 +8,54 @@
*/
JX.behavior('conpherence-pontificate', function(config) {
+
+ JX.Stratcom.listen('aphlict-receive-message', null, function(e) {
+ var message = e.getData();
+
+ if (message.type != 'message') {
+ // Not a message event.
+ return;
+ }
+
+ // TODO: This is really, really gross.
+ var infonode = JX.DOM.find(document, 'input', 'latest-transaction-id');
+ var data = JX.Stratcom.getData(infonode);
+
+ var latest_id = infonode.value;
+ var thread_phid = data.threadPHID;
+ var thread_id = data.threadID;
+
+ if (message.threadPHID != thread_phid) {
+ // Message event for some thread other than the visible one.
+ return;
+ }
+
+ if (message.messageID <= latest_id) {
+ // Message event for something we already know about.
+ return;
+ }
+
+ var params = {
+ action: 'load',
+ latest_transaction_id: latest_id
+ };
+
+ new JX.Workflow('/conpherence/update/' + thread_id + '/')
+ .setData(params)
+ .setHandler(function(r) {
+ JX.log(r);
+
+ var messages = JX.DOM.find(document, 'div', 'conpherence-messages');
+ JX.DOM.appendContent(messages, JX.$H(r.transactions));
+ messages.scrollTop = messages.scrollHeight;
+
+ // TODO: Continued grossness from above.
+ infonode.value = r.latest_transaction_id;
+ })
+ .start();
+ });
+
+
var onsubmit = function(e) {
e.kill();
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Wed, Apr 23, 6:23 PM (2 m, 28 s)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7729162
Default Alt Text
D9486.id22707.diff (14 KB)
Attached To
Mode
D9486: Make Conpherence threads update in real time, very roughly
Attached
Detach File
Event Timeline
Log In to Comment