diff options
| author | Richard van der Hoff <richard@matrix.org> | 2020-09-10 10:15:02 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2020-09-10 10:15:02 +0100 |
| commit | e44e9ee5189bfa9de010276f603fb0bd9ba9bd3b (patch) | |
| tree | de105bae1bb7f590d91b6133bd845156718e67ef | |
| parent | Do not error when thumbnailing invalid files (#8236) (diff) | |
| parent | 1.20.0rc2 (diff) | |
| download | synapse-e44e9ee5189bfa9de010276f603fb0bd9ba9bd3b.tar.xz | |
Merge branch 'release-v1.20.0' into develop
| -rw-r--r-- | CHANGES.md | 9 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | synapse/storage/databases/main/event_push_actions.py | 5 |
3 files changed, 13 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md index 81f9a1aa26..dbef6ab6c7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,12 @@ +Synapse 1.20.0rc2 (2020-09-09) +============================== + +Bugfixes +-------- + +- Fix a bug introduced in v1.20.0rc1 causing some features related to notifications to misbehave following the implementation of unread counts. ([\#8280](https://github.com/matrix-org/synapse/issues/8280)) + + Synapse 1.20.0rc1 (2020-09-08) ============================== diff --git a/synapse/__init__.py b/synapse/__init__.py index f4aca64be8..7e8731f86a 100644 --- a/synapse/__init__.py +++ b/synapse/__init__.py @@ -48,7 +48,7 @@ try: except ImportError: pass -__version__ = "1.20.0rc1" +__version__ = "1.20.0rc2" if bool(os.environ.get("SYNAPSE_TEST_PATCH_LOG_CONTEXTS", False)): # We import here so that we don't have to install a bunch of deps when diff --git a/synapse/storage/databases/main/event_push_actions.py b/synapse/storage/databases/main/event_push_actions.py index 50fac9e72e..5233ed83e2 100644 --- a/synapse/storage/databases/main/event_push_actions.py +++ b/synapse/storage/databases/main/event_push_actions.py @@ -196,7 +196,7 @@ class EventPushActionsWorkerStore(SQLBaseStore): def f(txn): sql = ( "SELECT DISTINCT(user_id) FROM event_push_actions WHERE" - " stream_ordering >= ? AND stream_ordering <= ?" + " stream_ordering >= ? AND stream_ordering <= ? AND notif = 1" ) txn.execute(sql, (min_stream_ordering, max_stream_ordering)) return [r[0] for r in txn] @@ -644,7 +644,7 @@ class EventPushActionsWorkerStore(SQLBaseStore): "SELECT e.received_ts" " FROM event_push_actions AS ep" " JOIN events e ON ep.room_id = e.room_id AND ep.event_id = e.event_id" - " WHERE ep.stream_ordering > ?" + " WHERE ep.stream_ordering > ? AND notif = 1" " ORDER BY ep.stream_ordering ASC" " LIMIT 1" ) @@ -708,6 +708,7 @@ class EventPushActionsStore(EventPushActionsWorkerStore): " FROM event_push_actions epa, events e" " WHERE epa.event_id = e.event_id" " AND epa.user_id = ? %s" + " AND epa.notif = 1" " ORDER BY epa.stream_ordering DESC" " LIMIT ?" % (before_clause,) ) |