Skip to content
Snippets Groups Projects
Verified Commit 713c294f authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Reformat

parent dfd40a80
No related branches found
No related tags found
1 merge request!24Release 2.0
include: include:
- project: "AlekSIS/official/AlekSIS" - project: "AlekSIS/official/AlekSIS"
file: /ci/general.yml file: /ci/general.yml
- project: "AlekSIS/official/AlekSIS" - project: "AlekSIS/official/AlekSIS"
file: /ci/prepare/lock.yml file: /ci/prepare/lock.yml
- project: "AlekSIS/official/AlekSIS" - project: "AlekSIS/official/AlekSIS"
file: /ci/test/lint.yml file: /ci/test/lint.yml
- project: "AlekSIS/official/AlekSIS" - project: "AlekSIS/official/AlekSIS"
file: /ci/test/security.yml file: /ci/test/security.yml
- project: "AlekSIS/official/AlekSIS" - project: "AlekSIS/official/AlekSIS"
file: /ci/build/dist.yml file: /ci/build/dist.yml
- project: "AlekSIS/official/AlekSIS" - project: "AlekSIS/official/AlekSIS"
file: /ci/build/docs.yml file: /ci/build/docs.yml
- project: "AlekSIS/official/AlekSIS" - project: "AlekSIS/official/AlekSIS"
file: "/ci/deploy/trigger_dist.yml" file: "/ci/deploy/trigger_dist.yml"
- project: "AlekSIS/official/AlekSIS" - project: "AlekSIS/official/AlekSIS"
file: "/ci/docker/image.yml" file: "/ci/docker/image.yml"
- project: "AlekSIS/official/AlekSIS" - project: "AlekSIS/official/AlekSIS"
file: /ci/publish/pypi.yml file: /ci/publish/pypi.yml
export default export default {
{ meta: {
meta: { inMenu: true,
inMenu: true, titleKey: "matrix.menu_title",
titleKey: "matrix.menu_title", icon: "mdi-forum-outline",
icon: "mdi-forum-outline", },
}, props: {
props: { byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true, },
}, children: [
children: [ {
{ path: "rooms/",
path: "rooms/", component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"),
component: () => import("aleksis.core/components/LegacyBaseTemplate.vue"), name: "matrix.groupsAndRooms",
name: "matrix.groupsAndRooms", meta: {
meta: { inMenu: true,
inMenu: true, titleKey: "matrix.rooms.menu_title",
titleKey: "matrix.rooms.menu_title", icon: "mdi-account-group-outline",
icon: "mdi-account-group-outline", permission: "matrix.view_matrixrooms_rule",
permission: "matrix.view_matrixrooms_rule",
},
props: {
byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
}, },
], props: {
} byTheGreatnessOfTheAlmightyAleksolotlISwearIAmWorthyOfUsingTheLegacyBaseTemplate: true,
},
},
],
};
...@@ -109,7 +109,6 @@ class MatrixRoom(ExtensiblePolymorphicModel): ...@@ -109,7 +109,6 @@ class MatrixRoom(ExtensiblePolymorphicModel):
not get_site_preferences()["matrix__disambiguate_room_aliases"] not get_site_preferences()["matrix__disambiguate_room_aliases"]
or e.args[0].get("errcode") != "M_ROOM_IN_USE" or e.args[0].get("errcode") != "M_ROOM_IN_USE"
): ):
raise raise
match = re.match(r"^(.*)-(\d+)$", alias) match = re.match(r"^(.*)-(\d+)$", alias)
......
...@@ -8,10 +8,10 @@ listeners: ...@@ -8,10 +8,10 @@ listeners:
tls: false tls: false
type: http type: http
x_forwarded: true x_forwarded: true
bind_addresses: [ '::1', '127.0.0.1' ] bind_addresses: ["::1", "127.0.0.1"]
resources: resources:
- names: [ client, federation ] - names: [client, federation]
compress: false compress: false
database: database:
......
...@@ -25,7 +25,6 @@ SERVER_URL = "http://127.0.0.1:8008" ...@@ -25,7 +25,6 @@ SERVER_URL = "http://127.0.0.1:8008"
def test_connection(synapse): def test_connection(synapse):
assert synapse["listeners"][0]["port"] == 8008 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
...@@ -33,7 +32,6 @@ def test_connection(synapse): ...@@ -33,7 +32,6 @@ def test_connection(synapse):
@pytest.fixture @pytest.fixture
def matrix_bot_user(synapse): def matrix_bot_user(synapse):
body = {"username": "aleksis-bot", "password": "test", "auth": {"type": "m.login.dummy"}} body = {"username": "aleksis-bot", "password": "test", "auth": {"type": "m.login.dummy"}}
get_site_preferences()["matrix__homeserver"] = SERVER_URL get_site_preferences()["matrix__homeserver"] = SERVER_URL
...@@ -72,7 +70,6 @@ def test_create_room_for_group(matrix_bot_user): ...@@ -72,7 +70,6 @@ def test_create_room_for_group(matrix_bot_user):
# #
def test_create_room_for_group_short_name(matrix_bot_user): def test_create_room_for_group_short_name(matrix_bot_user):
g = Group.objects.create(name="Test Room", short_name="test") g = Group.objects.create(name="Test Room", short_name="test")
assert not MatrixRoom.objects.all().exists() assert not MatrixRoom.objects.all().exists()
room = MatrixRoom.from_group(g) room = MatrixRoom.from_group(g)
...@@ -254,7 +251,6 @@ def test_power_levels(matrix_bot_user): ...@@ -254,7 +251,6 @@ def test_power_levels(matrix_bot_user):
def test_sync_room_members_without_user(matrix_bot_user): def test_sync_room_members_without_user(matrix_bot_user):
get_site_preferences()["matrix__homeserver_ids"] = "matrix.aleksis.example.org" get_site_preferences()["matrix__homeserver_ids"] = "matrix.aleksis.example.org"
g = Group.objects.create(name="Test Room") g = Group.objects.create(name="Test Room")
...@@ -278,7 +274,6 @@ def test_sync_room_members_without_user(matrix_bot_user): ...@@ -278,7 +274,6 @@ def test_sync_room_members_without_user(matrix_bot_user):
def test_sync_room_members_without_homeserver(matrix_bot_user): def test_sync_room_members_without_homeserver(matrix_bot_user):
get_site_preferences()["matrix__homeserver_ids"] = "" get_site_preferences()["matrix__homeserver_ids"] = ""
g = Group.objects.create(name="Test Room") g = Group.objects.create(name="Test Room")
...@@ -463,7 +458,6 @@ def test_too_much_invites(matrix_bot_user): ...@@ -463,7 +458,6 @@ def test_too_much_invites(matrix_bot_user):
persons = [] persons = []
for i in range(100): for i in range(100):
u = User.objects.create_user(f"test{i}", f"test{i}@example.org", f"test{i}") 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) p = Person.objects.create(first_name=f"Test {i}", last_name="Person", user=u)
persons.append(p) persons.append(p)
......
...@@ -122,76 +122,76 @@ ...@@ -122,76 +122,76 @@
site: 1 site: 1
name: "8c" name: "8c"
short_name: "8c" short_name: "8c"
members: [ 6, 7, 8 ] members: [6, 7, 8]
- model: core.group - model: core.group
pk: 102 pk: 102
fields: fields:
site: 1 site: 1
name: "5c" name: "5c"
short_name: "5c" short_name: "5c"
members: [ 6, 7, 8 ] members: [6, 7, 8]
- model: core.group - model: core.group
pk: 103 pk: 103
fields: fields:
site: 1 site: 1
name: "6c" name: "6c"
short_name: "6c" short_name: "6c"
members: [ 6, 7, 8 ] members: [6, 7, 8]
- model: core.group - model: core.group
pk: 104 pk: 104
fields: fields:
site: 1 site: 1
name: "5a" name: "5a"
short_name: "5a" short_name: "5a"
members: [ 6, 7, 8 ] members: [6, 7, 8]
- model: core.group - model: core.group
pk: 105 pk: 105
fields: fields:
site: 1 site: 1
name: "7a" name: "7a"
short_name: "7a" short_name: "7a"
members: [ 6, 7, 8 ] members: [6, 7, 8]
- model: core.group - model: core.group
pk: 106 pk: 106
fields: fields:
site: 1 site: 1
name: "6a" name: "6a"
short_name: "6a" short_name: "6a"
members: [ 6, 7, 8 ] members: [6, 7, 8]
- model: core.group - model: core.group
pk: 107 pk: 107
fields: fields:
site: 1 site: 1
name: "9d" name: "9d"
short_name: "9d" short_name: "9d"
members: [ 6, 7, 8 ] members: [6, 7, 8]
- model: core.group - model: core.group
pk: 1 pk: 1
fields: fields:
site: 1 site: 1
name: "8c:Mu" name: "8c:Mu"
short_name: "8c:Mu" short_name: "8c:Mu"
members: [ 6, 7, 8 ] members: [6, 7, 8]
owners: [ 2 ] owners: [2]
parent_groups: [ 101 ] parent_groups: [101]
- model: core.group - model: core.group
pk: 2 pk: 2
fields: fields:
site: 1 site: 1
name: "5c:Mu" name: "5c:Mu"
short_name: "5c:Mu" short_name: "5c:Mu"
members: [ 6, 7, 8 ] members: [6, 7, 8]
owners: [ 2 ] owners: [2]
parent_groups: [ 102 ] parent_groups: [102]
- model: core.group - model: core.group
pk: 3 pk: 3
fields: fields:
site: 1 site: 1
name: "6c:Mu" name: "6c:Mu"
short_name: "6c:Mu" short_name: "6c:Mu"
members: [ 6, 7, 8 ] members: [6, 7, 8]
owners: [ 3 ] owners: [3]
parent_groups: [ 103 ] parent_groups: [103]
- model: core.group - model: core.group
pk: 4 pk: 4
fields: fields:
...@@ -199,56 +199,56 @@ ...@@ -199,56 +199,56 @@
name: "5a:De" name: "5a:De"
short_name: "5a:De" short_name: "5a:De"
members: [ 6, 7, 8 ] members: [6, 7, 8]
owners: [ 4 ] owners: [4]
parent_groups: [ 104 ] parent_groups: [104]
- model: core.group - model: core.group
pk: 5 pk: 5
fields: fields:
site: 1 site: 1
name: "7a:Mu" name: "7a:Mu"
short_name: "7a:Mu" short_name: "7a:Mu"
members: [ 6, 7, 8 ] members: [6, 7, 8]
owners: [ 4 ] owners: [4]
parent_groups: [ 105 ] parent_groups: [105]
- model: core.group - model: core.group
pk: 6 pk: 6
fields: fields:
site: 1 site: 1
name: "6a:Mu" name: "6a:Mu"
short_name: "6a:Mu" short_name: "6a:Mu"
members: [ 6, 7, 8 ] members: [6, 7, 8]
owners: [ 5 ] owners: [5]
parent_groups: [ 106 ] parent_groups: [106]
- model: core.group - model: core.group
pk: 7 pk: 7
fields: fields:
site: 1 site: 1
name: "9d:Mu" name: "9d:Mu"
short_name: "9d:Mu" short_name: "9d:Mu"
members: [ 6, 7, 8 ] members: [6, 7, 8]
owners: [ 5 ] owners: [5]
parent_groups: [ 107 ] parent_groups: [107]
- model: core.group - model: core.group
pk: 8 pk: 8
fields: fields:
site: 1 site: 1
name: "6a:De" name: "6a:De"
short_name: "6a:De" short_name: "6a:De"
members: [ 6, 7, 8 ] members: [6, 7, 8]
owners: [ 5 ] owners: [5]
parent_groups: [ 106 ] parent_groups: [106]
- model: core.group - model: core.group
pk: 9 pk: 9
fields: fields:
site: 1 site: 1
name: "Teachers" name: "Teachers"
short_name: "Teachers" short_name: "Teachers"
members: [ 2, 3, 4, 5 ] members: [2, 3, 4, 5]
- model: core.group - model: core.group
pk: 10 pk: 10
fields: fields:
site: 1 site: 1
name: "Students" name: "Students"
short_name: "Students" short_name: "Students"
members: [ 6, 7, 8 ] members: [6, 7, 8]
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment