chore(release): 1.2.2 [skip ci]

.devcontainer/Dockerfile

@@ -1,2 +1 @@
-ARG VARIANT="16"
+FROM mcr.microsoft.com/devcontainers/javascript-node:18
-FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:0-${VARIANT}

.devcontainer/docker-compose.yml

@@ -12,7 +12,7 @@ services:
       - 'host.docker.internal:host-gateway'
 
   thream-database:
-    image: 'postgres:14.5'
+    image: 'postgres:15.0'
     environment:
       POSTGRES_USER: 'user'
       POSTGRES_PASSWORD: 'password'

.env.example

@@ -1,21 +1,22 @@
-COMPOSE_PROJECT_NAME=thream-api
-NODE_ENV=development
 API_URL=http://localhost:8080
-HOST=0.0.0.0
+COMPOSE_PROJECT_NAME=thream-api
-PORT=8080
 DATABASE_URL=postgresql://user:password@thream-database:5432/thream
+DISCORD_CLIENT_ID=
+DISCORD_CLIENT_SECRET=
 EMAIL_HOST=thream-maildev
 EMAIL_PASSWORD=password
 EMAIL_PORT=25
 EMAIL_USER=no-reply@thream.fr
 FILE_UPLOADS_API_KEY=apiKeySecret
 FILE_UPLOADS_API_URL=http://host.docker.internal:8000
-DISCORD_CLIENT_ID=
-DISCORD_CLIENT_SECRET=
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
+HOST=0.0.0.0
 JWT_ACCESS_EXPIRES_IN=15 minutes
+# You can generate JWT secrets with the `npm run generate:jwt-secret` command.
 JWT_ACCESS_SECRET=accessTokenSecret
 JWT_REFRESH_SECRET=refreshTokenSecret
+NODE_ENV=development
+PORT=8080

.github/workflows/analyze.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: 'actions/checkout@v3.0.0'
 
       - name: 'Initialize CodeQL'
-        uses: 'github/codeql-action/init@v1'
+        uses: 'github/codeql-action/init@v2'
         with:
           languages: ${{ matrix.language }}
 

.github/workflows/build.yml

@@ -10,12 +10,12 @@ jobs:
   build:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v3.0.0'
+      - uses: 'actions/checkout@v3.1.0'
 
       - name: 'Use Node.js'
-        uses: 'actions/setup-node@v3.0.0'
+        uses: 'actions/setup-node@v3.5.1'
         with:
-          node-version: '16.x'
+          node-version: '18.x'
           cache: 'npm'
 
       - name: 'Install'

.github/workflows/lint.yml

@@ -10,12 +10,12 @@ jobs:
   lint:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v3.0.0'
+      - uses: 'actions/checkout@v3.1.0'
 
       - name: 'Use Node.js'
-        uses: 'actions/setup-node@v3.0.0'
+        uses: 'actions/setup-node@v3.5.1'
         with:
-          node-version: '16.x'
+          node-version: '18.x'
           cache: 'npm'
 
       - name: 'Install'

.github/workflows/release.yml

@@ -8,7 +8,7 @@ jobs:
   release:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v3.0.0'
+      - uses: 'actions/checkout@v3.1.0'
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -21,9 +21,9 @@ jobs:
           git-commit-gpgsign: true
 
       - name: 'Use Node.js'
-        uses: 'actions/setup-node@v3.0.0'
+        uses: 'actions/setup-node@v3.5.1'
         with:
-          node-version: '16.x'
+          node-version: '18.x'
           cache: 'npm'
 
       - name: 'Install'

.github/workflows/test.yml

@@ -10,12 +10,12 @@ jobs:
   test:
     runs-on: 'ubuntu-latest'
     steps:
-      - uses: 'actions/checkout@v3.0.0'
+      - uses: 'actions/checkout@v3.1.0'
 
       - name: 'Use Node.js'
-        uses: 'actions/setup-node@v3.0.0'
+        uses: 'actions/setup-node@v3.5.1'
         with:
-          node-version: '16.x'
+          node-version: '18.x'
           cache: 'npm'
 
       - name: 'Install'

CONTRIBUTING.md

@@ -58,9 +58,9 @@ Scopes define what part of the code changed.
 ### Examples
 
 ```sh
-git commit -m "feat(services): add POST /users/signup"
+git commit -m "feat: add POST /users/signup"
 git commit -m "docs(readme): update installation process"
-git commit -m "fix(services): should emit events to connected users"
+git commit -m "fix: should emit events to connected users"
 ```
 
 ## Directory Structure
