From 99d2bc2d80b012ffea68b5583a39df34a55f61f0 Mon Sep 17 00:00:00 2001 From: Migan178 Date: Fri, 17 Feb 2023 18:14:28 +0900 Subject: [PATCH] . --- src/Client.ts | 4 ++++ src/Commands/learning_data.ts | 7 +++++-- src/modules/database.ts | 11 ++++++++--- src/modules/index.ts | 13 +++++++++++-- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/Client.ts b/src/Client.ts index e40b1be..2e91be3 100644 --- a/src/Client.ts +++ b/src/Client.ts @@ -9,6 +9,7 @@ import { Command, noPerm, ChatBot, NODE_ENV } from './modules' import { readdirSync } from 'node:fs' import { join } from 'node:path' import 'dotenv/config' +import { execSync } from 'node:child_process' const prefix = '멒힌아 ' @@ -40,6 +41,9 @@ export default class MuffinAI extends Client { }) this.once('ready', () => { + console.log( + `Build Number: ${execSync('git rev-parse --short HEAD').toString()}` + ) this.user!.setActivity({ type: ActivityType.Playing, name: 'ㅅ살려주세요..!', diff --git a/src/Commands/learning_data.ts b/src/Commands/learning_data.ts index f98a90f..0d3e67f 100644 --- a/src/Commands/learning_data.ts +++ b/src/Commands/learning_data.ts @@ -1,4 +1,4 @@ -import { Command, ResponseData } from '../modules' +import { Command, type ResponseData, type NSFWData } from '../modules' import { type Message } from 'discord.js' export default class extends Command { @@ -8,11 +8,14 @@ export default class extends Command { public async execute(msg: Message, args: string[]) { const db = await msg.client.chatBot.db const [rows] = await db.execute('SELECT * FROM statement;') + const [nsfw] = await db.execute('SELECT * FROM nsfw_content;') const muffin: ResponseData[] = [] rows.forEach(row => { if (row.persona === 'muffin') muffin.push(row) else return }) - msg.channel.send(`머핀 데이터: ${muffin.length}개`) + msg.channel.send( + `머핀 데이터: ${muffin.length}개\nnsfw 데이터: ${nsfw.length}` + ) } } diff --git a/src/modules/database.ts b/src/modules/database.ts index 05b4b45..641f524 100644 --- a/src/modules/database.ts +++ b/src/modules/database.ts @@ -5,15 +5,18 @@ import { } from 'mysql2/promise' import 'dotenv/config' -export interface ResponseData extends RowDataPacket { +export interface BaseData extends RowDataPacket { id: number text: string + created_at: string + persona: string +} + +export interface ResponseData extends BaseData { search_text: string conversation: string - created_at: string in_response_to: string | null search_in_response_to: string - persona: string } export const config: ConnectionOptions = { @@ -24,4 +27,6 @@ export const config: ConnectionOptions = { port: (process.env.MYSQL_PORT as unknown as number) || 3306, } +export { BaseData as NSFWData } + export default createConnection(config) diff --git a/src/modules/index.ts b/src/modules/index.ts index 3ffcaf3..e8d06f3 100644 --- a/src/modules/index.ts +++ b/src/modules/index.ts @@ -1,6 +1,15 @@ import ChatBot from './ChatBot' import Command from './Command' -import database, { ResponseData, config } from './database' +import database, { ResponseData, config, NSFWData } from './database' import noPerm from './noPerm' import { NODE_ENV } from './env' -export { ChatBot, Command, database, noPerm, ResponseData, config, NODE_ENV } +export { + ChatBot, + Command, + database, + noPerm, + ResponseData, + config, + NODE_ENV, + NSFWData, +}