Merge branch 'main' of ssh://git.apoena.dev:22222/julien/remanso

src/views/PublicNoteListByDidView.vue

@@ -3,11 +3,12 @@ import HomeButton from "@/components/HomeButton.vue"
 import PublicNoteList from "@/components/PublicNoteList.vue"
 import { usePublicNoteList } from "@/hooks/usePublicNoteList.hook"
 import { getAuthor } from "@/modules/atproto/getAuthor"
+import { fromShortDid } from "@/modules/atproto/shortDid"
 import { computedAsync } from "@vueuse/core"
 import { computed } from "vue"
 
-const props = defineProps<{ did: string }>()
-const did = computed(() => props.did)
+const props = defineProps<{ shortDid: string }>()
+const did = computed(() => fromShortDid(props.shortDid))
 
 const { notes, isLoading, canLoadMore, onLoadMore } = usePublicNoteList({ did })
 

src/views/PublicNoteListView.vue

@@ -6,6 +6,7 @@ import { useATProtoLogin } from "@/hooks/useATProtoLogin.hook"
 import { useFollows } from "@/hooks/useFollows.hook"
 import { useFollowingNoteList } from "@/hooks/useFollowingNoteList.hook"
 import { usePublicNoteList } from "@/hooks/usePublicNoteList.hook"
+import { toShortDid } from "@/modules/atproto/shortDid"
 import { computed } from "vue"
 import { useRoute, useRouter } from "vue-router"
 
@@ -62,7 +63,7 @@ const following = useFollowingNoteList(follows, followingEnabled)
       <template #meta="{ note }">
         <router-link
           v-if="all.getAuthor(note.did)"
-          :to="{ name: 'PublicNoteListByDidView', params: { did: note.did } }"
+          :to="{ name: 'PublicNoteListByDidView', params: { shortDid: toShortDid(note.did) } }"
           class="link link-hover"
         >
           {{ all.getAuthor(note.did) }}
@@ -84,7 +85,7 @@ const following = useFollowingNoteList(follows, followingEnabled)
       <template #meta="{ note }">
         <router-link
           v-if="following.getAuthor(note.did)"
-          :to="{ name: 'PublicNoteListByDidView', params: { did: note.did } }"
+          :to="{ name: 'PublicNoteListByDidView', params: { shortDid: toShortDid(note.did) } }"
           class="link link-hover"
         >
           {{ following.getAuthor(note.did) }}

src/views/PublicNoteView.vue

@@ -8,6 +8,7 @@ import { getAuthor } from "@/modules/atproto/getAuthor"
 import type { PublicNoteRecord } from "@/modules/atproto/publicNote.types"
 import { withATProtoImages } from "@/modules/atproto/withATProtoImages"
 import { getUrl } from "@/modules/atproto/getUrl"
+import { fromShortDid } from "@/modules/atproto/shortDid"
 import { downloadFont } from "@/utils/downloadFont"
 import { slugify } from "@/utils/slugify"
 import { computedAsync } from "@vueuse/core"
@@ -19,9 +20,9 @@ import ThemeSwap from "@/components/ThemeSwap.vue"
 import { useTitle } from "@vueuse/core"
 import { displayLanguage } from "@/utils/displayLanguage"
 
-const props = defineProps<{ did: string; rkey: string; slug?: string }>()
+const props = defineProps<{ shortDid: string; rkey: string; slug?: string }>()
 const router = useRouter()
-const did = computed(() => props.did)
+const did = computed(() => fromShortDid(props.shortDid))
 const rkey = computed(() => props.rkey)
 
 const author = computedAsync(async () => getAuthor(did.value))
@@ -125,7 +126,7 @@ watch(
     <div class="note article">
       <div class="header">
         <back-button
-          :fallback="{ name: 'PublicNoteListByDidView', params: { did } }"
+          :fallback="{ name: 'PublicNoteListByDidView', params: { shortDid } }"
           :prefer-fallback="false"
         />
 
@@ -141,7 +142,7 @@ watch(
             <span>&nbsp;•&nbsp;</span>
           </template>
           <router-link
-            :to="{ name: 'PublicNoteListByDidView', params: { did: did } }"
+            :to="{ name: 'PublicNoteListByDidView', params: { shortDid } }"
             class="link link-hover"
           >
             {{ author.handle }}