@@ -120,3 +120,5 @@ The folders after `src/services` : is the real path of the routes in the API exc
 folders starting and ending with `__` like `__test__` or `__utils__`.
 
 The filenames correspond to the HTTP methods used (`get`, `post`, `put`, `delete`).
+
+You can generate the boilerplate code for a new service with the `npm run generate` command.

Dockerfile

@@ -1,23 +1,21 @@
-FROM node:16.17.0 AS dependencies
+FROM node:18.12.1 AS dependencies
 WORKDIR /usr/src/app
 COPY ./package*.json ./
 RUN npm install
 
-FROM node:16.17.0 AS builder
+FROM node:18.12.1 AS builder
 WORKDIR /usr/src/app
 COPY --from=dependencies /usr/src/app/node_modules ./node_modules
 COPY ./ ./
 RUN npm run prisma:generate && npm run build
 
-FROM node:16.17.0 AS runner
+FROM node:18.12.1 AS runner
 WORKDIR /usr/src/app
 ENV NODE_ENV=production
 COPY --from=builder /usr/src/app/node_modules ./node_modules
-COPY --from=builder /usr/src/app/start.sh ./docker-start.sh
 COPY --from=builder /usr/src/app/package.json ./package.json
 COPY --from=builder /usr/src/app/email ./email
 COPY --from=builder /usr/src/app/build ./build
 COPY --from=builder /usr/src/app/prisma ./prisma
-COPY --from=builder /usr/src/app/uploads ./uploads
 USER node
-CMD ["./docker-start.sh"]
+CMD ["node", "build/index.js"]

README.md

@@ -49,6 +49,8 @@ the root of the project (see `.env.example`).
 
 ### Local Development environment
 
