From 92224d6dc9a07be059c517d90d23329127e985f8 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 5 Jun 2022 16:13:11 +0200
Subject: [PATCH] Sync rooms in separate tasks
---
aleksis/apps/matrix/model_extensions.py | 1 -
aleksis/apps/matrix/signals.py | 3 ---
aleksis/apps/matrix/tasks.py | 4 +++-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/aleksis/apps/matrix/model_extensions.py b/aleksis/apps/matrix/model_extensions.py
index 4e0472b..205ee40 100644
--- a/aleksis/apps/matrix/model_extensions.py
+++ b/aleksis/apps/matrix/model_extensions.py
@@ -22,7 +22,6 @@ def provision_in_matrix(self, sync: bool = False) -> Union[MatrixRoom, AsyncResu
def _provision_in_matrix(self) -> MatrixRoom:
"""Create and sync a room for this group in Matrix."""
room = MatrixRoom.from_group(self)
- room.sync()
return room
diff --git a/aleksis/apps/matrix/signals.py b/aleksis/apps/matrix/signals.py
index 10db2f5..0b67a1f 100644
--- a/aleksis/apps/matrix/signals.py
+++ b/aleksis/apps/matrix/signals.py
@@ -8,9 +8,6 @@ from .tasks import sync_room
def post_save_matrix_signal(sender, instance, created, **kwargs):
"""Sync Matrix room after changing a group/Matrix room/Matrix profile."""
- if created:
- return
-
rooms = []
if isinstance(instance, Group):
rooms = MatrixRoom.objects.filter(group=instance)
diff --git a/aleksis/apps/matrix/tasks.py b/aleksis/apps/matrix/tasks.py
index f61f53b..8574b3a 100644
--- a/aleksis/apps/matrix/tasks.py
+++ b/aleksis/apps/matrix/tasks.py
@@ -1,6 +1,8 @@
from datetime import timedelta
from typing import Sequence
+from celery.task.sets import TaskSet
+
from aleksis.apps.matrix.models import MatrixRoom
from aleksis.core.celery import app
from aleksis.core.models import Group
@@ -33,4 +35,4 @@ def sync_rooms():
"""Synchronise all Matrix rooms."""
rooms = MatrixRoom.objects.all()
for room in rooms:
- room.sync()
+ sync_room.delay(room.pk)
--
GitLab