Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-12-18 17:14:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update room column when room becomes unpublic

Browse Source
This commit is contained in:
Erik Johnston 2017-05-31 13:30:12 +01:00
parent 168524543f
commit b5db4ed5f6
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
synapse/handlers/user_directory.py
View File

@ -121,12 +121,13 @@ class UserDirectoyHandler(object):
# TODO: Make this faster? # TODO: Make this faster?
rooms = yield self.store.get_rooms_for_user(user_id) rooms = yield self.store.get_rooms_for_user(user_id)
for room_id in rooms: for j_room_id in rooms:
is_public = yield self.store.is_room_world_readable_or_publicly_joinable( is_public = yield self.store.is_room_world_readable_or_publicly_joinable(
room_id j_room_id
) )
if is_public: if is_public:
yield self.store.update_user_in_user_dir(user_id, j_room_id)
return return
yield self.store.remove_from_user_dir(user_id) yield self.store.remove_from_user_dir(user_id)
@ -149,6 +150,15 @@ class UserDirectoyHandler(object):
if change is None: if change is None:
continue continue
is_public = yield self.store.is_room_world_readable_or_publicly_joinable(
room_id
)
if change and is_public:
continue
elif not change and not is_public:
continue
users_with_profile = yield self.state.get_current_user_in_room(room_id) users_with_profile = yield self.state.get_current_user_in_room(room_id)
for user_id, profile in users_with_profile.iteritems(): for user_id, profile in users_with_profile.iteritems():
if change: if change:
@ -164,6 +174,15 @@ class UserDirectoyHandler(object):
if change is None: if change is None:
continue continue
is_public = yield self.store.is_room_world_readable_or_publicly_joinable(
room_id
)
if change and is_public:
continue
elif not change and not is_public:
continue
users_with_profile = yield self.state.get_current_user_in_room(room_id) users_with_profile = yield self.state.get_current_user_in_room(room_id)
for user_id, profile in users_with_profile.iteritems(): for user_id, profile in users_with_profile.iteritems():
if change: if change:

10
synapse/storage/user_directory.py
View File

@ -79,6 +79,16 @@ class UserDirectoryStore(SQLBaseStore):
"add_profiles_to_user_dir", _add_profiles_to_user_dir_txn "add_profiles_to_user_dir", _add_profiles_to_user_dir_txn
) )
@defer.inlineCallbacks
def update_user_in_user_dir(self, user_id, room_id):
yield self._simple_update_one(
table="user_directory",
keyvalues={"user_id": user_id},
updatevalues={"room_id": room_id},
desc="update_user_in_user_dir",
)
self.get_user_in_directory.invalidate((user_id,))
@defer.inlineCallbacks @defer.inlineCallbacks
def remove_from_user_dir(self, user_id): def remove_from_user_dir(self, user_id):
yield self._simple_delete( yield self._simple_delete(