From 3f58162cf4f431632335c315f95dea4b17ea484c Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 15:49:39 -0400
Subject: [PATCH 1/3] Fix polls & own reactions not showing in replies

---
 packages/backend/src/models/repositories/note.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index 1310c14b02..6520163550 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -236,6 +236,12 @@ export const NoteRepository = db.getRepository(Note).extend({
 			uri: note.uri || undefined,
 			url: note.url || undefined,
 			updatedAt: note.updatedAt?.toISOString() || undefined,
+			poll: note.hasPoll ? populatePoll(note, meId) : undefined,
+			...(meId
+				? {
+						myReaction: populateMyReaction(note, meId, options?._hint_),
+					}
+				: {}),
 
 			...(opts.detail
 				? {
@@ -252,14 +258,6 @@ export const NoteRepository = db.getRepository(Note).extend({
 									_hint_: options?._hint_,
 							  })
 							: undefined,
-
-						poll: note.hasPoll ? populatePoll(note, meId) : undefined,
-
-						...(meId
-							? {
-									myReaction: populateMyReaction(note, meId, options?._hint_),
-							  }
-							: {}),
 				  }
 				: {}),
 		});

From b5ffb5af8da38f17c2fe090ffa2cf0833347ee44 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 15:50:14 -0400
Subject: [PATCH 2/3] fix z-index

---
 packages/client/src/components/MkCwButton.vue       | 2 +-
 packages/client/src/components/MkShowMoreButton.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 5a66224592..9239d44298 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -59,7 +59,7 @@ defineExpose({
 <style lang="scss" scoped>
 ._button {
 	font-weight: 700;
-	z-index: 2;
+	z-index: 5;
 	> span {
 		background: var(--cwBg) !important;
 		color: var(--cwFg);
diff --git a/packages/client/src/components/MkShowMoreButton.vue b/packages/client/src/components/MkShowMoreButton.vue
index 3dd9acb9b0..3ec7086881 100644
--- a/packages/client/src/components/MkShowMoreButton.vue
+++ b/packages/client/src/components/MkShowMoreButton.vue
@@ -41,7 +41,7 @@ defineExpose({
 	bottom: 0;
 	left: 0;
 	width: 100%;
-	z-index: 2;
+	z-index: 5;
 	> span {
 		display: inline-block;
 		background: var(--panel);

From c683ee304e759bd5bad63bf59af3ea4f8f9bb711 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 16:24:31 -0400
Subject: [PATCH 3/3] tweak

---
 packages/client/src/components/MkNoteDetailed.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 0e1780b95f..76aa5ba46b 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -569,7 +569,7 @@ onUnmounted(() => {
 			background: var(--panelHighlight);
 			border-radius: var(--radius);
 			opacity: 0;
-			transition: opacity 0.2s;
+			transition: opacity 0.2s, background 0.2s;
 			z-index: -1;
 		}
 		&.reply-to {
@@ -604,6 +604,7 @@ onUnmounted(() => {
 			--panel: var(--panelHighlight);
 			&::before {
 				opacity: 1;
+				background: var(--panelHighlight) !important;
 			}
 		}
 		// @media (pointer: coarse) {
@@ -623,6 +624,7 @@ onUnmounted(() => {
 		&::before {
 			outline: auto;
 			opacity: 1;
+			background: none;
 		}
 	}