diff --git a/src/controllers/discord.controller.ts b/src/controllers/discord.controller.ts index 9b01397..36fb6c4 100644 --- a/src/controllers/discord.controller.ts +++ b/src/controllers/discord.controller.ts @@ -1,9 +1,6 @@ import { Commands, type CommandsType } from "commands"; import { ChannelType, - Client, - Events, - IntentsBitField, type ButtonInteraction, type CacheType, type ChatInputCommandInteraction, @@ -13,7 +10,6 @@ import { import client from "lib/client"; import EventEmitter from "node:events"; import DiscordService from "services/discord.service"; -import config from "config"; import { WaterMeService } from "actions/waterMe/waterMe.service"; import { MedicationService } from "actions/medication/medication.service"; import { HelpService } from "actions/help/help.service"; @@ -52,9 +48,8 @@ export default class DiscordController extends EventEmitter { client.on("interactionCreate", this.handleInteraction.bind(this)); client.on("messageCreate", async (message) => { - console.log(message.id) - if (message.channel.type === ChannelType.DM - ) { + console.log(message.id); + if (message.channel.type === ChannelType.DM) { console.log("got msg"); this.dmService.forward(message); } diff --git a/src/db/schema.ts b/src/db/schema.ts index 1a63496..10cd2cb 100644 --- a/src/db/schema.ts +++ b/src/db/schema.ts @@ -1,12 +1,10 @@ -import { TimestampStyles } from "discord.js"; -import { timestamp } from "drizzle-orm/mysql-core"; -import { integer, int, sqliteTable, text } from "drizzle-orm/sqlite-core"; +import { integer, sqliteTable, text } from "drizzle-orm/sqlite-core"; export const usersTable = sqliteTable("users_table", { - id: integer().primaryKey({ autoIncrement: true }), - name: text().notNull(), - discord_id: integer().notNull().unique(), - join_streak: integer(), - last_joined_at: integer({ mode: "timestamp" }), - took_medication_today: integer().notNull().default(0), + id: integer().primaryKey({ autoIncrement: true }), + name: text().notNull(), + discord_id: integer().notNull().unique(), + join_streak: integer(), + last_joined_at: integer({ mode: "timestamp" }), + took_medication_today: integer().notNull().default(0), }); diff --git a/src/lib/client.ts b/src/lib/client.ts index cbaa4ee..827dcf5 100644 --- a/src/lib/client.ts +++ b/src/lib/client.ts @@ -1,21 +1,28 @@ import config from "config"; -import { Client, GatewayIntentBits, Partials, ChannelType, Events, IntentsBitField } from "discord.js"; +import { + Client, + GatewayIntentBits, + Partials, + IntentsBitField, +} from "discord.js"; const client = new Client({ - intents: [IntentsBitField.Flags.Guilds, - IntentsBitField.Flags.GuildMembers, - IntentsBitField.Flags.GuildModeration, - IntentsBitField.Flags.GuildMessages, - IntentsBitField.Flags.GuildMessageReactions, - IntentsBitField.Flags.GuildMessagePolls, - IntentsBitField.Flags.MessageContent, - IntentsBitField.Flags.DirectMessages, - IntentsBitField.Flags.DirectMessageReactions, - IntentsBitField.Flags.DirectMessageTyping, - IntentsBitField.Flags.DirectMessagePolls, - GatewayIntentBits.DirectMessages, - GatewayIntentBits.MessageContent], - partials: [Partials.Channel, Partials.Message] + intents: [ + IntentsBitField.Flags.Guilds, + IntentsBitField.Flags.GuildMembers, + IntentsBitField.Flags.GuildModeration, + IntentsBitField.Flags.GuildMessages, + IntentsBitField.Flags.GuildMessageReactions, + IntentsBitField.Flags.GuildMessagePolls, + IntentsBitField.Flags.MessageContent, + IntentsBitField.Flags.DirectMessages, + IntentsBitField.Flags.DirectMessageReactions, + IntentsBitField.Flags.DirectMessageTyping, + IntentsBitField.Flags.DirectMessagePolls, + GatewayIntentBits.DirectMessages, + GatewayIntentBits.MessageContent, + ], + partials: [Partials.Channel, Partials.Message], }); await client.login(config.discord.token);