From 3896b143c6bb630c6558252b8a1197edb370dab3 Mon Sep 17 00:00:00 2001
From: CyberL1 <cyber.hf18@gmail.com>
Date: Wed, 24 Jun 2026 16:12:12 +0200
Subject: [PATCH] refactor: group message poll checks under one if

---
 src/api/util/handlers/Message.ts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/api/util/handlers/Message.ts b/src/api/util/handlers/Message.ts
index 3b2fda51a..41d8943dd 100644
--- a/src/api/util/handlers/Message.ts
+++ b/src/api/util/handlers/Message.ts
@@ -486,13 +486,17 @@ export async function handleMessage(opts: MessageOptions): Promise<Message> {
 
     message.content = opts.content?.trim();
 
-    if (message.poll && opts.poll?.duration) {
-        message.poll.expiry = new Date(Date.now() + opts.poll.duration * 3600000);
-    }
+    if (message.poll) {
+        message.poll.results = { answer_counts: [], is_finalized: false };
 
-    if (message.poll && opts.poll?.answers) {
-        for (let i = 0; i < opts.poll.answers.length; i++) {
-            message.poll.answers[i].answer_id = i;
+        if (opts.poll?.duration) {
+            message.poll.expiry = new Date(Date.now() + opts.poll.duration * 3600000);
+        }
+
+        if (opts.poll?.answers) {
+            for (let i = 0; i < opts.poll.answers.length; i++) {
+                message.poll.answers[i].answer_id = i;
+            }
         }
     }