code cleanup

kokeiro001 · Apr 10, 2022 · a4209ad · a4209ad
1 parent 2a8718c
commit a4209ad
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 33 deletions.
diff --git a/IksmClientDotNet.Core/Services/IksmClient.cs b/IksmClientDotNet.Core/Services/IksmClient.cs
@@ -11,7 11,7 @@ namespace IksmClientDotNet.Core.Services
  public class IksmClient
  {
  private readonly JsonSerializerSettings jsonSerializerSettings;
- private string iksmSession;
  private readonly string iksmSession;
 
  public IksmClient(string iksmSession)
  {
@@ -25,32 25,30 @@ public IksmClient(string iksmSession)
 
  public async Task<string> Request(string requestUrl)
  {
- using (var handler = new HttpClientHandler()
  using var handler = new HttpClientHandler()
  {
  UseCookies = false,
  AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
- })
- using (var client = new HttpClient(handler))
- using (var request = new HttpRequestMessage(HttpMethod.Get, $"https://app.splatoon2.nintendo.net/{requestUrl}"))
- {
- request.Headers.Add("User-Agent", "Mozilla/5.0 (Linux; Android 5.1.1; SM-N950F Build/NMF26X) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36");
  };
  using var client = new HttpClient(handler);
  using var request = new HttpRequestMessage(HttpMethod.Get, $"https://app.splatoon2.nintendo.net/{requestUrl}");
  request.Headers.Add("User-Agent", "Mozilla/5.0 (Linux; Android 5.1.1; SM-N950F Build/NMF26X) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/39.0.0.0 Mobile Safari/537.36");
 
-  request.Headers.Host = "app.splatoon2.nintendo.net";
-  request.Headers.Add("x-unique-id", "32449507786579989234");
-  request.Headers.Add("x-requested-with", "XMLHttpRequest");
-  request.Headers.Add("x-timezone-offset", "-540");
-  request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("*/*"));
-  request.Headers.Referrer = new Uri("https://app.splatoon2.nintendo.net/home");
-  request.Headers.AcceptEncoding.Add(StringWithQualityHeaderValue.Parse("gzip"));
-  request.Headers.AcceptEncoding.Add(StringWithQualityHeaderValue.Parse("deflate"));
-  request.Headers.AcceptLanguage.Add(StringWithQualityHeaderValue.Parse("ja-JP"));
  request.Headers.Host = "app.splatoon2.nintendo.net";
  request.Headers.Add("x-unique-id", "32449507786579989234");
  request.Headers.Add("x-requested-with", "XMLHttpRequest");
  request.Headers.Add("x-timezone-offset", "-540");
  request.Headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("*/*"));
  request.Headers.Referrer = new Uri("https://app.splatoon2.nintendo.net/home");
  request.Headers.AcceptEncoding.Add(StringWithQualityHeaderValue.Parse("gzip"));
  request.Headers.AcceptEncoding.Add(StringWithQualityHeaderValue.Parse("deflate"));
  request.Headers.AcceptLanguage.Add(StringWithQualityHeaderValue.Parse("ja-JP"));
 
-  request.Headers.Add("Cookie", $"iksm_session={iksmSession};");
  request.Headers.Add("Cookie", $"iksm_session={iksmSession};");
 
-  var response = await client.SendAsync(request);
  var response = await client.SendAsync(request);
 
- return await response.Content.ReadAsStringAsync();
- }
  return await response.Content.ReadAsStringAsync();
  }
 
  public async Task<string> GetHome()

diff --git a/IksmClientDotNet.RecentBattleHtmlCreator/Program.cs b/IksmClientDotNet.RecentBattleHtmlCreator/Program.cs
@@ -1,18 1,18 @@
-using System;
 using IksmClientDotNet.ConsoleApp.Services;
 using IksmClientDotNet.Core.Services;
 using Microsoft.Extensions.Configuration;
 using System;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
-using IksmClientDotNet.ConsoleApp.Services;
-using IksmClientDotNet.Core.Services;
-using Microsoft.Extensions.Configuration;
 
 namespace IksmClientDotNet.ConsoleApp
 {
- class Program
  internal class Program
  {
- static async Task Main(string[] args)
  private static async Task Main()
  {
  var builder = new ConfigurationBuilder();
  builder.SetBasePath(Directory.GetCurrentDirectory());
@@ -24,13 24,13 @@ static async Task Main(string[] args)
  }
  }
 
- class Config
  internal class Config
  {
  public string IksmSession { get; set; }
  public string EditHtmlPath { get; set; }
  }
 
- class IksmService
  internal class IksmService
  {
  private static readonly int AutoUpdateIntervalSecond = 300;
 
@@ -109,7 109,7 @@ private async Task OutputRecentBattleResultHtml()
 
  var data = battleResults.Results.Take(10).Select(x => new BattleDataSummary
  {
- Win = x.MyTeamResult.Name == "WIN!" ? true : false,
  Win = x.MyTeamResult.Name == "WIN!",
  KillCount = x.PlayerResult.KillCount,
  AssistCount = x.PlayerResult.AssistCount,
  DeathCount = x.PlayerResult.DeathCount,
@@ -144,22 144,21 @@ private async void Timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e
  lastUpdatedAt = DateTime.Now;
  }
 
- private void InitializeConsoleMode()
  private static void InitializeConsoleMode()
  {
  const uint ENABLE_QUICK_EDIT = 0x0040;
- uint consoleMode;
  const int STD_INPUT_HANDLE = -10;
 
  IntPtr consoleHandle = WinApiNativeMethods.GetStdHandle(STD_INPUT_HANDLE);
- WinApiNativeMethods.GetConsoleMode(consoleHandle, out consoleMode);
  WinApiNativeMethods.GetConsoleMode(consoleHandle, out uint consoleMode);
 
  consoleMode &= ~ENABLE_QUICK_EDIT;
 
  WinApiNativeMethods.SetConsoleMode(consoleHandle, consoleMode);
  }
  }
 
- class WinApiNativeMethods
  internal class WinApiNativeMethods
  {
  [DllImport("kernel32.dll", SetLastError = true)]
  public static extern IntPtr GetStdHandle(int nStdHandle);