Add the Notifications API #1028

dbkr · Aug 18, 2016

Proposal: https://docs.google.com/document/d/1tQUOkbygHky_6Te4ZNCju_KV0Phmk1cuJsbf2Ir0Vvs/edit

(5, 3) > (5,2) works as expected

Generally I prefer to use explicit joins, as it makes it easier to see what the actual conditions are. i.e.:

SELECT rl.room_id, rl.event_id, e.topological_ordering, e.stream_ordering FROM receipts_linearized AS rl
INNER JOIN events AS e USING (room_id, event_id)
WHERE user_id = ?

erikjohnston · Aug 18, 2016

This looks OK to me, though am slightly scared by performance. I'm happy to merge this on the condition that we have a rethink if hitting this with @ara4n's account makes the server cry.

dbkr assigned erikjohnston Aug 18, 2016

+    +                    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"] = (
+    +                    receipt["topological_ordering"] >= pa["topological_ordering"] or (
+    +                        receipt["topological_ordering"] == pa["topological_ordering"] and
+    +                        receipt["stream_ordering"] >= pa["stream_ordering"]
+    +                    )

@@ -95,6 +95,31 @@ def get_receipts_for_user(self, user_id, receipt_type):
              defer.returnValue({row["room_id"]: row["event_id"] for row in rows})
          @defer.inlineCallbacks
+    +    def get_receipts_for_user_with_orderings(self, user_id, receipt_type):
+    +        def f(txn):
+    +            sql = (
+    +                "SELECT rl.room_id, rl.event_id,"
+    +                " e.topological_ordering, e.stream_ordering"
+    +                " FROM receipts_linearized rl,"
+    +                " events e"
+    +                " WHERE rl.room_id = e.room_id"

matrix-org/synapse

Add the Notifications API #1028

dbkr commented Aug 18, 2016

dbkr added some commits May 23, 2016

dbkr assigned erikjohnston Aug 18, 2016

erikjohnston commented on an outdated diff Aug 18, 2016

erikjohnston commented on an outdated diff Aug 18, 2016

erikjohnston commented Aug 18, 2016

dbkr and others added some commits Aug 18, 2016

erikjohnston merged commit `d143f21` into develop Aug 22, 2016
10 checks passed

10 checks passed

matrix-org/synapse

Join GitHub today

Add the Notifications API #1028

Conversation

dbkr commented Aug 18, 2016

dbkr added some commits May 23, 2016

All checks have passed

All checks have passed

Some checks were not successful

All checks have passed

dbkr assigned erikjohnston Aug 18, 2016

Some checks were not successful

Show 1 comment Hide comment erikjohnston commented on an outdated diff Aug 18, 2016

erikjohnston Aug 18, 2016

Show 1 comment Hide comment erikjohnston commented on an outdated diff Aug 18, 2016

erikjohnston Aug 18, 2016

erikjohnston commented Aug 18, 2016

dbkr and others added some commits Aug 18, 2016

All checks have passed

All checks have passed

Hide details View details erikjohnston merged commit d143f21 into develop Aug 22, 2016 10 checks passed

10 checks passed

erikjohnston commented on an outdated diff Aug 18, 2016

erikjohnston commented on an outdated diff Aug 18, 2016

erikjohnston merged commit `d143f21` into develop Aug 22, 2016
10 checks passed