diff --git a/.gitignore b/.gitignore index 4e71e762..829ab221 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,5 @@ files/ config.json .vscode/settings.json -api/assets/plugins/*.js build diff --git a/package-lock.json b/package-lock.json index df9cfbff..490bc442 100644 Binary files a/package-lock.json and b/package-lock.json differ diff --git a/src-slowcord/bot/package-lock.json b/src-slowcord/bot/package-lock.json index 0d72daab..7d1c59ed 100644 Binary files a/src-slowcord/bot/package-lock.json and b/src-slowcord/bot/package-lock.json differ diff --git a/src-slowcord/bot/package.json b/src-slowcord/bot/package.json index 847cef09..454f84cb 100644 --- a/src-slowcord/bot/package.json +++ b/src-slowcord/bot/package.json @@ -10,7 +10,7 @@ "author": "", "license": "ISC", "dependencies": { - "@fosscord/util": "file:../../util", + "fosscord-server": "file:../..", "fosscord-gopnik": "^1.0.0", "mysql": "^2.18.1", "typescript": "^4.7.4" diff --git a/src-slowcord/bot/src/index.ts b/src-slowcord/bot/src/index.ts index ae69111b..253f759c 100644 --- a/src-slowcord/bot/src/index.ts +++ b/src-slowcord/bot/src/index.ts @@ -1,7 +1,7 @@ import "dotenv/config"; import Fosscord from "fosscord-gopnik"; import Bot from "./Bot.js"; // huh? -import { initDatabase } from "@fosscord/util"; +import { initDatabase } from "fosscord-server/src/util"; const client = new Fosscord.Client({ intents: ["GUILD_MESSAGES"], diff --git a/src-slowcord/login/package-lock.json b/src-slowcord/login/package-lock.json index 82eac102..72c8c257 100644 Binary files a/src-slowcord/login/package-lock.json and b/src-slowcord/login/package-lock.json differ diff --git a/src-slowcord/login/package.json b/src-slowcord/login/package.json index b458a875..cc10ff7f 100644 --- a/src-slowcord/login/package.json +++ b/src-slowcord/login/package.json @@ -3,6 +3,7 @@ "version": "1.0.0", "description": "Slowcord login service", "main": "build/index.js", + "types": "src/index.ts", "scripts": { "build": "tsc -b", "start": "node build/index.js" @@ -18,7 +19,7 @@ }, "homepage": "https://github.com/maddyunderstars/fosscord-server#readme", "dependencies": { - "@fosscord/util": "file:../../util", + "fosscord-server": "file:../../", "cookie-parser": "^1.4.6", "dotenv": "^16.0.1", "express": "^4.18.1", diff --git a/src-slowcord/login/src/index.ts b/src-slowcord/login/src/index.ts index a17e9eaa..56d0a687 100644 --- a/src-slowcord/login/src/index.ts +++ b/src-slowcord/login/src/index.ts @@ -1,8 +1,7 @@ import "dotenv/config"; import express, { Request, Response } from "express"; import cookieParser from "cookie-parser"; -import * as util from "@fosscord/util"; -const { initDatabase, generateToken, User, Config, handleFile } = util; +import { initDatabase, generateToken, User, Config, handleFile } from "fosscord-server/src/util"; import path from "path"; import fetch from "node-fetch";