mirror of
https://mau.dev/maunium/synapse.git
synced 2024-09-04 08:32:29 +00:00
Merge pull request #2280 from matrix-org/erikj/share_room_user_dir
Include users who you share a room with in user directory
This commit is contained in:
commit
d8f47d2efa
@ -14,12 +14,12 @@
|
|||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
|
|
||||||
from synapse.api.constants import EventTypes, JoinRules, Membership
|
from synapse.api.constants import EventTypes, JoinRules, Membership
|
||||||
from synapse.storage.roommember import ProfileInfo
|
from synapse.storage.roommember import ProfileInfo
|
||||||
from synapse.util.metrics import Measure
|
from synapse.util.metrics import Measure
|
||||||
|
from synapse.util.async import sleep
|
||||||
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
@ -41,12 +41,15 @@ class UserDirectoyHandler(object):
|
|||||||
one public room.
|
one public room.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
INITIAL_SLEEP_MS = 50
|
||||||
|
|
||||||
def __init__(self, hs):
|
def __init__(self, hs):
|
||||||
self.store = hs.get_datastore()
|
self.store = hs.get_datastore()
|
||||||
self.state = hs.get_state_handler()
|
self.state = hs.get_state_handler()
|
||||||
self.server_name = hs.hostname
|
self.server_name = hs.hostname
|
||||||
self.clock = hs.get_clock()
|
self.clock = hs.get_clock()
|
||||||
self.notifier = hs.get_notifier()
|
self.notifier = hs.get_notifier()
|
||||||
|
self.is_mine_id = hs.is_mine_id
|
||||||
|
|
||||||
self.notifier.add_replication_callback(self.notify_new_event)
|
self.notifier.add_replication_callback(self.notify_new_event)
|
||||||
|
|
||||||
@ -55,6 +58,9 @@ class UserDirectoyHandler(object):
|
|||||||
self.initially_handled_users = set()
|
self.initially_handled_users = set()
|
||||||
self.initially_handled_users_in_public = set()
|
self.initially_handled_users_in_public = set()
|
||||||
|
|
||||||
|
self.initially_handled_users_share = set()
|
||||||
|
self.initially_handled_users_share_private_room = set()
|
||||||
|
|
||||||
# The current position in the current_state_delta stream
|
# The current position in the current_state_delta stream
|
||||||
self.pos = None
|
self.pos = None
|
||||||
|
|
||||||
@ -65,7 +71,7 @@ class UserDirectoyHandler(object):
|
|||||||
# we start populating the user directory
|
# we start populating the user directory
|
||||||
self.clock.call_later(0, self.notify_new_event)
|
self.clock.call_later(0, self.notify_new_event)
|
||||||
|
|
||||||
def search_users(self, search_term, limit):
|
def search_users(self, user_id, search_term, limit):
|
||||||
"""Searches for users in directory
|
"""Searches for users in directory
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
@ -82,7 +88,7 @@ class UserDirectoyHandler(object):
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
return self.store.search_user_dir(search_term, limit)
|
return self.store.search_user_dir(user_id, search_term, limit)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def notify_new_event(self):
|
def notify_new_event(self):
|
||||||
@ -140,10 +146,14 @@ class UserDirectoyHandler(object):
|
|||||||
logger.info("Handling room %d/%d", num_processed_rooms, len(room_ids))
|
logger.info("Handling room %d/%d", num_processed_rooms, len(room_ids))
|
||||||
yield self._handle_intial_room(room_id)
|
yield self._handle_intial_room(room_id)
|
||||||
num_processed_rooms += 1
|
num_processed_rooms += 1
|
||||||
|
yield sleep(self.INITIAL_SLEEP_MS / 1000.)
|
||||||
|
|
||||||
logger.info("Processed all rooms.")
|
logger.info("Processed all rooms.")
|
||||||
|
|
||||||
self.initially_handled_users = None
|
self.initially_handled_users = None
|
||||||
|
self.initially_handled_users_in_public = None
|
||||||
|
self.initially_handled_users_share = None
|
||||||
|
self.initially_handled_users_share_private_room = None
|
||||||
|
|
||||||
yield self.store.update_user_directory_stream_pos(new_pos)
|
yield self.store.update_user_directory_stream_pos(new_pos)
|
||||||
|
|
||||||
@ -158,7 +168,8 @@ class UserDirectoyHandler(object):
|
|||||||
is_public = yield self.store.is_room_world_readable_or_publicly_joinable(room_id)
|
is_public = yield self.store.is_room_world_readable_or_publicly_joinable(room_id)
|
||||||
|
|
||||||
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)
|
||||||
unhandled_users = set(users_with_profile) - self.initially_handled_users
|
user_ids = set(users_with_profile)
|
||||||
|
unhandled_users = user_ids - self.initially_handled_users
|
||||||
|
|
||||||
yield self.store.add_profiles_to_user_dir(
|
yield self.store.add_profiles_to_user_dir(
|
||||||
room_id, {
|
room_id, {
|
||||||
@ -175,6 +186,69 @@ class UserDirectoyHandler(object):
|
|||||||
)
|
)
|
||||||
self.initially_handled_users_in_public != unhandled_users
|
self.initially_handled_users_in_public != unhandled_users
|
||||||
|
|
||||||
|
# We now go and figure out the new users who share rooms with user entries
|
||||||
|
# We sleep aggressively here as otherwise it can starve resources.
|
||||||
|
# We also batch up inserts/updates, but try to avoid too many at once.
|
||||||
|
to_insert = set()
|
||||||
|
to_update = set()
|
||||||
|
count = 0
|
||||||
|
for user_id in user_ids:
|
||||||
|
if count % 100 == 0:
|
||||||
|
yield sleep(self.INITIAL_SLEEP_MS / 1000.)
|
||||||
|
|
||||||
|
if not self.is_mine_id(user_id):
|
||||||
|
count += 1
|
||||||
|
continue
|
||||||
|
|
||||||
|
for other_user_id in user_ids:
|
||||||
|
if user_id == other_user_id:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if count % 100 == 0:
|
||||||
|
yield sleep(self.INITIAL_SLEEP_MS / 1000.)
|
||||||
|
count += 1
|
||||||
|
|
||||||
|
user_set = (user_id, other_user_id)
|
||||||
|
|
||||||
|
if user_set in self.initially_handled_users_share_private_room:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if user_set in self.initially_handled_users_share:
|
||||||
|
if is_public:
|
||||||
|
continue
|
||||||
|
to_update.add(user_set)
|
||||||
|
else:
|
||||||
|
to_insert.add(user_set)
|
||||||
|
|
||||||
|
if is_public:
|
||||||
|
self.initially_handled_users_share.add(user_set)
|
||||||
|
else:
|
||||||
|
self.initially_handled_users_share_private_room.add(user_set)
|
||||||
|
|
||||||
|
if len(to_insert) > 100:
|
||||||
|
yield self.store.add_users_who_share_room(
|
||||||
|
room_id, not is_public, to_insert,
|
||||||
|
)
|
||||||
|
to_insert.clear()
|
||||||
|
|
||||||
|
if len(to_update) > 100:
|
||||||
|
yield self.store.update_users_who_share_room(
|
||||||
|
room_id, not is_public, to_update,
|
||||||
|
)
|
||||||
|
to_update.clear()
|
||||||
|
|
||||||
|
if to_insert:
|
||||||
|
yield self.store.add_users_who_share_room(
|
||||||
|
room_id, not is_public, to_insert,
|
||||||
|
)
|
||||||
|
to_insert.clear()
|
||||||
|
|
||||||
|
if to_update:
|
||||||
|
yield self.store.update_users_who_share_room(
|
||||||
|
room_id, not is_public, to_update,
|
||||||
|
)
|
||||||
|
to_update.clear()
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def _handle_deltas(self, deltas):
|
def _handle_deltas(self, deltas):
|
||||||
"""Called with the state deltas to process
|
"""Called with the state deltas to process
|
||||||
@ -316,12 +390,77 @@ class UserDirectoyHandler(object):
|
|||||||
room_id
|
room_id
|
||||||
)
|
)
|
||||||
|
|
||||||
if not is_public:
|
if is_public:
|
||||||
return
|
row = yield self.store.get_user_in_public_room(user_id)
|
||||||
|
if not row:
|
||||||
|
yield self.store.add_users_to_public_room(room_id, [user_id])
|
||||||
|
|
||||||
row = yield self.store.get_user_in_public_room(user_id)
|
# Now we update users who share rooms with users. We do this by getting
|
||||||
if not row:
|
# all the current users in the room and seeing which aren't already
|
||||||
yield self.store.add_users_to_public_room(room_id, [user_id])
|
# marked in the database as sharing with `user_id`
|
||||||
|
|
||||||
|
users_with_profile = yield self.state.get_current_user_in_room(room_id)
|
||||||
|
|
||||||
|
to_insert = set()
|
||||||
|
to_update = set()
|
||||||
|
|
||||||
|
# First, if they're our user then we need to update for every user
|
||||||
|
if self.is_mine_id(user_id):
|
||||||
|
# Returns a map of other_user_id -> shared_private. We only need
|
||||||
|
# to update mappings if for users that either don't share a room
|
||||||
|
# already (aren't in the map) or, if the room is private, those that
|
||||||
|
# only share a public room.
|
||||||
|
user_ids_shared = yield self.store.get_users_who_share_room_from_dir(
|
||||||
|
user_id
|
||||||
|
)
|
||||||
|
|
||||||
|
for other_user_id in users_with_profile:
|
||||||
|
if user_id == other_user_id:
|
||||||
|
continue
|
||||||
|
|
||||||
|
shared_is_private = user_ids_shared.get(other_user_id)
|
||||||
|
if shared_is_private is True:
|
||||||
|
# We've already marked in the database they share a private room
|
||||||
|
continue
|
||||||
|
elif shared_is_private is False:
|
||||||
|
# They already share a public room, so only update if this is
|
||||||
|
# a private room
|
||||||
|
if not is_public:
|
||||||
|
to_update.add((user_id, other_user_id))
|
||||||
|
elif shared_is_private is None:
|
||||||
|
# This is the first time they both share a room
|
||||||
|
to_insert.add((user_id, other_user_id))
|
||||||
|
|
||||||
|
# Next we need to update for every local user in the room
|
||||||
|
for other_user_id in users_with_profile:
|
||||||
|
if user_id == other_user_id:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if self.is_mine_id(other_user_id):
|
||||||
|
shared_is_private = yield self.store.get_if_users_share_a_room(
|
||||||
|
other_user_id, user_id,
|
||||||
|
)
|
||||||
|
if shared_is_private is True:
|
||||||
|
# We've already marked in the database they share a private room
|
||||||
|
continue
|
||||||
|
elif shared_is_private is False:
|
||||||
|
# They already share a public room, so only update if this is
|
||||||
|
# a private room
|
||||||
|
if not is_public:
|
||||||
|
to_update.add((other_user_id, user_id))
|
||||||
|
elif shared_is_private is None:
|
||||||
|
# This is the first time they both share a room
|
||||||
|
to_insert.add((other_user_id, user_id))
|
||||||
|
|
||||||
|
if to_insert:
|
||||||
|
yield self.store.add_users_who_share_room(
|
||||||
|
room_id, not is_public, to_insert,
|
||||||
|
)
|
||||||
|
|
||||||
|
if to_update:
|
||||||
|
yield self.store.update_users_who_share_room(
|
||||||
|
room_id, not is_public, to_update,
|
||||||
|
)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def _handle_remove_user(self, room_id, user_id):
|
def _handle_remove_user(self, room_id, user_id):
|
||||||
@ -339,32 +478,29 @@ class UserDirectoyHandler(object):
|
|||||||
row = yield self.store.get_user_in_public_room(user_id)
|
row = yield self.store.get_user_in_public_room(user_id)
|
||||||
update_user_in_public = row and row["room_id"] == room_id
|
update_user_in_public = row and row["room_id"] == room_id
|
||||||
|
|
||||||
if not update_user_in_public and not update_user_dir:
|
if (update_user_in_public or update_user_dir):
|
||||||
return
|
# XXX: Make this faster?
|
||||||
|
rooms = yield self.store.get_rooms_for_user(user_id)
|
||||||
|
for j_room_id in rooms:
|
||||||
|
if (not update_user_in_public and not update_user_dir):
|
||||||
|
break
|
||||||
|
|
||||||
# XXX: Make this faster?
|
is_in_room = yield self.store.is_host_joined(
|
||||||
rooms = yield self.store.get_rooms_for_user(user_id)
|
j_room_id, self.server_name,
|
||||||
for j_room_id in rooms:
|
)
|
||||||
if not update_user_in_public and not update_user_dir:
|
|
||||||
break
|
|
||||||
|
|
||||||
is_in_room = yield self.store.is_host_joined(
|
if not is_in_room:
|
||||||
j_room_id, self.server_name,
|
continue
|
||||||
)
|
|
||||||
|
|
||||||
if not is_in_room:
|
if update_user_dir:
|
||||||
continue
|
update_user_dir = False
|
||||||
|
yield self.store.update_user_in_user_dir(user_id, j_room_id)
|
||||||
|
|
||||||
if update_user_dir:
|
|
||||||
update_user_dir = False
|
|
||||||
yield self.store.update_user_in_user_dir(user_id, j_room_id)
|
|
||||||
|
|
||||||
if update_user_in_public:
|
|
||||||
is_public = yield self.store.is_room_world_readable_or_publicly_joinable(
|
is_public = yield self.store.is_room_world_readable_or_publicly_joinable(
|
||||||
j_room_id
|
j_room_id
|
||||||
)
|
)
|
||||||
|
|
||||||
if is_public:
|
if update_user_in_public and is_public:
|
||||||
yield self.store.update_user_in_public_user_list(user_id, j_room_id)
|
yield self.store.update_user_in_public_user_list(user_id, j_room_id)
|
||||||
update_user_in_public = False
|
update_user_in_public = False
|
||||||
|
|
||||||
@ -373,6 +509,46 @@ class UserDirectoyHandler(object):
|
|||||||
elif update_user_in_public:
|
elif update_user_in_public:
|
||||||
yield self.store.remove_from_user_in_public_room(user_id)
|
yield self.store.remove_from_user_in_public_room(user_id)
|
||||||
|
|
||||||
|
# Now handle users_who_share_rooms.
|
||||||
|
|
||||||
|
# Get a list of user tuples that were in the DB due to this room and
|
||||||
|
# users (this includes tuples where the other user matches `user_id`)
|
||||||
|
user_tuples = yield self.store.get_users_in_share_dir_with_room_id(
|
||||||
|
user_id, room_id,
|
||||||
|
)
|
||||||
|
|
||||||
|
for user_id, other_user_id in user_tuples:
|
||||||
|
# For each user tuple get a list of rooms that they still share,
|
||||||
|
# trying to find a private room, and update the entry in the DB
|
||||||
|
rooms = yield self.store.get_rooms_in_common_for_users(user_id, other_user_id)
|
||||||
|
|
||||||
|
# If they dont share a room anymore, remove the mapping
|
||||||
|
if not rooms:
|
||||||
|
yield self.store.remove_user_who_share_room(
|
||||||
|
user_id, other_user_id,
|
||||||
|
)
|
||||||
|
continue
|
||||||
|
|
||||||
|
found_public_share = None
|
||||||
|
for j_room_id in rooms:
|
||||||
|
is_public = yield self.store.is_room_world_readable_or_publicly_joinable(
|
||||||
|
j_room_id
|
||||||
|
)
|
||||||
|
|
||||||
|
if is_public:
|
||||||
|
found_public_share = j_room_id
|
||||||
|
else:
|
||||||
|
found_public_share = None
|
||||||
|
yield self.store.update_users_who_share_room(
|
||||||
|
room_id, not is_public, [(user_id, other_user_id)],
|
||||||
|
)
|
||||||
|
break
|
||||||
|
|
||||||
|
if found_public_share:
|
||||||
|
yield self.store.update_users_who_share_room(
|
||||||
|
room_id, not is_public, [(user_id, other_user_id)],
|
||||||
|
)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def _handle_profile_change(self, user_id, room_id, prev_event_id, event_id):
|
def _handle_profile_change(self, user_id, room_id, prev_event_id, event_id):
|
||||||
"""Check member event changes for any profile changes and update the
|
"""Check member event changes for any profile changes and update the
|
||||||
|
@ -55,7 +55,9 @@ class UserDirectorySearchRestServlet(RestServlet):
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
yield self.auth.get_user_by_req(request, allow_guest=False)
|
requester = yield self.auth.get_user_by_req(request, allow_guest=False)
|
||||||
|
user_id = requester.user.to_string()
|
||||||
|
|
||||||
body = parse_json_object_from_request(request)
|
body = parse_json_object_from_request(request)
|
||||||
|
|
||||||
limit = body.get("limit", 10)
|
limit = body.get("limit", 10)
|
||||||
@ -66,7 +68,9 @@ class UserDirectorySearchRestServlet(RestServlet):
|
|||||||
except:
|
except:
|
||||||
raise SynapseError(400, "`search_term` is required field")
|
raise SynapseError(400, "`search_term` is required field")
|
||||||
|
|
||||||
results = yield self.user_directory_handler.search_users(search_term, limit)
|
results = yield self.user_directory_handler.search_users(
|
||||||
|
user_id, search_term, limit,
|
||||||
|
)
|
||||||
|
|
||||||
defer.returnValue((200, results))
|
defer.returnValue((200, results))
|
||||||
|
|
||||||
|
@ -25,7 +25,7 @@ logger = logging.getLogger(__name__)
|
|||||||
|
|
||||||
# Remember to update this number every time a change is made to database
|
# Remember to update this number every time a change is made to database
|
||||||
# schema files, so the users will be informed on server restarts.
|
# schema files, so the users will be informed on server restarts.
|
||||||
SCHEMA_VERSION = 42
|
SCHEMA_VERSION = 43
|
||||||
|
|
||||||
dir_path = os.path.abspath(os.path.dirname(__file__))
|
dir_path = os.path.abspath(os.path.dirname(__file__))
|
||||||
|
|
||||||
|
32
synapse/storage/schema/delta/43/user_share.sql
Normal file
32
synapse/storage/schema/delta/43/user_share.sql
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
/* Copyright 2017 Vector Creations Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
-- Table keeping track of who shares a room with who. We only keep track
|
||||||
|
-- of this for local users, so `user_id` is local users only (but we do keep track
|
||||||
|
-- of which remote users share a room)
|
||||||
|
CREATE TABLE users_who_share_rooms (
|
||||||
|
user_id TEXT NOT NULL,
|
||||||
|
other_user_id TEXT NOT NULL,
|
||||||
|
room_id TEXT NOT NULL,
|
||||||
|
share_private BOOLEAN NOT NULL -- is the shared room private? i.e. they share a private room
|
||||||
|
);
|
||||||
|
|
||||||
|
|
||||||
|
CREATE UNIQUE INDEX users_who_share_rooms_u_idx ON users_who_share_rooms(user_id, other_user_id);
|
||||||
|
CREATE INDEX users_who_share_rooms_r_idx ON users_who_share_rooms(room_id, user_id);
|
||||||
|
|
||||||
|
|
||||||
|
-- Make sure that we popualte the table initially
|
||||||
|
UPDATE user_directory_stream_pos SET stream_id = NULL;
|
@ -16,16 +16,19 @@
|
|||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
|
|
||||||
from ._base import SQLBaseStore
|
from ._base import SQLBaseStore
|
||||||
|
|
||||||
from synapse.util.caches.descriptors import cached, cachedInlineCallbacks
|
from synapse.util.caches.descriptors import cached, cachedInlineCallbacks
|
||||||
from synapse.api.constants import EventTypes, JoinRules
|
from synapse.api.constants import EventTypes, JoinRules
|
||||||
from synapse.storage.engines import PostgresEngine, Sqlite3Engine
|
from synapse.storage.engines import PostgresEngine, Sqlite3Engine
|
||||||
from synapse.types import get_domain_from_id, get_localpart_from_id
|
from synapse.types import get_domain_from_id, get_localpart_from_id
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
import logging
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
class UserDirectoryStore(SQLBaseStore):
|
class UserDirectoryStore(SQLBaseStore):
|
||||||
|
|
||||||
@cachedInlineCallbacks(cache_context=True)
|
@cachedInlineCallbacks(cache_context=True)
|
||||||
def is_room_world_readable_or_publicly_joinable(self, room_id, cache_context):
|
def is_room_world_readable_or_publicly_joinable(self, room_id, cache_context):
|
||||||
"""Check if the room is either world_readable or publically joinable
|
"""Check if the room is either world_readable or publically joinable
|
||||||
@ -270,27 +273,240 @@ class UserDirectoryStore(SQLBaseStore):
|
|||||||
desc="get_users_in_public_due_to_room",
|
desc="get_users_in_public_due_to_room",
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
def get_users_in_dir_due_to_room(self, room_id):
|
def get_users_in_dir_due_to_room(self, room_id):
|
||||||
"""Get all user_ids that are in the room directory becuase they're
|
"""Get all user_ids that are in the room directory becuase they're
|
||||||
in the given room_id
|
in the given room_id
|
||||||
"""
|
"""
|
||||||
return self._simple_select_onecol(
|
user_ids_dir = yield self._simple_select_onecol(
|
||||||
table="user_directory",
|
table="user_directory",
|
||||||
keyvalues={"room_id": room_id},
|
keyvalues={"room_id": room_id},
|
||||||
retcol="user_id",
|
retcol="user_id",
|
||||||
desc="get_users_in_dir_due_to_room",
|
desc="get_users_in_dir_due_to_room",
|
||||||
)
|
)
|
||||||
|
|
||||||
def get_all_rooms(self):
|
user_ids_pub = yield self._simple_select_onecol(
|
||||||
"""Get all room_ids we've ever known about
|
table="users_in_pubic_room",
|
||||||
"""
|
keyvalues={"room_id": room_id},
|
||||||
return self._simple_select_onecol(
|
retcol="user_id",
|
||||||
table="current_state_events",
|
desc="get_users_in_dir_due_to_room",
|
||||||
keyvalues={},
|
|
||||||
retcol="DISTINCT room_id",
|
|
||||||
desc="get_all_rooms",
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
user_ids_share = yield self._simple_select_onecol(
|
||||||
|
table="users_who_share_rooms",
|
||||||
|
keyvalues={"room_id": room_id},
|
||||||
|
retcol="user_id",
|
||||||
|
desc="get_users_in_dir_due_to_room",
|
||||||
|
)
|
||||||
|
|
||||||
|
user_ids = set(user_ids_dir)
|
||||||
|
user_ids.update(user_ids_pub)
|
||||||
|
user_ids.update(user_ids_share)
|
||||||
|
|
||||||
|
defer.returnValue(user_ids)
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def get_all_rooms(self):
|
||||||
|
"""Get all room_ids we've ever known about, in ascending order of "size"
|
||||||
|
"""
|
||||||
|
sql = """
|
||||||
|
SELECT room_id FROM current_state_events
|
||||||
|
GROUP BY room_id
|
||||||
|
ORDER BY count(*) ASC
|
||||||
|
"""
|
||||||
|
rows = yield self._execute("get_all_rooms", None, sql)
|
||||||
|
defer.returnValue([room_id for room_id, in rows])
|
||||||
|
|
||||||
|
def add_users_who_share_room(self, room_id, share_private, user_id_tuples):
|
||||||
|
"""Insert entries into the users_who_share_rooms table. The first
|
||||||
|
user should be a local user.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
room_id (str)
|
||||||
|
share_private (bool): Is the room private
|
||||||
|
user_id_tuples([(str, str)]): iterable of 2-tuple of user IDs.
|
||||||
|
"""
|
||||||
|
def _add_users_who_share_room_txn(txn):
|
||||||
|
self._simple_insert_many_txn(
|
||||||
|
txn,
|
||||||
|
table="users_who_share_rooms",
|
||||||
|
values=[
|
||||||
|
{
|
||||||
|
"user_id": user_id,
|
||||||
|
"other_user_id": other_user_id,
|
||||||
|
"room_id": room_id,
|
||||||
|
"share_private": share_private,
|
||||||
|
}
|
||||||
|
for user_id, other_user_id in user_id_tuples
|
||||||
|
],
|
||||||
|
)
|
||||||
|
for user_id, other_user_id in user_id_tuples:
|
||||||
|
txn.call_after(
|
||||||
|
self.get_users_who_share_room_from_dir.invalidate,
|
||||||
|
(user_id,),
|
||||||
|
)
|
||||||
|
txn.call_after(
|
||||||
|
self.get_if_users_share_a_room.invalidate,
|
||||||
|
(user_id, other_user_id),
|
||||||
|
)
|
||||||
|
return self.runInteraction(
|
||||||
|
"add_users_who_share_room", _add_users_who_share_room_txn
|
||||||
|
)
|
||||||
|
|
||||||
|
def update_users_who_share_room(self, room_id, share_private, user_id_sets):
|
||||||
|
"""Updates entries in the users_who_share_rooms table. The first
|
||||||
|
user should be a local user.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
room_id (str)
|
||||||
|
share_private (bool): Is the room private
|
||||||
|
user_id_tuples([(str, str)]): iterable of 2-tuple of user IDs.
|
||||||
|
"""
|
||||||
|
def _update_users_who_share_room_txn(txn):
|
||||||
|
sql = """
|
||||||
|
UPDATE users_who_share_rooms
|
||||||
|
SET room_id = ?, share_private = ?
|
||||||
|
WHERE user_id = ? AND other_user_id = ?
|
||||||
|
"""
|
||||||
|
txn.executemany(
|
||||||
|
sql,
|
||||||
|
(
|
||||||
|
(room_id, share_private, uid, oid)
|
||||||
|
for uid, oid in user_id_sets
|
||||||
|
)
|
||||||
|
)
|
||||||
|
for user_id, other_user_id in user_id_sets:
|
||||||
|
txn.call_after(
|
||||||
|
self.get_users_who_share_room_from_dir.invalidate,
|
||||||
|
(user_id,),
|
||||||
|
)
|
||||||
|
txn.call_after(
|
||||||
|
self.get_if_users_share_a_room.invalidate,
|
||||||
|
(user_id, other_user_id),
|
||||||
|
)
|
||||||
|
return self.runInteraction(
|
||||||
|
"update_users_who_share_room", _update_users_who_share_room_txn
|
||||||
|
)
|
||||||
|
|
||||||
|
def remove_user_who_share_room(self, user_id, other_user_id):
|
||||||
|
"""Deletes entries in the users_who_share_rooms table. The first
|
||||||
|
user should be a local user.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
room_id (str)
|
||||||
|
share_private (bool): Is the room private
|
||||||
|
user_id_tuples([(str, str)]): iterable of 2-tuple of user IDs.
|
||||||
|
"""
|
||||||
|
def _remove_user_who_share_room_txn(txn):
|
||||||
|
self._simple_delete_txn(
|
||||||
|
txn,
|
||||||
|
table="users_who_share_rooms",
|
||||||
|
keyvalues={
|
||||||
|
"user_id": user_id,
|
||||||
|
"other_user_id": other_user_id,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
txn.call_after(
|
||||||
|
self.get_users_who_share_room_from_dir.invalidate,
|
||||||
|
(user_id,),
|
||||||
|
)
|
||||||
|
txn.call_after(
|
||||||
|
self.get_if_users_share_a_room.invalidate,
|
||||||
|
(user_id, other_user_id),
|
||||||
|
)
|
||||||
|
|
||||||
|
return self.runInteraction(
|
||||||
|
"remove_user_who_share_room", _remove_user_who_share_room_txn
|
||||||
|
)
|
||||||
|
|
||||||
|
@cached(max_entries=500000)
|
||||||
|
def get_if_users_share_a_room(self, user_id, other_user_id):
|
||||||
|
"""Gets if users share a room.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
user_id (str): Must be a local user_id
|
||||||
|
other_user_id (str)
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool|None: None if they don't share a room, otherwise whether they
|
||||||
|
share a private room or not.
|
||||||
|
"""
|
||||||
|
return self._simple_select_one_onecol(
|
||||||
|
table="users_who_share_rooms",
|
||||||
|
keyvalues={
|
||||||
|
"user_id": user_id,
|
||||||
|
"other_user_id": other_user_id,
|
||||||
|
},
|
||||||
|
retcol="share_private",
|
||||||
|
allow_none=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
@cachedInlineCallbacks(max_entries=500000, iterable=True)
|
||||||
|
def get_users_who_share_room_from_dir(self, user_id):
|
||||||
|
"""Returns the set of users who share a room with `user_id`
|
||||||
|
|
||||||
|
Args:
|
||||||
|
user_id(str): Must be a local user
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict: user_id -> share_private mapping
|
||||||
|
"""
|
||||||
|
rows = yield self._simple_select_list(
|
||||||
|
table="users_who_share_rooms",
|
||||||
|
keyvalues={
|
||||||
|
"user_id": user_id,
|
||||||
|
},
|
||||||
|
retcols=("other_user_id", "share_private",),
|
||||||
|
desc="get_users_who_share_room_with_user",
|
||||||
|
)
|
||||||
|
|
||||||
|
defer.returnValue({
|
||||||
|
row["other_user_id"]: row["share_private"]
|
||||||
|
for row in rows
|
||||||
|
})
|
||||||
|
|
||||||
|
def get_users_in_share_dir_with_room_id(self, user_id, room_id):
|
||||||
|
"""Get all user tuples that are in the users_who_share_rooms due to the
|
||||||
|
given room_id.
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
[(user_id, other_user_id)]: where one of the two will match the given
|
||||||
|
user_id.
|
||||||
|
"""
|
||||||
|
sql = """
|
||||||
|
SELECT user_id, other_user_id FROM users_who_share_rooms
|
||||||
|
WHERE room_id = ? AND (user_id = ? OR other_user_id = ?)
|
||||||
|
"""
|
||||||
|
return self._execute(
|
||||||
|
"get_users_in_share_dir_with_room_id", None, sql, room_id, user_id, user_id
|
||||||
|
)
|
||||||
|
|
||||||
|
@defer.inlineCallbacks
|
||||||
|
def get_rooms_in_common_for_users(self, user_id, other_user_id):
|
||||||
|
"""Given two user_ids find out the list of rooms they share.
|
||||||
|
"""
|
||||||
|
sql = """
|
||||||
|
SELECT room_id FROM (
|
||||||
|
SELECT c.room_id FROM current_state_events AS c
|
||||||
|
INNER JOIN room_memberships USING (event_id)
|
||||||
|
WHERE type = 'm.room.member'
|
||||||
|
AND membership = 'join'
|
||||||
|
AND state_key = ?
|
||||||
|
) AS f1 INNER JOIN (
|
||||||
|
SELECT c.room_id FROM current_state_events AS c
|
||||||
|
INNER JOIN room_memberships USING (event_id)
|
||||||
|
WHERE type = 'm.room.member'
|
||||||
|
AND membership = 'join'
|
||||||
|
AND state_key = ?
|
||||||
|
) f2 USING (room_id)
|
||||||
|
"""
|
||||||
|
|
||||||
|
rows = yield self._execute(
|
||||||
|
"get_rooms_in_common_for_users", None, sql, user_id, other_user_id
|
||||||
|
)
|
||||||
|
|
||||||
|
defer.returnValue([room_id for room_id, in rows])
|
||||||
|
|
||||||
def delete_all_from_user_dir(self):
|
def delete_all_from_user_dir(self):
|
||||||
"""Delete the entire user directory
|
"""Delete the entire user directory
|
||||||
"""
|
"""
|
||||||
@ -298,8 +514,11 @@ class UserDirectoryStore(SQLBaseStore):
|
|||||||
txn.execute("DELETE FROM user_directory")
|
txn.execute("DELETE FROM user_directory")
|
||||||
txn.execute("DELETE FROM user_directory_search")
|
txn.execute("DELETE FROM user_directory_search")
|
||||||
txn.execute("DELETE FROM users_in_pubic_room")
|
txn.execute("DELETE FROM users_in_pubic_room")
|
||||||
|
txn.execute("DELETE FROM users_who_share_rooms")
|
||||||
txn.call_after(self.get_user_in_directory.invalidate_all)
|
txn.call_after(self.get_user_in_directory.invalidate_all)
|
||||||
txn.call_after(self.get_user_in_public_room.invalidate_all)
|
txn.call_after(self.get_user_in_public_room.invalidate_all)
|
||||||
|
txn.call_after(self.get_users_who_share_room_from_dir.invalidate_all)
|
||||||
|
txn.call_after(self.get_if_users_share_a_room.invalidate_all)
|
||||||
return self.runInteraction(
|
return self.runInteraction(
|
||||||
"delete_all_from_user_dir", _delete_all_from_user_dir_txn
|
"delete_all_from_user_dir", _delete_all_from_user_dir_txn
|
||||||
)
|
)
|
||||||
@ -392,7 +611,7 @@ class UserDirectoryStore(SQLBaseStore):
|
|||||||
)
|
)
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def search_user_dir(self, search_term, limit):
|
def search_user_dir(self, user_id, search_term, limit):
|
||||||
"""Searches for users in directory
|
"""Searches for users in directory
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
@ -418,46 +637,63 @@ class UserDirectoryStore(SQLBaseStore):
|
|||||||
# The array of numbers are the weights for the various part of the
|
# The array of numbers are the weights for the various part of the
|
||||||
# search: (domain, _, display name, localpart)
|
# search: (domain, _, display name, localpart)
|
||||||
sql = """
|
sql = """
|
||||||
SELECT user_id, display_name, avatar_url
|
SELECT d.user_id, display_name, avatar_url
|
||||||
FROM user_directory_search
|
FROM user_directory_search
|
||||||
INNER JOIN user_directory USING (user_id)
|
INNER JOIN user_directory AS d USING (user_id)
|
||||||
INNER JOIN users_in_pubic_room USING (user_id)
|
LEFT JOIN users_in_pubic_room AS p USING (user_id)
|
||||||
WHERE vector @@ to_tsquery('english', ?)
|
LEFT JOIN (
|
||||||
|
SELECT other_user_id AS user_id FROM users_who_share_rooms
|
||||||
|
WHERE user_id = ? AND share_private
|
||||||
|
) AS s USING (user_id)
|
||||||
|
WHERE
|
||||||
|
(s.user_id IS NOT NULL OR p.user_id IS NOT NULL)
|
||||||
|
AND vector @@ to_tsquery('english', ?)
|
||||||
ORDER BY
|
ORDER BY
|
||||||
2 * ts_rank_cd(
|
(CASE WHEN s.user_id IS NOT NULL THEN 4.0 ELSE 1.0 END)
|
||||||
'{0.1, 0.1, 0.9, 1.0}',
|
* (CASE WHEN display_name IS NOT NULL THEN 1.2 ELSE 1.0 END)
|
||||||
vector,
|
* (CASE WHEN avatar_url IS NOT NULL THEN 1.2 ELSE 1.0 END)
|
||||||
to_tsquery('english', ?),
|
* (
|
||||||
8
|
3 * ts_rank_cd(
|
||||||
)
|
'{0.1, 0.1, 0.9, 1.0}',
|
||||||
+ ts_rank_cd(
|
vector,
|
||||||
'{0.1, 0.1, 0.9, 1.0}',
|
to_tsquery('english', ?),
|
||||||
vector,
|
8
|
||||||
to_tsquery('english', ?),
|
)
|
||||||
8
|
+ ts_rank_cd(
|
||||||
|
'{0.1, 0.1, 0.9, 1.0}',
|
||||||
|
vector,
|
||||||
|
to_tsquery('english', ?),
|
||||||
|
8
|
||||||
|
)
|
||||||
)
|
)
|
||||||
DESC,
|
DESC,
|
||||||
display_name IS NULL,
|
display_name IS NULL,
|
||||||
avatar_url IS NULL
|
avatar_url IS NULL
|
||||||
LIMIT ?
|
LIMIT ?
|
||||||
"""
|
"""
|
||||||
args = (full_query, exact_query, prefix_query, limit + 1,)
|
args = (user_id, full_query, exact_query, prefix_query, limit + 1,)
|
||||||
elif isinstance(self.database_engine, Sqlite3Engine):
|
elif isinstance(self.database_engine, Sqlite3Engine):
|
||||||
search_query = _parse_query_sqlite(search_term)
|
search_query = _parse_query_sqlite(search_term)
|
||||||
|
|
||||||
sql = """
|
sql = """
|
||||||
SELECT user_id, display_name, avatar_url
|
SELECT d.user_id, display_name, avatar_url
|
||||||
FROM user_directory_search
|
FROM user_directory_search
|
||||||
INNER JOIN user_directory USING (user_id)
|
INNER JOIN user_directory AS d USING (user_id)
|
||||||
INNER JOIN users_in_pubic_room USING (user_id)
|
LEFT JOIN users_in_pubic_room AS p USING (user_id)
|
||||||
WHERE value MATCH ?
|
LEFT JOIN (
|
||||||
|
SELECT other_user_id AS user_id FROM users_who_share_rooms
|
||||||
|
WHERE user_id = ? AND share_private
|
||||||
|
) AS s USING (user_id)
|
||||||
|
WHERE
|
||||||
|
(s.user_id IS NOT NULL OR p.user_id IS NOT NULL)
|
||||||
|
AND value MATCH ?
|
||||||
ORDER BY
|
ORDER BY
|
||||||
rank(matchinfo(user_directory_search)) DESC,
|
rank(matchinfo(user_directory_search)) DESC,
|
||||||
display_name IS NULL,
|
display_name IS NULL,
|
||||||
avatar_url IS NULL
|
avatar_url IS NULL
|
||||||
LIMIT ?
|
LIMIT ?
|
||||||
"""
|
"""
|
||||||
args = (search_query, limit + 1)
|
args = (user_id, search_query, limit + 1)
|
||||||
else:
|
else:
|
||||||
# This should be unreachable.
|
# This should be unreachable.
|
||||||
raise Exception("Unrecognized database engine")
|
raise Exception("Unrecognized database engine")
|
||||||
|
Loading…
Reference in New Issue
Block a user