Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-03 00:34:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

initial

Browse source
This commit is contained in:
Amber Brown 2019-03-11 21:11:36 +11:00
parent 39e57f9728
commit 4abc988c6a
No known key found for this signature in database
GPG key ID: 20835A1515AB6FAC
5 changed files with 114 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

34
synapse/storage/user_directory.py
View file

@ -241,6 +241,9 @@ class UserDirectoryStore(SQLBaseStore):
self._simple_delete_txn(
txn, table="user_directory_search", keyvalues={"user_id": user_id}
)
self._simple_delete_txn(
txn, table="users_in_public_rooms", keyvalues={"user_id": user_id}
)
self._simple_delete_txn(
txn,
table="users_who_share_public_rooms",
@ -339,6 +342,21 @@ class UserDirectoryStore(SQLBaseStore):
value_names=(),
value_values=None,
)
# If it's a public room, also update them in users_in_public_rooms.
# We don't look before they're in the table before we do it, as it's
# more efficient to simply have Postgres do that (one UPSERT vs one
# SELECT and maybe one INSERT).
if not share_private:
for user_id in set([x[1] for x in user_id_tuples]):
self._simple_upsert_txn(
txn,
"users_in_public_rooms",
keyvalues={"user_id": user_id},
values={},
desc="add_user_as_in_public_room",
)
for user_id, other_user_id in user_id_tuples:
txn.call_after(
self.get_users_who_share_room_from_dir.invalidate, (user_id,)
@ -379,6 +397,21 @@ class UserDirectoryStore(SQLBaseStore):
table="users_who_share_public_rooms",
keyvalues={"other_user_id": user_id, "room_id": room_id},
)
# Are the users still in a public room after we deleted them from this one?
still_in_public = self._simple_select_one_onecol_txn(
txn,
"users_who_share_public_rooms",
keyvalues={"other_user_id": user_id},
retcol="other_user_id",
allow_none=True,
)
if still_in_public is None:
self._simple_delete_txn(
txn, table="users_in_public_rooms", keyvalues={"user_id": user_id}
)
txn.call_after(
self.get_users_who_share_room_from_dir.invalidate, (user_id,)
)
@ -452,6 +485,7 @@ class UserDirectoryStore(SQLBaseStore):
def _delete_all_from_user_dir_txn(txn):
txn.execute("DELETE FROM user_directory")
txn.execute("DELETE FROM user_directory_search")
txn.execute("DELETE FROM users_in_public_rooms")
txn.execute("DELETE FROM users_who_share_public_rooms")
txn.execute("DELETE FROM users_who_share_private_rooms")
txn.call_after(self.get_user_in_directory.invalidate_all)