Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Flake8

This commit is contained in:
Erik Johnston 2017-10-19 13:36:06 +01:00
parent ffd3f1a783
commit c7d46510d7
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
synapse/config/groups.py
View File

@ -13,12 +13,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from synapse.util.module_loader import load_module
from ._base import Config from ._base import Config
from distutils.util import strtobool
class GroupsConfig(Config): class GroupsConfig(Config):
def read_config(self, config): def read_config(self, config):

6
synapse/groups/groups_server.py
View File

@ -707,7 +707,9 @@ class GroupsServerHandler(object):
is_admin = yield self.auth.is_server_admin(UserID.from_string(user_id)) is_admin = yield self.auth.is_server_admin(UserID.from_string(user_id))
if not is_admin: if not is_admin:
if not self.hs.config.enable_group_creation: if not self.hs.config.enable_group_creation:
raise SynapseError(403, "Only server admin can create group on this server") raise SynapseError(
403, "Only server admin can create group on this server",
)
localpart = GroupID.from_string(group_id).localpart localpart = GroupID.from_string(group_id).localpart
if not localpart.startswith(self.hs.config.group_creation_prefix): if not localpart.startswith(self.hs.config.group_creation_prefix):
raise SynapseError( raise SynapseError(
@ -715,7 +717,7 @@ class GroupsServerHandler(object):
"Can only create groups with prefix %r on this server" % ( "Can only create groups with prefix %r on this server" % (
self.hs.config.group_creation_prefix, self.hs.config.group_creation_prefix,
), ),
) )
profile = content.get("profile", {}) profile = content.get("profile", {})
name = profile.get("name") name = profile.get("name")