Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 23:57:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Potential progress? Not totally sure

Browse source
This commit is contained in:
Zach Fox 2017-10-03 16:18:29 -07:00
parent 9c4b02c659
commit ed40e41b94
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
libraries/entities/src/EntityTree.cpp
View file

@ -1097,6 +1097,29 @@ bool EntityTree::isScriptInWhitelist(const QString& scriptProperty) {
return false; return false;
} }
void EntityTree::popStatusSuccess(QNetworkReply& reply) {
QJsonObject jsonObject = QJsonDocument::fromJson(reply.readAll()).object();
qCDebug(entities) << "ZRF FIXME" << jsonObject;
//if (!jsonObject["invalid_reason"].toString().isEmpty()) {
// qCDebug(entities) << "invalid_reason not empty, deleting entity" << entityItemID;
// deleteEntity(entityItemID, true);
//} else if (jsonObject["transfer_status"].toString() == "failed") {
// qCDebug(entities) << "'transfer_status' is 'failed', deleting entity" << entityItemID;
// deleteEntity(entityItemID, true);
//} else {
// //auto challengeOwnershipPacket = NLPacket::create(PacketType::ChallengeOwnership, NUM_BYTES_RFC4122_UUID + sizeof(encryptedText));
// //challengeOwnershipPacket->write(senderNode->getUUID());
// //challengeOwnershipPacket->writePrimitive(KillAvatarReason::TheirAvatarEnteredYourBubble);
//}
}
void EntityTree::popStatusFailure(QNetworkReply& reply) {
QJsonObject jsonObject = QJsonDocument::fromJson(reply.readAll()).object();
qCDebug(entities) << "ZRF FIXME" << jsonObject;
//qCDebug(entities) << "Call to proof_of_purchase_status endpoint failed; deleting entity" << entityItemID;
//deleteEntity(entityItemID, true);
}
int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned char* editData, int maxLength, int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned char* editData, int maxLength,
const SharedNodePointer& senderNode) { const SharedNodePointer& senderNode) {
@ -1322,7 +1345,22 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
qCDebug(entities) << "Certificate ID" << certID << "belongs to" << entityItemID; qCDebug(entities) << "Certificate ID" << certID << "belongs to" << entityItemID;
} }
// Start owner verification // Start owner verification.
// First, asynchronously hit "proof_of_purchase_status?transaction_type=transfer" endpoint.
const QString endpoint("proof_of_purchase_status?transaction_type=transfer");
QJsonObject request;
request["certificate_id"] = certID;
request["domain_id"] = DependencyManager::get<NodeList>()->getDomainHandler().getUUID().toString();
auto accountManager = DependencyManager::get<AccountManager>();
const QString URL = "/api/v1/commerce/";
JSONCallbackParameters callbackParams(this, "popStatusSuccess", this, "popStatusFailure");
qCDebug(entities) << "Sending" << endpoint << QJsonDocument(request).toJson(QJsonDocument::Compact);
accountManager->sendRequest(URL + endpoint,
AccountManagerAuth::None,
QNetworkAccessManager::PostOperation,
callbackParams,
QJsonDocument(request).toJson());
} }
} }

9
libraries/entities/src/EntityTree.h
View file

@ -15,6 +15,11 @@
#include <QSet> #include <QSet>
#include <QVector> #include <QVector>
#include "AccountManager.h"
#include <QJsonObject>
#include <QJsonDocument>
#include <QtNetwork/QNetworkReply>
#include <Octree.h> #include <Octree.h>
#include <SpatialParentFinder.h> #include <SpatialParentFinder.h>
@ -277,6 +282,10 @@ signals:
void newCollisionSoundURL(const QUrl& url, const EntityItemID& entityID); void newCollisionSoundURL(const QUrl& url, const EntityItemID& entityID);
void clearingEntities(); void clearingEntities();
private slots:
void popStatusSuccess(QNetworkReply& reply);
void popStatusFailure(QNetworkReply& reply);
protected: protected:
void processRemovedEntities(const DeleteEntityOperator& theOperator); void processRemovedEntities(const DeleteEntityOperator& theOperator);