feat: sending messages works

2026-03-20 17:53:29 -04:00
parent df3cb95c91
commit 4d39ed8053
8 changed files with 240 additions and 157 deletions
--- a/Sources/zundamon/Actions.swift
+++ b/Sources/zundamon/Actions.swift
@@ -1,11 +1,11 @@
-// import DiscordBM
+// import DiscordKit
 // 
 // struct Actions {
 //     static func getUserFromMention(_ mention: MentionUser) -> String {
 //         mention.member?.nick ?? mention.global_name ?? mention.username
 //     }
 // 
-//     static func performAction(ctx: Gateway.MessageCreate, client: DiscordClient, resOpts: [String]) async throws {
+//     static func performAction(ctx: MessageCreate, client: DiscordClient, resOpts: [String]) async throws {
 //         let author = "**\(ctx.member?.nick ?? ctx.author?.global_name ?? ctx.author?.username ?? "Zundamon")**"
 //         let dests = ctx.mentions.map(getUserFromMention).map({ "**\($0)**" })
 //         let orig: String
@@ -99,7 +99,7 @@
 //     static func pat(
 //         _ args: ArraySlice<String.SubSequence>,
 //         client: DiscordClient,
-//         ctx: Gateway.MessageCreate
+//         ctx: MessageCreate
 //     ) async throws {
 //         guard let patRes = patRes else { print("pat.txt not loaded"); return }
 //         try await performAction(ctx: ctx, client: client, resOpts: patRes)
