Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

before fulfilling a group invite,check if user is already joined/invited #3436

Merged
merged 11 commits into from Oct 10, 2019

Conversation

@t3chguy
Copy link
Contributor

t3chguy commented Jun 23, 2018

Fixes vector-im/riot-web#5645

Please advise if more appropriate error messages can be used

Signed-off-by: Michael Telatynski 7t3chguy@gmail.com

t3chguy added 2 commits Jun 23, 2018
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
…fix_groups_invite
@t3chguy t3chguy force-pushed the t3chguy/fix_groups_invite branch from a97bef0 to 885f6e8 Jul 24, 2018
t3chguy added 5 commits Jul 6, 2019
…t3chguy/fix_groups_invite
@t3chguy t3chguy requested a review from matrix-org/synapse-core Jul 6, 2019
@codecov

This comment has been minimized.

Copy link

codecov bot commented Jul 6, 2019

Codecov Report

❗️ No coverage uploaded for pull request base (develop@276ae5c). Click here to learn what that means.
The diff coverage is 42.85%.

@@            Coverage Diff             @@
##             develop    #3436   +/-   ##
==========================================
  Coverage           ?   63.25%           
==========================================
  Files              ?      328           
  Lines              ?    35883           
  Branches           ?     5917           
==========================================
  Hits               ?    22698           
  Misses             ?    11556           
  Partials           ?     1629
Copy link
Member

erikjohnston left a comment

Woo, better late than never. Only small quibble is with using a 403 here

synapse/groups/groups_server.py Outdated Show resolved Hide resolved
@richvdh richvdh added this to In progress in Homeserver Task Board via automation Oct 3, 2019
@richvdh richvdh moved this from In progress to Community PRs in Homeserver Task Board Oct 3, 2019
synapse/groups/groups_server.py Outdated Show resolved Hide resolved
changelog.d/3436.bugfix Outdated Show resolved Hide resolved
Co-Authored-By: Erik Johnston <erik@matrix.org>
@richvdh richvdh self-assigned this Oct 3, 2019
@richvdh
richvdh approved these changes Oct 4, 2019
@t3chguy

This comment has been minimized.

Copy link
Contributor Author

t3chguy commented Oct 4, 2019

🎉

@richvdh

This comment has been minimized.

Copy link
Member

richvdh commented Oct 4, 2019

(pending CI)

@richvdh

This comment has been minimized.

Copy link
Member

richvdh commented Oct 10, 2019

flaky test is flaky, merging anyway

@richvdh richvdh merged commit 9a84d74 into develop Oct 10, 2019
16 of 18 checks passed
16 of 18 checks passed
buildkite/synapse Build #4810 failed (21 minutes, 21 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-monolith Failed (exit status 1)
Details
buildkite/synapse/check-sample-config Passed (1 minute, 25 seconds)
Details
buildkite/synapse/check-style Passed (1 minute, 43 seconds)
Details
buildkite/synapse/isort Passed (43 seconds)
Details
buildkite/synapse/mypy Passed (44 seconds)
Details
buildkite/synapse/newspaper-newsfile Passed (38 seconds)
Details
buildkite/synapse/packaging Passed (39 seconds)
Details
buildkite/synapse/pipeline Passed (3 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-postgres-9-dot-5 Passed (18 minutes, 9 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite Passed (5 minutes, 33 seconds)
Details
buildkite/synapse/python-3-dot-5-slash-sqlite-slash-old-deps Passed (7 minutes, 53 seconds)
Details
buildkite/synapse/python-3-dot-6-slash-sqlite Passed (6 minutes, 8 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-11 Passed (17 minutes, 26 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-postgres-9-dot-5 Passed (18 minutes, 11 seconds)
Details
buildkite/synapse/python-3-dot-7-slash-sqlite Passed (5 minutes, 42 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-postgres-9-dot-6-slash-workers Passed (12 minutes, 34 seconds)
Details
buildkite/synapse/sytest-python-3-dot-5-slash-sqlite-slash-monolith Passed (10 minutes, 46 seconds)
Details
Homeserver Task Board automation moved this from Community PRs to Done Oct 10, 2019
@richvdh richvdh deleted the t3chguy/fix_groups_invite branch Oct 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
4 participants
You can’t perform that action at this time.