From 294d94080079099cc6744ed5d87f9cc05ae6005c Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 20 Feb 2023 13:30:15 -0500
Subject: [PATCH] Revert footer changes

---
 packages/client/src/components/MkNoteFooter.vue    |  4 +---
 packages/client/src/components/MkNoteSub.vue       |  3 +--
 .../client/src/components/MkReactionsViewer.vue    |  7 +++----
 .../client/src/components/MkSubNoteContent.vue     | 14 +++++++-------
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/packages/client/src/components/MkNoteFooter.vue b/packages/client/src/components/MkNoteFooter.vue
index 8a40240b32..1f47d4083f 100644
--- a/packages/client/src/components/MkNoteFooter.vue
+++ b/packages/client/src/components/MkNoteFooter.vue
@@ -1,6 +1,6 @@
 <template>
 	<footer ref="el" class="footer" @click.stop.prevent>
-		<XReactionsViewer v-if="!conversation" ref="reactionsViewer" :note="appearNote"/>
+		<XReactionsViewer ref="reactionsViewer" :note="appearNote"/>
 		<button v-tooltip.noDelay.bottom="i18n.ts.reply" class="button _button" @click="reply()">
 			<template v-if="appearNote.reply"><i class="ph-arrow-u-up-left-bold ph-lg"></i></template>
 			<template v-else><i class="ph-arrow-bend-up-left-bold ph-lg"></i></template>
@@ -18,7 +18,6 @@
 		<button ref="menuButton" v-tooltip.noDelay.bottom="i18n.ts.more" class="button _button" @click="menu()">
 			<i class="ph-dots-three-outline-bold ph-lg"></i>
 		</button>
-		<XReactionsViewer v-if="conversation" ref="reactionsViewer" :note="appearNote"/>
 	</footer>
 </template>
 
@@ -41,7 +40,6 @@ import { useNoteCapture } from '@/scripts/use-note-capture';
 
 const props = defineProps<{
 	note: misskey.entities.Note;
-	conversation?: misskey.entities.Note[];
 }>();
 
 let note = $ref(deepClone(props.note));
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 39a4bc7383..645d2d277a 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -17,7 +17,7 @@
 					<MkSubNoteContent class="text" :note="note" :detailed="true"/>
 				</div>
 			</div>
-			<MkNoteFooter :note="note" :conversation="conversation"></MkNoteFooter>
+			<MkNoteFooter :note="note"></MkNoteFooter>
 		</div>
 	</div>
 	<template v-if="conversation">
@@ -65,7 +65,6 @@ const replies: misskey.entities.Note[] = props.conversation?.filter(item => item
 <style lang="scss" scoped>
 .wrpstxzv {
 	padding: 16px 32px;
-	// --divider: rgba(255,255,255,0.5); // for now
 
 	&.children {
 		padding: 10px 0 0 var(--indent);
diff --git a/packages/client/src/components/MkReactionsViewer.vue b/packages/client/src/components/MkReactionsViewer.vue
index a9cf9b00c3..eb60e3633d 100644
--- a/packages/client/src/components/MkReactionsViewer.vue
+++ b/packages/client/src/components/MkReactionsViewer.vue
@@ -21,11 +21,10 @@ const isMe = computed(() => $i && $i.id === props.note.userId);
 
 <style lang="scss" scoped>
 .tdflqwzn {
-	margin: 0px -2px 0 -2px;
+	margin-inline: -2px;
+	margin-top: .2em;
 	width: 100%;
-	.reply & {
-		width: auto;
-	}
+	
 	&:empty {
 		display: none;
 	}
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index daded56d22..987d596f40 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -5,13 +5,13 @@
 		<MkA v-if="note.replyId" class="reply" :to="`/notes/${note.replyId}`"><i class="ph-arrow-bend-up-left-bold ph-lg"></i></MkA>
 		<Mfm v-if="note.text" :text="note.text" :author="note.user" :i="$i" :custom-emojis="note.emojis"/>
 		<MkA v-if="note.renoteId" class="rp" :to="`/notes/${note.renoteId}`">{{ i18n.ts.quoteAttached }}: ...</MkA>
-		<template v-if="detailed">
-			<!-- <div v-if="note.renoteId" class="renote">
-				<XNoteSimple :note="note.renote"/>
-			</div> -->
-			<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
-		</template>
 	</div>
+	<template v-if="detailed">
+		<!-- <div v-if="note.renoteId" class="renote">
+			<XNoteSimple :note="note.renote"/>
+		</div> -->
+		<MkUrlPreview v-for="url in urls" :key="url" :url="url" :compact="true" :detail="false" class="url-preview"/>
+	</template>
 	<div v-if="note.files.length > 0">
 		<XMediaList :media-list="note.files"/>
 	</div>
@@ -58,7 +58,7 @@ const urls = props.note.text ? extractUrlFromMfm(mfm.parse(props.note.text)) : n
 <style lang="scss" scoped>
 .wrmlmaau {
 	overflow-wrap: break-word;
-
+	
 	> .body {
 		> .reply {
 			margin-right: 6px;