summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2019-07-05 16:47:58 +0100
committerGitHub <noreply@github.com>2019-07-05 16:47:58 +0100
commit80cc82a4459e4bbc926c6a57ae5e29278c2f9439 (patch)
tree53731feea39bb2015e6f4d63ad5964b6022b1c79 /synapse/config
parentremove dead transaction persist code (#5622) (diff)
downloadsynapse-80cc82a4459e4bbc926c6a57ae5e29278c2f9439.tar.xz
Remove support for invite_3pid_guest. (#5625)
This has never been documented, and I'm not sure it's ever been used outside
sytest.

It's quite a lot of poorly-maintained code, so I'd like to get rid of it.

For now I haven't removed the database table; I suggest we leave that for a
future clearout.
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/registration.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/config/registration.py b/synapse/config/registration.py
index 4a59e6ec90..b895c4e9f4 100644
--- a/synapse/config/registration.py
+++ b/synapse/config/registration.py
@@ -71,9 +71,8 @@ class RegistrationConfig(Config):
         self.default_identity_server = config.get("default_identity_server")
         self.allow_guest_access = config.get("allow_guest_access", False)
 
-        self.invite_3pid_guest = self.allow_guest_access and config.get(
-            "invite_3pid_guest", False
-        )
+        if config.get("invite_3pid_guest", False):
+            raise ConfigError("invite_3pid_guest is no longer supported")
 
         self.auto_join_rooms = config.get("auto_join_rooms", [])
         for room_alias in self.auto_join_rooms: