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

Already on GitHub? Sign in to your account

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

Projects
None yet
5 participants
Contributor

Rugvip commented Feb 23, 2016

Can one of the admins verify this patch?

Contributor

illicitonion commented Feb 23, 2016

@matrixbot ok to test

Contributor

illicitonion commented Feb 23, 2016

@Rugvip LGTM, will merge if jenkins is happy

Contributor

Rugvip commented Feb 23, 2016

Needs #599

Contributor

Rugvip commented Feb 23, 2016

Actually wth, added that commit into this instead :p

Contributor

illicitonion commented Feb 23, 2016

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()
Owner

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.

Owner

erikjohnston commented Mar 4, 2016

@Rugvip Can you fix the merge conflicts?

Can one of the admins verify this patch?

Rugvip added some commits Feb 23, 2016

config,handlers/_base: added homeserver config for what state is incl…
…uded in a room invite

Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
tests/utils: added room_invite_state_types to test config
Signed-off-by: Patrik Oldsberg <patrik.oldsberg@ericsson.com>
Owner

erikjohnston commented Mar 4, 2016

LGTM

erikjohnston added a commit that referenced this pull request Mar 4, 2016

Merge pull request #598 from Rugvip/invite-state
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

4 checks passed

Flake8 + Packaging (Merged PR) Build finished.
Details
Sytest Postgres (Merged PR) Build finished.
Details
Sytest SQLite (Merged PR) Build finished.
Details
Unit Tests (Merged PR) Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment