Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add option to include the current room state

This commit is contained in:
Erik Johnston 2015-11-20 14:16:42 +00:00
parent 506874cca9
commit 6b95a79724
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
synapse/handlers/search.py
View File

@ -80,6 +80,9 @@ class SearchHandler(BaseHandler):
# What to order results by (impacts whether pagination can be doen) # What to order results by (impacts whether pagination can be doen)
order_by = room_cat.get("order_by", "rank") order_by = room_cat.get("order_by", "rank")
# Return the current state of the rooms?
include_state = room_cat.get("include_state", False)
# Include context around each event? # Include context around each event?
event_context = room_cat.get( event_context = room_cat.get(
"event_context", None "event_context", None
@ -97,6 +100,9 @@ class SearchHandler(BaseHandler):
after_limit = int(event_context.get( after_limit = int(event_context.get(
"after_limit", 5 "after_limit", 5
)) ))
# Return the historic display name and avatar for the senders
# of the events?
include_profile = bool(event_context.get("include_profile", False)) include_profile = bool(event_context.get("include_profile", False))
except KeyError: except KeyError:
raise SynapseError(400, "Invalid search query") raise SynapseError(400, "Invalid search query")
@ -316,6 +322,18 @@ class SearchHandler(BaseHandler):
for e in context["events_after"] for e in context["events_after"]
] ]
state_results = {}
if include_state:
rooms = set(e.room_id for e in allowed_events)
for room_id in rooms:
state = yield self.state_handler.get_current_state(room_id)
state_results[room_id] = state.values()
state_results.values()
# We're now about to serialize the events. We should not make any
# blocking calls after this. Otherwise the 'age' will be wrong
results = { results = {
e.event_id: { e.event_id: {
"rank": rank_map[e.event_id], "rank": rank_map[e.event_id],
@ -332,6 +350,12 @@ class SearchHandler(BaseHandler):
"count": len(results) "count": len(results)
} }
if state_results:
rooms_cat_res["state"] = {
room_id: [serialize_event(e, time_now) for e in state]
for room_id, state in state_results.items()
}
if room_groups and "room_id" in group_keys: if room_groups and "room_id" in group_keys:
rooms_cat_res.setdefault("groups", {})["room_id"] = room_groups rooms_cat_res.setdefault("groups", {})["room_id"] = room_groups