Filter search results
This commit is contained in:
parent
44e2933bf8
commit
c8baada94a
1 changed files with 7 additions and 2 deletions
|
@ -18,6 +18,7 @@ from twisted.internet import defer
|
||||||
from ._base import BaseHandler
|
from ._base import BaseHandler
|
||||||
|
|
||||||
from synapse.api.constants import Membership
|
from synapse.api.constants import Membership
|
||||||
|
from synapse.api.filtering import Filter
|
||||||
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
|
||||||
|
|
||||||
|
@ -49,9 +50,12 @@ class SearchHandler(BaseHandler):
|
||||||
keys = content["search_categories"]["room_events"].get("keys", [
|
keys = content["search_categories"]["room_events"].get("keys", [
|
||||||
"content.body", "content.name", "content.topic",
|
"content.body", "content.name", "content.topic",
|
||||||
])
|
])
|
||||||
|
filter_dict = content["search_categories"]["room_events"].get("filter", {})
|
||||||
except KeyError:
|
except KeyError:
|
||||||
raise SynapseError(400, "Invalid search query")
|
raise SynapseError(400, "Invalid search query")
|
||||||
|
|
||||||
|
filtr = Filter(filter_dict)
|
||||||
|
|
||||||
# TODO: Search through left rooms too
|
# TODO: Search through left rooms too
|
||||||
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(),
|
user.to_string(),
|
||||||
|
@ -64,11 +68,12 @@ class SearchHandler(BaseHandler):
|
||||||
|
|
||||||
rank_map, event_map = yield self.store.search_msgs(room_ids, search_term, keys)
|
rank_map, event_map = yield self.store.search_msgs(room_ids, search_term, keys)
|
||||||
|
|
||||||
|
filtered_events = filtr.filter(event_map.values())
|
||||||
|
|
||||||
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(), filtered_events
|
||||||
)
|
)
|
||||||
|
|
||||||
# TODO: Filter allowed_events
|
|
||||||
# TODO: Add a limit
|
# TODO: Add a limit
|
||||||
|
|
||||||
time_now = self.clock.time_msec()
|
time_now = self.clock.time_msec()
|
||||||
|
|
Loading…
Reference in a new issue