diff --git a/aleksis/apps/matrix/models.py b/aleksis/apps/matrix/models.py index 0b7e6100ed6fceaa78925fb3c78399c7de397e87..71dcf1c8552dfe6c2c4f4e226df2a55eb7714bc1 100644 --- a/aleksis/apps/matrix/models.py +++ b/aleksis/apps/matrix/models.py @@ -10,7 +10,7 @@ from aleksis.core.mixins import ExtensibleModel, ExtensiblePolymorphicModel from aleksis.core.models import Group, Person from aleksis.core.util.core_helpers import get_site_preferences -from .util.matrix import do_matrix_request +from .util.matrix import MatrixException, do_matrix_request class MatrixProfile(ExtensibleModel): @@ -74,8 +74,6 @@ class MatrixRoom(ExtensiblePolymorphicModel): @classmethod def from_group(cls, group: Group) -> "MatrixRoom": """Create a Matrix room from a group.""" - from .util.matrix import MatrixException, do_matrix_request - try: room = cls.get_queryset().get(group=group) except cls.DoesNotExist: @@ -97,12 +95,11 @@ class MatrixRoom(ExtensiblePolymorphicModel): r = cls._create_room(group.name, alias, profiles_to_invite) alias_found = True except MatrixException as e: - print(e.args, get_site_preferences()["matrix__disambiguate_room_aliases"]) if ( not get_site_preferences()["matrix__disambiguate_room_aliases"] or e.args[0].get("errcode") != "M_ROOM_IN_USE" ): - raise MatrixException(*e.args) + raise match = re.match(r"^(.*)-(\d+)$", alias) if match: @@ -127,8 +124,6 @@ class MatrixRoom(ExtensiblePolymorphicModel): invite: Optional[list[str]] = None, creation_content: Optional[dict] = None, ) -> dict[str, Any]: - from .util.matrix import do_matrix_request - body = {"preset": "private_chat", "name": name, "room_alias_name": alias} if invite: @@ -144,8 +139,6 @@ class MatrixRoom(ExtensiblePolymorphicModel): @property def power_levels(self) -> dict[str, int]: """Return the power levels for this room.""" - from .util.matrix import do_matrix_request - r = do_matrix_request("GET", f"rooms/{self.room_id}/state") event = list(filter(lambda x: x["type"] == "m.room.power_levels", r)) @@ -155,8 +148,6 @@ class MatrixRoom(ExtensiblePolymorphicModel): @property def members(self) -> list[str]: - from .util.matrix import do_matrix_request - r = do_matrix_request( "GET", f"rooms/{self.room_id}/members", body={"membership": ["join", "invite"]} ) @@ -164,8 +155,6 @@ class MatrixRoom(ExtensiblePolymorphicModel): def _invite(self, profile: MatrixProfile) -> dict[str, Any]: """Invite a user to this room.""" - from .util.matrix import do_matrix_request - r = do_matrix_request( "POST", f"rooms/{self.room_id}/invite", @@ -281,8 +270,6 @@ class MatrixSpace(MatrixRoom): @property def child_spaces(self) -> list[str]: """Get all child spaces of this space.""" - from .util.matrix import do_matrix_request - r = do_matrix_request("GET", f"rooms/{self.room_id}/state") return [c["state_key"] for c in r if c["type"] == "m.space.child"]