Fixed issue #2.

Updated libraries.
josago97 · Jul 25, 2023 · fe172ac · fe172ac
1 parent 1da1b06
commit fe172ac
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/RAE/RAE.csproj b/RAE/RAE.csproj
@@ -11,11 +11,11 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/josago97/RAE.NET</RepositoryUrl>
     <PackageTags>RAE, Diccionario, España, Español, Lengua, Dictionary, Spain, Spanish, Language</PackageTags>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.49" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.50" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 

diff --git a/RAE/RAEAPI.cs b/RAE/RAEAPI.cs
@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using System.Xml;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
@@ -57,16 +55,13 @@ public async Task<string[]> GetKeysAsync(string query)
         public async Task<Word> GetRandomWordAsync()
         {
             string response = await _httpClient.GetStringAsync($"{URLBASE}/random");
+            XmlDocument xml = new XmlDocument();
+            xml.LoadXml($"<root>{response}</root>");
 
-            string idFormat = "article id=\"";
-            Match idMatch = Regex.Match(response, $@"{idFormat}\w+");
-            string id = Regex.Replace(idMatch.Value, idFormat, "");
+            string id = xml.DocumentElement.SelectSingleNode("//article").Attributes["id"].Value;
+            string content = xml.DocumentElement.SelectSingleNode("//header").InnerText;
 
-            string contentFormat = "class=\"f\".*?>";
-            Match contentMatch = Regex.Match(response, $@"{contentFormat}\w[\,\s\w]*");
-            string content = Regex.Replace(contentMatch.Value, contentFormat, "");
-
-            return new Word(id, HtmlDecode(content));
+            return new Word(id, content);
         }
 
         public async Task<Word> GetWordOfTheDayAsync()