Remote Ping changes

Add many new fields to remote pings, add sending data as json, made msg property optional for ping responses
Plenyx · Oct 25, 2024 · a285253 · a285253
1 parent a05e453
commit a285253
Show file tree

Hide file tree

Showing 10 changed files with 309 additions and 59 deletions.
diff --git a/DpsReport/DpsReportJson.cs b/DpsReport/DpsReportJson.cs
@@ -32,13 +32,13 @@ internal sealed class DpsReportJson
         /// Time when the log was uploaded to DPSReport
         /// </summary>
         [JsonProperty("uploadTime")]
-        internal int UploadTime { get; set; }
+        internal ulong UploadTime { get; set; }
 
         /// <summary>
         /// Total time of the encounter, might be null
         /// </summary>
         [JsonProperty("encounterTime")]
-        internal int? EncounterTime { get; set; }
+        internal ulong? EncounterTime { get; set; }
 
         /// <summary>
         /// Log tool used with processing the log on DPSReport
@@ -100,7 +100,12 @@ internal sealed class DpsReportJson
         /// <summary>
         /// whether the encounter was in legendary challenge mode
         /// </summary>
-        internal bool LegendaryChallengeMode => ExtraJson?.IsLegendaryCm ?? false;
+        internal bool LegendaryChallengeMode => (ExtraJson?.IsLegendaryCm ?? false) || (Encounter?.IsLegendaryCm ?? false);
+
+        /// <summary>
+        /// whether the encounter was emboldened
+        /// </summary>
+        internal bool Emboldened => (Encounter.Emboldened ?? 0) > 0;
 
         internal List<LogPlayer> GetLogPlayers()
         {

diff --git a/DpsReport/DpsReportJsonEncounter.cs b/DpsReport/DpsReportJsonEncounter.cs
@@ -28,8 +28,14 @@ internal sealed class DpsReportJsonEncounter
         [JsonProperty("isCm")]
         internal bool? IsCm { get; set; }
 
+        [JsonProperty("isLegendaryCm")]
+        internal bool? IsLegendaryCm { get; set; }
+
+        [JsonProperty("emboldened")]
+        internal int? Emboldened { get; set; }
+
         [JsonProperty("gw2Build")]
-        internal int? GameBuild { get; set; }
+        internal ulong? GameBuild { get; set; }
 
         [JsonProperty("jsonAvailable")]
         internal bool? JsonAvailable { get; set; }

diff --git a/DpsReport/DpsReportJsonExtraJson.cs b/DpsReport/DpsReportJsonExtraJson.cs
@@ -26,14 +26,20 @@ internal sealed class DpsReportJsonExtraJson
         [JsonProperty("duration")]
         internal string Duration { get; set; }
 
+        [JsonProperty("durationMs")]
+        internal ulong DurationMs { get; set; }
+
+        [JsonProperty("success")]
+        internal bool Succcess { get; set; }
+
         [JsonProperty("triggerID")]
         internal int TriggerId { get; set; }
 
         [JsonProperty("fightName")]
         internal string FightName { get; set; }
 
         [JsonProperty("gw2Build")]
-        internal int GameBuild { get; set; }
+        internal ulong GameBuild { get; set; }
 
         [JsonProperty("fightIcon")]
         internal string FightIcon { get; set; }
@@ -50,6 +56,9 @@ internal sealed class DpsReportJsonExtraJson
         [JsonProperty("players")]
         internal Player[] Players { get; set; }
 
+        [JsonProperty("logErrors")]
+        internal string[] LogErrors { get; set; }
+
         internal Target PossiblyLastTarget
         {
             get

diff --git a/Forms/FormDiscordWebhooks.cs b/Forms/FormDiscordWebhooks.cs
@@ -356,7 +356,10 @@ await SendLogViaWebhooks(reportJSON.Encounter.Success ?? false,
                     false,
                     false,
                     bossData, players,
-                    jsonContentWvWNone, jsonContentWvWSquad, jsonContentWvWPlayers, jsonContentWvWSquadAndPlayers);
+                    jsonContentWvWNone,
+                    jsonContentWvWSquad,
+                    jsonContentWvWPlayers,
+                    jsonContentWvWSquadAndPlayers);
 
                 if (allWebhooks.Count > 0)
                 {
@@ -515,8 +518,12 @@ await SendLogViaWebhooks(reportJSON.Encounter.Success ?? false,
                     reportJSON.Encounter.BossId,
                     reportJSON.ChallengeMode,
                     reportJSON.LegendaryChallengeMode,
-                    bossData, players,
-                    jsonContentNone, jsonContentSquad, jsonContentPlayers, jsonContentSquadAndPlayers);
+                    bossData,
+                    players,
+                    jsonContentNone,
+                    jsonContentSquad,
+                    jsonContentPlayers,
+                    jsonContentSquadAndPlayers);
 
                 if (allWebhooks.Count > 0)
                 {

diff --git a/Forms/FormEditPing.Designer.cs b/Forms/FormEditPing.Designer.cs
diff --git a/Forms/FormEditPing.cs b/Forms/FormEditPing.cs
@@ -60,6 +60,15 @@ internal FormEditPing(FormPings pingLink, int reservedId, bool addNew, PingConfi
             {
                 radioButtonUseNormalField.Checked = true;
             }
+            if (config?.SendDataAsJson ?? true)
+            {
+                checkBoxSendDataAsJson.Checked = true;
+                radioButtonUseNormalField.Enabled = false;
+                if (radioButtonUseNormalField.Checked)
+                {
+                    radioButtonNoAuthorization.Checked = true;
+                }
+            }
         }
 
         private void FormPing_FormClosing(object sender, FormClosingEventArgs e)
@@ -101,6 +110,7 @@ private void FormPing_FormClosing(object sender, FormClosingEventArgs e)
                     Url = textBoxURL.Text,
                     Method = chosenMethod,
                     Authentication = auth,
+                    SendDataAsJson = checkBoxSendDataAsJson.Enabled,
                 };
                 pingLink.listViewPings.Items.Add(new ListViewItem()
                 {
@@ -115,6 +125,7 @@ private void FormPing_FormClosing(object sender, FormClosingEventArgs e)
                 pingLink.AllPings[reservedId].Active = config.Active;
                 pingLink.AllPings[reservedId].Name = textBoxName.Text;
                 pingLink.AllPings[reservedId].Url = textBoxURL.Text;
+                pingLink.AllPings[reservedId].SendDataAsJson = checkBoxSendDataAsJson.Checked;
                 if (radioButtonMethodPut.Checked)
                 {
                     pingLink.AllPings[reservedId].Method = PingMethod.Put;
@@ -181,6 +192,7 @@ private async void ButtonTestPing_Click(object sender, EventArgs e)
                 Url = textBoxURL.Text,
                 Method = chosenMethod,
                 Authentication = auth,
+                SendDataAsJson = checkBoxSendDataAsJson.Checked,
             };
             var result = await tempPing.PingServerAsync(null, null);
             if (result)
@@ -199,5 +211,15 @@ private void RadioButtonNoAuthorization_CheckedChanged(object sender, EventArgs
             textBoxAuthName.Enabled = toggle;
             textBoxAuthToken.Enabled = toggle;
         }
+
+        private void CheckBoxSendDataAsJson_CheckedChanged(object sender, EventArgs e)
+        {
+            var toggle = checkBoxSendDataAsJson.Checked;
+            radioButtonUseNormalField.Enabled = !toggle;
+            if (radioButtonUseNormalField.Checked && toggle)
+            {
+                radioButtonNoAuthorization.Checked = true;
+            }
+        }
     }
 }