+Recommended to use [VSCode: Remote development in Containers](https://code.visualstudio.com/docs/remote/containers-tutorial).
+
 #### Setup the database
 
 ```sh
@@ -76,18 +78,6 @@ npm run dev
 npm run prisma:studio
 ```
 
-### Production environment with [Docker](https://www.docker.com/)
-
-```sh
-# Setup and run all the services for you
-docker-compose up --build
-```
-
-#### Services started
-
-- API : `http://localhost:8080`
-- [PostgreSQL database](https://www.postgresql.org/)
-
 ## 💡 Contributing
 
 Anyone can help to improve the project, submit a Feature Request, a bug report or

docker-compose.yml

@@ -1,29 +0,0 @@
-version: '3.0'
-services:
-  thream-api:
-    container_name: ${COMPOSE_PROJECT_NAME}
-    build:
-      context: './'
-    env_file:
-      - '.env'
-    ports:
-      - '${PORT}:${PORT}'
-    depends_on:
-      - 'thream-database'
-    volumes:
-      - './uploads:/usr/src/app/uploads'
-    restart: 'unless-stopped'
-
-  thream-database:
-    container_name: 'thream-database'
-    image: 'postgres:14.2'
-    environment:
-      POSTGRES_USER: 'user'
-      POSTGRES_PASSWORD: 'password'
-      POSTGRES_DB: 'thream'
-    volumes:
-      - 'database-volume:/var/lib/postgresql/data'
-    restart: 'unless-stopped'
-
-volumes:
-  database-volume:

docker-start.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-npm run prisma:migrate:deploy
-node build/index.js

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thream/api",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Thream's application programming interface to stay close with your friends and communities.",
   "private": true,
   "type": "module",
@@ -18,6 +18,7 @@
     "start": "node build/index.js",
     "dev": "concurrently -k -n \"TypeScript,Node\" -p \"[{name}]\" -c \"blue,green\" \"npm run build:dev\" \"cross-env NODE_ENV=development nodemon build/index.js\"",
     "generate": "plop",
+    "generate:jwt-secret": "node ./build/scripts/generate-jwt-secret.js",
     "lint:commit": "commitlint",
     "lint:editorconfig": "editorconfig-checker",
     "lint:markdown": "markdownlint-cli2",
@@ -34,70 +35,71 @@
     "postinstall": "husky install"
   },
   "dependencies": {
-    "@fastify/cors": "8.1.0",
+    "@fastify/cors": "8.2.0",
-    "@fastify/helmet": "9.1.0",
+    "@fastify/helmet": "10.0.2",
-    "@fastify/multipart": "7.1.1",
+    "@fastify/multipart": "7.3.0",
-    "@fastify/rate-limit": "7.3.0",
+    "@fastify/rate-limit": "7.5.0",
     "@fastify/sensible": "5.1.1",
-    "@fastify/swagger": "7.4.1",
+    "@fastify/swagger": "8.1.0",
-    "@prisma/client": "4.2.1",
+    "@fastify/swagger-ui": "1.2.0",
-    "@sinclair/typebox": "0.24.28",
+    "@prisma/client": "4.5.0",
-    "@thream/socketio-jwt": "3.0.0",
+    "@sinclair/typebox": "0.25.3",
-    "axios": "0.26.1",
+    "@thream/socketio-jwt": "3.0.1",
+    "axios": "1.1.3",
     "bcryptjs": "2.4.3",
-    "dotenv": "16.0.1",
+    "dotenv": "16.0.3",
     "ejs": "3.1.8",
-    "fastify": "4.5.3",
+    "fastify": "4.9.2",
-    "fastify-plugin": "4.2.1",
+    "fastify-plugin": "4.3.0",
     "form-data": "4.0.0",
     "http-errors": "2.0.0",
     "jsonwebtoken": "8.5.1",
     "ms": "2.1.3",
-    "nodemailer": "6.7.8",
+    "nodemailer": "6.8.0",
     "read-pkg": "7.1.0",
-    "socket.io": "4.5.1"
+    "socket.io": "4.5.3"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.1.2",
+    "@commitlint/cli": "17.2.0",
-    "@commitlint/config-conventional": "17.1.0",
+    "@commitlint/config-conventional": "17.2.0",
     "@saithodev/semantic-release-backmerge": "2.1.2",
     "@semantic-release/git": "10.0.1",
     "@swc/cli": "0.1.57",
-    "@swc/core": "1.2.244",
+    "@swc/core": "1.3.14",
     "@types/bcryptjs": "2.4.2",
     "@types/busboy": "1.5.0",
     "@types/ejs": "3.1.1",
     "@types/http-errors": "1.8.2",
     "@types/jsonwebtoken": "8.5.9",
     "@types/ms": "0.7.31",
-    "@types/node": "18.7.13",
+    "@types/node": "18.11.9",
-    "@types/nodemailer": "6.4.5",
+    "@types/nodemailer": "6.4.6",
     "@types/sinon": "10.0.13",
     "@types/tap": "15.0.7",
-    "@typescript-eslint/eslint-plugin": "5.35.1",
+    "@typescript-eslint/eslint-plugin": "5.42.1",
-    "@typescript-eslint/parser": "5.35.1",
+    "@typescript-eslint/parser": "5.42.1",
     "c8": "7.12.0",
-    "concurrently": "7.3.0",
+    "concurrently": "7.5.0",
     "cross-env": "7.0.3",
     "editorconfig-checker": "4.0.2",
-    "eslint": "8.23.0",
+    "eslint": "8.27.0",
-    "eslint-config-conventions": "3.0.0",
+    "eslint-config-conventions": "5.0.0",
     "eslint-config-prettier": "8.5.0",
     "eslint-plugin-import": "2.26.0",
     "eslint-plugin-prettier": "4.2.1",
-    "eslint-plugin-promise": "6.0.1",
+    "eslint-plugin-promise": "6.1.1",
-    "eslint-plugin-unicorn": "43.0.2",
+    "eslint-plugin-unicorn": "44.0.2",
-    "husky": "8.0.1",
+    "husky": "8.0.2",
     "lint-staged": "13.0.3",
     "markdownlint-cli2": "0.5.1",
-    "nodemon": "2.0.19",
+    "nodemon": "2.0.20",
     "plop": "3.1.1",
     "prettier": "2.7.1",
-    "prisma": "4.2.1",
+    "prisma": "4.5.0",
     "rimraf": "3.0.2",
     "semantic-release": "19.0.5",
-    "sinon": "14.0.0",
+    "sinon": "14.0.2",
     "tap": "16.3.0",
-    "typescript": "4.8.2"
+    "typescript": "4.8.4"
   }
 }

src/__test__/utils/authenticateUserTest.ts

@@ -1,8 +1,9 @@
-import { User } from '@prisma/client'
+import type { User } from '@prisma/client'
 import sinon from 'sinon'
 
 import { refreshTokenExample } from '../../models/RefreshToken.js'
