From bd7c45cdbf36718d6935ca2fd41c141d7391ba63 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Wed, 31 Oct 2018 08:17:26 +0000 Subject: [PATCH 1/4] Disallow faction reputation in Journal schema --- schemas/journal-v1.0.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/schemas/journal-v1.0.json b/schemas/journal-v1.0.json index adaa1b3..ff522cc 100644 --- a/schemas/journal-v1.0.json +++ b/schemas/journal-v1.0.json @@ -59,6 +59,16 @@ "description" : "Should be added by the sender if not present in the journal event" }, + "Factions": { + "type" : "array", + "description" : "Present in Location and FSDJump messages", + "items" : { + "type" : "object", + "properties": { + "MyReputation" : { "$ref" : "#/definitions/disallowed" } + } + } + }, "CockpitBreach" : { "$ref" : "#/definitions/disallowed" }, "BoostUsed" : { "$ref" : "#/definitions/disallowed" }, "FuelLevel" : { "$ref" : "#/definitions/disallowed" }, From 701b5f912d313b645b6e701900d9d53209cd3559 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Sun, 4 Nov 2018 13:07:18 +0000 Subject: [PATCH 2/4] Disallow "ActiveFine" and "Wanted" in Journal schema --- schemas/journal-v1.0.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/schemas/journal-v1.0.json b/schemas/journal-v1.0.json index ff522cc..2c3b043 100644 --- a/schemas/journal-v1.0.json +++ b/schemas/journal-v1.0.json @@ -69,13 +69,15 @@ } } }, + "ActiveFine" : { "$ref" : "#/definitions/disallowed" }, "CockpitBreach" : { "$ref" : "#/definitions/disallowed" }, "BoostUsed" : { "$ref" : "#/definitions/disallowed" }, "FuelLevel" : { "$ref" : "#/definitions/disallowed" }, "FuelUsed" : { "$ref" : "#/definitions/disallowed" }, "JumpDist" : { "$ref" : "#/definitions/disallowed" }, "Latitude" : { "$ref" : "#/definitions/disallowed" }, - "Longitude" : { "$ref" : "#/definitions/disallowed" } + "Longitude" : { "$ref" : "#/definitions/disallowed" }, + "Wanted" : { "$ref" : "#/definitions/disallowed" } }, "patternProperties" : { "_Localised$" : { "$ref" : "#/definitions/disallowed" } From e86a5257ee035fcf907143c0fb87fa3a295e8007 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Thu, 22 Nov 2018 09:37:14 +0000 Subject: [PATCH 3/4] Also disallow faction squadron status --- schemas/journal-v1.0.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/schemas/journal-v1.0.json b/schemas/journal-v1.0.json index 2c3b043..6292c97 100644 --- a/schemas/journal-v1.0.json +++ b/schemas/journal-v1.0.json @@ -65,7 +65,10 @@ "items" : { "type" : "object", "properties": { - "MyReputation" : { "$ref" : "#/definitions/disallowed" } + "HappiestSystem" : { "$ref" : "#/definitions/disallowed" }, + "HomeSystem" : { "$ref" : "#/definitions/disallowed" }, + "MyReputation" : { "$ref" : "#/definitions/disallowed" }, + "SquadronFaction" : { "$ref" : "#/definitions/disallowed" } } } }, From 96d84628b6caa9b9151745b56cb8705f0746b80c Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Tue, 8 Jan 2019 10:35:24 +0000 Subject: [PATCH 4/4] Make SystemAddress mandatory --- schemas/journal-v1.0.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/journal-v1.0.json b/schemas/journal-v1.0.json index 6292c97..4ba8770 100644 --- a/schemas/journal-v1.0.json +++ b/schemas/journal-v1.0.json @@ -33,7 +33,7 @@ "type" : "object", "description" : "Contains all properties from the listed events in the client's journal minus Localised strings and the properties marked below as 'disallowed'", "additionalProperties" : true, - "required" : [ "timestamp", "event", "StarSystem", "StarPos" ], + "required" : [ "timestamp", "event", "StarSystem", "StarPos", "SystemAddress" ], "properties" : { "timestamp": { "type" : "string",