From a0e4e68ba6fc7009bb46d78756b8e13e00a12784 Mon Sep 17 00:00:00 2001
From: defnax <9952056+defnax@users.noreply.github.com>
Date: Sun, 7 Jun 2026 23:43:34 +0200
Subject: [PATCH] update gxs calendar service

---
 src/retroshare/rsgxscalendar.h |  9 +++++++++
 src/services/p3gxscalendar.cc  | 20 ++++++++++++++++----
 src/services/p3gxscalendar.h   |  8 ++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/retroshare/rsgxscalendar.h b/src/retroshare/rsgxscalendar.h
index 24820a815..3d71fffa3 100644
--- a/src/retroshare/rsgxscalendar.h
+++ b/src/retroshare/rsgxscalendar.h
@@ -28,6 +28,7 @@
 #include "retroshare/rstokenservice.h"
 #include "retroshare/rsgxsifacehelper.h"
 #include "retroshare/rsgxscommon.h"
+#include "retroshare/rsgxsflags.h"
 #include "serialiser/rsserializable.h"
 #include "util/rsmemory.h"
 
@@ -110,6 +111,10 @@ public:
 	        const std::string& name,
 	        const std::string& description,
 	        const RsGxsId&     authorId = RsGxsId(),
+	        uint32_t           circleType = 0x0001,
+	        const RsGxsCircleId& circleId = RsGxsCircleId(),
+	        const RsGxsCircleId& internalCircle = RsGxsCircleId(),
+	        uint32_t           groupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC,
 	        RsGxsGroupId& calendarId = RS_DEFAULT_STORAGE_PARAM(RsGxsGroupId),
 	        std::string&  errorMessage = RS_DEFAULT_STORAGE_PARAM(std::string)
 	        ) = 0;
@@ -119,6 +124,10 @@ public:
 	        const std::string& name,
 	        const std::string& description,
 	        const RsGxsId&     authorId = RsGxsId(),
+	        uint32_t           circleType = 0x0001,
+	        const RsGxsCircleId& circleId = RsGxsCircleId(),
+	        const RsGxsCircleId& internalCircle = RsGxsCircleId(),
+	        uint32_t           groupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC,
 	        std::string&  errorMessage = RS_DEFAULT_STORAGE_PARAM(std::string)
 	        ) = 0;
 
diff --git a/src/services/p3gxscalendar.cc b/src/services/p3gxscalendar.cc
index 8b1c0c221..61069c22e 100644
--- a/src/services/p3gxscalendar.cc
+++ b/src/services/p3gxscalendar.cc
@@ -69,6 +69,10 @@ bool p3GxsCalendar::createCalendar(
         const std::string& name,
         const std::string& description,
         const RsGxsId&     authorId,
+        uint32_t           circleType,
+        const RsGxsCircleId& circleId,
+        const RsGxsCircleId& internalCircle,
+        uint32_t           groupFlags,
         RsGxsGroupId& calendarId,
         std::string&  errorMessage
         )
@@ -76,9 +80,11 @@ bool p3GxsCalendar::createCalendar(
 	RsGxsCalendarGroup group;
 	group.mMeta.mGroupName = name;
 	group.mMeta.mAuthorId = authorId;
-	group.mMeta.mCircleType = static_cast<uint32_t>(RsGxsCircleType::PUBLIC);
+	group.mMeta.mCircleType = circleType;
+	group.mMeta.mCircleId = circleId;
+	group.mMeta.mInternalCircle = internalCircle;
 	group.mMeta.mSignFlags = GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_NONEREQ | GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_REQUIRED;
-	group.mMeta.mGroupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC;
+	group.mMeta.mGroupFlags = groupFlags;
 	group.mDescription = description;
 
 	RsGxsCalendarGroupItem* grpItem = new RsGxsCalendarGroupItem();
@@ -108,6 +114,10 @@ bool p3GxsCalendar::updateCalendar(
         const std::string& name,
         const std::string& description,
         const RsGxsId&     authorId,
+        uint32_t           circleType,
+        const RsGxsCircleId& circleId,
+        const RsGxsCircleId& internalCircle,
+        uint32_t           groupFlags,
         std::string&  errorMessage
         )
 {
@@ -115,9 +125,11 @@ bool p3GxsCalendar::updateCalendar(
 	group.mMeta.mGroupId = calendarId;
 	group.mMeta.mGroupName = name;
 	group.mMeta.mAuthorId = authorId;
-	group.mMeta.mCircleType = static_cast<uint32_t>(RsGxsCircleType::PUBLIC);
+	group.mMeta.mCircleType = circleType;
+	group.mMeta.mCircleId = circleId;
+	group.mMeta.mInternalCircle = internalCircle;
 	group.mMeta.mSignFlags = GXS_SERV::FLAG_GROUP_SIGN_PUBLISH_NONEREQ | GXS_SERV::FLAG_AUTHOR_AUTHENTICATION_REQUIRED;
-	group.mMeta.mGroupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC;
+	group.mMeta.mGroupFlags = groupFlags;
 	group.mDescription = description;
 
 	RsGxsCalendarGroupItem* grpItem = new RsGxsCalendarGroupItem();
diff --git a/src/services/p3gxscalendar.h b/src/services/p3gxscalendar.h
index e310a4a09..9358cca82 100644
--- a/src/services/p3gxscalendar.h
+++ b/src/services/p3gxscalendar.h
@@ -42,6 +42,10 @@ public:
 	        const std::string& name,
 	        const std::string& description,
 	        const RsGxsId&     authorId = RsGxsId(),
+	        uint32_t           circleType = 0x0001,
+	        const RsGxsCircleId& circleId = RsGxsCircleId(),
+	        const RsGxsCircleId& internalCircle = RsGxsCircleId(),
+	        uint32_t           groupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC,
 	        RsGxsGroupId& calendarId = RS_DEFAULT_STORAGE_PARAM(RsGxsGroupId),
 	        std::string&  errorMessage = RS_DEFAULT_STORAGE_PARAM(std::string)
 	        ) override;
@@ -51,6 +55,10 @@ public:
 	        const std::string& name,
 	        const std::string& description,
 	        const RsGxsId&     authorId = RsGxsId(),
+	        uint32_t           circleType = 0x0001,
+	        const RsGxsCircleId& circleId = RsGxsCircleId(),
+	        const RsGxsCircleId& internalCircle = RsGxsCircleId(),
+	        uint32_t           groupFlags = GXS_SERV::FLAG_PRIVACY_PUBLIC,
 	        std::string&  errorMessage = RS_DEFAULT_STORAGE_PARAM(std::string)
 	        ) override;