.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "muffin-ai-arujak",
-  "version": "2.0.0-79-oreo",
+  "version": "2.0.0-80-oreo",
   "main": "dist/index.js",
   "private": true,
   "dependencies": {

src/Client.ts

@@ -33,16 +33,6 @@ export default class MuffinAI extends Client {
     if (NODE_ENV === 'development') this.on('debug', console.info)
     this.chatBot.train(this)
 
-    setInterval(async () => {
-      const db = await this.chatBot.db.getConnection()
-
-      await db.beginTransaction()
-      await db.ping()
-      await db.commit()
-
-      db.release()
-    }, 600000)
-
     readdirSync(join(__dirname, 'Commands')).forEach(file => {
       const a = require(join(__dirname, 'Commands', file))
       const b: Command = new a.default()

src/Commands/deleteLearn.ts

@@ -1,5 +1,5 @@
 import { Message } from 'discord.js'
-import { Command, LearnData } from '../modules'
+import { Command } from '../modules'
 
 export default class extends Command {
   public constructor() {
@@ -9,32 +9,21 @@ export default class extends Command {
     if (!args[0]) {
       return await msg.channel.send('```멒힌아 삭제 (지울 단어)```')
     }
-    const db = await msg.client.chatBot.db.getConnection()
     const command = args[0]
-    const [rows] = await db.execute<LearnData[]>(
-      'SELECT * FROM learn WHERE command = ?;',
-      [command],
-    )
+    const db = msg.client.chatBot.db
+    const data = await db.learn.findOne(command)
 
-    if (!rows[0]) {
+    if (!data[0]) {
       return await msg.channel.send('해당하는 걸 찾ㅈ을 수 없어요.')
     }
 
-    if (rows[0].user_id !== msg.author.id) {
+    if (data[0].user_id !== msg.author.id) {
       return await msg.channel.send(
         '당신ㄴ은 해당 지식을 안가르ㄹ쳐 주셨ㅅ는데요?',
       )
     }
 
-    try {
-      await db.beginTransaction()
-      await db.execute('DELETE FROM learn WHERE command = ?;', [command])
+    await db.learn.delete(command)
     await msg.channel.send('해당 단어를 삭ㄱ제했어요.')
-      await db.commit()
-    } catch (err) {
-      console.error(err)
-    } finally {
-      db.release()
-    }
   }
 }

src/Commands/learn.ts

@@ -1,4 +1,4 @@
-import { Command, LearnData } from '../modules'
+import { Command } from '../modules'
 import { Message } from 'discord.js'
 import config from '../../config.json'
 
@@ -27,17 +27,14 @@ export default class extends Command {
       '삭제',
     ]
     const disallowed = ['@everyone', '@here', `<@${config.bot.owner_ID}>`]
-    const db = await msg.client.chatBot.db.getConnection()
-    const [learn] = await db.execute<LearnData[]>(
-      'SELECT * FROM learn WHERE command = ?;',
-      [command],
-    )
+    const db = msg.client.chatBot.db
+    const data = await db.learn.findOne(command)
 
-    if (learn[0]) {
-      if (msg.author.id !== learn[0].user_id) {
+    if (data[0]) {
+      if (msg.author.id !== data[0].user_id) {
         return msg.channel.send(
           `해ㄷ당 단어는 이미 ${
-            (await msg.client.users.fetch(learn[0].user_id)).username
+            (await msg.client.users.fetch(data[0].user_id)).username
           }님에게서 배웠어요.`,
         )
       }
@@ -55,30 +52,19 @@ export default class extends Command {
       }
     }
 
-    try {
-      await db.beginTransaction()
-
-      if (learn[0] && msg.author.id === learn[0].user_id) {
-        await db.execute('UPDATE learn SET result = ? WHERE command = ?;', [
-          result,
+    if (data[0] && msg.author.id === data[0].user_id) {
+      await db.learn.update({
         command,
-        ])
+        result,
+      })
       await msg.channel.send(`${command}을/를 다시 배ㅂ웠어요.`)
     } else {
-        await db.execute(
-          'INSERT INTO learn (command, result, user_id) VALUES (?, ?, ?);',
-          [command, result, msg.author.id],
-        )
+      await db.learn.insert({
+        command,
+        result,
+        user_id: msg.author.id,
+      })
       await msg.channel.send(`${command}을/를 배웠ㅇ어요.`)
     }
-
-      await db.commit()
-    } catch (err) {
-      console.error(err)
-      await db.rollback()
-      await msg.channel.send('배우는데 오류ㄹ가 생겨서 배우지 못했어ㅇ요.')
-    } finally {
-      db.release()
-    }
   }
 }

src/Commands/learning_data.ts

@@ -1,22 +1,22 @@
-import { Command, type ResponseData, type NSFWData } from '../modules'
+import { Command, type ResponseData } from '../modules'
 import { type Message } from 'discord.js'
 
 export default class extends Command {
   public constructor() {
     super('학습데이터량')
   }
-  public async execute(msg: Message, args: string[]) {
-    const db = await msg.client.chatBot.db.getConnection()
-    const [rows] = await db.execute<ResponseData[]>('SELECT * FROM statement;')
-    const [nsfw] = await db.execute<NSFWData[]>('SELECT * FROM nsfw_content;')
+  public async execute(msg: Message<true>, args: string[]) {
+    const db = msg.client.chatBot.db
+    const data = await db.statement.all()
+    const nsfwData = await db.nsfwContent.all()
+    const learnData = await db.learn.all()
     const muffin: ResponseData[] = []
-    rows.forEach(row => {
+    data.forEach(row => {
       if (row.persona === 'muffin') muffin.push(row)
       else return
     })
     msg.channel.send(
-      `머핀 데이터: ${muffin.length}개\nnsfw 데이터: ${nsfw.length}개`,
+      `머핀 데이터: ${muffin.length}개\nnsfw 데이터: ${nsfwData.length}개\n지금까지 배운 단어: ${learnData.length}개`,
     )
-    db.release()
   }
 }

src/Commands/list.ts

@@ -1,5 +1,5 @@
 import { Message, codeBlock } from 'discord.js'
-import { Command, LearnData } from '../modules'
+import { Command } from '../modules'
 
 export default class extends Command {
   public constructor() {
@@ -7,21 +7,18 @@ export default class extends Command {
   }
 
   public async execute(msg: Message<boolean>, args: string[]) {
-    const db = await msg.client.chatBot.db.getConnection()
-    const [rows] = await db.execute<LearnData[]>(
-      'SELECT * FROM learn WHERE user_id = ?;',
-      [msg.author.id],
-    )
+    const db = msg.client.chatBot.db
+    const data = await db.learn.findOneAnotherKey('user_id', msg.author.id)
     const list: string[] = []
 
-    if (!rows) {
+    if (!data[0]) {
       return await msg.channel.send(
         '당신ㄴ은 단어를 가르쳐준 기억이 없ㅅ는데요.',
       )
     }
 
-    for (const data of rows) {
-      list.push(data.command)
+    for (const listData of data) {
+      list.push(listData.command)
     }
 
     await msg.channel.send({
@@ -33,7 +30,7 @@ export default class extends Command {
             list.map(item => `-  ${item}`).join('\n'),
           ),
           color: 0x0000ff,
-          timestamp: new Date().toISOString()
+          timestamp: new Date().toISOString(),
         },
       ],
     })

src/modules/ChatBot.ts

@@ -1,26 +1,21 @@
 import type { Client, Message } from 'discord.js'
-import { database, LearnData, ResponseData } from './database'
+import { MaaDatabase } from './database'
 import { TextChannel } from 'discord.js'
 import config from '../../config.json'
 import { NODE_ENV } from '.'
 
 export default class ChatBot {
   get db() {
-    return this.#db
+    return new MaaDatabase()
   }
-  #db = database
   public async getResponse(msg: Message): Promise<string> {
-    const db = await this.db.getConnection()
-    const [rows] = await db.execute<ResponseData[]>('SELECT * FROM statement;')
+    const data = await this.db.statement.all()
     const args = msg.content
       .slice('머핀아 '.length)
       .trim()
       .split(/ +/g)
       .join(' ')
-    const [learn] = await db.execute<LearnData[]>(
-      'SELECT * from learn WHERE command = ?;',
-      [args],
-    )
+    const learnData = await this.db.learn.findOne(args)
     const a = Math.round(Math.random() * (2 - 1) + 1)
 
     if (NODE_ENV === 'development') {
@@ -29,11 +24,10 @@ export default class ChatBot {
     }
 
     if (a === 1) {
-      if (learn[0]) {
-        if (args.startsWith(learn[0].command)) {
-          db.release()
-          return `${learn[0].result}\n\`${
-            (await msg.client.users.fetch(learn[0].user_id)).username
+      if (learnData[0]) {
+        if (args.startsWith(learnData[0].command)) {
+          return `${learnData[0].result}\n\`${
+            (await msg.client.users.fetch(learnData[0].user_id)).username
           }님이 알려주셨어요.\``
         }
       }
@@ -41,66 +35,44 @@ export default class ChatBot {
 
     let response: string
     if ((msg.channel as TextChannel).nsfw) {
-      const [rows1] = await db.execute<ResponseData[]>(
-        'SELECT * FROM nsfw_content;',
-      )
-      const rows2 = [...rows, ...rows1]
-      response = rows2[Math.floor(Math.random() * rows2.length)].text
+      const NSFWData = await this.db.nsfwContent.all()
+      const dataList = [...data, ...NSFWData]
+      response = dataList[Math.floor(Math.random() * dataList.length)].text
     } else {
-      response = rows[Math.floor(Math.random() * rows.length)].text
+      response = data[Math.floor(Math.random() * data.length)].text
     }
     if (!response) response = '살ㄹ려주세요'
-    db.release()
     return response
   }
 
   public async train(client: Client): Promise<ChatBot> {
-    const db = await this.db.getConnection()
     client.on('messageCreate', async msg => {
       if (msg.author.bot) return
       if (msg.author.id === config.train.user_ID) {
         const response = await this.getResponse(msg)
-        const [rows] = await db.execute<ResponseData[]>(
-          'SELECT * FROM statement;',
-        )
-        try {
-          await db.beginTransaction()
-          await db.execute(
-            'INSERT INTO statement (id, text, persona, in_response_to) VALUES (?, ?, ?, ?);',
-            [++rows[rows.length - 1].id, msg.content, 'muffin', response],
-          )
-          await db.commit()
-        } catch (err) {
-          console.log(err)
-          await db.rollback()
-        }
+        const data = await this.db.statement.all()
+        await this.db.statement.insert({
+          id: ++data[data.length - 1].id,
+          text: msg.content,
+          persona: 'muffin',
+          in_response_to: response,
+        })
       } else {
         if (!(msg.channel as TextChannel).nsfw) return
         if (!msg.content.startsWith('머핀아 ')) return
         const user = `user:${msg.author.username.slice(0, 50).toLowerCase()}`
         const text = msg.content.replace('머핀아 ', '')
-        const [rows] = await db.execute<ResponseData[]>(
-          'SELECT * FROM nsfw_content;',
-        )
-        try {
-          await db.beginTransaction()
-          await db.execute(
-            `INSERT INTO nsfw_content (id, text, persona) VALUES (?, ?, ?);`,
-            [++rows[rows.length - 1].id, text, user],
-          )
-          await db.commit()
-        } catch (err) {
-          console.log(err)
-          await db.rollback()
-        }
+        const data = await this.db.nsfwContent.all()
+        await this.db.nsfwContent.insert({
+          id: ++data[data.length - 1].id,
+          text,
+          persona: user,
+        })
       }
     })
-    db.release()
 
     setInterval(async () => {
-      const db = await database.getConnection()
-      await db.ping()
-      db.release()
+      await this.db.ping()
     }, 60000)
     return this
   }

src/modules/index.ts

@@ -1,18 +1,11 @@
 import ChatBot from './ChatBot'
 import Command from './Command'
-import {
-  database,
-  ResponseData,
-  NSFWData,
-  LearnData,
-  MaaDatabase,
-} from './database'
+import { ResponseData, NSFWData, LearnData, MaaDatabase } from './database'
 import noPerm from './noPerm'
 import { NODE_ENV } from './env'
 export {
   ChatBot,
   Command,
-  database,
   noPerm,
   ResponseData,
   NODE_ENV,