From 713c294f037defa8ecb38788f19101350644fee5 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Thu, 23 Feb 2023 18:08:02 +0100
Subject: [PATCH] Reformat

---
 .gitlab-ci.yml                                | 36 +++++-----
 aleksis/apps/matrix/frontend/index.js         | 51 +++++++-------
 aleksis/apps/matrix/models.py                 |  1 -
 .../apps/matrix/tests/synapse/homeserver.yaml |  4 +-
 aleksis/apps/matrix/tests/test_matrix.py      |  6 --
 fixtures/example_data.yaml                    | 66 +++++++++----------
 6 files changed, 78 insertions(+), 86 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b53733..8beab2e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,19 +1,19 @@
 include:
-    - project: "AlekSIS/official/AlekSIS"
-      file: /ci/general.yml
-    - project: "AlekSIS/official/AlekSIS"
-      file: /ci/prepare/lock.yml
-    - project: "AlekSIS/official/AlekSIS"
-      file: /ci/test/lint.yml
-    - project: "AlekSIS/official/AlekSIS"
-      file: /ci/test/security.yml
-    - project: "AlekSIS/official/AlekSIS"
-      file: /ci/build/dist.yml
-    - project: "AlekSIS/official/AlekSIS"
-      file: /ci/build/docs.yml
-    - project: "AlekSIS/official/AlekSIS"
-      file: "/ci/deploy/trigger_dist.yml"
-    - project: "AlekSIS/official/AlekSIS"
-      file: "/ci/docker/image.yml"
-    - project: "AlekSIS/official/AlekSIS"
-      file: /ci/publish/pypi.yml
+  - project: "AlekSIS/official/AlekSIS"
+    file: /ci/general.yml
+  - project: "AlekSIS/official/AlekSIS"
+    file: /ci/prepare/lock.yml
+  - project: "AlekSIS/official/AlekSIS"
+    file: /ci/test/lint.yml
+  - project: "AlekSIS/official/AlekSIS"
+    file: /ci/test/security.yml
+  - project: "AlekSIS/official/AlekSIS"
+    file: /ci/build/dist.yml
+  - project: "AlekSIS/official/AlekSIS"
+    file: /ci/build/docs.yml
+  - project: "AlekSIS/official/AlekSIS"
+    file: "/ci/deploy/trigger_dist.yml"
+  - project: "AlekSIS/official/AlekSIS"
+    file: "/ci/docker/image.yml"
+  - project: "AlekSIS/official/AlekSIS"
+    file: /ci/publish/pypi.yml
diff --git a/aleksis/apps/matrix/frontend/index.js b/aleksis/apps/matrix/frontend/index.js
index 0c46c2e..6113a60 100644
--- a/aleksis/apps/matrix/frontend/index.js
+++ b/aleksis/apps/matrix/frontend/index.js
@@ -1,27 +1,26 @@
-export default
-  {
-    meta: {
-      inMenu: true,
-      titleKey: "matrix.menu_title",
-      icon: "mdi-forum-outline",
-    },
-    props: {
-      byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
-    },
-    children: [
-      {
-        path: "rooms/",
-        component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
-        name: "matrix.groupsAndRooms",
-        meta: {
-          inMenu: true,
-          titleKey: "matrix.rooms.menu_title",
-          icon: "mdi-account-group-outline",
-          permission: "matrix.view_matrixrooms_rule",
-        },
-        props: {
-          byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
-        },
+export default {
+  meta: {
+    inMenu: true,
+    titleKey: "matrix.menu_title",
+    icon: "mdi-forum-outline",
+  },
+  props: {
+    byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+  },
+  children: [
+    {
+      path: "rooms/",
+      component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
+      name: "matrix.groupsAndRooms",
+      meta: {
+        inMenu: true,
+        titleKey: "matrix.rooms.menu_title",
+        icon: "mdi-account-group-outline",
+        permission: "matrix.view_matrixrooms_rule",
       },
-    ],
-  }
+      props: {
+        byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
+      },
+    },
+  ],
+};
diff --git a/aleksis/apps/matrix/models.py b/aleksis/apps/matrix/models.py
index 7f2a7a3..e991dad 100644
--- a/aleksis/apps/matrix/models.py
+++ b/aleksis/apps/matrix/models.py
@@ -109,7 +109,6 @@ class MatrixRoom(ExtensiblePolymorphicModel):
                         not get_site_preferences()["matrix__disambiguate_room_aliases"]
                         or e.args[0].get("errcode") != "M_ROOM_IN_USE"
                     ):
