Get events all at once

pull/5294/head
Erik Johnston 2019-05-30 15:15:13 +01:00
parent e9e5d3392d
commit 54d50fbfdf
1 changed files with 25 additions and 32 deletions

View File

@ -179,46 +179,39 @@ class StatsStore(StateDeltasStore):
current_state_ids = yield self.get_current_state_ids(room_id) current_state_ids = yield self.get_current_state_ids(room_id)
join_rules = yield self.get_event( join_rules_id = current_state_ids.get((EventTypes.JoinRules, ""))
current_state_ids.get((EventTypes.JoinRules, "")), allow_none=True history_visibility_id = current_state_ids.get(
) (EventTypes.RoomHistoryVisibility, "")
history_visibility = yield self.get_event(
current_state_ids.get((EventTypes.RoomHistoryVisibility, "")),
allow_none=True,
)
encryption = yield self.get_event(
current_state_ids.get((EventTypes.RoomEncryption, "")), allow_none=True
)
name = yield self.get_event(
current_state_ids.get((EventTypes.Name, "")), allow_none=True
)
topic = yield self.get_event(
current_state_ids.get((EventTypes.Topic, "")), allow_none=True
)
avatar = yield self.get_event(
current_state_ids.get((EventTypes.RoomAvatar, "")), allow_none=True
)
canonical_alias = yield self.get_event(
current_state_ids.get((EventTypes.CanonicalAlias, "")), allow_none=True
) )
encryption_id = current_state_ids.get((EventTypes.RoomEncryption, ""))
name_id = current_state_ids.get((EventTypes.Name, ""))
topic_id = current_state_ids.get((EventTypes.Topic, ""))
avatar_id = current_state_ids.get((EventTypes.RoomAvatar, ""))
canonical_alias_id = current_state_ids.get((EventTypes.CanonicalAlias, ""))
def _or_none(x, arg): state_events = yield self.get_events([
if x: join_rules_id, history_visibility_id, encryption_id, name_id,
return x.content.get(arg) topic_id, avatar_id, canonical_alias_id,
])
def _get_or_none(event_id, arg):
event = state_events.get(event_id)
if event:
return event.content.get(arg)
return None return None
yield self.update_room_state( yield self.update_room_state(
room_id, room_id,
{ {
"join_rules": _or_none(join_rules, "join_rule"), "join_rules": _get_or_none(join_rules_id, "join_rule"),
"history_visibility": _or_none( "history_visibility": _get_or_none(
history_visibility, "history_visibility" history_visibility_id, "history_visibility"
), ),
"encryption": _or_none(encryption, "algorithm"), "encryption": _get_or_none(encryption_id, "algorithm"),
"name": _or_none(name, "name"), "name": _get_or_none(name_id, "name"),
"topic": _or_none(topic, "topic"), "topic": _get_or_none(topic_id, "topic"),
"avatar": _or_none(avatar, "url"), "avatar": _get_or_none(avatar_id, "url"),
"canonical_alias": _or_none(canonical_alias, "alias"), "canonical_alias": _get_or_none(canonical_alias_id, "alias"),
}, },
) )