From 615a53d1ba3d8454f553cc601f5cb40778aba773 Mon Sep 17 00:00:00 2001 From: Eccentric Date: Sun, 4 Feb 2024 15:33:38 +0000 Subject: [PATCH] Complete gifting --- aid/json.go | 5 +++++ handlers/client.go | 27 +++++++++++++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/aid/json.go b/aid/json.go index 89c9138..681fffc 100644 --- a/aid/json.go +++ b/aid/json.go @@ -15,6 +15,11 @@ func (j *JSON) ToBytes() []byte { return json } +func JSONToBytes(input JSON) []byte { + json, _ := json.Marshal(input) + return json +} + func JSONStringify(input interface{}) string { json, _ := json.Marshal(input) return string(json) diff --git a/handlers/client.go b/handlers/client.go index cf1a05c..f666153 100644 --- a/handlers/client.go +++ b/handlers/client.go @@ -9,6 +9,7 @@ import ( "github.com/ectrc/snow/aid" "github.com/ectrc/snow/fortnite" p "github.com/ectrc/snow/person" + "github.com/ectrc/snow/socket" "github.com/gofiber/fiber/v2" ) @@ -745,6 +746,19 @@ func clientGiftCatalogEntryAction(c *fiber.Ctx, person *p.Person, profile *p.Pro return fmt.Errorf("invalid price") } + for _, receiverAccountId := range body.ReceiverAccountIds { + receiverPerson := p.Find(receiverAccountId) + if receiverPerson == nil { + return fmt.Errorf("one or more receivers not found") + } + + for _, grant := range offer.Grants { + if receiverPerson.AthenaProfile.Items.GetItemByTemplateID(grant) != nil { + return fmt.Errorf("one or more receivers has one of the items") + } + } + } + price := offer.Price * len(body.ReceiverAccountIds) vbucks := profile.Items.GetItemByTemplateID("Currency:MtxPurchased") @@ -768,10 +782,6 @@ func clientGiftCatalogEntryAction(c *fiber.Ctx, person *p.Person, profile *p.Pro for _, receiverAccountId := range body.ReceiverAccountIds { receiverPerson := p.Find(receiverAccountId) - if receiverPerson == nil { - continue - } - gift := p.NewGift(body.GiftWrapTemplateId, 1, person.ID, body.PersonalMessage) for _, grant := range offer.Grants { item := p.NewItem(grant, 1) @@ -780,6 +790,15 @@ func clientGiftCatalogEntryAction(c *fiber.Ctx, person *p.Person, profile *p.Pro } receiverPerson.CommonCoreProfile.Gifts.AddGift(gift).Save() + + socket, ok := socket.JabberSockets.Get(receiverPerson.ID) + if ok { + socket.Write(aid.JSONToBytes(aid.JSON{ + "payload": aid.JSON{}, + "type": "com.epicgames.gift.received", + "timestamp": time.Now().Format("2006-01-02T15:04:05.999Z"), + })) + } } return nil