From 4235f266a1b5a0499f51f9ec5c210d52c942bd2d Mon Sep 17 00:00:00 2001
From: Cilly Leang <me@lava.moe>
Date: Fri, 10 Oct 2025 16:58:16 +1100
Subject: [PATCH] Revert "fix(Zinnia): fix incorrect spacing in replies"

This reverts commit 9113ee5b24d143962b4b79882db9f4ea400314af.

It completely broke replies, will have a proper fix later.
---
 .../kotlin/moe/lava/awoocord/zinnia/Zinnia.kt | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/plugins/Zinnia/src/main/kotlin/moe/lava/awoocord/zinnia/Zinnia.kt b/plugins/Zinnia/src/main/kotlin/moe/lava/awoocord/zinnia/Zinnia.kt
index e0d6b6c..8aefe72 100644
--- a/plugins/Zinnia/src/main/kotlin/moe/lava/awoocord/zinnia/Zinnia.kt
+++ b/plugins/Zinnia/src/main/kotlin/moe/lava/awoocord/zinnia/Zinnia.kt
@@ -14,8 +14,6 @@ import com.aliucord.utils.DimenUtils.dp
 import com.aliucord.utils.ViewUtils.findViewById
 import com.aliucord.utils.accessField
 import com.discord.databinding.WidgetChannelMembersListItemUserBinding
-import com.discord.models.member.GuildMember
-import com.discord.models.user.User
 import com.discord.stores.StoreStream
 import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListAdapter
 import com.discord.widgets.channels.memberlist.adapter.ChannelMembersListViewHolderMember
@@ -26,10 +24,6 @@ import kotlin.math.abs
 
 private val ChannelMembersListViewHolderMember.binding
         by accessField<WidgetChannelMembersListItemUserBinding>()
-private val WidgetChatListAdapterItemMessage.itemName
-        by accessField<TextView?>()
-private val WidgetChatListAdapterItemMessage.replyName
-        by accessField<TextView?>()
 
 data class Colours(
     val fgP: Int,
@@ -170,17 +164,20 @@ class Zinnia : Plugin() {
             Int::class.javaPrimitiveType!!,
             ChatListEntry::class.java,
         ) { (_, _: Int, entry: MessageEntry) ->
-            itemName?.let { configureOn(it, entry.author?.color) }
+            val username = itemView.findViewById<TextView?>("chat_list_adapter_item_text_name")
+                ?: return@after
+            configureOn(username, entry.author?.color)
         }
 
         // Configures for reply preview username
         patcher.after<WidgetChatListAdapterItemMessage>(
-            "configureReplyAuthor",
-            User::class.java,
-            GuildMember::class.java,
+            "configureReplyPreview",
             MessageEntry::class.java,
-        ) { (_, _: User, member: GuildMember) ->
-            replyName?.let { configureOn(it, member.color) }
+        ) { (_, entry: MessageEntry) ->
+            val referencedAuthor = entry.replyData?.messageEntry?.author
+            val replyUsername = itemView.findViewById<TextView?>("chat_list_adapter_item_text_decorator_reply_name")
+                ?: return@after
+            configureOn(replyUsername, referencedAuthor?.color)
         }
     }
 }