diff --git a/Apps.Wordpress/Actions/PageActions.cs b/Apps.Wordpress/Actions/PageActions.cs index e53a028..6c46e47 100644 --- a/Apps.Wordpress/Actions/PageActions.cs +++ b/Apps.Wordpress/Actions/PageActions.cs @@ -23,6 +23,7 @@ using Blackbird.Applications.Sdk.Utils.Extensions.System; using Blackbird.Applications.Sdk.Utils.Html.Extensions; using Blackbird.Applications.Sdk.Utils.Parsers; +using Newtonsoft.Json; using RestSharp; namespace Apps.Wordpress.Actions; @@ -75,9 +76,10 @@ public async Task GetPageById([ActionParameter] PageRequest input { var client = new WordpressRestClient(Creds); var request = new WordpressRestRequest(Endpoint + $"/{input.Id}", Method.Get, Creds); - var post = await client.ExecuteWithHandling(request); + var post = await client.ExecuteWithHandling(request); - return new(post); + var dto = JsonConvert.DeserializeObject(post.Content!)!; + return new(dto); } [Action("Get page missing translations (P)", Description = "Gets all the languages that are missing for this page.")] @@ -114,14 +116,15 @@ public async Task GetTranslationByPage([ActionParameter] PageRequ [Action("Get page as HTML", Description = "Get page by id as HTML file")] public async Task GetPageByIdAsHtml([ActionParameter] PageRequest input) { - var client = new CustomWordpressClient(Creds); - var page = await client.Pages.GetByIDAsync(input.Id); - - var html = (page.Title.Rendered, page.Content.Rendered).AsHtml(); + var client = new WordpressRestClient(Creds); + var request = new WordpressRestRequest(Endpoint + $"/{input.Id}", Method.Get, Creds); + var post = await client.ExecuteWithHandling(request); + + var html = (post.Title.Rendered, post.Content.Rendered).AsHtml(); using var stream = new MemoryStream(Encoding.UTF8.GetBytes(html)); var file = await _fileManagementClient.UploadAsync(stream, MediaTypeNames.Text.Html, - $"{page.Title.Rendered}.html"); + $"{post.Title.Rendered}.html"); return new(file); } diff --git a/Apps.Wordpress/Api/RestSharp/WordpressRestClient.cs b/Apps.Wordpress/Api/RestSharp/WordpressRestClient.cs index 0f1f873..b70a859 100644 --- a/Apps.Wordpress/Api/RestSharp/WordpressRestClient.cs +++ b/Apps.Wordpress/Api/RestSharp/WordpressRestClient.cs @@ -39,7 +39,7 @@ public async Task> Paginate(RestRequest request) }); var response = await ExecuteWithHandling(request); - totalPages ??= int.Parse(response.Headers.First(x => x.Name == "X-Wp-Totalpages").Value.ToString()); + totalPages ??= int.Parse(response.Headers.First(x => x.Name!.Equals("X-Wp-Totalpages", StringComparison.OrdinalIgnoreCase)).Value.ToString()); var content = response.Content; var data = JsonConvert.DeserializeObject(response.Content); diff --git a/Apps.Wordpress/Apps.Wordpress.csproj b/Apps.Wordpress/Apps.Wordpress.csproj index abee31d..66c52c4 100644 --- a/Apps.Wordpress/Apps.Wordpress.csproj +++ b/Apps.Wordpress/Apps.Wordpress.csproj @@ -4,7 +4,7 @@ enable enable Wordpress (+ Polylang) - 1.2.1 + 1.2.2 The world’s most popular website builder Apps.Wordpress @@ -13,7 +13,7 @@ - +