This repository was archived by the owner on Apr 26, 2024. It is now read-only.
config,handlers/_base: added homeserver config for what state is included in a room invite#598
Merged
erikjohnston merged 2 commits intomatrix-org:developfrom Mar 4, 2016
Merged
Conversation
Member
|
Can one of the admins verify this patch? |
Contributor
|
@matrixbot ok to test |
Contributor
|
@Rugvip LGTM, will merge if jenkins is happy |
Author
|
Needs #599 |
Author
|
Actually wth, added that commit into this instead :p |
Contributor
|
This breaks our unit tests; can you throw in this patch?: $ git diff
diff --git a/tests/utils.py b/tests/utils.py
index bf7a31f..11d9acb 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -50,6 +50,7 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs):
config.macaroon_secret_key = "not even a little secret"
config.server_name = "server.under.test"
config.trusted_third_party_id_servers = []
+ config.room_invite_state_types = []
if "clock" not in kargs:
kargs["clock"] = MockClock() |
Member
|
Before merging this, we should update the spec to actually articulate what's allowed to go into an invite and not. Agreed that it'd be nice to have this extensibility, but want to do so without creating a spam vector or encouraging fragmentation. Created a https://matrix.org/jira/browse/SPEC-357 spec bug first. |
501cdc3 to
b0e56f0
Compare
Member
|
@Rugvip Can you fix the merge conflicts? |
Member
|
Can one of the admins verify this patch? |
added 2 commits
March 4, 2016 10:43
…uded in a room invite Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
Member
|
LGTM |
erikjohnston
added a commit
that referenced
this pull request
Mar 4, 2016
config,handlers/_base: added homeserver config for what state is included in a room invite
This was referenced Nov 23, 2020
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related SPEC bug: https://matrix.org/jira/browse/SPEC-357