mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-10 20:02:21 +02:00
Simplify code
This commit is contained in:
parent
bed7889703
commit
9da4c5340d
2 changed files with 6 additions and 8 deletions
|
@ -93,7 +93,7 @@ class BaseHandler(object):
|
|||
membership_event = state.get((EventTypes.Member, user_id), None)
|
||||
if membership_event:
|
||||
was_forgotten_at_event = yield self.store.was_forgotten_at(
|
||||
membership_event.user_id,
|
||||
membership_event.state_key,
|
||||
membership_event.room_id,
|
||||
membership_event.event_id
|
||||
)
|
||||
|
|
|
@ -295,7 +295,7 @@ class RoomMemberStore(SQLBaseStore):
|
|||
sql = (
|
||||
"SELECT"
|
||||
" COUNT(*)"
|
||||
"FROM"
|
||||
" FROM"
|
||||
" room_memberships"
|
||||
" WHERE"
|
||||
" user_id = ?"
|
||||
|
@ -318,8 +318,8 @@ class RoomMemberStore(SQLBaseStore):
|
|||
def f(txn):
|
||||
sql = (
|
||||
"SELECT"
|
||||
" COUNT(*)"
|
||||
"FROM"
|
||||
" forgotten"
|
||||
" FROM"
|
||||
" room_memberships"
|
||||
" WHERE"
|
||||
" user_id = ?"
|
||||
|
@ -327,11 +327,9 @@ class RoomMemberStore(SQLBaseStore):
|
|||
" 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)
|
||||
forgot = yield self.runInteraction("did_forget_membership_at", f)
|
||||
defer.returnValue(forgot == 1)
|
||||
|
|
Loading…
Reference in a new issue