Added final changes for 1.1.6

dentolos19 · Jul 19, 2021 · 7241faf · 7241faf
1 parent a8465cb
commit 7241faf
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 17 deletions.
diff --git a/PasteMystNet.Tests/Operations.cs b/PasteMystNet.Tests/Operations.cs
@@ -10,7 +10,7 @@ namespace PasteMystNet.Tests
     internal static class Operations
     {
 
-        private static PasteMystAuth? AuthToken { get; }
+        private static PasteMystToken? AuthToken { get; }
         private static PasteMystPasteForm TemplateForm { get; } = new()
         {
             Title = "PasteMyst.NET",
@@ -98,12 +98,12 @@ public static void DeletePasteTest()
         [Test]
         public static async Task LanguageDataTest()
         {
-            var identifyPart1 = await PasteMystLanguage.IdentifyByExtensionAsync("cs");
+            var identifyPart1 = await PasteMystLanguage.GetLanguageByExtensionAsync("cs");
             Assert.IsNotNull(identifyPart1);
             Console.WriteLine("=====> IDENTITY PART 1 <=====");
             Console.WriteLine(ObjectDumper.Dump(identifyPart1));
             Console.WriteLine();
-            var identifyPart2 = await PasteMystLanguage.IdentifyByNameAsync("C#");
+            var identifyPart2 = await PasteMystLanguage.GetLanguageByNameAsync("C#");
             Assert.IsNotNull(identifyPart2);
             Console.WriteLine("=====> IDENTIFY PART 2 <=====");
             Console.WriteLine(ObjectDumper.Dump(identifyPart2));

diff --git a/PasteMystNet/PasteMystEditForm.cs b/PasteMystNet/PasteMystEditForm.cs
@@ -38,7 +38,7 @@ internal PasteMystEditForm(PasteMystPaste paste)
         [JsonProperty(PropertyName = "pasties")] public IList<PasteMystPastyForm>? Pasties { get; set; }
         [JsonIgnore] public IList<string>? Tags { get; set; } = new List<string>();
 
-        public async Task<PasteMystPaste?> PatchPasteAsync(PasteMystAuth auth)
+        public async Task<PasteMystPaste?> PatchPasteAsync(PasteMystToken auth)
         {
             if (Pasties is not { Count: > 0 })
                 throw new Exception($"{nameof(Pasties)} must not be null or empty.");

diff --git a/PasteMystNet/PasteMystLanguage.cs b/PasteMystNet/PasteMystLanguage.cs
@@ -17,8 +17,8 @@ public class PasteMystLanguage
         [JsonProperty(PropertyName = "ext")] public string[] Extensions { get; private set; }
         [JsonProperty(PropertyName = "color")] public string ColorHex { get; private set; }
         [JsonIgnore] public Color Color => Utilities.ParseColor(ColorHex);
-        
-        public static async Task<PasteMystLanguage?> IdentifyByNameAsync(string name)
+
+        public static async Task<PasteMystLanguage?> GetLanguageByNameAsync(string name)
         {
             var response = await Constants.HttpClient.GetAsync(string.Format(Constants.IdentifyByNameEndpoint, Uri.EscapeDataString(name)));
             if (response.StatusCode != HttpStatusCode.OK)
@@ -27,14 +27,17 @@ public class PasteMystLanguage
             return JsonConvert.DeserializeObject<PasteMystLanguage>(content);
         }
 
-        public static async Task<PasteMystLanguage?> IdentifyByExtensionAsync(string extension)
+        public static async Task<PasteMystLanguage?> GetLanguageByExtensionAsync(string extension)
         {
             var response = await Constants.HttpClient.GetAsync(string.Format(Constants.IdentifyByExtensionEndpoint, Uri.EscapeDataString(extension)));
             if (response.StatusCode != HttpStatusCode.OK)
                 return null;
             var content = await response.Content.ReadAsStringAsync();
             return JsonConvert.DeserializeObject<PasteMystLanguage>(content);
         }
+
+        [Obsolete] public static async Task<PasteMystLanguage?> IdentifyByNameAsync(string name) { return await GetLanguageByNameAsync(name); }
+        [Obsolete] public static async Task<PasteMystLanguage?> IdentifyByExtensionAsync(string extension) { return await GetLanguageByExtensionAsync(extension); }
 
         public override string ToString()
         {

diff --git a/PasteMystNet/PasteMystNet.csproj b/PasteMystNet/PasteMystNet.csproj
@@ -9,7 +9,7 @@
 		<PackageIcon>Icon.png</PackageIcon>
 		<Product>PasteMyst.NET</Product>
 		<Authors>Dennise Catolos</Authors>
-		<Version>1.1.5</Version>
+		<Version>1.1.6</Version>
 		<Copyright>Copyright © 2021</Copyright>
 		<Description>A simple .NET API wrapper for PasteMyst!</Description>
 

diff --git a/PasteMystNet/PasteMystPaste.cs b/PasteMystNet/PasteMystPaste.cs
@@ -34,7 +34,7 @@ public PasteMystEditForm CreateEditForm()
             return new(this);
         }
 
-        public static async Task<PasteMystPaste?> GetPasteAsync(string id, PasteMystAuth? auth = null)
+        public static async Task<PasteMystPaste?> GetPasteAsync(string id, PasteMystToken? auth = null)
         {
             try
             {
@@ -68,7 +68,7 @@ public PasteMystEditForm CreateEditForm()
             }
         }
 
-        public static async Task DeletePasteAsync(string id, PasteMystAuth auth)
+        public static async Task DeletePasteAsync(string id, PasteMystToken auth)
         {
             try
             {

diff --git a/PasteMystNet/PasteMystPasteForm.cs b/PasteMystNet/PasteMystPasteForm.cs
@@ -22,7 +22,7 @@ public class PasteMystPasteForm
         [JsonProperty(PropertyName = "expiresIn")] public string ExpireDuration { get; set; } = PasteMystExpirations.Never;
         [JsonIgnore] public IList<string>? Tags { get; set; } = new List<string>();
 
-        public async Task<PasteMystPaste?> PostPasteAsync(PasteMystAuth? auth = null)
+        public async Task<PasteMystPaste?> PostPasteAsync(PasteMystToken? auth = null)
         {
             if ((IsPrivate || IsPublic) && auth == null)
                 throw new ArgumentNullException(nameof(auth));

diff --git a/PasteMystNet/PasteMystAuth.cs → PasteMystNet/PasteMystToken.cs b/PasteMystNet/PasteMystAuth.cs → PasteMystNet/PasteMystToken.cs
@@ -1,10 +1,10 @@
 namespace PasteMystNet
 {
 
-    public class PasteMystAuth
+    public class PasteMystToken
     {
 
-        public PasteMystAuth(string token)
+        public PasteMystToken(string token)
         {
             Token = token;
         }

diff --git a/PasteMystNet/PasteMystUser.cs b/PasteMystNet/PasteMystUser.cs
@@ -40,7 +40,7 @@ public static async Task<bool> UserExistsAsync(string name)
             return JsonConvert.DeserializeObject<PasteMystUser>(content);
         }
 
-        public static async Task<PasteMystUser?> GetUserAsync(PasteMystAuth auth)
+        public static async Task<PasteMystUser?> GetUserAsync(PasteMystToken auth)
         {
             try
             {
@@ -73,7 +73,7 @@ public static async Task<bool> UserExistsAsync(string name)
             }
         }
 
-        public static async Task<string[]?> GetUserPastesAsync(PasteMystAuth auth)
+        public static async Task<string[]?> GetUserPastesAsync(PasteMystToken auth)
         {
             try
             {
@@ -106,8 +106,8 @@ public static async Task<bool> UserExistsAsync(string name)
             }
         }
 
-        [Obsolete] public static async Task<PasteMystUser?> GetSelfAsync(PasteMystAuth auth) { return await GetUserAsync(auth); }
-        [Obsolete] public static async Task<string[]?> GetSelfPastesAsync(PasteMystAuth auth) { return await GetUserPastesAsync(auth); }
+        [Obsolete] public static async Task<PasteMystUser?> GetSelfAsync(PasteMystToken auth) { return await GetUserAsync(auth); }
+        [Obsolete] public static async Task<string[]?> GetSelfPastesAsync(PasteMystToken auth) { return await GetUserPastesAsync(auth); }
 
         public override string ToString()
         {