-
                         raise
 
                 match = re.match(r"^(.*)-(\d+)$", alias)
diff --git a/aleksis/apps/matrix/tests/synapse/homeserver.yaml b/aleksis/apps/matrix/tests/synapse/homeserver.yaml
index 9221c00..892eb96 100644
--- a/aleksis/apps/matrix/tests/synapse/homeserver.yaml
+++ b/aleksis/apps/matrix/tests/synapse/homeserver.yaml
@@ -8,10 +8,10 @@ listeners:
     tls: false
     type: http
     x_forwarded: true
-    bind_addresses: [ '::1', '127.0.0.1' ]
+    bind_addresses: ["::1", "127.0.0.1"]
 
     resources:
-      - names: [ client, federation ]
+      - names: [client, federation]
         compress: false
 
 database:
diff --git a/aleksis/apps/matrix/tests/test_matrix.py b/aleksis/apps/matrix/tests/test_matrix.py
index b1cc47d..a815655 100644
--- a/aleksis/apps/matrix/tests/test_matrix.py
+++ b/aleksis/apps/matrix/tests/test_matrix.py
@@ -25,7 +25,6 @@ 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
@@ -33,7 +32,6 @@ def test_connection(synapse):
 
 @pytest.fixture
 def matrix_bot_user(synapse):
-
     body = {"username": "aleksis-bot", "password": "test", "auth": {"type": "m.login.dummy"}}
 
     get_site_preferences()["matrix__homeserver"] = SERVER_URL
@@ -72,7 +70,6 @@ def test_create_room_for_group(matrix_bot_user):
 
 #
 def test_create_room_for_group_short_name(matrix_bot_user):
-
     g = Group.objects.create(name="Test Room", short_name="test")
     assert not MatrixRoom.objects.all().exists()
     room = MatrixRoom.from_group(g)
@@ -254,7 +251,6 @@ def test_power_levels(matrix_bot_user):
 
 
 def test_sync_room_members_without_user(matrix_bot_user):
-
     get_site_preferences()["matrix__homeserver_ids"] = "matrix.aleksis.example.org"
 
     g = Group.objects.create(name="Test Room")
@@ -278,7 +274,6 @@ def test_sync_room_members_without_user(matrix_bot_user):
 
 
 def test_sync_room_members_without_homeserver(matrix_bot_user):
-
     get_site_preferences()["matrix__homeserver_ids"] = ""
 
     g = Group.objects.create(name="Test Room")
@@ -463,7 +458,6 @@ def test_too_much_invites(matrix_bot_user):
 
     persons = []
     for i in range(100):
-
         u = User.objects.create_user(f"test{i}", f"test{i}@example.org", f"test{i}")
         p = Person.objects.create(first_name=f"Test {i}", last_name="Person", user=u)
         persons.append(p)
diff --git a/fixtures/example_data.yaml b/fixtures/example_data.yaml
index 9fa7bee..64fe88d 100644
--- a/fixtures/example_data.yaml
+++ b/fixtures/example_data.yaml
@@ -122,76 +122,76 @@
     site: 1
     name: "8c"
     short_name: "8c"
-    members: [ 6, 7, 8 ]
+    members: [6, 7, 8]
 - model: core.group
   pk: 102
   fields:
     site: 1
     name: "5c"
     short_name: "5c"
-    members: [ 6, 7, 8 ]
+    members: [6, 7, 8]
 - model: core.group
   pk: 103
   fields:
     site: 1
     name: "6c"
     short_name: "6c"
