diff options
| author | Erik Johnston <erik@matrix.org> | 2016-04-05 11:13:24 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-04-05 11:13:24 +0100 |
| commit | df727f212606b771b1410c8e322fb8a99d159de4 (patch) | |
| tree | 771a74464dda92d206316d613770b302e43c1e35 /synapse/storage/__init__.py | |
| parent | Docs and indents (diff) | |
| download | synapse-df727f212606b771b1410c8e322fb8a99d159de4.tar.xz | |
Fix stuck invites
If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject.
Diffstat (limited to 'synapse/storage/__init__.py')
| -rw-r--r-- | synapse/storage/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/__init__.py b/synapse/storage/__init__.py index 57863bba4d..07916b292d 100644 --- a/synapse/storage/__init__.py +++ b/synapse/storage/__init__.py @@ -94,7 +94,8 @@ class DataStore(RoomMemberStore, RoomStore, ) self._stream_id_gen = StreamIdGenerator( - db_conn, "events", "stream_ordering" + db_conn, "events", "stream_ordering", + extra_tables=[("local_invites", "stream_id")] ) self._backfill_id_gen = StreamIdGenerator( db_conn, "events", "stream_ordering", step=-1 |