Skip to content
This repository has been 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
merged 2 commits into from
Mar 4, 2016

Conversation

Rugvip
Copy link

@Rugvip Rugvip commented Feb 23, 2016

@matrixbot
Copy link
Member

Can one of the admins verify this patch?

@illicitonion
Copy link
Contributor

@matrixbot ok to test

@illicitonion
Copy link
Contributor

@Rugvip LGTM, will merge if jenkins is happy

@Rugvip
Copy link
Author

Rugvip commented Feb 23, 2016

Needs #599

@Rugvip
Copy link
Author

Rugvip commented Feb 23, 2016

Actually wth, added that commit into this instead :p

@illicitonion
Copy link
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()

@ara4n
Copy link
Member

ara4n commented Feb 23, 2016

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.

@Rugvip Rugvip force-pushed the invite-state branch 2 times, most recently from 501cdc3 to b0e56f0 Compare February 23, 2016 14:54
@erikjohnston
Copy link
Member

@Rugvip Can you fix the merge conflicts?

@matrixbot
Copy link
Member

Can one of the admins verify this patch?

Patrik Oldsberg 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>
@erikjohnston
Copy link
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
@erikjohnston erikjohnston merged commit 389d558 into matrix-org:develop Mar 4, 2016
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.

5 participants