Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14022230
D9396.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
1 KB
Referenced Files
None
Subscribers
None
D9396.diff
View Options
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
@@ -175,9 +175,12 @@
}
private function sendNotification($chrono_key) {
-
$data = array(
- 'key' => (string)$chrono_key,
+ 'data' => array(
+ 'key' => (string)$chrono_key,
+ 'type' => 'notification',
+ ),
+ 'subscribers' => $this->subscribedPHIDs,
);
try {
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
@@ -2,7 +2,7 @@
final class PhabricatorNotificationClient {
- const EXPECT_VERSION = 4;
+ const EXPECT_VERSION = 5;
public static function getServerStatus() {
$uri = PhabricatorEnv::getEnvConfig('notification.server-uri');
diff --git a/support/aphlict/server/aphlict_server.js b/support/aphlict/server/aphlict_server.js
--- a/support/aphlict/server/aphlict_server.js
+++ b/support/aphlict/server/aphlict_server.js
@@ -120,9 +120,9 @@
request.on('end', function () {
++messages_in;
- var data = JSON.parse(body);
- debug.log('notification: ' + JSON.stringify(data));
- broadcast(data);
+ var msg = JSON.parse(body);
+ debug.log('notification: ' + JSON.stringify(msg));
+ broadcast(msg.data);
response.end();
});
} else if (request.url == '/status/') {
@@ -139,7 +139,7 @@
'messages.in': messages_in,
'messages.out': messages_out,
'log': config.log,
- 'version': 4
+ 'version': 5
};
response.write(JSON.stringify(status));
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Nov 7, 3:46 PM (1 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6736640
Default Alt Text
D9396.diff (1 KB)
Attached To
Mode
D9396: Publish additional context to the Aphlict server.
Attached
Detach File
Event Timeline
Log In to Comment