Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-11 16:20:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #691 from matrix-org/erikj/member

Browse source 
Fix stuck invites
This commit is contained in:
Erik Johnston 2016-04-05 12:44:39 +01:00
commit b29f98377d
4 changed files with 58 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

3
synapse/storage/__init__.py
View file

@ -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

19
synapse/storage/roommember.py
View file

@ -102,6 +102,25 @@ class RoomMemberStore(SQLBaseStore):
event.state_key,
))
@defer.inlineCallbacks
def locally_reject_invite(self, user_id, room_id):
sql = (
"UPDATE local_invites SET stream_id = ?, locally_rejected = ? WHERE"
" room_id = ? AND invitee = ? AND locally_rejected is NULL"
" AND replaced_by is NULL"
)
def f(txn, stream_ordering):
txn.execute(sql, (
stream_ordering,
True,
room_id,
user_id,
))
with self._stream_id_gen.get_next() as stream_ordering:
yield self.runInteraction("locally_reject_invite", f, stream_ordering)
def get_room_member(self, user_id, room_id):
"""Retrieve the current state of a room member.