From 4741406e4a6406ce78adee85253dc974489ec5fc Mon Sep 17 00:00:00 2001
From: tresabhi <43380238+tresabhi@users.noreply.github.com>
Date: Mon, 21 Apr 2025 18:30:35 -0500
Subject: [PATCH] fix: include prisma only in bot

---
 .gitignore                                                 | 2 +-
 packages/bot/src/commands/link.tsx                         | 7 ++-----
 packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts      | 5 +++--
 packages/bot/src/core/blitzkit/processes.ts                | 2 +-
 .../src/blitzkit => bot/src/core/db}/flagUserActivity.ts   | 2 +-
 .../blitzkit => bot/src/core/db}/linkBlitzAndDiscord.ts    | 2 +-
 packages/{core/src/databases => bot/src/core/db}/users.ts  | 2 +-
 packages/core/src/blitzkit/index.ts                        | 2 --
 packages/core/src/databases/index.ts                       | 1 -
 packages/core/src/index.ts                                 | 1 -
 prisma/schema.prisma                                       | 2 +-
 11 files changed, 11 insertions(+), 17 deletions(-)
 rename packages/{core/src/blitzkit => bot/src/core/db}/flagUserActivity.ts (79%)
 rename packages/{core/src/blitzkit => bot/src/core/db}/linkBlitzAndDiscord.ts (88%)
 rename packages/{core/src/databases => bot/src/core/db}/users.ts (52%)
 delete mode 100644 packages/core/src/databases/index.ts

diff --git a/.gitignore b/.gitignore
index 9422d5c7b..87a643861 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,4 @@ target
 /.astro
 .vercel
 /src
-/packages/core/src/prisma
\ No newline at end of file
+/packages/bot/src/prisma
\ No newline at end of file
diff --git a/packages/bot/src/commands/link.tsx b/packages/bot/src/commands/link.tsx
index a80f15c3a..9096b7520 100644
--- a/packages/bot/src/commands/link.tsx
+++ b/packages/bot/src/commands/link.tsx
@@ -1,11 +1,8 @@
-import {
-  getAccountInfo,
-  getClanAccountInfo,
-  linkBlitzAndDiscord,
-} from '@blitzkit/core';
+import { getAccountInfo, getClanAccountInfo } from '@blitzkit/core';
 import { teal } from '@radix-ui/colors';
 import { Glow } from '../components/AllStatsOverview/components/HeroStat/components/Glow';
 import { CommandWrapper } from '../components/CommandWrapper';
+import { linkBlitzAndDiscord } from '../core/db/linkBlitzAndDiscord';
 import { addUsernameChoices } from '../core/discord/addUsernameChoices';
 import { autocompleteUsername } from '../core/discord/autocompleteUsername';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
