fix merge conflict

community-network · Oct 3, 2022 · 2871798 · 2871798
1 parent be5ce35
commit 2871798
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 27 deletions.
diff --git a/Battlefield rich presence/Api.cs b/Battlefield rich presence/Api.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Net.Http;
-using BattlefieldRichPresence.Properties;
 using BattlefieldRichPresence.Structs;
 using System.Text;
-using System.Threading.Tasks;
 using Newtonsoft.Json;
 
 namespace BattlefieldRichPresence
@@ -48,12 +46,12 @@ public static ServerInfo GetBf5CurrentServer(string playerName)
             {
                 throw new Exception("not in a server");
             }
-            return jsonSerializer.Deserialize<ServerInfo>(data);
+            return JsonConvert.DeserializeObject<ServerInfo>(responseContent);
         }
 
         public static void PostPlayerlist(GameReader.CurrentServerReader currentServerReader, Guid guid)
         {
-            var post = new
+            var payload = new
             {
                 guid = guid.ToString(),
                 serverinfo = new
@@ -73,13 +71,12 @@ public static void PostPlayerlist(GameReader.CurrentServerReader currentServerRe
                     scoreteam2FromFlags = currentServerReader.Team2ScoreFromFlags,
                 }
             };
-            JavaScriptSerializer jsonSerializer = new JavaScriptSerializer();
-            string dataString = jsonSerializer.Serialize(post);
-            WebClient webClient = new WebClient();
-            string jwtData = Jwt.Create(dataString, guid.ToString());
-            webClient.Headers.Add(HttpRequestHeader.ContentType, "application/json");
-            string postData = jsonSerializer.Serialize(new { data = jwtData });
-            webClient.UploadString(new Uri("https://api.gametools.network/seederplayerlist/bf1"), "POST", postData);
+            string dataString = JsonConvert.SerializeObject(payload);
+            string jwtData = Jwt.Create(dataString);
+            string stringPayload = JsonConvert.SerializeObject(new { data = jwtData });
+            StringContent httpContent = new StringContent(stringPayload, Encoding.UTF8, "application/json");
+            HttpResponseMessage httpResponse = new HttpClient().PostAsync("https://api.gametools.network/seederplayerlist/bf1", httpContent).Result;
+            _ = httpResponse.Content.ReadAsStringAsync().Result;
         }
     }
 }
diff --git a/Battlefield rich presence/Battlefield rich presence.csproj b/Battlefield rich presence/Battlefield rich presence.csproj
@@ -33,6 +33,11 @@
     <OutputPath>bin\x64\Release\</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Update="Properties\Settings.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
     <Compile Update="TimerPlus.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -88,4 +93,10 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
+  <ItemGroup>
+    <None Update="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
 </Project>
diff --git a/Battlefield rich presence/Config.cs b/Battlefield rich presence/Config.cs
@@ -1,4 +1,5 @@
 using BattlefieldRichPresence.Properties;
+using System;
 
 namespace BattlefieldRichPresence
 {

diff --git a/Battlefield rich presence/GameReader/CurrentServerReader.cs b/Battlefield rich presence/GameReader/CurrentServerReader.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using BattlefieldRichPresence.Structs;
 
 namespace BattlefieldRichPresence.GameReader
 {

diff --git a/Battlefield rich presence/Properties/Settings.Designer.cs b/Battlefield rich presence/Properties/Settings.Designer.cs
diff --git a/Battlefield rich presence/TrayItem.cs b/Battlefield rich presence/TrayItem.cs
@@ -5,14 +5,13 @@ namespace BattlefieldRichPresence
 {
     public class TrayItem : ApplicationContext
     {
-        TimerPlus _timer = new TimerPlus();
-        TimerPlus _trayUpdateTimer = new TimerPlus();
-        private NotifyIcon _trayIcon;
-        private Config _config;
+        private readonly TimerPlus _timer = new();
+        private readonly TimerPlus _trayUpdateTimer = new();
+        private readonly Config _config = new();
+        private readonly NotifyIcon _trayIcon;
 
         public TrayItem()
         {
-            _config = new Config();
             // Initialize Tray Icon
             _trayIcon = new NotifyIcon
             {
@@ -25,6 +24,7 @@ public TrayItem()
                 //new MenuItem($"Player: {_config.PlayerName}", Void),
                 new ToolStripMenuItem("Next update in ...", null, Void),
                 new ToolStripMenuItem("Edit settings", null, Edit),
+                new ToolStripMenuItem("Copy BF1 sender id (anonymous)", null, Copy),
                 new ToolStripMenuItem("Exit", null, Exit),
             });
             _trayIcon.ContextMenuStrip.Items[0].Enabled = false;
@@ -53,18 +53,20 @@ void UpdateTrayItems()
         {
             if (_config.GatherServerInfo)
             {
-                _trayIcon.ContextMenu = new ContextMenu(new[] {
-                    new MenuItem("Next update in ...", Void),
-                    new MenuItem("Copy bf1 sender id (anonymous)", Copy),
-                    new MenuItem("Edit settings", Edit),
-                    new MenuItem("Exit", Exit),
+                _trayIcon.ContextMenuStrip.Items.Clear();
+                _trayIcon.ContextMenuStrip.Items.AddRange(new ToolStripItem[] {
+                    new ToolStripMenuItem("Next update in ...", null, Void),
+                    new ToolStripMenuItem("Copy bf1 sender id (anonymous)", null, Copy),
+                    new ToolStripMenuItem("Edit settings", null, Edit),
+                    new ToolStripMenuItem("Exit", null, Exit),
                 });
             } else
             {
-                _trayIcon.ContextMenu = new ContextMenu(new[] {
-                    new MenuItem("Next update in ...", Void),
-                    new MenuItem("Edit settings", Edit),
-                    new MenuItem("Exit", Exit),
+                _trayIcon.ContextMenuStrip.Items.Clear();
+                _trayIcon.ContextMenuStrip.Items.AddRange(new ToolStripItem[] {
+                    new ToolStripMenuItem("Next update in ...", null, Void),
+                    new ToolStripMenuItem("Edit settings", null, Edit),
+                    new ToolStripMenuItem("Exit", null, Exit),
                 });
             }
         }