--- a/Sources/zundamon/MessageHandler.swift
+++ b/Sources/zundamon/MessageHandler.swift
@@ -1,116 +1,117 @@
-// import Foundation
-// #if canImport(FoundationNetworking)
-// import FoundationNetworking
-// #endif
-// import DiscordBM
-// 
-// struct MessageHandler {
-//     let ctx: Gateway.MessageCreate
-//     let client: any DiscordClient
-// 
-//     static let prefix = ":"
-//     static let zundaGifData = try? Data(contentsOf: URL(filePath: "resources/media/zundamone.gif"))
-// 
-//     func handle() async throws {
-//         guard !(ctx.author?.bot ?? false) else { return }
-//         if (ctx.content.hasPrefix(MessageHandler.prefix)) {
-//             let split = ctx.content.split(separator: " ")
-//             let command = split.first?.trimmingPrefix(MessageHandler.prefix)
-//             let args = split[1...]
-// 
-//             switch command {
-//                 case "wow": try await handleWow(args)
-//                 case "domath": try await Wolfram.handleMath(args, client: client, ctx: ctx)
-//                 case "hug": try await Actions.hug(args, client: client, ctx: ctx)
-//                 case "pat": try await Actions.pat(args, client: client, ctx: ctx)
-//                 case "pet": try await Actions.pat(args, client: client, ctx: ctx)
-//                 default: break
-//             }
-//         } else if ctx.mentions.contains(where: { $0.id == Zundamon.ownID }) {
-//             if ctx.content
-//                 .replacingOccurrences(of: "<@\(Zundamon.ownID!.rawValue)>", with: "")
-//                 .trimmingCharacters(in: .whitespacesAndNewlines)
-//                 .count == 0,
-//                 let zundaGif = MessageHandler.zundaGifData
-//             {
-//                 try await client.createMessage(
-//                     channelId: ctx.channel_id,
-//                     payload: .init(
-//                         message_reference: .init(
-//                             type: .default,
-//                             message_id: ctx.id,
-//                             channel_id: ctx.channel_id,
-//                             guild_id: ctx.guild_id,
-//                         ),
-//                         files: [.init(data: .init(data: zundaGif), filename: "zundamone.gif")],
-//                         attachments: [.init(index: 0, filename: "zundamone.gif")],
-//                     )
-//                 ).guardSuccess()
-//             } else {
-//                 try await handle8Ball()
-//             }
-//         }
-//     }
-// 
-//     static let ballResponses = [
-//         "It is certain.",
-//         "It is decidedly so.",
-//         "Without a doubt.",
-//         "Yes – definitely.",
-//         "You may rely on it.",
-//         "As I see it, yes.",
-//         "Most likely.",
-//         "Outlook good.",
-//         "Yes.",
-//         "Signs point to yes.",
-//         "Reply hazy, try again.",
-//         "Ask again later.",
-//         "Better not tell you now.",
-//         "Cannot predict now.",
-//         "Concentrate and ask again.",
-//         "Don’t count on it.",
-//         "My reply is no.",
-//         "My sources say no.",
-//         "Outlook not so good.",
-//         "Very doubtful.",
-//         "Ui beam",
-//         "We are Shigure Ui",
-//         "We are Shigure Ux",
-//     ]
-//     func handle8Ball() async throws {
-//         try await client.createMessage(
-//             channelId: ctx.channel_id,
-//             payload: .init(
-//                 content: MessageHandler.ballResponses.randomElement(),
-//                 message_reference: .init(
-//                     type: .default,
-//                     message_id: ctx.id,
-//                     channel_id: ctx.channel_id,
-//                     guild_id: ctx.guild_id,
-//                 ),
-//             )
-//         ).guardSuccess()
-//     }
-// 
-//     static let wows = [
-//         "<:wow:1477062414913634334>",
-//         "<:wow2:1477062432357875948>",
-//         "<:wow4:1477062471746588713>",
-//         "<:wow5:1477062452804849845>"
-//     ]
-//     func handleWow(_ args: ArraySlice<String.SubSequence>) async throws {
-//         try await client.createMessage(
-//             channelId: ctx.channel_id,
-//             payload: .init(
-//                 content: MessageHandler.wows.randomElement(),
-//                 message_reference: .init(
-//                     type: .default,
-//                     message_id: ctx.id,
-//                     channel_id: ctx.channel_id,
-//                     guild_id: ctx.guild_id,
-//                 ),
-//             )
-//         ).guardSuccess()
-//     }
-// 
-// }
+import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+import DiscordKit
+
+struct MessageHandler {
+    let ctx: MessageCreate
+    let client: DiscordClient
+
+    static let prefix = ":"
+    static let zundaGifData = try? Data(contentsOf: URL(filePath: "resources/media/zundamone.gif"))
+
+    func handle() async throws {
+        guard !(ctx.author?.bot ?? false) else { return }
+        if (ctx.content.hasPrefix(MessageHandler.prefix)) {
+            let split = ctx.content.split(separator: " ")
+            let command = split.first?.trimmingPrefix(MessageHandler.prefix)
+            let args = split[1...]
+
+            switch command {
+                case "wow": try await handleWow(args)
+                // case "domath": try await Wolfram.handleMath(args, client: client, ctx: ctx)
+                // case "hug": try await Actions.hug(args, client: client, ctx: ctx)
+                // case "pat": try await Actions.pat(args, client: client, ctx: ctx)
+                // case "pet": try await Actions.pat(args, client: client, ctx: ctx)
+                default: break
+            }
+        } else if ctx.mentions.contains(where: { $0.id == Zundamon.ownID }) {
+            if ctx.content
+                .replacingOccurrences(of: "<@\(Zundamon.ownID!)>", with: "")
+                .trimmingCharacters(in: .whitespacesAndNewlines)
+                .count == 0,
+                let zundaGif = MessageHandler.zundaGifData
+            {
+                // try await client.createMessage(
+                //     channelId: ctx.channel_id,
+                //     payload: .init(
+                //         message_reference: .init(
+                //             type: .default,
+                //             message_id: ctx.id,
+                //             channel_id: ctx.channel_id,
+                //             guild_id: ctx.guild_id,
+                //         ),
+                //         files: [.init(data: .init(data: zundaGif), filename: "zundamone.gif")],
+                //         attachments: [.init(index: 0, filename: "zundamone.gif")],
+                //     )
+                // ).guardSuccess()
+            } else {
+                try await handle8Ball()
+            }
+        }
+    }
+
+    static let ballResponses = [
+        "It is certain.",
+        "It is decidedly so.",
+        "Without a doubt.",
+        "Yes – definitely.",
+        "You may rely on it.",
+        "As I see it, yes.",
+        "Most likely.",
+        "Outlook good.",
+        "Yes.",
+        "Signs point to yes.",
+        "Reply hazy, try again.",
+        "Ask again later.",
+        "Better not tell you now.",
+        "Cannot predict now.",
+        "Concentrate and ask again.",
+        "Don’t count on it.",
+        "My reply is no.",
+        "My sources say no.",
+        "Outlook not so good.",
+        "Very doubtful.",
+        "Ui beam",
+        "We are Shigure Ui",
+        "We are Shigure Ux",
+    ]
+    func handle8Ball() async throws {
+        print("yo wuddup")
+        try await client.createMessage(
+            channelId: ctx.channel_id,
+            payload: .init(
+                content: MessageHandler.ballResponses.randomElement(),
+                message_reference: .init(
+                    type: 0,
+                    message_id: ctx.id,
+                    channel_id: ctx.channel_id,
+                    guild_id: ctx.guild_id,
+                ),
+            )
+        )
+    }
+
+    static let wows = [
+        "<:wow:1477062414913634334>",
+        "<:wow2:1477062432357875948>",
+        "<:wow4:1477062471746588713>",
+        "<:wow5:1477062452804849845>"
+    ]
+    func handleWow(_ args: ArraySlice<String.SubSequence>) async throws {
+        try await client.createMessage(
+            channelId: ctx.channel_id,
+            payload: .init(
+                content: MessageHandler.wows.randomElement(),
+                message_reference: .init(
+                    type: 0,
+                    message_id: ctx.id,
+                    channel_id: ctx.channel_id,
+                    guild_id: ctx.guild_id,
+                ),
+            )
+        )
+    }
+
+}
--- a/Sources/zundamon/Wolfram.swift
+++ b/Sources/zundamon/Wolfram.swift
@@ -2,8 +2,8 @@
 // #if canImport(FoundationNetworking)
 // import FoundationNetworking
 // #endif
