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

Handle the case of missing auth events when joining a room #964

Merged
merged 3 commits into from
Jul 29, 2016

Conversation

erikjohnston
Copy link
Member

No description provided.

@@ -1155,7 +1155,7 @@ def _handle_new_events(self, origin, event_infos, backfilled=False):
)

@defer.inlineCallbacks
def _persist_auth_tree(self, auth_events, state, event):
def _persist_auth_tree(self, origin, auth_events, state, event):
"""Checks the auth chain is valid (and passes auth checks) for the
state and event. Then persists the auth chain and state atomically.
Persists the event seperately.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe update the docstring with the changes?

@erikjohnston
Copy link
Member Author

@NegativeMjark PTAL

@@ -1160,6 +1160,12 @@ def _persist_auth_tree(self, origin, auth_events, state, event):
state and event. Then persists the auth chain and state atomically.
Persists the event seperately.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a couple of lines explaining that it will fetch missing events, and under what conditions it will do so?

@NegativeMjark
Copy link
Contributor

Eh LGTM

@erikjohnston erikjohnston merged commit cbea0c7 into develop Jul 29, 2016
@richvdh richvdh deleted the erikj/fed_join_fix branch December 1, 2016 14:09
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants