refactor: adjust PinkSea.Gateway based on the new lexicons.

Author: purifetchi

PinkSea.Gateway/Lexicons/Author.cs

@@ -0,0 +1,21 @@
+using System.Text.Json.Serialization;
+
+namespace PinkSea.Gateway.Lexicons;
+
+/// <summary>
+/// The "com.shinolabs.pinksea.appViewDefs#author" object.
+/// </summary>
+public class Author
+{
+    /// <summary>
+    /// The DID of the author.
+    /// </summary>
+    [JsonPropertyName("did")]
+    public required string Did { get; set; }
+    
+    /// <summary>
+    /// The handle of the author.
+    /// </summary>
+    [JsonPropertyName("handle")]
+    public required string Handle { get; set; }
+}

PinkSea.Gateway/Lexicons/GetOekakiResponse.cs

@@ -0,0 +1,12 @@
+namespace PinkSea.Gateway.Lexicons;
+
+/// <summary>
+/// The response for the "com.shinolabs.pinksea.getOekaki" call.
+/// </summary>
+public class GetOekakiResponse
+{
+    /// <summary>
+    /// The parent post.
+    /// </summary>
+    public required OekakiDto Parent { get; set; }
+}

PinkSea.Gateway/OekakiDto.cs renamed to PinkSea.Gateway/Lexicons/OekakiDto.cs

@@ -1,50 +1,52 @@
-namespace PinkSea.Gateway;
+using System.Text.Json.Serialization;
 
+namespace PinkSea.Gateway.Lexicons;
+
+/// <summary>
+/// The "com.shinolabs.pinksea.appViewDefs#hydratedOekaki" type.
+/// </summary>
 public class OekakiDto
 {
     /// <summary>
-    /// The oekaki record key.
-    /// </summary>
-    public required string OekakiRecordKey { get; set; }
-    
-    /// <summary>
-    /// The DID of the author.
-    /// </summary>
-    public required string AuthorDid { get; set; }
-    
-    /// <summary>
-    /// The handle of the author.
+    /// The author of the oekaki.
     /// </summary>
-    public required string AuthorHandle { get; set; }
+    [JsonPropertyName("author")]
+    public required Author Author { get; set; }
 
     /// <summary>
     /// The image link.
     /// </summary>
+    [JsonPropertyName("image")]
     public required string ImageLink { get; set; }
 
     /// <summary>
     /// The AT protocol link.
     /// </summary>
+    [JsonPropertyName("at")]
     public required string AtProtoLink { get; set; }
 
     /// <summary>
     /// The oekaki CID.
     /// </summary>
-    public required string OekakiCid { get; set; }
+    [JsonPropertyName("cid")]
+    public required string Cid { get; set; }
 
     /// <summary>
     /// The creation time.
     /// </summary>
+    [JsonPropertyName("creationTime")]
     public required DateTimeOffset CreationTime { get; set; }
 
     /// <summary>
     /// Is this oekaki NSFW?
     /// </summary>
+    [JsonPropertyName("nsfw")]
     public required bool Nsfw { get; set; }
 
     /// <summary>
     /// The tags for this oekaki post.
     /// </summary>
+    [JsonPropertyName("tags")]
     public string[]? Tags { get; set; }
 
     /// <summary>

PinkSea.Gateway/OekakiResponse.cs

@@ -1,5 +1,6 @@
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.Options;
+using PinkSea.Gateway.Lexicons;
 using PinkSea.Gateway.Models;
 
 namespace PinkSea.Gateway.Services;
@@ -27,7 +28,7 @@ public Task<string> GetOekakiMetaFor(string did, string rkey)
             async cacheEntry =>
             {
                 using var client = httpClientFactory.CreateClient("pinksea-xrpc");
-                var resp = await client.GetFromJsonAsync<OekakiResponse>(string.Format(endpointTemplate, did, rkey));
+                var resp = await client.GetFromJsonAsync<GetOekakiResponse>(string.Format(endpointTemplate, did, rkey));
 
                 cacheEntry.AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(cacheExpiry);
 
@@ -60,16 +61,21 @@ public string GetRegularMeta()
     /// </summary>
     /// <param name="resp">The response.</param>
     /// <returns>The formatted oekaki response.</returns>
-    private string FormatOekakiResponse(OekakiResponse resp)
+    private string FormatOekakiResponse(GetOekakiResponse resp)
     {
+        var rkey = resp.Parent
+            .AtProtoLink
+            .Split('/')
+            .Last();
+        
         return $"""
-                <link rel="alternate" href="at://{resp.Parent.AuthorDid}/com.shinolabs.pinksea.oekaki/{resp.Parent.OekakiRecordKey}" />
+                <link rel="alternate" href="{resp.Parent.AtProtoLink}" />
                 <meta name="application-name" content="PinkSea">
                 <meta name="generator" content="PinkSea.Gateway">
                 <meta property="og:site_name" content="PinkSea" />
-                <meta property="og:title" content="{resp!.Parent.AuthorHandle}'s oekaki" />
+                <meta property="og:title" content="{resp!.Parent.Author.Handle}'s oekaki" />
                 <meta property="og:type" content="website" />
-                <meta property="og:url" content="{options.Value.FrontEndEndpoint}/{resp.Parent.AuthorDid}/oekaki/{resp.Parent.OekakiRecordKey}" />
+                <meta property="og:url" content="{options.Value.FrontEndEndpoint}/{resp.Parent.Author.Did}/oekaki/{rkey}" />
                 <meta property="og:image" content="{resp!.Parent.ImageLink}" />
                 <meta property="og:description" content="{resp!.Parent.Alt}" />
                 <meta name="theme-color" content="#FFB6C1">

PinkSea.Gateway/Services/MetaGeneratorService.cs

@@ -1,6 +1,6 @@
 {
   "GatewaySettings": {
-    "AppViewEndpoint": "https://api.pinksea.art",
+    "PinkSeaEndpoint": "https://api.pinksea.art",
     "FrontEndEndpoint": "https://pinksea.art"
   }
 }