Merged in cwalther/cwe/setpublic (pull request #35)

Let ptVault.setAgePublic accept ptVaultAgeInfoNode in addition to ptAgeInfoStruct

In this case it now also works for non-owners of the age. Previously it only worked for owners because the ageInfoStruct does not contain the vault node ID, so it needed to be looked up somewhere, and that was in the AgesIOwnFolder.

Prerequisite for hood auto-bump (MOULSCRIPT-ou PR #22).

From H-uru/Plasma#461.

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyVault.cpp

@@ -664,6 +664,11 @@ bool pyVault::SetAgePublic( const pyAgeInfoStruct * ageInfo, bool makePublic )
 	return VaultSetOwnedAgePublicAndWait(ageInfo->GetAgeInfo(), makePublic);
 }
 
+bool pyVault::SetAgePublic( const pyVaultAgeInfoNode * ageInfoNode, bool makePublic )
+{
+	return VaultSetAgePublicAndWait(ageInfoNode->GetNode(), makePublic);
+}
+
 
 PyObject* pyVault::GetGlobalInbox( void )
 {

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyVault.h

@@ -176,6 +176,8 @@ public:
 	void CreateNeighborhood();
 	// set an age's public status. will fail if you aren't czar of age.
 	bool SetAgePublic( const pyAgeInfoStruct * ageInfo, bool makePublic );
+	// set an age's public status, also works for non-owners
+	bool SetAgePublic( const pyVaultAgeInfoNode * ageInfoNode, bool makePublic );
 
 	PyObject* GetGlobalInbox( void ); // returns pyVaultFolderNode
 #ifdef GlobalInboxTestCode

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfPython/pyVaultGlue.cpp

@@ -43,6 +43,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "pyEnum.h"
 #include "pyAgeInfoStruct.h"
 #include "pyVaultNode.h"
+#include "pyVaultAgeInfoNode.h"
 #include "pySDL.h"
 #include "pyAgeLinkStruct.h"
 
@@ -451,16 +452,21 @@ PYTHON_METHOD_DEFINITION(ptVault, setAgePublic, args)
 	char makePublic;
 	if (!PyArg_ParseTuple(args, "Ob", &ageInfoObj, &makePublic))
 	{
-		PyErr_SetString(PyExc_TypeError, "setAgePublic expects a ptAgeInfoStruct and a boolean");
+		PyErr_SetString(PyExc_TypeError, "setAgePublic expects a ptAgeInfoStruct or ptVaultAgeInfoNode and a boolean");
 		PYTHON_RETURN_ERROR;
 	}
-	if (!pyAgeInfoStruct::Check(ageInfoObj))
+	if (pyAgeInfoStruct::Check(ageInfoObj))
 	{
-		PyErr_SetString(PyExc_TypeError, "setAgePublic expects a ptAgeInfoStruct and a boolean");
-		PYTHON_RETURN_ERROR;
-	}
 		pyAgeInfoStruct* ageInfo = pyAgeInfoStruct::ConvertFrom(ageInfoObj);
 		PYTHON_RETURN_BOOL(self->fThis->SetAgePublic(ageInfo, makePublic != 0));
+	}
+	else if (pyVaultAgeInfoNode::Check(ageInfoObj))
+	{
+		pyVaultAgeInfoNode* ageInfoNode = pyVaultAgeInfoNode::ConvertFrom(ageInfoObj);
+		PYTHON_RETURN_BOOL(self->fThis->SetAgePublic(ageInfoNode, makePublic != 0));
+	}
+	PyErr_SetString(PyExc_TypeError, "setAgePublic expects a ptAgeInfoStruct or ptVaultAgeInfoNode and a boolean");
+	PYTHON_RETURN_ERROR;
 }
 
 PYTHON_START_METHODS_TABLE(ptVault)

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.cpp

@@ -2476,9 +2476,19 @@ bool VaultAddOwnedAgeSpawnPoint (const Uuid & ageInstId, const plSpawnPointInfo
 bool VaultSetOwnedAgePublicAndWait (const plAgeInfoStruct * info, bool publicOrNot) {
 	if (RelVaultNode * rvnLink = VaultGetOwnedAgeLinkIncRef(info)) {
 		if (RelVaultNode * rvnInfo = rvnLink->GetChildNodeIncRef(plVault::kNodeType_AgeInfo, 1)) {
-			NetCliAuthSetAgePublic(rvnInfo->nodeId, publicOrNot);
+			VaultSetAgePublicAndWait(rvnInfo, publicOrNot);
+			rvnInfo->DecRef();
+		}
+		rvnLink->DecRef();
+	}
+	return true;
+}
 
-			VaultAgeInfoNode access(rvnInfo);
+//============================================================================
+bool VaultSetAgePublicAndWait (NetVaultNode * ageInfoNode, bool publicOrNot) {
+	NetCliAuthSetAgePublic(ageInfoNode->nodeId, publicOrNot);
+
+	VaultAgeInfoNode access(ageInfoNode);
 	char ageName[MAX_PATH];
 	StrToAnsi(ageName, access.ageFilename, arrsize(ageName));
 	
@@ -2490,11 +2500,6 @@ bool VaultSetOwnedAgePublicAndWait (const plAgeInfoStruct * info, bool publicOrN
 	msg->SetResultCode(true);
 	msg->GetArgs()->AddString(plNetCommon::VaultTaskArgs::kAgeFilename, ageName);
 	msg->Send();
-			
-			rvnInfo->DecRef();
-		}
-		rvnLink->DecRef();
-	}
 	return true;
 }
 

MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plVault/plVaultClientApi.h

@@ -345,6 +345,7 @@ RelVaultNode *	VaultGetOwnedAgeInfoIncRef (const plAgeInfoStruct * info);
 bool			VaultGetOwnedAgeLink (const plAgeInfoStruct * info, plAgeLinkStruct * link);
 bool			VaultAddOwnedAgeSpawnPoint (const Uuid & ageInstId, const plSpawnPointInfo & spawnPt);
 bool			VaultSetOwnedAgePublicAndWait (const plAgeInfoStruct * info, bool publicOrNot);
+bool			VaultSetAgePublicAndWait (NetVaultNode * ageInfoNode, bool publicOrNot);
 RelVaultNode *	VaultGetVisitAgeLinkIncRef (const plAgeInfoStruct * info);
 bool			VaultGetVisitAgeLink (const plAgeInfoStruct * info, class plAgeLinkStruct * link);
 bool			VaultRegisterOwnedAgeAndWait (const plAgeLinkStruct * link);