Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-02-18 01:14:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Apply forgetting properly to historical events

Browse Source
This commit is contained in:
Daniel Wagner-Hall 2015-11-18 18:08:22 -05:00
parent ba26eb3d5d
commit bed7889703
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
synapse/handlers/_base.py
View File

@ -92,7 +92,15 @@ class BaseHandler(object):
membership_event = state.get((EventTypes.Member, user_id), None) membership_event = state.get((EventTypes.Member, user_id), None)
if membership_event: if membership_event:
membership = membership_event.membership was_forgotten_at_event = yield self.store.was_forgotten_at(
membership_event.user_id,
membership_event.room_id,
membership_event.event_id
)
if was_forgotten_at_event:
membership = None
else:
membership = membership_event.membership
else: else:
membership = None membership = None

34
synapse/storage/roommember.py
View File

@ -271,6 +271,7 @@ class RoomMemberStore(SQLBaseStore):
defer.returnValue(ret) defer.returnValue(ret)
def forget(self, user_id, room_id): def forget(self, user_id, room_id):
"""Indicate that user_id wishes to discard history for room_id."""
def f(txn): def f(txn):
sql = ( sql = (
"UPDATE" "UPDATE"
@ -287,6 +288,9 @@ class RoomMemberStore(SQLBaseStore):
@defer.inlineCallbacks @defer.inlineCallbacks
def did_forget(self, user_id, room_id): def did_forget(self, user_id, room_id):
"""Returns whether user_id has elected to discard history for room_id.
Returns False if they have since re-joined."""
def f(txn): def f(txn):
sql = ( sql = (
"SELECT" "SELECT"
@ -298,10 +302,36 @@ class RoomMemberStore(SQLBaseStore):
" AND" " AND"
" room_id = ?" " room_id = ?"
" AND" " AND"
" forgotten = 1" " forgotten = 0"
) )
txn.execute(sql, (user_id, room_id)) txn.execute(sql, (user_id, room_id))
rows = txn.fetchall() rows = txn.fetchall()
return rows[0][0] return rows[0][0]
count = yield self.runInteraction("did_forget_membership", f) count = yield self.runInteraction("did_forget_membership", f)
defer.returnValue(count > 0) defer.returnValue(count == 0)
@defer.inlineCallbacks
def was_forgotten_at(self, user_id, room_id, event_id):
"""Returns whether user_id has elected to discard history for room_id at event_id.
event_id must be a membership event."""
def f(txn):
sql = (
"SELECT"
" COUNT(*)"
"FROM"
" room_memberships"
" WHERE"
" user_id = ?"
" AND"
" room_id = ?"
" AND"
" event_id = ?"
" AND"
" forgotten = 1"
)
txn.execute(sql, (user_id, room_id, event_id))
rows = txn.fetchall()
return rows[0][0]
count = yield self.runInteraction("did_forget_membership_at", f)
defer.returnValue(count == 1)