Fix #14 and add MisskeyService Dispose().

Sagiri-Dev · Jul 9, 2023 · cd2aa55 · cd2aa55
1 parent 5f4f1e4
commit cd2aa55
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/Sagiri/Services/Misskey/Interfaces/IMisskeyService.cs b/Sagiri/Services/Misskey/Interfaces/IMisskeyService.cs
@@ -7,7 +7,7 @@ namespace Sagiri.Services.Misskey.Interfaces
     public interface IMisskeyService
     {
         /// <summary>
-        /// 
+        /// 初期化
         /// </summary>
         /// <returns></returns>
         ValueTask<bool> InitializeAsync();
@@ -27,5 +27,10 @@ public interface IMisskeyService
         /// <param name="ps">パラメーター</param>
         /// <returns>レスポンス</returns>
         ValueTask<dynamic> RequestWithBinaryAsync(string endpoint, MultipartFormDataContent ps);
+
+        /// <summary>
+        /// 後始末
+        /// </summary>
+        void Dispose();
     }
 }
diff --git a/Sagiri/Services/Misskey/MisskeyService.cs b/Sagiri/Services/Misskey/MisskeyService.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
@@ -10,8 +9,6 @@
 using Sagiri.Util.Common;
 using Sagiri.Util.Configuration;
 
-using static Sagiri.Util.Common.Constants;
-
 namespace Sagiri.Services.Misskey
 {
     /// <summary>
@@ -43,6 +40,10 @@ public MisskeyService(string host, string accessToken)
 
         #region Public Methods
 
+        /// <summary>
+        /// 初期化
+        /// </summary>
+        /// <returns></returns>
         async ValueTask<bool> IMisskeyService.InitializeAsync()
         {
             try
@@ -75,7 +76,8 @@ async ValueTask<bool> IMisskeyService.InitializeAsync()
         async ValueTask<dynamic> IMisskeyService.RequestAsync(string endpoint, Dictionary<string, object?> ps)
         {
             ps.Add("i", _AccessToken);
-            return await _RequestAsync(_Host, endpoint, ps);
+            var host = new Uri(_Host).ToString();
+            return await _RequestAsync(host, endpoint, ps);
         }
 
         /// <summary>
@@ -87,7 +89,18 @@ async ValueTask<dynamic> IMisskeyService.RequestAsync(string endpoint, Dictionar
         async ValueTask<dynamic> IMisskeyService.RequestWithBinaryAsync(string endpoint, MultipartFormDataContent ps)
         {
             ps.Add(new StringContent(_AccessToken), "i");
-            return await _RequestWithBinaryAsync(_Host, endpoint, ps);
+            var host = new Uri(_Host).ToString();
+            return await _RequestWithBinaryAsync(host, endpoint, ps);
+        }
+
+        /// <summary>
+        /// 後始末
+        /// </summary>
+        void IMisskeyService.Dispose()
+        {
+            _Client.Value?.Dispose();
+            _Logger = null;
+            _MisskeyCredentialConfig = null;
         }
 
         #endregion Public Methods
@@ -105,7 +118,7 @@ private async ValueTask<dynamic> _RequestAsync(string? host, string endpoint, Di
         {
             var client = _Client.Value;
 
-            var ep = $"{host}/api/{endpoint}";
+            var ep = $"{host}api/{endpoint}";
 
             var content = new StringContent(
                 JsonConvert.SerializeObject(ps),
@@ -132,7 +145,7 @@ private async ValueTask<dynamic> _RequestWithBinaryAsync(string? host, string en
         {
             var client = _Client.Value;
 
-            var ep = $"{host}/api/{endpoint}";
+            var ep = $"{host}api/{endpoint}";
 
             var res = await client.PostAsync(ep, ps);
 

diff --git a/SagiriUI/Form1.cs b/SagiriUI/Form1.cs
@@ -1,9 +1,12 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Net.Http;
 using System.Text;
 using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 
 using Sagiri.Services.Misskey;
@@ -12,14 +15,10 @@
 using Sagiri.Services.Spotify.Interfaces;
 using Sagiri.Services.Spotify.Track;
 using Sagiri.Util.Common;
-using Sagiri.Util.Configuration;
+using SagiriUI.Controls;
 using SagiriUI.Properties;
 
-using SagiriUI.Controls;
 using Microsoft.Toolkit.Uwp.Notifications;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
 
 namespace SagiriUI
 {
@@ -31,8 +30,6 @@ public partial class Form1 : Form
         private IMisskeyService? _IMisskeyService { get; set; }
         private CurrentTrackInfo _CurrentTrackInfo { get; set; }
 
-        private SpotifyCredentialConfig _SpotifyCredentialConfig { get; set; }
-
         private Logger _Logger { get; set; }
         private Point _MousePoint { get; set; }
 
@@ -61,9 +58,8 @@ private async void Form1_Load(object sender, EventArgs e)
             if (!File.Exists("spotify.json") || !File.Exists("misskey.json"))
                 _CheckClosingApp(errorType: "file", title: "File not found!", message: "");
 
-            _CurrentTrackInfo = new();
             _ISpotifyService = new SpotifyService();
-            _SpotifyCredentialConfig = SpotifyCredentialConfig.Instance;
+            _CurrentTrackInfo = new();
 
             var spCanInitialized = await _ISpotifyService.InitializeAsync();
             if (!spCanInitialized)
@@ -94,6 +90,7 @@ private async void Form1_Load(object sender, EventArgs e)
         private void Form1_Closing(object sender, EventArgs e)
         {
             _ISpotifyService?.Dispose();
+            _IMisskeyService?.Dispose();
         }
 
         private void Form1_MouseDown(object sender, MouseEventArgs e)
@@ -237,7 +234,7 @@ private async void MisskeyPostPanel_Click(object sender, EventArgs e)
             ps.Add("mediaIds", new string[] { file.id });
             _ = await _IMisskeyService.RequestAsync("notes/create", ps);
 
-            new MessageBoxEx(note.ToString(), "投稿完了！", 3000).Show();
+            new MessageBoxEx(note.ToString(), "投稿完了！", 2000).Show();
 
             #region Logging