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

Neilj/fix autojoin #4223

Merged
merged 3 commits into from
Nov 28, 2018
Merged

Neilj/fix autojoin #4223

merged 3 commits into from
Nov 28, 2018

Conversation

neilisfragile
Copy link
Contributor

In the case where the server requires consent, then auto joining cannot happen until consent has been granted by the user - this PR calls the auto join code after consent has been granted and calls it immediately if consent is not required

@neilisfragile neilisfragile requested a review from a team November 23, 2018 16:57
@codecov-io
Copy link

Codecov Report

Merging #4223 into develop will increase coverage by 0.03%.
The diff coverage is 100%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #4223      +/-   ##
===========================================
+ Coverage    73.52%   73.55%   +0.03%     
===========================================
  Files          299      299              
  Lines        29798    29806       +8     
  Branches      4871     4872       +1     
===========================================
+ Hits         21908    21923      +15     
+ Misses        6465     6454      -11     
- Partials      1425     1429       +4
Impacted Files Coverage Δ
synapse/rest/consent/consent_resource.py 74.48% <100%> (+0.53%) ⬆️
synapse/rest/client/v2_alpha/register.py 60.22% <100%> (+0.14%) ⬆️
synapse/handlers/register.py 70.74% <100%> (+0.65%) ⬆️
synapse/handlers/search.py 81.25% <0%> (ø) ⬆️
synapse/handlers/federation.py 61.72% <0%> (ø) ⬆️
synapse/state/v1.py 92.24% <0%> (+1.55%) ⬆️
synapse/handlers/message.py 83.5% <0%> (+1.71%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8ca53fb...713a9d1. Read the comment docs.

@hawkowl hawkowl merged commit 7039ece into develop Nov 28, 2018
@hawkowl hawkowl deleted the neilj/fix_autojoin branch November 28, 2018 11:25
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.

3 participants