diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index 8b223e032b..c729dee47a 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -46,6 +46,7 @@ from synapse.rest.client.v2_alpha import (
account_data,
report_event,
openid,
+ notifications,
)
from synapse.http.server import JsonResource
@@ -90,3 +91,4 @@ class ClientRestResource(JsonResource):
account_data.register_servlets(hs, client_resource)
report_event.register_servlets(hs, client_resource)
openid.register_servlets(hs, client_resource)
+ notifications.register_servlets(hs, client_resource)
diff --git a/synapse/rest/client/v2_alpha/notifications.py b/synapse/rest/client/v2_alpha/notifications.py
new file mode 100644
index 0000000000..505e998393
--- /dev/null
+++ b/synapse/rest/client/v2_alpha/notifications.py
@@ -0,0 +1,100 @@
+# -*- coding: utf-8 -*-
+# Copyright 2016 OpenMarket Ltd
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from twisted.internet import defer
+
+from synapse.http.servlet import (
+ RestServlet, parse_string, parse_integer
+)
+from synapse.events.utils import (
+ serialize_event, format_event_for_client_v2_without_room_id,
+)
+
+from ._base import client_v2_patterns
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class NotificationsServlet(RestServlet):
+ PATTERNS = client_v2_patterns("/notifications$", releases=())
+
+ def __init__(self, hs):
+ super(NotificationsServlet, self).__init__()
+ self.store = hs.get_datastore()
+ self.auth = hs.get_auth()
+ self.clock = hs.get_clock()
+
+ @defer.inlineCallbacks
+ def on_GET(self, request):
+ requester = yield self.auth.get_user_by_req(request)
+ user_id = requester.user.to_string()
+
+ from_token = parse_string(request, "from", required=False)
+ limit = parse_integer(request, "limit", default=50)
+
+ limit = min(limit, 500)
+
+ push_actions = yield self.store.get_push_actions_for_user(
+ user_id, from_token, limit
+ )
+
+ receipts_by_room = yield self.store.get_receipts_for_user_with_orderings(
+ user_id, 'm.read'
+ )
+
+ notif_event_ids = [pa["event_id"] for pa in push_actions]
+ notif_events = yield self.store.get_events(notif_event_ids)
+
+ returned_push_actions = []
+
+ next_token = None
+
+ for pa in push_actions:
+ returned_pa = {
+ "room_id": pa["room_id"],
+ "profile_tag": pa["profile_tag"],
+ "actions": pa["actions"],
+ "event": serialize_event(
+ notif_events[pa["event_id"]],
+ self.clock.time_msec(),
+ event_format=format_event_for_client_v2_without_room_id,
+ ),
+ }
+
+ if pa["room_id"] not in receipts_by_room:
+ returned_pa["read"] = False
+ else:
+ receipt = receipts_by_room[pa["room_id"]]
+
+ returned_pa["read"] = (
+ pa["topological_ordering"] > receipt["topological_ordering"]
+ or (
+ pa["topological_ordering"] == receipt["topological_ordering"]
+ and pa["stream_ordering"] > receipt["stream_ordering"]
+ )
+ )
+ returned_push_actions.append(returned_pa)
+ next_token = pa["stream_ordering"]
+
+ defer.returnValue((200, {
+ "notifications": returned_push_actions,
+ "next_token": next_token,
+ }))
+
+
+def register_servlets(hs, http_server):
+ NotificationsServlet(hs).register(http_server)
|
