diff --git a/backend/api/controllers/ape-keys.ts b/backend/api/controllers/ape-keys.ts index 2e4a14df5..87456a722 100644 --- a/backend/api/controllers/ape-keys.ts +++ b/backend/api/controllers/ape-keys.ts @@ -2,9 +2,9 @@ import _ from "lodash"; import { randomBytes } from "crypto"; import { hash } from "bcrypt"; import ApeKeysDAO from "../../dao/ape-keys"; -import MonkeyError from "../../handlers/error"; -import { MonkeyResponse } from "../../handlers/monkey-response"; -import { base64UrlEncode } from "../../handlers/misc"; +import MonkeyError from "../../utils/error"; +import { MonkeyResponse } from "../../utils/monkey-response"; +import { base64UrlEncode } from "../../utils/misc"; function cleanApeKey(apeKey: MonkeyTypes.ApeKey): Partial { return _.omit(apeKey, "hash"); diff --git a/backend/api/controllers/config.ts b/backend/api/controllers/config.ts index 1f9af9e2e..b32ffd9af 100644 --- a/backend/api/controllers/config.ts +++ b/backend/api/controllers/config.ts @@ -1,5 +1,5 @@ import ConfigDAO from "../../dao/config"; -import { MonkeyResponse } from "../../handlers/monkey-response"; +import { MonkeyResponse } from "../../utils/monkey-response"; class ConfigController { static async getConfig(req: MonkeyTypes.Request): Promise { diff --git a/backend/api/controllers/leaderboards.ts b/backend/api/controllers/leaderboards.ts index b0344562e..ddad9207d 100644 --- a/backend/api/controllers/leaderboards.ts +++ b/backend/api/controllers/leaderboards.ts @@ -1,5 +1,5 @@ import _ from "lodash"; -import { MonkeyResponse } from "../../handlers/monkey-response"; +import { MonkeyResponse } from "../../utils/monkey-response"; import LeaderboardsDAO from "../../dao/leaderboards"; class LeaderboardsController { diff --git a/backend/api/controllers/preset.ts b/backend/api/controllers/preset.ts index 094f09c5d..f7164065f 100644 --- a/backend/api/controllers/preset.ts +++ b/backend/api/controllers/preset.ts @@ -1,5 +1,5 @@ import PresetDAO from "../../dao/preset"; -import { MonkeyResponse } from "../../handlers/monkey-response"; +import { MonkeyResponse } from "../../utils/monkey-response"; class PresetController { static async getPresets(req: MonkeyTypes.Request): Promise { diff --git a/backend/api/controllers/psa.ts b/backend/api/controllers/psa.ts index 8fb60ea18..027c44a70 100644 --- a/backend/api/controllers/psa.ts +++ b/backend/api/controllers/psa.ts @@ -1,5 +1,5 @@ import PsaDAO from "../../dao/psa"; -import { MonkeyResponse } from "../../handlers/monkey-response"; +import { MonkeyResponse } from "../../utils/monkey-response"; class PsaController { static async get(_req: MonkeyTypes.Request): Promise { diff --git a/backend/api/controllers/quotes.ts b/backend/api/controllers/quotes.ts index 5b2b656a3..4a43f37ee 100644 --- a/backend/api/controllers/quotes.ts +++ b/backend/api/controllers/quotes.ts @@ -4,10 +4,10 @@ import UserDAO from "../../dao/user"; import ReportDAO from "../../dao/report"; import NewQuotesDao from "../../dao/new-quotes"; import QuoteRatingsDAO from "../../dao/quote-ratings"; -import MonkeyError from "../../handlers/error"; -import { verify } from "../../handlers/captcha"; -import Logger from "../../handlers/logger"; -import { MonkeyResponse } from "../../handlers/monkey-response"; +import MonkeyError from "../../utils/error"; +import { verify } from "../../utils/captcha"; +import Logger from "../../utils/logger"; +import { MonkeyResponse } from "../../utils/monkey-response"; class QuotesController { static async getQuotes(_req: MonkeyTypes.Request): Promise { diff --git a/backend/api/controllers/result.js b/backend/api/controllers/result.js index 0a1a88a62..4602072e6 100644 --- a/backend/api/controllers/result.js +++ b/backend/api/controllers/result.js @@ -2,12 +2,12 @@ import ResultDAO from "../../dao/result"; import UserDAO from "../../dao/user"; import PublicStatsDAO from "../../dao/public-stats"; import BotDAO from "../../dao/bot"; -import { roundTo2, stdDev } from "../../handlers/misc"; +import { roundTo2, stdDev } from "../../utils/misc"; import node_object_hash from "node-object-hash"; -import Logger from "../../handlers/logger"; +import Logger from "../../utils/logger"; import "dotenv/config"; -import { MonkeyResponse } from "../../handlers/monkey-response"; -import MonkeyError from "../../handlers/error"; +import { MonkeyResponse } from "../../utils/monkey-response"; +import MonkeyError from "../../utils/error"; import { implemented as anticheatImplemented, validateResult, diff --git a/backend/api/controllers/user.ts b/backend/api/controllers/user.ts index 76a1bee72..f6601a99c 100644 --- a/backend/api/controllers/user.ts +++ b/backend/api/controllers/user.ts @@ -1,11 +1,11 @@ import _ from "lodash"; import UsersDAO from "../../dao/user"; import BotDAO from "../../dao/bot"; -import MonkeyError from "../../handlers/error"; -import Logger from "../../handlers/logger.js"; -import { MonkeyResponse } from "../../handlers/monkey-response"; -import { linkAccount } from "../../handlers/discord"; -import { buildAgentLog } from "../../handlers/misc"; +import MonkeyError from "../../utils/error"; +import Logger from "../../utils/logger.js"; +import { MonkeyResponse } from "../../utils/monkey-response"; +import { linkAccount } from "../../utils/discord"; +import { buildAgentLog } from "../../utils/misc"; function cleanUser(user: MonkeyTypes.User): Omit { return _.omit(user, "apeKeys"); diff --git a/backend/api/routes/index.ts b/backend/api/routes/index.ts index 6076b8a92..602475ed4 100644 --- a/backend/api/routes/index.ts +++ b/backend/api/routes/index.ts @@ -7,7 +7,7 @@ import leaderboards from "./leaderboards"; import quotes from "./quotes"; import apeKeys from "./ape-keys"; import { asyncHandler } from "../../middlewares/api-utils"; -import { MonkeyResponse } from "../../handlers/monkey-response"; +import { MonkeyResponse } from "../../utils/monkey-response"; import { Application, NextFunction, Response } from "express"; import swStats from "swagger-stats"; diff --git a/backend/api/routes/users.ts b/backend/api/routes/users.ts index 3e20c0352..34d83cae2 100644 --- a/backend/api/routes/users.ts +++ b/backend/api/routes/users.ts @@ -4,7 +4,7 @@ import { Router } from "express"; import UserController from "../controllers/user"; import { asyncHandler, validateRequest } from "../../middlewares/api-utils"; import * as RateLimit from "../../middlewares/rate-limit"; -import { isUsernameValid } from "../../handlers/validation"; +import { isUsernameValid } from "../../utils/validation"; const router = Router(); diff --git a/backend/dao/ape-keys.ts b/backend/dao/ape-keys.ts index 96021c602..118a971da 100644 --- a/backend/dao/ape-keys.ts +++ b/backend/dao/ape-keys.ts @@ -1,7 +1,7 @@ import _ from "lodash"; import UsersDAO from "./user"; import { ObjectId } from "mongodb"; -import MonkeyError from "../handlers/error"; +import MonkeyError from "../utils/error"; function checkIfKeyExists( apeKeys: MonkeyTypes.User["apeKeys"], diff --git a/backend/dao/leaderboards.js b/backend/dao/leaderboards.js index f0d6cd411..f10ad9de3 100644 --- a/backend/dao/leaderboards.js +++ b/backend/dao/leaderboards.js @@ -1,5 +1,5 @@ import db from "../init/db"; -import Logger from "../handlers/logger"; +import Logger from "../utils/logger"; import { performance } from "perf_hooks"; class LeaderboardsDAO { diff --git a/backend/dao/new-quotes.js b/backend/dao/new-quotes.js index 80a9e815c..d1d7bfa06 100644 --- a/backend/dao/new-quotes.js +++ b/backend/dao/new-quotes.js @@ -4,7 +4,7 @@ import stringSimilarity from "string-similarity"; import path from "path"; import fs from "fs"; import db from "../init/db"; -import MonkeyError from "../handlers/error"; +import MonkeyError from "../utils/error"; let git; try { diff --git a/backend/dao/preset.js b/backend/dao/preset.js index 49a6b69f3..95af8d46f 100644 --- a/backend/dao/preset.js +++ b/backend/dao/preset.js @@ -1,4 +1,4 @@ -import MonkeyError from "../handlers/error"; +import MonkeyError from "../utils/error"; import db from "../init/db"; import { ObjectId } from "mongodb"; diff --git a/backend/dao/public-stats.js b/backend/dao/public-stats.js index 0228d45f1..c5d4097c0 100644 --- a/backend/dao/public-stats.js +++ b/backend/dao/public-stats.js @@ -1,5 +1,5 @@ import db from "../init/db"; -import { roundTo2 } from "../handlers/misc"; +import { roundTo2 } from "../utils/misc"; class PublicStatsDAO { //needs to be rewritten, this is public stats not user stats diff --git a/backend/dao/report.js b/backend/dao/report.js index 339887118..ea39eb1ae 100644 --- a/backend/dao/report.js +++ b/backend/dao/report.js @@ -1,4 +1,4 @@ -import MonkeyError from "../handlers/error"; +import MonkeyError from "../utils/error"; import db from "../init/db"; class ReportDAO { static async createReport(report, maxReports, contentReportLimit) { diff --git a/backend/dao/result.js b/backend/dao/result.js index 1e83e7613..ab5f9a2b3 100644 --- a/backend/dao/result.js +++ b/backend/dao/result.js @@ -1,5 +1,5 @@ import { ObjectId } from "mongodb"; -import MonkeyError from "../handlers/error"; +import MonkeyError from "../utils/error"; import db from "../init/db"; import UserDAO from "./user"; diff --git a/backend/dao/user.js b/backend/dao/user.js index dd5258fa0..c494ec1d8 100644 --- a/backend/dao/user.js +++ b/backend/dao/user.js @@ -1,9 +1,9 @@ import _ from "lodash"; -import { isUsernameValid } from "../handlers/validation"; -import { updateAuthEmail } from "../handlers/auth"; -import { checkAndUpdatePb } from "../handlers/pb"; +import { isUsernameValid } from "../utils/validation"; +import { updateAuthEmail } from "../utils/auth"; +import { checkAndUpdatePb } from "../utils/pb"; import db from "../init/db"; -import MonkeyError from "../handlers/error"; +import MonkeyError from "../utils/error"; import { ObjectId } from "mongodb"; class UsersDAO { diff --git a/backend/init/configuration.ts b/backend/init/configuration.ts index 3c856c48c..8199a4b61 100644 --- a/backend/init/configuration.ts +++ b/backend/init/configuration.ts @@ -1,7 +1,7 @@ import db from "./db"; import _ from "lodash"; -import Logger from "../handlers/logger.js"; -import { identity } from "../handlers/misc"; +import Logger from "../utils/logger.js"; +import { identity } from "../utils/misc"; import BASE_CONFIGURATION from "../constants/base-configuration"; const CONFIG_UPDATE_INTERVAL = 10 * 60 * 1000; // 10 Minutes diff --git a/backend/jobs/delete-old-logs.ts b/backend/jobs/delete-old-logs.ts index 2f6ea04b3..094b6f747 100644 --- a/backend/jobs/delete-old-logs.ts +++ b/backend/jobs/delete-old-logs.ts @@ -1,6 +1,6 @@ import { CronJob } from "cron"; import db from "../init/db"; -import Logger from "../handlers/logger"; +import Logger from "../utils/logger"; const CRON_SCHEDULE = "0 0 0 * * *"; const LOG_MAX_AGE_DAYS = 7; diff --git a/backend/middlewares/api-utils.ts b/backend/middlewares/api-utils.ts index ce7f37d1e..227f6998e 100644 --- a/backend/middlewares/api-utils.ts +++ b/backend/middlewares/api-utils.ts @@ -1,11 +1,8 @@ import _ from "lodash"; import joi from "joi"; -import MonkeyError from "../handlers/error"; +import MonkeyError from "../utils/error"; import { Response, NextFunction, RequestHandler } from "express"; -import { - handleMonkeyResponse, - MonkeyResponse, -} from "../handlers/monkey-response"; +import { handleMonkeyResponse, MonkeyResponse } from "../utils/monkey-response"; import UsersDAO from "../dao/user"; interface ValidationOptions { diff --git a/backend/middlewares/auth.ts b/backend/middlewares/auth.ts index d23ca0d8e..c03c9ff04 100644 --- a/backend/middlewares/auth.ts +++ b/backend/middlewares/auth.ts @@ -1,9 +1,9 @@ import _ from "lodash"; import { compare } from "bcrypt"; import UsersDAO from "../dao/user"; -import MonkeyError from "../handlers/error"; -import { verifyIdToken } from "../handlers/auth"; -import { base64UrlDecode } from "../handlers/misc"; +import MonkeyError from "../utils/error"; +import { verifyIdToken } from "../utils/auth"; +import { base64UrlDecode } from "../utils/misc"; import { NextFunction, Response, Handler } from "express"; interface RequestAuthenticationOptions { diff --git a/backend/middlewares/error.ts b/backend/middlewares/error.ts index 6d1c52cba..e6f4aa5f2 100644 --- a/backend/middlewares/error.ts +++ b/backend/middlewares/error.ts @@ -1,11 +1,8 @@ import db from "../init/db"; import { v4 as uuidv4 } from "uuid"; -import Logger from "../handlers/logger"; -import MonkeyError from "../handlers/error"; -import { - MonkeyResponse, - handleMonkeyResponse, -} from "../handlers/monkey-response"; +import Logger from "../utils/logger"; +import MonkeyError from "../utils/error"; +import { MonkeyResponse, handleMonkeyResponse } from "../utils/monkey-response"; import { NextFunction, Response } from "express"; async function errorHandlingMiddleware( diff --git a/backend/middlewares/rate-limit.ts b/backend/middlewares/rate-limit.ts index ad521cddb..7ed45695c 100644 --- a/backend/middlewares/rate-limit.ts +++ b/backend/middlewares/rate-limit.ts @@ -1,6 +1,6 @@ import { Response, NextFunction } from "express"; import rateLimit, { Options } from "express-rate-limit"; -import MonkeyError from "../handlers/error"; +import MonkeyError from "../utils/error"; const REQUEST_MULTIPLIER = process.env.MODE === "dev" ? 100 : 1; diff --git a/backend/handlers/auth.js b/backend/utils/auth.js similarity index 100% rename from backend/handlers/auth.js rename to backend/utils/auth.js diff --git a/backend/handlers/captcha.js b/backend/utils/captcha.js similarity index 100% rename from backend/handlers/captcha.js rename to backend/utils/captcha.js diff --git a/backend/handlers/discord.ts b/backend/utils/discord.ts similarity index 100% rename from backend/handlers/discord.ts rename to backend/utils/discord.ts diff --git a/backend/handlers/error.js b/backend/utils/error.js similarity index 100% rename from backend/handlers/error.js rename to backend/utils/error.js diff --git a/backend/handlers/logger.js b/backend/utils/logger.js similarity index 100% rename from backend/handlers/logger.js rename to backend/utils/logger.js diff --git a/backend/handlers/misc.js b/backend/utils/misc.js similarity index 100% rename from backend/handlers/misc.js rename to backend/utils/misc.js diff --git a/backend/handlers/monkey-response.js b/backend/utils/monkey-response.js similarity index 100% rename from backend/handlers/monkey-response.js rename to backend/utils/monkey-response.js diff --git a/backend/handlers/pb.js b/backend/utils/pb.js similarity index 100% rename from backend/handlers/pb.js rename to backend/utils/pb.js diff --git a/backend/handlers/pb_old.js b/backend/utils/pb_old.js similarity index 100% rename from backend/handlers/pb_old.js rename to backend/utils/pb_old.js diff --git a/backend/handlers/validation.ts b/backend/utils/validation.ts similarity index 100% rename from backend/handlers/validation.ts rename to backend/utils/validation.ts