Merge pull request #2 from nullforce-public/twibooru

nullforce · web-flow · commit 458cb52e9915 · 2022-08-14T14:00:03.000-05:00
Add support for Twibooru.
Breaking: Namespace for Derpibooru/Philomena support
diff --git a/src/JsonBase.cs b/src/JsonBase.cs
@@ -1,4 +1,4 @@
-namespace Nullforce.Api.Derpibooru.JsonModels;
+namespace Nullforce.Api.JsonModels;
 
 public abstract class JsonBase
 {
diff --git a/src/Philomena/AwardsJson.cs b/src/Philomena/AwardsJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class AwardsJson : JsonBase
 {
diff --git a/src/Philomena/CommentJson.cs b/src/Philomena/CommentJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class CommentJson : JsonBase
 {
diff --git a/src/Philomena/FilterJson.cs b/src/Philomena/FilterJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class FilterJson : JsonBase
 {
diff --git a/src/Philomena/ForumJson.cs b/src/Philomena/ForumJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class ForumJson : JsonBase
 {
diff --git a/src/Philomena/GalleryJson.cs b/src/Philomena/GalleryJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class GalleryJson : JsonBase
 {
diff --git a/src/Philomena/ImageJson.cs b/src/Philomena/ImageJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class ImageJson : JsonBase
 {
diff --git a/src/Philomena/IntensitiesJson.cs b/src/Philomena/IntensitiesJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class IntensitiesJson : JsonBase
 {
diff --git a/src/Philomena/InteractionJson.cs b/src/Philomena/InteractionJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 /// <summary>
 /// The interactions of the user specified by the API key given.
diff --git a/src/Philomena/LinksJson.cs b/src/Philomena/LinksJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class LinksJson : JsonBase
 {
diff --git a/src/Philomena/OembedJson.cs b/src/Philomena/OembedJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class OembedJson : JsonBase
 {
diff --git a/src/Philomena/PostJson.cs b/src/Philomena/PostJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class PostJson : JsonBase
 {
diff --git a/src/Philomena/RepresentationJson.cs b/src/Philomena/RepresentationJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class RepresentationsJson : JsonBase
 {
diff --git a/src/Philomena/RootJson.cs b/src/Philomena/RootJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class CommentRootJson : JsonBase
 {
diff --git a/src/Philomena/TagJson.cs b/src/Philomena/TagJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class TagJson : JsonBase
 {
diff --git a/src/Philomena/TopicJson.cs b/src/Philomena/TopicJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class TopicJson : JsonBase
 {
diff --git a/src/Philomena/UserJson.cs b/src/Philomena/UserJson.cs
@@ -1,4 +1,4 @@
-﻿namespace Nullforce.Api.Derpibooru.JsonModels;
+﻿namespace Nullforce.Api.JsonModels.Philomena;
 
 public class UserJson : JsonBase
 {
diff --git a/src/Twibooru/CommentJson.cs b/src/Twibooru/CommentJson.cs
@@ -0,0 +1,19 @@
+﻿namespace Nullforce.Api.JsonModels.Twibooru;
+
+public class CommentJson : JsonBase
+{
+    [JsonPropertyName("id")]
+    public int Id { get; set; }
+
+    [JsonPropertyName("created_at")]
+    public DateTime CreatedAt { get; set; }
+
+    [JsonPropertyName("updated_at")]
+    public DateTime UpdatedAt { get; set; }
+
+    [JsonPropertyName("hidden_from_users")]
+    public bool HiddenFromUsers { get; set; }
+
+    [JsonPropertyName("body")]
+    public string Body { get; set; }
+}
diff --git a/src/Twibooru/IntensitiesJson.cs b/src/Twibooru/IntensitiesJson.cs
@@ -0,0 +1,13 @@
+﻿namespace Nullforce.Api.JsonModels.Twibooru;
+
+public class IntensitiesJson : JsonBase
+{
+    [JsonPropertyName("ne")]
+    public double NE { get; set; }
+    [JsonPropertyName("nw")]
+    public double NW { get; set; }
+    [JsonPropertyName("se")]
+    public double SE { get; set; }
+    [JsonPropertyName("sw")]
+    public double SW { get; set; }
+}
diff --git a/src/Twibooru/LocationJson.cs b/src/Twibooru/LocationJson.cs
@@ -0,0 +1,13 @@
+﻿namespace Nullforce.Api.JsonModels.Twibooru;
+
+public class LocationJson : JsonBase
+{
+    [JsonPropertyName("id_at_location")]
+    public int Id { get; set; }
+
+    [JsonPropertyName("location")]
+    public string Location { get; set; }
+
+    [JsonPropertyName("url_at_location")]
+    public string Url { get; set; }
+}
diff --git a/src/Twibooru/PostJson.cs b/src/Twibooru/PostJson.cs
@@ -0,0 +1,120 @@
+﻿namespace Nullforce.Api.JsonModels.Twibooru;
+
+public class PostJson : JsonBase
+{
+    [JsonPropertyName("id")]
+    public int Id { get; set; }
+
+    [JsonPropertyName("created_at")]
+    public DateTime CreatedAt { get; set; }
+
+    [JsonPropertyName("deletion_reason")]
+    public string DeletionReason { get; set; }
+
+    [JsonPropertyName("duplicate_of")]
+    public int DuplicateOf { get; set; }
+
+    [JsonPropertyName("first_seen_at")]
+    public DateTime FirstSeenAt { get; set; }
+
+    [JsonPropertyName("hidden_from_users")]
+    public bool HiddenFromUsers { get; set; }
+
+    [JsonPropertyName("locations")]
+    public LocationJson[] Locations { get; set; }
+
+    /// <summary>
+    /// The type of media associated with this post. One of "paste", "image".
+    /// </summary>
+    [JsonPropertyName("media_type")]
+    public string MediaType { get; set; }
+
+    [JsonPropertyName("orig_sha512_hash")]
+    public string OriginalSHA512Hash { get; set; }
+
+    [JsonPropertyName("processed")]
+    public bool Processed { get; set; }
+
+    [JsonPropertyName("sha512_hash")]
+    public string SHA512Hash { get; set; }
+
+    [JsonPropertyName("source_url")]
+    public string SourceUrl { get; set; }
+
+    [JsonPropertyName("tag_ids")]
+    public int[] TagIds { get; set; }
+
+    [JsonPropertyName("tags")]
+    public string[] Tags { get; set; }
+
+    [JsonPropertyName("updated_at")]
+    public DateTime UpdatedAt { get; set; }
+
+    // Non-hidden Post
+    [JsonPropertyName("comment_count")]
+    public int CommentCount { get; set; }
+
+    [JsonPropertyName("description")]
+    public string Description { get; set; }
+
+    [JsonPropertyName("downvotes")]
+    public int Downvotes { get; set; }
+
+    [JsonPropertyName("faves")]
+    public int Favorites { get; set; }
+
+    [JsonPropertyName("score")]
+    public int Score { get; set; }
+
+    [JsonPropertyName("size")]
+    public long Size { get; set; }
+
+    [JsonPropertyName("upvotes")]
+    public int Upvotes { get; set; }
+
+    [JsonPropertyName("wilson_score")]
+    public double WilsonScore { get; set; }
+
+    // Image Post
+    [JsonPropertyName("animated")]
+    public bool Animated { get; set; }
+
+    [JsonPropertyName("aspect_ratio")]
+    public double AspectRatio { get; set; }
+
+    [JsonPropertyName("duration")]
+    public double Duration { get; set; }
+
+    /// <summary>
+    /// The file extension of the image. One of "gif", "jpg", "jpeg", "png", "svg", "webm", "mp4".
+    /// </summary>
+    [JsonPropertyName("format")]
+    public string Format { get; set; }
+
+    [JsonPropertyName("height")]
+    public int Height { get; set; }
+
+    [JsonPropertyName("intensities")]
+    public IntensitiesJson Intensities { get; set; }
+
+    /// <summary>
+    /// The MIME type of this image. One of "image/gif", "image/jpeg", "image/png", "image/svg+xml", "video/webm", "video/mp4".
+    /// </summary>
+    [JsonPropertyName("mime_type")]
+    public string MimeType { get; set; }
+
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    [JsonPropertyName("representations")]
+    public RepresentationsJson Representations { get; set; }
+
+    [JsonPropertyName("thumbnails_generated")]
+    public bool ThumbnailsGenerated { get; set; }
+
+    [JsonPropertyName("view_url")]
+    public string ViewUrl { get; set; }
+
+    [JsonPropertyName("width")]
+    public int Width { get; set; }
+}
diff --git a/src/Twibooru/RepresentationsJson.cs b/src/Twibooru/RepresentationsJson.cs
@@ -0,0 +1,19 @@
+﻿namespace Nullforce.Api.JsonModels.Twibooru;
+
+public class RepresentationsJson : JsonBase
+{
+    [JsonPropertyName("full")]
+    public string Full { get; set; }
+    [JsonPropertyName("large")]
+    public string Large { get; set; }
+    [JsonPropertyName("medium")]
+    public string Medium { get; set; }
+    [JsonPropertyName("small")]
+    public string Small { get; set; }
+    [JsonPropertyName("thumb")]
+    public string Thumb { get; set; }
+    [JsonPropertyName("thumb_small")]
+    public string ThumbSmall { get; set; }
+    [JsonPropertyName("thumb_tiny")]
+    public string ThumbTiny { get; set; }
+}
diff --git a/src/Twibooru/RootJson.cs b/src/Twibooru/RootJson.cs
@@ -0,0 +1,29 @@
+﻿namespace Nullforce.Api.JsonModels.Twibooru;
+
+
+public class CommentResponseJson : JsonBase
+{
+    [JsonPropertyName("comments")]
+    public CommentJson[] Comments { get; set; }
+}
+
+public class PostResponseJson : JsonBase
+{
+    [JsonPropertyName("post")]
+    public PostJson Post { get; set; }
+}
+
+public class SearchPostsResponseJson : JsonBase
+{
+    [JsonPropertyName("posts")]
+    public PostJson[] Posts { get; set; }
+
+    [JsonPropertyName("total")]
+    public int Total { get; set; }
+}
+
+public class SearchTagsResponseJson : JsonBase
+{
+    [JsonPropertyName("tags")]
+    public TagJson[] Tags { get; set; }
+}
diff --git a/src/Twibooru/TagJson.cs b/src/Twibooru/TagJson.cs
@@ -0,0 +1,46 @@
+﻿namespace Nullforce.Api.JsonModels.Twibooru;
+
+public class TagJson : JsonBase
+{
+    [JsonPropertyName("id")]
+    public int Id { get; set; }
+
+    [JsonPropertyName("aliased_tag")]
+    public string AliasedTag { get; set; }
+
+    [JsonPropertyName("aliases")]
+    public string[] Aliases { get; set; }
+
+    /// <summary>
+    /// The category class of this tag. One of "character", "content-fanmade", "content-official", "error", "oc", "origin", "rating", "species", "spoiler".
+    /// </summary>
+    [JsonPropertyName("category")]
+    public string Category { get; set; }
+
+    [JsonPropertyName("description")]
+    public string Description { get; set; }
+
+    [JsonPropertyName("implied_by_tags")]
+    public string[] ImpliedByTags { get; set; }
+
+    [JsonPropertyName("implied_tags")]
+    public string[] ImpliedTags { get; set; }
+
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+    [JsonPropertyName("name_in_namespace")]
+    public string NameInNamespace { get; set; }
+
+    [JsonPropertyName("namespace")]
+    public string Namespace { get; set; }
+
+    [JsonPropertyName("posts")]
+    public int PostCount { get; set; }
+
+    [JsonPropertyName("short_description")]
+    public string ShortDescription { get; set; }
+
+    [JsonPropertyName("slug")]
+    public string Slug { get; set; }
+}
diff --git a/src/Usings.cs b/src/Usings.cs
@@ -1,3 +1,4 @@
+global using Nullforce.Api.JsonModels;
 global using System;
 global using System.Collections.Generic;
 global using System.Text.Json;
diff --git a/tests/Nullforce.Api.Derpibooru.JsonModel.Tests/Philomena/PhilomenaTests.cs b/tests/Nullforce.Api.Derpibooru.JsonModel.Tests/Philomena/PhilomenaTests.cs
@@ -1,20 +1,13 @@
 using System;
 using System.Linq;
-using System.Text.Json;
-using System.Threading.Tasks;
-using FluentAssertions;
-using FluentAssertions.Execution;
-using Flurl;
-using Flurl.Http;
-using Xunit;
 
-namespace Nullforce.Api.Derpibooru.JsonModels.Tests.Integration;
+namespace Nullforce.Api.JsonModels.Philomena.Tests.Integration;
 
-public class DeserializationTests
+public class PhilomenaTests
 {
     private readonly string _baseUri = "https://derpibooru.org/api/v1/json";
 
-    public DeserializationTests()
+    public PhilomenaTests()
     {
         // Do this in Startup. All calls to the _baseUri will use the same HttpClient instance.
         FlurlHttp.ConfigureClient(_baseUri, cli => cli
diff --git a/tests/Nullforce.Api.Derpibooru.JsonModel.Tests/Twibooru/TwibooruTests.cs b/tests/Nullforce.Api.Derpibooru.JsonModel.Tests/Twibooru/TwibooruTests.cs
diff --git a/tests/Nullforce.Api.Derpibooru.JsonModel.Tests/Usings.cs b/tests/Nullforce.Api.Derpibooru.JsonModel.Tests/Usings.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Nullforce.Api.Derpibooru.JsonModels;`
	`1`	`+namespace Nullforce.Api.JsonModels;`
`2`	`2`
`3`	`3`	`public abstract class JsonBase`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace Nullforce.Api.Derpibooru.JsonModels;`
	`1`	`+namespace Nullforce.Api.JsonModels.Philomena;`
`2`	`2`
`3`	`3`	`public class AwardsJson : JsonBase`
`4`	`4`	`{`