From 64350cfcb85a49eced135b14b2cf5d5ab825ad88 Mon Sep 17 00:00:00 2001
From: Natty <natty.sh.git@gmail.com>
Date: Thu, 28 Dec 2023 04:00:00 +0100
Subject: [PATCH] Frontend: Fixed showing media in profiles

---
 .../client/src/pages/user/index.photos.vue    | 34 ++++++++++---------
 .../client/src/pages/user/index.timeline.vue  |  3 +-
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/fe_calckey/frontend/client/src/pages/user/index.photos.vue b/fe_calckey/frontend/client/src/pages/user/index.photos.vue
index 4e9cd2a..4bf2289 100644
--- a/fe_calckey/frontend/client/src/pages/user/index.photos.vue
+++ b/fe_calckey/frontend/client/src/pages/user/index.photos.vue
@@ -29,7 +29,6 @@
 
 <script lang="ts" setup>
 import { onMounted } from "vue";
-import * as misskey from "calckey-js";
 import { getStaticImageUrl } from "@/scripts/get-static-image-url";
 import { notePage } from "@/filters/note";
 import * as os from "@/os";
@@ -38,6 +37,7 @@ import ImgWithBlurhash from "@/components/MkImgWithBlurhash.vue";
 import { defaultStore } from "@/store";
 import { i18n } from "@/i18n";
 import { packed } from "magnetar-common";
+import { resolveNote } from "@/scripts-mag/mag-util";
 
 const props = defineProps<{
     user: packed.PackUserBase;
@@ -46,15 +46,15 @@ const props = defineProps<{
 let fetching = $ref(true);
 let images = $ref<
     {
-        note: misskey.entities.Note;
-        file: misskey.entities.DriveFile;
+        note: packed.PackNoteMaybeAttachments;
+        file: packed.PackDriveFileBase;
     }[]
 >([]);
 
-function thumbnail(image: misskey.entities.DriveFile): string {
+function thumbnail(image: packed.PackDriveFileBase): string {
     return defaultStore.state.disableShowingAnimatedImages
-        ? getStaticImageUrl(image.thumbnailUrl)
-        : image.thumbnailUrl;
+        ? getStaticImageUrl(image.thumbnail_url)
+        : image.thumbnail_url;
 }
 
 onMounted(() => {
@@ -71,17 +71,19 @@ onMounted(() => {
         fileType: image,
         excludeNsfw: defaultStore.state.nsfw !== "ignore",
         limit: 10,
-    }).then((notes) => {
-        for (const note of notes) {
-            for (const file of note.files) {
-                images.push({
-                    note,
-                    file,
-                });
+    })
+        .then((n) => Promise.all(n.map(resolveNote)))
+        .then((notes) => {
+            for (const note of notes) {
+                for (const file of note.attachments) {
+                    images.push({
+                        note,
+                        file,
+                    });
+                }
             }
-        }
-        fetching = false;
-    });
+            fetching = false;
+        });
 });
 </script>
 
diff --git a/fe_calckey/frontend/client/src/pages/user/index.timeline.vue b/fe_calckey/frontend/client/src/pages/user/index.timeline.vue
index a88b6de..de79fc7 100644
--- a/fe_calckey/frontend/client/src/pages/user/index.timeline.vue
+++ b/fe_calckey/frontend/client/src/pages/user/index.timeline.vue
@@ -29,7 +29,8 @@ const pagination = {
     limit: 10,
     params: computed(() => ({
         userId: props.user.id,
-        includeReplies: include.value === "replies",
+        includeReplies:
+            include.value === "replies" || include.value === "files",
         withFiles: include.value === "files",
     })),
 };