summary refs log tree commit diff
path: root/synapse/rest/client/notifications.py
diff options
context:
space:
mode:
authorEric Eastwood <erice@element.io>2022-08-09 14:46:03 -0500
committerEric Eastwood <erice@element.io>2022-08-09 14:46:03 -0500
commit7024d7b86e181f293cfb1324e1979f593c6d0674 (patch)
tree889bd04b933e4b5a2ec2546a1182b4d7bf6251b7 /synapse/rest/client/notifications.py
parentTry fix Twisted/treq problems (diff)
parentAllow use of both `@trace` and `@tag_args` stacked on the same function (#13453) (diff)
downloadsynapse-7024d7b86e181f293cfb1324e1979f593c6d0674.tar.xz
Merge branch 'develop' into madlittlemods/11850-migrate-to-opentelemetry
Conflicts:
	synapse/logging/opentracing.py
	tests/logging/test_opentracing.py
Diffstat (limited to 'synapse/rest/client/notifications.py')
-rw-r--r--synapse/rest/client/notifications.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/synapse/rest/client/notifications.py b/synapse/rest/client/notifications.py

index 24bc7c9095..a73322a6a4 100644 --- a/synapse/rest/client/notifications.py +++ b/synapse/rest/client/notifications.py
@@ -58,7 +58,12 @@ class NotificationsServlet(RestServlet): ) receipts_by_room = await self.store.get_receipts_for_user_with_orderings( - user_id, [ReceiptTypes.READ, ReceiptTypes.READ_PRIVATE] + user_id, + [ + ReceiptTypes.READ, + ReceiptTypes.READ_PRIVATE, + ReceiptTypes.UNSTABLE_READ_PRIVATE, + ], ) notif_event_ids = [pa.event_id for pa in push_actions]