From 5e190d146f3efd65bd1345346c2249ec7675a6aa Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Mon, 23 May 2022 17:41:21 +0200
Subject: [PATCH] update: fixing subscriptions generation
---
.../commands/create_subscriptions.py | 35 +++++++++++++++----
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git a/djangoldp_notification/management/commands/create_subscriptions.py b/djangoldp_notification/management/commands/create_subscriptions.py
index 18b30c4..b6e4e4b 100644
--- a/djangoldp_notification/management/commands/create_subscriptions.py
+++ b/djangoldp_notification/management/commands/create_subscriptions.py
@@ -10,16 +10,39 @@ class Command(BaseCommand):
jabber_host = getattr(settings, 'JABBER_DEFAULT_HOST')
xmpp = getattr(settings, 'PROSODY_HTTP_URL')
- Subscription.objects.get_or_create(object=host+"/circles/", inbox=xmpp + "/conference." + jabber_host + "/happydev_muc_admin", field=None)
- # Subscription.objects.get_or_create(object=host+"/circle-members/", inbox=xmpp + "/conference." + jabber_host + "/happydev_muc_admin", field="circle")
- Subscription.objects.get_or_create(object=host+"/projects/", inbox=xmpp + "/conference." + jabber_host + "/happydev_muc_admin", field=None)
- # Subscription.objects.get_or_create(object=host+"/project-members/", inbox=xmpp + "/conference." + jabber_host + "/happydev_muc_admin", field="project")
+ try:
+ sub = Subscription.objects.get(object="{}/circles/".format(host))
+ sub.delete()
+ except Subscription.DoesNotExist:
+ pass
+
+ try:
+ sub = Subscription.objects.get(object="{}/projects/".format(host))
+ sub.delete()
+ except Subscription.DoesNotExist:
+ pass
+
+ try:
+ sub = Subscription.objects.get(object="{}/circle-members/".format(host))
+ sub.delete()
+ except Subscription.DoesNotExist:
+ pass
+
+ try:
+ sub = Subscription.objects.get(object="{}/project-members/".format(host))
+ sub.delete()
+ except Subscription.DoesNotExist:
+ pass
+
+ Subscription.objects.get_or_create(object=host+"/circles/", inbox=xmpp + "/conference." + jabber_host + "/startinblox_muc_admin", field=None)
+ Subscription.objects.get_or_create(object=host+"/projects/", inbox=xmpp + "/conference." + jabber_host + "/startinblox_muc_admin", field=None)
+
Subscription.objects.get_or_create(object=host+"/users/", inbox=xmpp + "/" + jabber_host + "/happydev_user_admin", field=None)
Subscription.objects.get_or_create(object=host+"/profiles/", inbox=xmpp + "/" + jabber_host + "/happydev_user_admin", field="user")
Subscription.objects.get_or_create(object=host+"/chatprofiles/", inbox=xmpp + "/" + jabber_host + "/happydev_user_admin", field="user")
Subscription.objects.get_or_create(object=host+"/accounts/", inbox=xmpp + "/" + jabber_host + "/happydev_user_admin", field="user")
- Subscription.objects.get_or_create(object=host+"/circle-members/", inbox=xmpp + "/conference." + jabber_host + "/startinblox_muc_members_admin")
- Subscription.objects.get_or_create(object=host+"/project-members/", inbox=xmpp + "/conference." + jabber_host + "/startinblox_muc_members_admin")
+ Subscription.objects.get_or_create(object=host+"/circle-members/", inbox=xmpp + "/conference." + jabber_host + "/startinblox_muc_members_admin", field=None)
+ Subscription.objects.get_or_create(object=host+"/project-members/", inbox=xmpp + "/conference." + jabber_host + "/startinblox_muc_members_admin", field=None)
self.stdout.write(self.style.SUCCESS("Successfully created subscriptions\nhost: "+host+"\nxmpp server: "+xmpp+"\njabber host: "+jabber_host))
--
GitLab