From fb5845bf9d53d524cd89cca5a3bd9ef77cd82310 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 6 Apr 2022 13:55:06 -0400
Subject: [PATCH] Remove groups configuration.

---
 docs/sample_config.yaml      | 10 ---------
 synapse/config/_base.pyi     |  2 --
 synapse/config/groups.py     | 39 ------------------------------------
 synapse/config/homeserver.py |  2 --
 4 files changed, 53 deletions(-)
 delete mode 100644 synapse/config/groups.py

diff --git a/docs/sample_config.yaml b/docs/sample_config.yaml
index b8d8c0dbf0a1..a33b672b0902 100644
--- a/docs/sample_config.yaml
+++ b/docs/sample_config.yaml
@@ -2450,16 +2450,6 @@ push:
 #encryption_enabled_by_default_for_room_type: invite
 
 
-# Uncomment to allow non-server-admin users to create groups on this server
-#
-#enable_group_creation: true
-
-# If enabled, non server admins can only create groups with local parts
-# starting with this prefix
-#
-#group_creation_prefix: "unofficial_"
-
-
 
 # User Directory configuration
 #
diff --git a/synapse/config/_base.pyi b/synapse/config/_base.pyi
index bd092f956dde..02fd9fcb17cb 100644
--- a/synapse/config/_base.pyi
+++ b/synapse/config/_base.pyi
@@ -28,7 +28,6 @@ from synapse.config import (
     emailconfig,
     experimental,
     federation,
-    groups,
     jwt,
     key,
     logger,
@@ -101,7 +100,6 @@ class RootConfig:
     push: push.PushConfig
     spamchecker: spam_checker.SpamCheckerConfig
     room: room.RoomConfig
-    groups: groups.GroupsConfig
     userdirectory: user_directory.UserDirectoryConfig
     consent: consent.ConsentConfig
     stats: stats.StatsConfig
diff --git a/synapse/config/groups.py b/synapse/config/groups.py
deleted file mode 100644
index c9b9c6daadef..000000000000
--- a/synapse/config/groups.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2017 New Vector Ltd
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from typing import Any
-
-from synapse.types import JsonDict
-
-from ._base import Config
-
-
-class GroupsConfig(Config):
-    section = "groups"
-
-    def read_config(self, config: JsonDict, **kwargs: Any) -> None:
-        self.enable_group_creation = config.get("enable_group_creation", False)
-        self.group_creation_prefix = config.get("group_creation_prefix", "")
-
-    def generate_config_section(self, **kwargs: Any) -> str:
-        return """\
-        # Uncomment to allow non-server-admin users to create groups on this server
-        #
-        #enable_group_creation: true
-
-        # If enabled, non server admins can only create groups with local parts
-        # starting with this prefix
-        #
-        #group_creation_prefix: "unofficial_"
-        """
diff --git a/synapse/config/homeserver.py b/synapse/config/homeserver.py
index a4ec70690802..4d2b298a70be 100644
--- a/synapse/config/homeserver.py
+++ b/synapse/config/homeserver.py
@@ -25,7 +25,6 @@
 from .emailconfig import EmailConfig
 from .experimental import ExperimentalConfig
 from .federation import FederationConfig
-from .groups import GroupsConfig
 from .jwt import JWTConfig
 from .key import KeyConfig
 from .logger import LoggingConfig
@@ -89,7 +88,6 @@ class HomeServerConfig(RootConfig):
         PushConfig,
         SpamCheckerConfig,
         RoomConfig,
-        GroupsConfig,
         UserDirectoryConfig,
         ConsentConfig,
         StatsConfig,