Fix lint

aleksis/apps/matrix/model_extensions.py

@@ -29,14 +29,14 @@ def _provision_in_matrix(self) -> MatrixRoom:
 @Group.property_
 def matrix_alias(self) -> Optional[str]:
     """Return the alias of the group's room in Matrix."""
-    rooms = [room for room in self.matrix_rooms.all() if type(room) == MatrixRoom]
+    rooms = [room for room in self.matrix_rooms.all() if isinstance(room, MatrixRoom)]
     return rooms[0].alias if rooms else None
 
 
 @Group.property_
 def matrix_room_id(self) -> Optional[str]:
     """Return the ID of the group's room in Matrix."""
-    rooms = [room for room in self.matrix_rooms.all() if type(room) == MatrixRoom]
+    rooms = [room for room in self.matrix_rooms.all() if isinstance(room, MatrixRoom)]
     return rooms[0].room_id if rooms else None
 
 

aleksis/apps/matrix/tasks.py

+from collections.abc import Sequence
 from datetime import timedelta
-from typing import Sequence
 
 from aleksis.apps.matrix.models import MatrixRoom
 from aleksis.core.celery import app

aleksis/apps/matrix/tests/test_matrix.py

-import time
 from datetime import date
 from unittest.mock import call
 
 from django.contrib.auth.models import User
-from django.db.models import Q
 
 import pytest
 import requests
-from celery.result import AsyncResult
 
 from aleksis.apps.matrix.models import MatrixProfile, MatrixRoom, MatrixSpace
 from aleksis.apps.matrix.util.matrix import (
     MatrixException,
     build_url,
     do_matrix_request,
-    get_headers,
 )
 from aleksis.core.models import Group, Person, SchoolTerm
 from aleksis.core.util.core_helpers import get_site_preferences
@@ -27,7 +23,7 @@ SERVER_URL = "http://127.0.0.1:8008"
 def test_connection(synapse):
     assert synapse["listeners"][0]["port"] == 8008
 
-    assert requests.get(SERVER_URL).status_code == requests.codes.ok
+    assert requests.get(SERVER_URL).status_code == requests.codes.ok  # noqa: S113
 
 
 @pytest.fixture
@@ -36,7 +32,7 @@ def matrix_bot_user(synapse):
 
     get_site_preferences()["matrix__homeserver"] = SERVER_URL
 
-    r = requests.post(build_url("register"), json=body)
+    r = requests.post(build_url("register"), json=body)  # noqa: S113
     print(r.text, build_url("register"))
     assert r.status_code == requests.codes.ok
 
@@ -172,7 +168,7 @@ def test_sync_room_members(matrix_bot_user):
     # Get power levels
     r = do_matrix_request("GET", f"rooms/{room.room_id}/state")
     for event in r:
-        if not event["type"] == "m.room.power_levels":
+        if event["type"] != "m.room.power_levels":
             continue
         current_power_levels = event["content"]["users"]
 
@@ -207,7 +203,7 @@ def test_power_levels(matrix_bot_user):
     # Get power levels
     r = do_matrix_request("GET", f"rooms/{room.room_id}/state")
     for event in r:
-        if not event["type"] == "m.room.power_levels":
+        if event["type"] != "m.room.power_levels":
             continue
         current_power_levels = event["content"]["users"]
 
@@ -225,7 +221,7 @@ def test_power_levels(matrix_bot_user):
     # Not reduced here
     r = do_matrix_request("GET", f"rooms/{room.room_id}/state")
     for event in r:
-        if not event["type"] == "m.room.power_levels":
+        if event["type"] != "m.room.power_levels":
             continue
         current_power_levels = event["content"]["users"]
 
@@ -240,7 +236,7 @@ def test_power_levels(matrix_bot_user):
     # Reduced here
     r = do_matrix_request("GET", f"rooms/{room.room_id}/state")
     for event in r:
-        if not event["type"] == "m.room.power_levels":
+        if event["type"] != "m.room.power_levels":
             continue
         current_power_levels = event["content"]["users"]
 
@@ -313,9 +309,6 @@ def test_use_room_sync(matrix_bot_user):
     assert p1.matrix_profile.matrix_id == "@test1:matrix.aleksis.example.org"
 
 
-from django.test import TransactionTestCase, override_settings
-
-
 def test_space_creation(matrix_bot_user):
     parent_group = Group.objects.create(name="Test Group")
     child_1 = Group.objects.create(name="Test Group 1")
@@ -518,7 +511,7 @@ def test_signal_profile_person_changed(matrix_bot_user, mocker):
     g2.members.set([p2])
     g2.owners.set([p4])
 
-    room = MatrixRoom.from_group(g)
+    MatrixRoom.from_group(g)
     room2 = MatrixRoom.from_group(g2)
 
     sync_mock = mocker.patch("aleksis.apps.matrix.tasks.sync_room.delay")

aleksis/apps/matrix/util/matrix.py

@@ -29,7 +29,7 @@ def get_headers() -> dict[str, str]:
 def do_matrix_request(method: str, url: str, body: Optional[dict] = None) -> dict[str, Any]:
     """Do a HTTP request to the Matrix Client Server API."""
     while True:
-        res = requests.request(method=method, url=build_url(url), headers=get_headers(), json=body)
+        res = requests.request(method=method, url=build_url(url), headers=get_headers(), json=body)  # noqa: S113
 
         try:
             data = res.json()