Skip to content
Snippets Groups Projects
Commit d58edd98 authored by Mark Haines's avatar Mark Haines
Browse files

Update the other place check_joined_room is called

parent 5cf22f05
No related branches found
No related tags found
No related merge requests found
......@@ -154,7 +154,8 @@ def serialize_event(e, time_now_ms, as_client_event=True,
if "redacted_because" in e.unsigned:
d["unsigned"]["redacted_because"] = serialize_event(
e.unsigned["redacted_because"], time_now_ms
e.unsigned["redacted_because"], time_now_ms,
event_format=event_format
)
if token_id is not None:
......
......@@ -520,7 +520,7 @@ class SyncHandler(BaseHandler):
current_state=current_state_events,
)
state_events_delta = yield self.check_joined_room(
state_events_delta, _ = yield self.check_joined_room(
sync_config, room_id, state_events_delta
)
......
......@@ -19,6 +19,7 @@ commands =
check-manifest
[testenv:pep8]
skip_install = True
basepython = python2.7
deps =
flake8
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment