Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2024-10-01 11:49:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove constraints in preperation of using filters

Browse Source
This commit is contained in:
Erik Johnston 2015-10-13 15:22:14 +01:00
parent 323d3e506d
commit 3e2a1297b5
2 changed files with 20 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
synapse/handlers/search.py
View File

@ -18,7 +18,7 @@ from twisted.internet import defer
from ._base import BaseHandler from ._base import BaseHandler
from synapse.api.constants import ( from synapse.api.constants import (
EventTypes, KnownRoomEventKeys, Membership, SearchConstraintTypes EventTypes, Membership,
) )
from synapse.api.errors import SynapseError from synapse.api.errors import SynapseError
from synapse.events.utils import serialize_event from synapse.events.utils import serialize_event
@ -29,45 +29,6 @@ import logging
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
KEYS_TO_ALLOWED_CONSTRAINT_TYPES = {
KnownRoomEventKeys.CONTENT_BODY: [SearchConstraintTypes.FTS],
KnownRoomEventKeys.CONTENT_MSGTYPE: [SearchConstraintTypes.EXACT],
KnownRoomEventKeys.CONTENT_NAME: [
SearchConstraintTypes.FTS,
SearchConstraintTypes.EXACT,
SearchConstraintTypes.SUBSTRING,
],
KnownRoomEventKeys.CONTENT_TOPIC: [SearchConstraintTypes.FTS],
KnownRoomEventKeys.SENDER: [SearchConstraintTypes.EXACT],
KnownRoomEventKeys.ORIGIN_SERVER_TS: [SearchConstraintTypes.RANGE],
KnownRoomEventKeys.ROOM_ID: [SearchConstraintTypes.EXACT],
}
class RoomConstraint(object):
def __init__(self, search_type, keys, value):
self.search_type = search_type
self.keys = keys
self.value = value
@classmethod
def from_dict(cls, d):
search_type = d["type"]
keys = d["keys"]
for key in keys:
if key not in KEYS_TO_ALLOWED_CONSTRAINT_TYPES:
raise SynapseError(400, "Unrecognized key %r", key)
if search_type not in KEYS_TO_ALLOWED_CONSTRAINT_TYPES[key]:
raise SynapseError(
400,
"Disallowed constraint type %r for key %r", search_type, key
)
return cls(search_type, keys, d["value"])
class SearchHandler(BaseHandler): class SearchHandler(BaseHandler):
def __init__(self, hs): def __init__(self, hs):
@ -121,22 +82,20 @@ class SearchHandler(BaseHandler):
@defer.inlineCallbacks @defer.inlineCallbacks
def search(self, user, content): def search(self, user, content):
constraint_dicts = content["search_categories"]["room_events"]["constraints"] try:
constraints = [RoomConstraint.from_dict(c)for c in constraint_dicts] search_term = content["search_categories"]["room_events"]["search_term"]
keys = content["search_categories"]["room_events"]["keys"]
fts = False except KeyError:
for c in constraints: raise SynapseError(400, "Invalid search query")
if c.search_type == SearchConstraintTypes.FTS:
if fts:
raise SynapseError(400, "Only one constraint can be FTS")
fts = True
rooms = yield self.store.get_rooms_for_user_where_membership_is( rooms = yield self.store.get_rooms_for_user_where_membership_is(
user.to_string(), membership_list=[Membership.JOIN, Membership.LEAVE], user.to_string(),
membership_list=[Membership.JOIN],
# membership_list=[Membership.JOIN, Membership.LEAVE, Membership.Ban],
) )
room_ids = set(r.room_id for r in rooms) room_ids = set(r.room_id for r in rooms)
rank_map, event_map = yield self.store.search_msgs(room_ids, constraints) rank_map, event_map = yield self.store.search_msgs(room_ids, search_term, keys)
allowed_events = yield self._filter_events_for_client( allowed_events = yield self._filter_events_for_client(
user.to_string(), event_map.values() user.to_string(), event_map.values()

30
synapse/storage/search.py
View File

@ -16,38 +16,28 @@
from twisted.internet import defer from twisted.internet import defer
from _base import SQLBaseStore from _base import SQLBaseStore
from synapse.api.constants import KnownRoomEventKeys, SearchConstraintTypes
from synapse.storage.engines import PostgresEngine from synapse.storage.engines import PostgresEngine
class SearchStore(SQLBaseStore): class SearchStore(SQLBaseStore):
@defer.inlineCallbacks @defer.inlineCallbacks
def search_msgs(self, room_ids, constraints): def search_msgs(self, room_ids, search_term, keys):
clauses = [] clauses = []
args = [] args = []
fts = None
clauses.append( clauses.append(
"room_id IN (%s)" % (",".join(["?"] * len(room_ids)),) "room_id IN (%s)" % (",".join(["?"] * len(room_ids)),)
) )
args.extend(room_ids) args.extend(room_ids)
for c in constraints: local_clauses = []
local_clauses = [] for key in keys:
if c.search_type == SearchConstraintTypes.FTS: local_clauses.append("key = ?")
fts = c.value args.append(key)
for key in c.keys:
local_clauses.append("key = ?") clauses.append(
args.append(key) "(%s)" % (" OR ".join(local_clauses),)
elif c.search_type == SearchConstraintTypes.EXACT: )
for key in c.keys:
if key == KnownRoomEventKeys.ROOM_ID:
for value in c.value:
local_clauses.append("room_id = ?")
args.append(value)
clauses.append(
"(%s)" % (" OR ".join(local_clauses),)
)
if isinstance(self.database_engine, PostgresEngine): if isinstance(self.database_engine, PostgresEngine):
sql = ( sql = (
@ -67,7 +57,7 @@ class SearchStore(SQLBaseStore):
sql += " ORDER BY rank DESC" sql += " ORDER BY rank DESC"
results = yield self._execute( results = yield self._execute(
"search_msgs", self.cursor_to_dict, sql, *([fts] + args) "search_msgs", self.cursor_to_dict, sql, *([search_term] + args)
) )
events = yield self._get_events([r["event_id"] for r in results]) events = yield self._get_events([r["event_id"] for r in results])