diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -10,7 +10,7 @@ 'conpherence.pkg.css' => 'a34d59bd', 'conpherence.pkg.js' => '5f86c17d', 'core.pkg.css' => '959330a2', - 'core.pkg.js' => '1cedf416', + 'core.pkg.js' => '2e969052', 'darkconsole.pkg.js' => '31272f61', 'differential.pkg.css' => '90b30783', 'differential.pkg.js' => 'ddfeb49b', @@ -361,7 +361,7 @@ 'rsrc/image/texture/table_header.png' => '5c433037', 'rsrc/image/texture/table_header_hover.png' => '038ec3b9', 'rsrc/image/texture/table_header_tall.png' => 'd56b434f', - 'rsrc/js/application/aphlict/Aphlict.js' => '7cacce98', + 'rsrc/js/application/aphlict/Aphlict.js' => '9b5dda26', 'rsrc/js/application/aphlict/behavior-aphlict-dropdown.js' => 'caade6f2', 'rsrc/js/application/aphlict/behavior-aphlict-listen.js' => 'd82b1ff9', 'rsrc/js/application/aphlict/behavior-aphlict-status.js' => '5e2634b9', @@ -583,7 +583,7 @@ 'herald-rule-editor' => 'd6a7e717', 'herald-test-css' => 'a52e323e', 'inline-comment-summary-css' => '51efda3a', - 'javelin-aphlict' => '7cacce98', + 'javelin-aphlict' => '9b5dda26', 'javelin-behavior' => '61cbc29a', 'javelin-behavior-aphlict-dropdown' => 'caade6f2', 'javelin-behavior-aphlict-listen' => 'd82b1ff9', @@ -1468,13 +1468,6 @@ 'owners-path-editor', 'javelin-behavior', ), - '7cacce98' => array( - 'javelin-install', - 'javelin-util', - 'javelin-websocket', - 'javelin-leader', - 'javelin-json', - ), '7cbe244b' => array( 'javelin-install', 'javelin-util', @@ -1686,6 +1679,13 @@ 'aphront-typeahead-control-css', 'phui-tag-view-css', ), + '9b5dda26' => array( + 'javelin-install', + 'javelin-util', + 'javelin-websocket', + 'javelin-leader', + 'javelin-json', + ), '9bbf3762' => array( 'javelin-behavior', 'javelin-dom', 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 @@ -18,6 +18,11 @@ } public static function tryToPostMessage(array $data) { + $unique_id = Filesystem::readRandomCharacters(32); + $data = $data + array( + 'uniqueID' => $unique_id, + ); + $servers = PhabricatorNotificationServerRef::getEnabledAdminServers(); shuffle($servers); diff --git a/webroot/rsrc/js/application/aphlict/Aphlict.js b/webroot/rsrc/js/application/aphlict/Aphlict.js --- a/webroot/rsrc/js/application/aphlict/Aphlict.js +++ b/webroot/rsrc/js/application/aphlict/Aphlict.js @@ -130,7 +130,9 @@ _message: function(raw) { var message = JX.JSON.parse(raw); - JX.Leader.broadcast(null, {type: 'aphlict.server', data: message}); + var id = message.uniqueID || null; + + JX.Leader.broadcast(id, {type: 'aphlict.server', data: message}); }, _receive: function(message, is_leader) {