From 255575ad126e6e7f12a68c223ed64b897b30fae6 Mon Sep 17 00:00:00 2001
From: holzmaster <holzmaster@outlook.com>
Date: Tue, 26 Mar 2024 02:58:57 +0100
Subject: [PATCH] Fix import

---
 src/commands/poll.ts                 | 9 +++++----
 src/storage/additionalMessageData.ts | 6 +++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/commands/poll.ts b/src/commands/poll.ts
index c121dd0f..9e7a924b 100644
--- a/src/commands/poll.ts
+++ b/src/commands/poll.ts
@@ -11,7 +11,6 @@ import {
 } from "discord.js";
 
 import log from "../utils/logger.js";
-import AdditionalMessageData from "../storage/model/AdditionalMessageData.js";
 import * as additionalMessageData from "../storage/additionalMessageData.js";
 import { getConfig } from "../utils/configHandler.js";
 import type { BotContext } from "../context.js";
@@ -278,13 +277,15 @@ export const run: CommandFunction = async (_client, message, args, context) => {
 };
 
 export const importPolls = async () => {
-    const additionalDatas = await AdditionalMessageData.findAll();
+    const additionalDatas = await additionalMessageData.findAll();
     let count = 0;
     for (const additionalData of additionalDatas) {
-        if (!additionalData.customData.delayedPollData) {
+        const customData = JSON.parse(additionalData.customData);
+
+        if (!customData.delayedPollData) {
             continue;
         }
-        delayedPolls.push(additionalData.customData.delayedPollData);
+        delayedPolls.push(customData.delayedPollData);
         count++;
     }
     log.info(`Loaded ${count} polls from database`);
diff --git a/src/storage/additionalMessageData.ts b/src/storage/additionalMessageData.ts
index de6ad66a..765daa77 100644
--- a/src/storage/additionalMessageData.ts
+++ b/src/storage/additionalMessageData.ts
@@ -1,4 +1,4 @@
-import type { Message, PartialMessage, Snowflake, User } from "discord.js";
+import type { Message, Snowflake } from "discord.js";
 import { sql } from "kysely";
 
 import type { AdditionalMessageData } from "./model.js";
@@ -76,3 +76,7 @@ export function destroyForMessage(message: Message, ctx = db()) {
         .where("messageId", "=", message.id)
         .execute();
 }
+
+export function findAll(ctx = db()): Promise<AdditionalMessageData[]> {
+    return ctx.selectFrom("additionalMessageData").selectAll().execute();
+}