diff --git a/packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts b/packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts
index 4bb31df02..16088c64b 100644
--- a/packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts
+++ b/packages/bot/src/core/blitzkit/getBlitzFromDiscord.ts
@@ -1,5 +1,6 @@
-import { idToRegion, usersDatabase } from '@blitzkit/core';
-import { flagUserActivity } from '@blitzkit/core/src/blitzkit/flagUserActivity';
+import { idToRegion } from '@blitzkit/core';
+import { flagUserActivity } from '../db/flagUserActivity';
+import { usersDatabase } from '../db/users';
 
 export async function getBlitzFromDiscord(discordId: bigint) {
   const unique = await usersDatabase.discordUser.findUnique({
diff --git a/packages/bot/src/core/blitzkit/processes.ts b/packages/bot/src/core/blitzkit/processes.ts
index 01d055cd4..096fbdb25 100644
--- a/packages/bot/src/core/blitzkit/processes.ts
+++ b/packages/bot/src/core/blitzkit/processes.ts
@@ -1,4 +1,4 @@
-import { usersDatabase } from '@blitzkit/core';
+import { usersDatabase } from '../db/users';
 import { client } from '../discord/client';
 
 const EXIT_EVENTS = [
diff --git a/packages/core/src/blitzkit/flagUserActivity.ts b/packages/bot/src/core/db/flagUserActivity.ts
similarity index 79%
rename from packages/core/src/blitzkit/flagUserActivity.ts
rename to packages/bot/src/core/db/flagUserActivity.ts
index 986e0a666..4fa958410 100644
--- a/packages/core/src/blitzkit/flagUserActivity.ts
+++ b/packages/bot/src/core/db/flagUserActivity.ts
@@ -1,4 +1,4 @@
-import { usersDatabase } from '@blitzkit/core';
+import { usersDatabase } from './users';
 
 export async function flagUserActivity(blitzId: number) {
   await usersDatabase.user.upsert({
diff --git a/packages/core/src/blitzkit/linkBlitzAndDiscord.ts b/packages/bot/src/core/db/linkBlitzAndDiscord.ts
similarity index 88%
rename from packages/core/src/blitzkit/linkBlitzAndDiscord.ts
rename to packages/bot/src/core/db/linkBlitzAndDiscord.ts
index 813ea0aab..229aaeb1c 100644
--- a/packages/core/src/blitzkit/linkBlitzAndDiscord.ts
+++ b/packages/bot/src/core/db/linkBlitzAndDiscord.ts
@@ -1,5 +1,5 @@
-import { usersDatabase } from '@blitzkit/core';
 import { flagUserActivity } from './flagUserActivity';
+import { usersDatabase } from './users';
 
 export async function linkBlitzAndDiscord(discordId: bigint, blitzId: number) {
   await usersDatabase.discordUser.upsert({
diff --git a/packages/core/src/databases/users.ts b/packages/bot/src/core/db/users.ts
similarity index 52%
rename from packages/core/src/databases/users.ts
rename to packages/bot/src/core/db/users.ts
index e1f065106..bfa600844 100644
--- a/packages/core/src/databases/users.ts
+++ b/packages/bot/src/core/db/users.ts
@@ -1,3 +1,3 @@
-import { PrismaClient } from '../prisma';
+import { PrismaClient } from '../../prisma';
 
 export const usersDatabase = new PrismaClient();
diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts
index 2221072c9..c5c879837 100644
--- a/packages/core/src/blitzkit/index.ts
+++ b/packages/core/src/blitzkit/index.ts
@@ -13,7 +13,6 @@ export * from './discoveredIdDefinitions';
 export * from './emblemURL';
 export * from './equipmentDefinitions';
 export * from './eventManager';
-// export * from './flagUserActivity';
 export * from './gameDefinitions';
 export * from './getArchivedLatestSeasonNumber';
 // export * from './getArchivedRatingInfo';
@@ -21,7 +20,6 @@ export * from './getArchivedRatingLeaderboard';
 // export * from './getArchivedRatingMidnightLeaderboard';
 export * from './getTimeDaysAgo';
 export * from './isExplosive';
-export * from './linkBlitzAndDiscord';
 export * from './mapDefinitions';
 export * from './modelDefinitions';
 export * from './normalizeBoundingBox';
diff --git a/packages/core/src/databases/index.ts b/packages/core/src/databases/index.ts
deleted file mode 100644
index b18bf4cae..000000000
--- a/packages/core/src/databases/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './users';
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index cae496f70..8fd80f89d 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -1,6 +1,5 @@
 export * from './blitz';
 export * from './blitzkit';
-export * from './databases';
 export * from './imgur';
 export * from './math';
 export * from './patreon';
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index d8d66ff34..dcc620ae3 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -1,7 +1,7 @@
 generator client {
   provider      = "prisma-client-js"
   binaryTargets = ["native", "debian-openssl-1.1.x", "debian-openssl-3.0.x"]
-  output        = "../packages/core/src/prisma"
+  output        = "../packages/bot/src/prisma"
 }
 
 datasource db {