Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Update the other place check_joined_room is called
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark Haines committed Oct 30, 2015
1 parent 5cf22f0 commit d58edd9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion synapse/events/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion synapse/handlers/sync.py
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ def incremental_sync_with_gap_for_room(self, room_id, sync_config,
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
)

Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ commands =
check-manifest

[testenv:pep8]
skip_install = True
basepython = python2.7
deps =
flake8
Expand Down

0 comments on commit d58edd9

Please sign in to comment.