-    members: [ 6, 7, 8 ]
+    members: [6, 7, 8]
 - model: core.group
   pk: 104
   fields:
     site: 1
     name: "5a"
     short_name: "5a"
-    members: [ 6, 7, 8 ]
+    members: [6, 7, 8]
 - model: core.group
   pk: 105
   fields:
     site: 1
     name: "7a"
     short_name: "7a"
-    members: [ 6, 7, 8 ]
+    members: [6, 7, 8]
 - model: core.group
   pk: 106
   fields:
     site: 1
     name: "6a"
     short_name: "6a"
-    members: [ 6, 7, 8 ]
+    members: [6, 7, 8]
 - model: core.group
   pk: 107
   fields:
     site: 1
     name: "9d"
     short_name: "9d"
-    members: [ 6, 7, 8 ]
+    members: [6, 7, 8]
 - model: core.group
   pk: 1
   fields:
     site: 1
     name: "8c:Mu"
     short_name: "8c:Mu"
-    members: [ 6, 7, 8 ]
-    owners: [ 2 ]
-    parent_groups: [ 101 ]
+    members: [6, 7, 8]
+    owners: [2]
+    parent_groups: [101]
 - model: core.group
   pk: 2
   fields:
     site: 1
     name: "5c:Mu"
     short_name: "5c:Mu"
-    members: [ 6, 7, 8 ]
-    owners: [ 2 ]
-    parent_groups: [ 102 ]
+    members: [6, 7, 8]
+    owners: [2]
+    parent_groups: [102]
 - model: core.group
   pk: 3
   fields:
     site: 1
     name: "6c:Mu"
     short_name: "6c:Mu"
-    members: [ 6, 7, 8 ]
-    owners: [ 3 ]
-    parent_groups: [ 103 ]
+    members: [6, 7, 8]
+    owners: [3]
+    parent_groups: [103]
 - model: core.group
   pk: 4
   fields:
@@ -199,56 +199,56 @@
     name: "5a:De"
     short_name: "5a:De"
 
-    members: [ 6, 7, 8 ]
-    owners: [ 4 ]
-    parent_groups: [ 104 ]
+    members: [6, 7, 8]
+    owners: [4]
+    parent_groups: [104]
 - model: core.group
   pk: 5
   fields:
     site: 1
     name: "7a:Mu"
     short_name: "7a:Mu"
-    members: [ 6, 7, 8 ]
-    owners: [ 4 ]
-    parent_groups: [ 105 ]
+    members: [6, 7, 8]
+    owners: [4]
+    parent_groups: [105]
 - model: core.group
   pk: 6
   fields:
     site: 1
     name: "6a:Mu"
     short_name: "6a:Mu"
-    members: [ 6, 7, 8 ]
-    owners: [ 5 ]
-    parent_groups: [ 106 ]
+    members: [6, 7, 8]
+    owners: [5]
+    parent_groups: [106]
 - model: core.group
   pk: 7
   fields:
     site: 1
     name: "9d:Mu"
     short_name: "9d:Mu"
-    members: [ 6, 7, 8 ]
-    owners: [ 5 ]
-    parent_groups: [ 107 ]
+    members: [6, 7, 8]
+    owners: [5]
+    parent_groups: [107]
 - model: core.group
   pk: 8
   fields:
     site: 1
     name: "6a:De"
     short_name: "6a:De"
-    members: [ 6, 7, 8 ]
-    owners: [ 5 ]
-    parent_groups: [ 106 ]
+    members: [6, 7, 8]
+    owners: [5]
+    parent_groups: [106]
 - model: core.group
   pk: 9
   fields:
     site: 1
     name: "Teachers"
     short_name: "Teachers"
-    members: [ 2, 3, 4, 5 ]
+    members: [2, 3, 4, 5]
 - model: core.group
   pk: 10
   fields:
     site: 1
     name: "Students"
     short_name: "Students"
-    members: [ 6, 7, 8 ]
+    members: [6, 7, 8]
-- 
GitLab