-import { userExample, UserJWT } from '../../models/User.js'
+import type { UserJWT } from '../../models/User.js'
+import { userExample } from '../../models/User.js'
 import { userSettingsExample } from '../../models/UserSettings.js'
 import {
   generateAccessToken,

src/application.ts

@@ -2,15 +2,17 @@ import dotenv from 'dotenv'
 import fastify from 'fastify'
 import fastifyCors from '@fastify/cors'
 import fastifySwagger from '@fastify/swagger'
+import fastifySwaggerUI from '@fastify/swagger-ui'
 import fastifyHelmet from '@fastify/helmet'
 import fastifyRateLimit from '@fastify/rate-limit'
 import fastifySensible from '@fastify/sensible'
+import { readPackage } from 'read-pkg'
 
 import { services } from './services/index.js'
-import { swaggerOptions } from './tools/configurations/swaggerOptions.js'
 import fastifySocketIo from './tools/plugins/socket-io.js'
 
 dotenv.config()
+const packageJSON = await readPackage()
 export const application = fastify({
   logger: process.env.NODE_ENV === 'development',
   ajv: {
@@ -39,5 +41,35 @@ await application.register(fastifyRateLimit, {
   max: 200,
   timeWindow: '1 minute'
 })
-await application.register(fastifySwagger, swaggerOptions)
+await application.register(fastifySwagger, {
+  openapi: {
+    info: {
+      title: packageJSON.name,
+      description: packageJSON.description,
+      version: packageJSON.version
+    },
+    tags: [
+      { name: 'users' },
+      { name: 'oauth2' },
+      { name: 'guilds' },
+      { name: 'channels' },
+      { name: 'messages' },
+      { name: 'members' }
+    ],
+    components: {
+      securitySchemes: {
+        bearerAuth: {
+          type: 'http',
+          scheme: 'bearer',
+          bearerFormat: 'JWT'
+        }
+      }
+    }
+  },
+  hideUntagged: true
+})
+await application.register(fastifySwaggerUI, {
+  routePrefix: '/documentation',
+  staticCSP: true
+})
 await application.register(services)

src/index.ts

@@ -1,5 +1,5 @@
 import { application } from './application.js'
-import { HOST, PORT } from './tools/configurations/index.js'
+import { HOST, PORT } from './tools/configurations.js'
 
 const address = await application.listen({
   port: PORT,

src/models/Channel.ts

@@ -1,5 +1,5 @@
 import { Type } from '@sinclair/typebox'
-import { Channel } from '@prisma/client'
+import type { Channel } from '@prisma/client'
 
 import { date, id } from './utils.js'
 import { guildExample } from './Guild.js'

src/models/Guild.ts

@@ -1,4 +1,4 @@
-import { Guild } from '@prisma/client'
+import type { Guild } from '@prisma/client'
 import { Type } from '@sinclair/typebox'
 
 import { date, id } from './utils.js'

src/models/Member.ts

@@ -1,5 +1,5 @@
 import { Type } from '@sinclair/typebox'
-import { Member } from '@prisma/client'
+import type { Member } from '@prisma/client'
 
 import { date, id } from './utils.js'
 import { guildExample } from './Guild.js'

src/models/Message.ts

@@ -1,4 +1,4 @@
-import { Message } from '@prisma/client'
+import type { Message } from '@prisma/client'
 import { Type } from '@sinclair/typebox'
 
 import { date, id } from './utils.js'

src/models/OAuth.ts

@@ -5,12 +5,12 @@ import { date, id } from './utils.js'
 export const providers = ['Google', 'GitHub', 'Discord'] as const
 export const strategies = [...providers, 'Local'] as const
 
-export const strategiesTypebox = strategies.map((strategy) =>
+export const strategiesTypebox = strategies.map((strategy) => {
-  Type.Literal(strategy)
+  return Type.Literal(strategy)
-)
+})
-export const providersTypebox = providers.map((provider) =>
+export const providersTypebox = providers.map((provider) => {
-  Type.Literal(provider)
+  return Type.Literal(provider)
-)
+})
 
 export type ProviderOAuth = typeof providers[number]
 export type AuthenticationStrategy = typeof strategies[number]

src/models/RefreshToken.ts

@@ -1,4 +1,4 @@
-import { RefreshToken } from '@prisma/client'
+import type { RefreshToken } from '@prisma/client'
 import { Type } from '@sinclair/typebox'
 
 import { userExample } from './User.js'

src/models/User.ts

@@ -1,7 +1,9 @@
-import { User } from '@prisma/client'
+import type { User } from '@prisma/client'
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
+import { Type } from '@sinclair/typebox'
 
-import { AuthenticationStrategy, strategiesTypebox } from './OAuth.js'
+import type { AuthenticationStrategy } from './OAuth.js'
+import { strategiesTypebox } from './OAuth.js'
 import { userSettingsSchema } from './UserSettings.js'
 import { date, id } from './utils.js'
 

src/models/UserSettings.ts

@@ -1,5 +1,6 @@
-import { UserSetting } from '@prisma/client'
+import type { UserSetting } from '@prisma/client'
-import { Type, Static } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
+import { Type } from '@sinclair/typebox'
 
 import { date, id } from './utils.js'
 

src/models/utils.ts

@@ -34,7 +34,7 @@ export const fastifyErrorsSchema = {
   404: {
     statusCode: Type.Literal(404),
     error: Type.Literal('Not Found'),
-    message: Type.Literal('Not Found')
+    message: Type.String()
   },
   431: {
     statusCode: Type.Literal(431),

src/scripts/generate-jwt-secret.ts

@@ -0,0 +1,3 @@
+import crypto from 'node:crypto'
+
+console.log(crypto.randomBytes(256).toString('base64'))

src/services/channels/[channelId]/delete.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/channels/[channelId]/get.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/channels/[channelId]/messages/get.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../../models/utils.js'

src/services/channels/[channelId]/messages/post.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../../models/utils.js'

src/services/channels/[channelId]/messages/uploads/post.ts

@@ -1,5 +1,6 @@
-import { Type, Static } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 import fastifyMultipart from '@fastify/multipart'
 
 import prisma from '../../../../../tools/database/prisma.js'

src/services/channels/[channelId]/put.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/channels/index.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from 'fastify'
+import type { FastifyPluginAsync } from 'fastify'
 
 import { deleteChannelService } from './[channelId]/delete.js'
 import { getChannelByIdService } from './[channelId]/get.js'

src/services/guilds/[guildId]/channels/get.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../../models/utils.js'

src/services/guilds/[guildId]/channels/post.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../../models/utils.js'

src/services/guilds/[guildId]/delete.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/guilds/[guildId]/get.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/guilds/[guildId]/icon/put.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 import fastifyMultipart from '@fastify/multipart'
 
 import authenticateUser from '../../../../tools/plugins/authenticateUser.js'

src/services/guilds/[guildId]/members/get.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../../models/utils.js'

src/services/guilds/[guildId]/members/join/post.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../../../tools/database/prisma.js'
 import {

src/services/guilds/[guildId]/members/leave/delete.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../../../models/utils.js'

src/services/guilds/[guildId]/put.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/guilds/get.ts

@@ -1,5 +1,6 @@
-import { Type, Static } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../tools/database/prisma.js'
 import { fastifyErrors, id } from '../../models/utils.js'

src/services/guilds/index.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from 'fastify'
+import type { FastifyPluginAsync } from 'fastify'
 
 import { getGuilds } from './get.js'
 import { postGuilds } from './post.js'

src/services/guilds/post.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../tools/database/prisma.js'
 import { fastifyErrors } from '../../models/utils.js'

src/services/guilds/public/get.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/index.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from 'fastify'
+import type { FastifyPluginAsync } from 'fastify'
 
 import { usersService } from './users/index.js'
 import { guildsService } from './guilds/index.js'

src/services/messages/[messageId]/delete.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/messages/[messageId]/put.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/messages/index.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from 'fastify'
+import type { FastifyPluginAsync } from 'fastify'
 
 import { deleteMessageService } from './[messageId]/delete.js'
 import { putMessageService } from './[messageId]/put.js'

src/services/users/[userId]/get.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/users/confirm-email/get.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/users/current/get.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/users/current/logo/put.ts

@@ -1,5 +1,5 @@
 import { Type } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 import fastifyMultipart from '@fastify/multipart'
 
 import authenticateUser from '../../../../tools/plugins/authenticateUser.js'

src/services/users/current/put.ts

@@ -1,15 +1,16 @@
 import { randomUUID } from 'node:crypto'
 
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'
 import authenticateUser from '../../../tools/plugins/authenticateUser.js'
 import { userCurrentSchema, userSchema } from '../../../models/User.js'
 import { sendEmail } from '../../../tools/email/sendEmail.js'
-import { API_URL } from '../../../tools/configurations/index.js'
+import { API_URL } from '../../../tools/configurations.js'
-import { Language, Theme } from '../../../models/UserSettings.js'
+import type { Language, Theme } from '../../../models/UserSettings.js'
 import { parseStringNullish } from '../../../tools/utils/parseStringNullish.js'
 
 const bodyPutServiceSchema = Type.Object({
@@ -136,7 +137,9 @@ export const putCurrentUser: FastifyPluginAsync = async (fastify) => {
       })
       await fastify.io.emitToAuthorizedUsers({
         event: 'users',
-        isAuthorizedCallback: () => true,
+        isAuthorizedCallback: () => {
+          return true
+        },
         payload: {
           action: 'update',
           item: user

src/services/users/current/settings/put.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../../models/utils.js'

src/services/users/index.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from 'fastify'
+import type { FastifyPluginAsync } from 'fastify'
 
 import { postSignupUser } from './signup/post.js'
 import { getConfirmEmail } from './confirm-email/get.js'

src/services/users/oauth2/[provider]/delete.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../../models/utils.js'
@@ -55,7 +56,9 @@ export const deleteProviderService: FastifyPluginAsync = async (fastify) => {
       if (user.current.password != null) {
         strategies.push('Local')
       }
-      const oauthProvider = OAuths.find((oauth) => oauth.provider === provider)
+      const oauthProvider = OAuths.find((oauth) => {
+        return oauth.provider === provider
+      })
       if (oauthProvider == null) {
         throw fastify.httpErrors.notFound('You are not using this provider')
       }

src/services/users/oauth2/discord/add-strategy/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { DISCORD_BASE_URL, DISCORD_CLIENT_ID } from '../__utils__/utils.js'
 import authenticateUser from '../../../../../tools/plugins/authenticateUser.js'

src/services/users/oauth2/discord/callback-add-strategy/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { discordStrategy, getDiscordUserData } from '../__utils__/utils.js'
 import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

src/services/users/oauth2/discord/callback/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { discordStrategy, getDiscordUserData } from '../__utils__/utils.js'
 import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

src/services/users/oauth2/discord/signin/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { DISCORD_BASE_URL, DISCORD_CLIENT_ID } from '../__utils__/utils.js'
 

src/services/users/oauth2/github/add-strategy/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { GITHUB_BASE_URL, GITHUB_CLIENT_ID } from '../__utils__/utils.js'
 import authenticateUser from '../../../../../tools/plugins/authenticateUser.js'

src/services/users/oauth2/github/callback-add-strategy/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { githubStrategy, getGitHubUserData } from '../__utils__/utils.js'
 import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

src/services/users/oauth2/github/callback/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { githubStrategy, getGitHubUserData } from '../__utils__/utils.js'
 import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

src/services/users/oauth2/github/signin/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { GITHUB_BASE_URL, GITHUB_CLIENT_ID } from '../__utils__/utils.js'
 

src/services/users/oauth2/google/add-strategy/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { GOOGLE_BASE_URL, GOOGLE_CLIENT_ID } from '../__utils__/utils.js'
 import authenticateUser from '../../../../../tools/plugins/authenticateUser.js'

src/services/users/oauth2/google/callback-add-strategy/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { googleStrategy, getGoogleUserData } from '../__utils__/utils.js'
 import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

src/services/users/oauth2/google/callback/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { googleStrategy, getGoogleUserData } from '../__utils__/utils.js'
 import { buildQueryURL } from '../../../../../tools/utils/buildQueryURL.js'

src/services/users/oauth2/google/signin/get.ts

@@ -1,7 +1,8 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
-import { API_URL } from '../../../../../tools/configurations/index.js'
+import { API_URL } from '../../../../../tools/configurations.js'
 import { fastifyErrors } from '../../../../../models/utils.js'
 import { GOOGLE_BASE_URL, GOOGLE_CLIENT_ID } from '../__utils__/utils.js'
 

src/services/users/refresh-token/post.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 import jwt from 'jsonwebtoken'
 
 import prisma from '../../../tools/database/prisma.js'
@@ -9,8 +10,8 @@ import {
   jwtSchema,
   expiresIn
 } from '../../../tools/utils/jwtToken.js'
-import { UserRefreshJWT } from '../../../models/User.js'
+import type { UserRefreshJWT } from '../../../models/User.js'
-import { JWT_REFRESH_SECRET } from '../../../tools/configurations/index.js'
+import { JWT_REFRESH_SECRET } from '../../../tools/configurations.js'
 
 const bodyPostRefreshTokenSchema = Type.Object({
   refreshToken: jwtSchema.refreshToken

src/services/users/reset-password/post.ts

@@ -1,14 +1,15 @@
 import { randomUUID } from 'node:crypto'
 
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 import ms from 'ms'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'
 import { userSchema } from '../../../models/User.js'
 import { sendEmail } from '../../../tools/email/sendEmail.js'
-import { Language, Theme } from '../../../models/UserSettings.js'
+import type { Language, Theme } from '../../../models/UserSettings.js'
 
 const queryPostResetPasswordSchema = Type.Object({
   redirectURI: Type.String({ format: 'uri-reference' })

src/services/users/reset-password/put.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 import bcrypt from 'bcryptjs'
 
 import prisma from '../../../tools/database/prisma.js'

src/services/users/signin/post.ts

@@ -1,5 +1,6 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 import bcrypt from 'bcryptjs'
 
 import prisma from '../../../tools/database/prisma.js'

src/services/users/signout/__test__/post.test.ts

@@ -5,7 +5,7 @@ import jwt from 'jsonwebtoken'
 import { application } from '../../../../application.js'
 import prisma from '../../../../tools/database/prisma.js'
 import { refreshTokenExample } from '../../../../models/RefreshToken.js'
-import { UserRefreshJWT } from '../../../../models/User.js'
+import type { UserRefreshJWT } from '../../../../models/User.js'
 
 await tap.test('POST /users/signout', async (t) => {
   t.afterEach(() => {

src/services/users/signout/delete.ts

@@ -1,5 +1,5 @@
 import { Type } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'

src/services/users/signout/post.ts

@@ -1,11 +1,12 @@
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import { Type } from '@sinclair/typebox'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 import jwt from 'jsonwebtoken'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'
-import { JWT_REFRESH_SECRET } from '../../../tools/configurations/index.js'
+import { JWT_REFRESH_SECRET } from '../../../tools/configurations.js'
-import { UserRefreshJWT } from '../../../models/User.js'
+import type { UserRefreshJWT } from '../../../models/User.js'
 import { jwtSchema } from '../../../tools/utils/jwtToken.js'
 
 const bodyPostSignoutSchema = Type.Object({

src/services/users/signup/post.ts

@@ -1,18 +1,16 @@
 import { randomUUID } from 'node:crypto'
 
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
+import { Type } from '@sinclair/typebox'
 import bcrypt from 'bcryptjs'
-import { FastifyPluginAsync, FastifySchema } from 'fastify'
+import type { FastifyPluginAsync, FastifySchema } from 'fastify'
 
 import prisma from '../../../tools/database/prisma.js'
 import { fastifyErrors } from '../../../models/utils.js'
-import {
+import type { BodyUserSchemaType } from '../../../models/User.js'
-  bodyUserSchema,
+import { bodyUserSchema, userPublicSchema } from '../../../models/User.js'
-  BodyUserSchemaType,
-  userPublicSchema
-} from '../../../models/User.js'
 import { sendEmail } from '../../../tools/email/sendEmail.js'
-import { API_URL } from '../../../tools/configurations/index.js'
+import { API_URL } from '../../../tools/configurations.js'
 
 const queryPostSignupSchema = Type.Object({
   redirectURI: Type.Optional(Type.String({ format: 'uri-reference' }))

src/tools/configurations.ts

@@ -18,7 +18,7 @@ export const JWT_REFRESH_SECRET =
 export const JWT_ACCESS_EXPIRES_IN =
   process.env.JWT_ACCESS_EXPIRES_IN ?? '15 minutes'
 
-export const SRC_URL = new URL('../../', import.meta.url)
+export const SRC_URL = new URL('../', import.meta.url)
 export const ROOT_URL = new URL('../', SRC_URL)
 export const EMAIL_URL = new URL('./email/', ROOT_URL)
 export const EMAIL_TEMPLATE_URL = new URL('./email-template.ejs', EMAIL_URL)

src/tools/configurations/swaggerOptions.ts

@@ -1,38 +0,0 @@
-import dotenv from 'dotenv'
-import { readPackage } from 'read-pkg'
-import { FastifyDynamicSwaggerOptions } from '@fastify/swagger'
-
-dotenv.config()
-
-const packageJSON = await readPackage()
-
-export const swaggerOptions: FastifyDynamicSwaggerOptions = {
-  routePrefix: '/documentation',
-  openapi: {
-    info: {
-      title: packageJSON.name,
-      description: packageJSON.description,
-      version: packageJSON.version
-    },
-    tags: [
-      { name: 'users' },
-      { name: 'oauth2' },
-      { name: 'guilds' },
-      { name: 'channels' },
-      { name: 'messages' },
-      { name: 'members' }
-    ],
-    components: {
-      securitySchemes: {
-        bearerAuth: {
-          type: 'http',
-          scheme: 'bearer',
-          bearerFormat: 'JWT'
-        }
-      }
-    }
-  },
-  exposeRoute: true,
-  staticCSP: true,
-  hideUntagged: true
-}

src/tools/database/pagination.ts

@@ -1,5 +1,6 @@
-import { Prisma } from '@prisma/client'
+import type { Prisma } from '@prisma/client'
-import { Static, Type } from '@sinclair/typebox'
+import type { Static } from '@sinclair/typebox'
+import { Type } from '@sinclair/typebox'
 
 export const queryPaginationSchema = {
   /** Maximum number of items to return */

src/tools/email/sendEmail.ts

@@ -3,11 +3,8 @@ import { URL, fileURLToPath } from 'node:url'
 
 import ejs from 'ejs'
 
-import { Language, Theme } from '../../models/UserSettings.js'
+import type { Language, Theme } from '../../models/UserSettings.js'
-import {
+import { EMAIL_LOCALES_URL, EMAIL_TEMPLATE_URL } from '../configurations.js'
-  EMAIL_LOCALES_URL,
-  EMAIL_TEMPLATE_URL
-} from '../configurations/index.js'
 import { emailTransporter, EMAIL_INFO } from './emailTransporter.js'
 
 interface EmailTranslation {

src/tools/plugins/authenticateUser.ts

@@ -3,8 +3,8 @@ import httpErrors from 'http-errors'
 import jwt from 'jsonwebtoken'
 
 import prisma from '../database/prisma.js'
-import { UserJWT, UserRequest } from '../../models/User.js'
+import type { UserJWT, UserRequest } from '../../models/User.js'
-import { JWT_ACCESS_SECRET } from '../configurations/index.js'
+import { JWT_ACCESS_SECRET } from '../configurations.js'
 
 const { Unauthorized, Forbidden, BadRequest } = httpErrors
 

src/tools/plugins/socket-io.ts

@@ -1,9 +1,10 @@
 import fastifyPlugin from 'fastify-plugin'
-import { Server as SocketIoServer, ServerOptions } from 'socket.io'
+import type { ServerOptions } from 'socket.io'
+import { Server as SocketIoServer } from 'socket.io'
 import { authorize } from '@thream/socketio-jwt'
 
 import prisma from '../database/prisma.js'
-import { JWT_ACCESS_SECRET } from '../configurations/index.js'
+import { JWT_ACCESS_SECRET } from '../configurations.js'
 
 interface EmitEventOptions {
   event: string

src/tools/utils/OAuthStrategy.ts

@@ -1,12 +1,12 @@
+import type { ResponseJWT } from './jwtToken.js'
 import {
   expiresIn,
   generateAccessToken,
-  generateRefreshToken,
+  generateRefreshToken
-  ResponseJWT
 } from './jwtToken.js'
 import prisma from '../database/prisma.js'
-import { ProviderOAuth } from '../../models/OAuth.js'
+import type { ProviderOAuth } from '../../models/OAuth.js'
-import { UserRequest } from '../../models/User.js'
+import type { UserRequest } from '../../models/User.js'
 
 interface ProviderData {
   name: string

src/tools/utils/jwtToken.ts

@@ -5,12 +5,12 @@ import jwt from 'jsonwebtoken'
 import ms from 'ms'
 
 import prisma from '../database/prisma.js'
-import { UserJWT } from '../../models/User.js'
+import type { UserJWT } from '../../models/User.js'
 import {
   JWT_ACCESS_EXPIRES_IN,
   JWT_ACCESS_SECRET,
   JWT_REFRESH_SECRET
-} from '../configurations/index.js'
+} from '../configurations.js'
 
 export interface ResponseJWT {
   accessToken: string

src/tools/utils/uploadFile.ts

@@ -2,13 +2,13 @@ import fs from 'node:fs'
 
 import axios from 'axios'
 import FormData from 'form-data'
-import { FastifyInstance, FastifyRequest } from 'fastify'
+import type { FastifyInstance, FastifyRequest } from 'fastify'
-import { Multipart } from '@fastify/multipart'
+import type { SavedMultipartFile } from '@fastify/multipart'
 
 import {
   FILE_UPLOADS_API_KEY,
   FILE_UPLOADS_API_URL
-} from '../configurations/index.js'
+} from '../configurations.js'
 
 export const fileUploadAPI = axios.create({
   baseURL: FILE_UPLOADS_API_URL,
@@ -35,7 +35,7 @@ export const uploadFile = async (
   options: UploadFileOptions
 ): Promise<UploadFileResult> => {
   const { fastify, request, folderInUploadsFolder } = options
-  let files: Multipart[] = []
+  let files: SavedMultipartFile[] = []
   try {
     files = await request.saveRequestFiles({
       limits: {