Merge branch 'main' into dev

Author: KnugiHK

synapse_admin/client.py

@@ -66,7 +66,8 @@ def client_create_room(
         name: str = None,
         invite: Union[str, list] = None,
         federation: bool = True,
-        encrypted: bool = True
+        encrypted: bool = True,
+        room_type: str = None
     ) -> str:
         """Create a room as a client
 
@@ -77,6 +78,7 @@ def client_create_room(
             invite (Union[str, list], optional): list of members. Defaults to None. # noqa: E501
             federation (bool, optional): allow federation. Defaults to True.
             encrypted (bool, optional): create encrypted room or not. Defaults to True
+            room_type: (str, optional): type of room to create
 
         Returns:
             str: created room id
@@ -101,6 +103,8 @@ def client_create_room(
                 raise TypeError("Argument invite must be str or list.")
             data["invite"] = validated_invite
         data["creation_content"] = {"m.federate": federation}
+        if room_type is not None:
+            data["creation_content"]["type"] = room_type
         if encrypted:
             data["initial_state"] = [{
                 "type": "m.room.encryption",

synapse_admin/room.py

@@ -211,7 +211,8 @@ def create(
         members: list = None,
         federation: bool = True,
         leave: bool = False,
-        encrypted: bool = True
+        encrypted: bool = True,
+        room_type: str = None
     ) -> RoomInformation:
         """Create a room and force users to be a member
 
@@ -222,6 +223,7 @@ def create(
             members (list, optional): a list of user that should be the members of the room. Defaults to None. # noqa: E501
             federation (bool, optional): can the room be federated. Defaults to True.
             leave (bool, optional): whether to leave the room yourself after the creation. Defaults to False.
+            room_type (str, optional): the type of room. Defaults to None.
 
         Returns:
             RoomInformation: roomid: room id, joined: a list of joined users
@@ -238,7 +240,8 @@ def create(
             alias,
             name,
             federation=federation,
-            encrypted=encrypted
+            encrypted=encrypted,
+            room_type=room_type
         )
         joined = []
         if members is not None:

synapse_admin/user.py

@@ -513,7 +513,7 @@ def register(
         data = {
             "nonce": nonce,
             "username": username,
-            "display_name": displayname,
+            "displayname": displayname,
             "password": password,
             "admin": admin,
             "mac": self._generate_mac(nonce, username, password, shared_secret)