refactor: adjust appview/frontend to lexicon changes.

Author: purifetchi

PinkSea.Frontend/src/api/atproto/helpers.ts

@@ -14,7 +14,7 @@ export const getRecordKeyFromAtUri = (uri: string) => {
 
 export const buildOekakiUrlFromOekakiObject = (oekaki: Oekaki) => {
   const rkey = getRecordKeyFromAtUri(oekaki.at)
-  return `/${oekaki.did}/oekaki/${rkey}`
+  return `/${oekaki.author.did}/oekaki/${rkey}`
 }
 
 export const formatDate = (date: Date) => {

PinkSea.Frontend/src/components/TimeLineOekakiCard.vue

@@ -14,7 +14,7 @@ const props = defineProps<{
 }>()
 
 const imageLink = computed(() => `url(${props.oekaki.image})`)
-const authorProfileLink = computed(() => `/${props.oekaki.did}`);
+const authorProfileLink = computed(() => `/${props.oekaki.author.did}`);
 const creationTime = computed(() => {
   return formatDate(props.oekaki.creationTime)
 })
@@ -37,7 +37,7 @@ const openInNewTab = () => {
       <div class="oekaki-nsfw-blur" v-if="props.oekaki.nsfw && persistedStore.blurNsfw">NSFW</div>
     </div>
     <div class="oekaki-meta">
-      <span>{{ $t("timeline.by_before_handle") }}<b class="oekaki-author"> <RouterLink :to="authorProfileLink" >@{{ props.oekaki.handle }}</RouterLink></b>{{ $t("timeline.by_after_handle") }}</span><br>
+      <span>{{ $t("timeline.by_before_handle") }}<b class="oekaki-author"> <RouterLink :to="authorProfileLink" >@{{ props.oekaki.author.handle }}</RouterLink></b>{{ $t("timeline.by_after_handle") }}</span><br>
       <span>{{ creationTime }}</span><br>
       <TagContainer v-if="props.oekaki.tags !== undefined && props.oekaki.tags.length > 0" :tags="props.oekaki.tags" />
       <div class="oekaki-tag-container-substitute" v-else>.</div>

PinkSea.Frontend/src/components/oekaki/PostViewOekakiChildCard.vue

@@ -15,7 +15,7 @@ const props = defineProps<{
 const router = useRouter();
 const persistedStore = usePersistedStore();
 
-const authorProfileLink = computed(() => `/${props.oekaki.did}`);
+const authorProfileLink = computed(() => `/${props.oekaki.author.did}`);
 const creationTime = computed(() => {
   return formatDate(props.oekaki.creationTime)
 })
@@ -30,18 +30,18 @@ const redirectToParent = async () => {
   const rkey = getRecordKeyFromAtUri(props.oekaki.at);
   const { data } = await xrpc.get("com.shinolabs.pinksea.getParentForReply", {
     params: {
-      did: props.oekaki.did,
+      did: props.oekaki.author.did,
       rkey: rkey!
     }
   });
 
-  await router.push(`/${data.did}/oekaki/${data.rkey}#${props.oekaki.did}-${rkey}`);
+  await router.push(`/${data.did}/oekaki/${data.rkey}#${props.oekaki.author.did}-${rkey}`);
 };
 </script>
 
 <template>
   <div :class="classList" v-if="!props.oekaki.nsfw || (props.oekaki.nsfw && !persistedStore.hideNsfw)">
-    <div class="oekaki-child-info">{{ $t("post.response_from_before_handle") }}<b class="oekaki-author"> <RouterLink :to="authorProfileLink" >@{{ props.oekaki.handle }}</RouterLink></b>{{ $t("post.response_from_after_handle") }}{{ $t("post.response_from_at_date") }}{{ creationTime }}</div>
+    <div class="oekaki-child-info">{{ $t("post.response_from_before_handle") }}<b class="oekaki-author"> <RouterLink :to="authorProfileLink" >@{{ props.oekaki.author.handle }}</RouterLink></b>{{ $t("post.response_from_after_handle") }}{{ $t("post.response_from_at_date") }}{{ creationTime }}</div>
     <PostViewOekakiImageContainer :oekaki="props.oekaki" v-on:click="redirectToParent" style="max-height: 400px; cursor: pointer;"/>
   </div>
 </template>

PinkSea.Frontend/src/components/oekaki/PostViewOekakiParentCard.vue

@@ -12,7 +12,7 @@ const props = defineProps<{
 
 const persistedStore = usePersistedStore();
 
-const authorProfileLink = computed(() => `/${props.oekaki.did}`);
+const authorProfileLink = computed(() => `/${props.oekaki.author.did}`);
 const creationTime = computed(() => {
   return formatDate(props.oekaki.creationTime)
 })
@@ -23,7 +23,7 @@ const creationTime = computed(() => {
   <div class="oekaki-card" v-if="!props.oekaki.nsfw || (props.oekaki.nsfw && !persistedStore.hideNsfw)">
     <PostViewOekakiImageContainer :oekaki="props.oekaki" />
     <div class="oekaki-meta">
-      <span>{{ $t("timeline.by_before_handle" )}}<b class="oekaki-author"> <RouterLink :to="authorProfileLink" >@{{ props.oekaki.handle }}</RouterLink></b>{{ $t("timeline.by_after_handle" )}}</span><br>
+      <span>{{ $t("timeline.by_before_handle" )}}<b class="oekaki-author"> <RouterLink :to="authorProfileLink" >@{{ props.oekaki.author.handle }}</RouterLink></b>{{ $t("timeline.by_after_handle" )}}</span><br>
       <span>{{ creationTime }}</span><br>
       <TagContainer v-if="props.oekaki.tags !== undefined" :tags="props.oekaki.tags" />
     </div>

PinkSea.Frontend/src/models/author.ts

@@ -0,0 +1,4 @@
+export interface Author {
+  did: string,
+  handle: string
+}

PinkSea.Frontend/src/models/oekaki.ts

@@ -1,6 +1,7 @@
+import type { Author } from '@/models/author'
+
 export interface Oekaki {
-  did: string,
-  handle: string,
+  author: Author,
   image: string,
   at: string,
   cid: string,

PinkSea/Lexicons/Objects/Author.cs

@@ -0,0 +1,21 @@
+using System.Text.Json.Serialization;
+
+namespace PinkSea.Lexicons.Objects;
+
+/// <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/Lexicons/Objects/HydratedOekaki.cs

@@ -9,16 +9,10 @@ namespace PinkSea.Lexicons.Objects;
 public class HydratedOekaki
 {
     /// <summary>
-    /// The DID of the author.
+    /// The author of the oekaki.
     /// </summary>
-    [JsonPropertyName("did")]
-    public required string Did { get; set; }
-    
-    /// <summary>
-    /// The handle of the author.
-    /// </summary>
-    [JsonPropertyName("handle")]
-    public required string Handle { get; set; }
+    [JsonPropertyName("author")]
+    public required Author Author { get; set; }
 
     /// <summary>
     /// The image link.
@@ -73,8 +67,11 @@ public static HydratedOekaki FromOekakiModel(
     {
         return new HydratedOekaki
         {
-            Did = oekakiModel.AuthorDid,
-            Handle = authorHandle,
+            Author = new Author
+            {
+                Did = oekakiModel.AuthorDid,
+                Handle = authorHandle
+            },
             CreationTime = oekakiModel.IndexedAt,
             ImageLink =
                 $"https://cdn.bsky.app/img/feed_fullsize/plain/{oekakiModel.AuthorDid}/{oekakiModel.BlobCid}",