From f10bc5488d36aaaf64ce1a471eda4b1471019a28 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 3 Jul 2023 00:20:50 -0700
Subject: [PATCH] send height info, fix retry

---
 .../backend/src/server/web/views/note.pug     |  1 -
 packages/client/src/pages/note.embed.vue      | 46 ++++++++++---------
 packages/client/src/pages/note.vue            |  2 +-
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
index bbc02db46a..dae0a82d5e 100644
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@@ -8,7 +8,6 @@ block vars
 	- const isImage = note.files.length !== 0 && note.files[0].type.startsWith('image');
 	- const isVideo = note.files.length !== 0 && note.files[0].type.startsWith('video');
 	- const imageUrl = isImage ? note.files[0].url : isVideo ? note.files[0].thumbnailUrl : avatarUrl;
-	- const isEmbed = embed;
 
 block title
 	= `${title} | ${instanceName}`
diff --git a/packages/client/src/pages/note.embed.vue b/packages/client/src/pages/note.embed.vue
index 1f2989ce2e..dcc4a02261 100644
--- a/packages/client/src/pages/note.embed.vue
+++ b/packages/client/src/pages/note.embed.vue
@@ -1,34 +1,25 @@
 <template>
 	<MkStickyContainer>
-		<template #header
-			><MkPageHeader
-				:actions="headerActions"
-				:tabs="headerTabs"
-				:display-back-button="true"
-				:to="`#${noteId}`"
-		/></template>
-		<MkSpacer :content-max="800" :marginMin="6">
-			<div class="fcuexfpr">
-				<div v-if="appearNote" class="note">
-					<div class="main _gap">
-						<div class="note _gap">
-							<XNoteDetailed
-								:key="appearNote.id"
-								v-model:note="appearNote"
-								class="note"
-							/>
-						</div>
+		<div class="fcuexfpr">
+			<div v-if="appearNote" class="note">
+				<div class="main _gap">
+					<div class="note _gap" ref="noteContainer">
+						<XNoteDetailed
+							:key="appearNote.id"
+							v-model:note="appearNote"
+							class="note"
+						/>
 					</div>
 				</div>
-				<MkError v-else-if="error" @retry="fetch()" />
-				<MkLoading v-else />
 			</div>
-		</MkSpacer>
+			<MkError v-else-if="error" @retry="fetchNote()" />
+			<MkLoading v-else />
+		</div>
 	</MkStickyContainer>
 </template>
 
 <script lang="ts" setup>
-import { computed, watch } from "vue";
+import { computed, onMounted, watch } from "vue";
 import * as misskey from "calckey-js";
 import XNoteDetailed from "@/components/MkNoteDetailed.vue";
 import * as os from "@/os";
@@ -39,6 +30,7 @@ const props = defineProps<{
 	noteId: string;
 }>();
 
+const noteContainer = $ref<HTMLElement>();
 let note = $ref<null | misskey.entities.Note>();
 let error = $ref();
 let isRenote = $ref(false);
@@ -108,6 +100,16 @@ definePageMetadata(
 			: null
 	)
 );
+
+onMounted(() => {
+	window.parent.postMessage(
+		{
+			type: "setHeight",
+			height: noteContainer?.clientHeight,
+		},
+		"*"
+	);
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index c127ad0df4..a75da90cfd 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -60,7 +60,7 @@
 							/>
 						</div>
 					</div>
-					<MkError v-else-if="error" @retry="fetch()" />
+					<MkError v-else-if="error" @retry="fetchNote()" />
 					<MkLoading v-else />
 				</transition>
 			</div>