+// import DiscordKit
 // import XMLCoder
-// import DiscordBM
 // 
 // struct Wolfram {
 //     static let token = ProcessInfo.processInfo.environment["WOLFRAM_APP_ID"]!
@@ -22,7 +22,7 @@
 //         var img: URL?
 // 
 //         if let resultPod = resultPod {
-//             ans = String(resultPod.subpod.compactMap(\.plaintext).joined(by: "\n"))
+//             ans = String(resultPod.subpod.compactMap(\.plaintext).joined(separator: "\n"))
 //                 .replacingOccurrences(of: " | ", with: ": ")
 //         }
 //         if let imgPod = wolframRes.pod.first(where: {
@@ -46,7 +46,7 @@
 //     static func handleMath(
 //         _ args: ArraySlice<String.SubSequence>,
 //         client: DiscordClient,
-//         ctx: Gateway.MessageCreate
+//         ctx: MessageCreate
 //     ) async throws {
 //         try await client.triggerTypingIndicator(channelId: ctx.channel_id).guardSuccess()
 // 
@@ -68,14 +68,14 @@
 //         try await client.createMessage(channelId: ctx.channel_id, payload: .init(
 //             content: answer,
 //             message_reference: .init(
-//                 type: .default,
+//                 type: 0,
 //                 message_id: ctx.id,
 //                 channel_id: ctx.channel_id,
 //                 guild_id: ctx.guild_id,
 //             ),
 //             files: files,
 //             attachments: attachments
-//         )).guardSuccess()
+//         ))
 //     }
 // }
 // 
--- a/Sources/zundamon/Zundamon.swift
+++ b/Sources/zundamon/Zundamon.swift
@@ -4,7 +4,7 @@ import SwiftDotenv

@main
 struct Zundamon {
-    //nonisolated(unsafe) static private(set) var ownID: UserSnowflake? = nil
+    nonisolated(unsafe) static private(set) var ownID: String? = nil

    static func main() async throws {
        if case .failure = Result(catching: { try Dotenv.configure() }) {
@@ -16,9 +16,10 @@ struct Zundamon {
        guard !token.isEmpty else { fatalError("Err: Empty DISCORD_TOKEN. Exiting...") }

        let intents: Intents = [.guilds, .guildMessages, .messageContent, .guildMembers, .directMessages]
-        print(intents)

        let bot = try await DiscordKit.Bot(token: token, intents: intents)
+        ownID = try await bot.client.getOwnUser().id
+        guard ownID != nil else { fatalError("Failed to get own User ID") }

        // let bot = await BotGatewayManager(token: token, intents: [.guildMessages, .messageContent])

@@ -30,6 +31,12 @@ struct Zundamon {
            taskGroup.addTask {
                for await event in await bot.events {
                    dump(event)
+                    switch event.d {
+                        case .messageCreate(let event):
+                            try await MessageHandler(ctx: event, client: bot.client).handle()
+                        default:
+                            continue
+                    }
                }
            }
        }