From 5f4405c9ee463c8a2e804e7293679c57dfbd84cd Mon Sep 17 00:00:00 2001
From: Danil Nikolaev <lischenkodev@gmail.com>
Date: Thu, 29 Jan 2026 18:14:07 +0300
Subject: [PATCH] fix checking of same user requirement

---
 src/util/utils.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/util/utils.ts b/src/util/utils.ts
index 7a56240..e4f1cc6 100644
--- a/src/util/utils.ts
+++ b/src/util/utils.ts
@@ -178,7 +178,11 @@ export async function checkRequirements(cmd: ChatCommand | CallbackCommand | nul
     if (reqs.isRequiresSameUser()) {
         let originalFromId: number | null;
         try {
-            originalFromId = (await MessageStore.get(chatId, messageId))?.fromId;
+            const queryMessage = await MessageStore.get(chatId, messageId);
+            if (queryMessage && queryMessage.replyToMessageId) {
+                const originalMessage = await MessageStore.get(chatId, queryMessage.replyToMessageId);
+                originalFromId = originalMessage?.fromId;
+            }
         } catch (e) {
             logError(e);
             originalFromId = null;