move models to shared lib DbModels

packages/chat_server/package.json

@@ -14,7 +14,8 @@
         "RedisClient": "src/shared-classes",
         "StorageClient": "src/shared-classes",
         "DbManager": "src/shared-classes",
-        "Errors": "src/shared-classes"
+        "Errors": "src/shared-classes",
+        "DbModels": "src/shared-classes"
     },
     "license": "MIT",
     "dependencies": {

packages/file_server/package.json

@@ -14,7 +14,8 @@
         "RedisClient": "src/shared-classes",
         "StorageClient": "src/shared-classes",
         "DbManager": "src/shared-classes",
-        "Errors": "src/shared-classes"
+        "Errors": "src/shared-classes",
+        "DbModels": "src/shared-classes"
     },
     "license": "MIT",
     "dependencies": {

packages/marketplace_server/package.json

@@ -14,7 +14,8 @@
         "RedisClient": "src/shared-classes",
         "StorageClient": "src/shared-classes",
         "DbManager": "src/shared-classes",
-        "Errors": "src/shared-classes"
+        "Errors": "src/shared-classes",
+        "DbModels": "src/shared-classes"
     },
     "license": "MIT",
     "dependencies": {

packages/marketplace_server/src/controllers/widgets/routes/get/:widgetId/debug.jsx

@@ -1,4 +1,4 @@
-import { Widget } from "@models"
+import { Widget } from "@shared-classes/DbModels"
 import getWidgetCode from "@utils/getWidgetCode"
 
 export default async (req, res) => {

packages/marketplace_server/src/controllers/widgets/routes/get/:widgetId/manifest.js

@@ -1,4 +1,4 @@
-import { Widget } from "@models"
+import { Widget } from "@shared-classes/DbModels"
 
 export default async (req, res) => {
     const widget_id = req.params.widgetId

packages/marketplace_server/src/controllers/widgets/routes/get/index.js

@@ -1,4 +1,4 @@
-import { Widget } from "@models"
+import { Widget } from "@shared-classes/DbModels"
 
 export default async (req, res) => {
     let { limit = 20, offset = 0, keywords } = req.query

packages/marketplace_server/src/controllers/widgets/routes/get/user/:user_id.js

@@ -1,4 +1,4 @@
-import { Widget } from "@models"
+import { Widget } from "@shared-classes/DbModels"
 
 export default async (req, res) => {
     const { user_id } = req.params

packages/marketplace_server/src/controllers/widgets/routes/post/publish.js

@@ -5,7 +5,7 @@ import path from "path"
 
 import syncFolder from "@utils/syncDirToRemote"
 
-import { Widget } from "@models"
+import { Widget } from "@shared-classes/DbModels"
 
 const tmpPath = path.join(process.cwd(), ".tmp")
 

packages/marketplace_server/src/utils/getWidgetCode/index.js

@@ -1,4 +1,4 @@
-import { Widget } from "@models"
+import { Widget } from "@shared-classes/DbModels"
 import compileWidgetCode from "@utils/compileWidgetCode"
 import path from "path"
 

packages/music_server/package.json

@@ -12,7 +12,8 @@
         "RedisClient": "src/shared-classes",
         "StorageClient": "src/shared-classes",
         "DbManager": "src/shared-classes",
-        "Errors": "src/shared-classes"
+        "Errors": "src/shared-classes",
+        "DbModels": "src/shared-classes"
     },
     "license": "MIT",
     "dependencies": {

packages/music_server/src/controllers/lyrics/routes/get/:track_id.js

@@ -1,5 +1,5 @@
 
-import { Track } from "@models"
+import { Track } from "@shared-classes/DbModels"
 import getEnhancedLyricsFromTrack from "@services/getEnhancedLyricsFromTrack"
 
 export default async (req, res) => {

packages/music_server/src/controllers/playlists/routes/delete/:playlist_id.js

@@ -1,4 +1,4 @@
-import { Playlist, Track } from "@models"
+import { Playlist, Track } from "@shared-classes/DbModels"
 import { AuthorizationError, PermissionError, NotFoundError } from "@shared-classes/Errors"
 import RemoveTracks from "@services/removeTracks"
 

packages/music_server/src/controllers/playlists/routes/get/:playlist_id/data.js

@@ -1,4 +1,4 @@
-import { Playlist, TrackLike, Track } from "@models"
+import { Playlist, TrackLike, Track } from "@shared-classes/DbModels"
 import { NotFoundError } from "@shared-classes/Errors"
 
 export default async (req, res) => {

packages/music_server/src/controllers/playlists/routes/get/search.js

@@ -1,4 +1,4 @@
-import { Playlist, Track } from "@models"
+import { Playlist, Track } from "@shared-classes/DbModels"
 
 export default async (req, res) => {
     const { keywords, limit = 5, offset = 0 } = req.query

packages/music_server/src/controllers/playlists/routes/get/self.js

@@ -1,4 +1,4 @@
-import { Playlist, Track } from "@models"
+import { Playlist, Track } from "@shared-classes/DbModels"
 import { AuthorizationError, NotFoundError } from "@shared-classes/Errors"
 
 export default async (req, res) => {

packages/music_server/src/controllers/playlists/routes/put/playlist.js

@@ -1,4 +1,4 @@
-import { Playlist, Track } from "@models"
+import { Playlist, Track } from "@shared-classes/DbModels"
 import { AuthorizationError, NotFoundError, PermissionError, BadRequestError } from "@shared-classes/Errors"
 import axios from "axios"
 

packages/music_server/src/controllers/playlists/services/getTrackById.js

@@ -1,4 +1,4 @@
-import { Track } from "@models"
+import { Track } from "@shared-classes/DbModels"
 
 export default async (_id) => {
     if (!_id) {

packages/music_server/src/controllers/tracks/routes/get/:track_id/data.js

@@ -1,4 +1,4 @@
-import { Track } from "@models"
+import { Track } from "@shared-classes/DbModels"
 import { NotFoundError } from "@shared-classes/Errors"
 
 export default async (req, res) => {

packages/music_server/src/controllers/tracks/routes/get/:track_id/stream.js

@@ -1,4 +1,4 @@
-import { Track } from "@models"
+import { Track } from "@shared-classes/DbModels"
 import { NotFoundError, InternalServerError } from "@shared-classes/Errors"
 
 import mimetypes from "mime-types"

packages/music_server/src/controllers/tracks/routes/get/many.js

@@ -1,4 +1,4 @@
-import { Track } from "@models"
+import { Track } from "@shared-classes/DbModels"
 
 export default async (req, res) => {
     const { ids, limit = 20, offset = 0 } = req.query

packages/music_server/src/controllers/tracks/routes/post/:track_id/refresh-cache.js

@@ -1,4 +1,4 @@
-import { Track } from "@models"
+import { Track } from "@shared-classes/DbModels"
 import { NotFoundError } from "@shared-classes/Errors"
 import getEnhancedLyricsFromTrack from "@services/getEnhancedLyricsFromTrack"
 

packages/music_server/src/controllers/tracks/routes/post/:track_id/toggle-like.js

@@ -1,4 +1,4 @@
-import { TrackLike, Track } from "@models"
+import { TrackLike, Track } from "@shared-classes/DbModels"
 import { AuthorizationError, NotFoundError } from "@shared-classes/Errors"
 
 export default async (req, res) => {

packages/music_server/src/models/index.js

@@ -1,19 +0,0 @@
-import mongoose, { Schema } from "mongoose"
-import fs from "fs"
-import path from "path"
-
-function generateModels() {
-    let models = {}
-
-    const dirs = fs.readdirSync(__dirname).filter(file => file !== "index.js")
-
-    dirs.forEach((file) => {
-        const model = require(path.join(__dirname, file)).default
-
-        models[model.name] = mongoose.model(model.name, new Schema(model.schema), model.collection)
-    })
-
-    return models
-}
-
-module.exports = generateModels()

packages/music_server/src/services/getEnhancedLyricsFromTrack.js

@@ -1,5 +1,5 @@
 import findSpotifyId from "@services/findSpotifyId"
-import { Track } from "@models"
+import { Track } from "@shared-classes/DbModels"
 import axios from "axios"
 
 const syncLyricsProvider = `https://spotify-lyric-api.herokuapp.com`

packages/music_server/src/services/removeTracks.js

@@ -1,4 +1,4 @@
-import { Track } from "@models"
+import { Track } from "@shared-classes/DbModels"
 
 const urlRegex = new RegExp(`^https://(.*?)/(.*)$`)
 

packages/server/package.json

@@ -14,7 +14,8 @@
         "RedisClient": "src/shared-classes",
         "StorageClient": "src/shared-classes",
         "DbManager": "src/shared-classes",
-        "Errors": "src/shared-classes"
+        "Errors": "src/shared-classes",
+        "DbModels": "src/shared-classes"
     },
     "license": "MIT",
     "dependencies": {
@@ -52,7 +53,7 @@
         "music-metadata": "^8.1.3",
         "normalize-url": "^8.0.0",
         "nsfwjs": "2.4.2",
-        "p-map": "^6.0.0",
+        "p-map": "4",
         "p-queue": "^7.3.4",
         "passport": "^0.6.0",
         "passport-jwt": "^4.0.1",
@@ -68,4 +69,4 @@
         "mocha": "^10.2.0",
         "nodemon": "^2.0.15"
     }
-}
+}

packages/server/src/api.js

@@ -8,7 +8,7 @@ import passport from "passport"
 import jwt from "jsonwebtoken"
 import EventEmitter from "@foxify/events"
 
-import { User, Session, Config } from "@models"
+import { User, Session, Config } from "@shared-classes/DbModels"
 
 import DbManager from "@classes/DbManager"
 import { createStorageClientInstance } from "@classes/StorageClient"

packages/server/src/controllers/AdminController/endpoints/resetPassword.js

@@ -1,4 +1,4 @@
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 
 import bcrypt from "bcrypt"
 

packages/server/src/controllers/AuthController/endpoints/dataValidation.js

@@ -1,4 +1,4 @@
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/AuthController/endpoints/userLogout.js

@@ -1,4 +1,4 @@
-import { Session } from "@models"
+import { Session } from "@shared-classes/DbModels"
 
 export default {
     method: "POST",

packages/server/src/controllers/AuthController/methods/createUser.js

@@ -1,4 +1,4 @@
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 import Avatars from "dicebar_lib"
 import bcrypt from "bcrypt"
 

packages/server/src/controllers/BadgesController/endpoints/deleteBadge.js

@@ -1,4 +1,4 @@
-import { Badge } from "@models"
+import { Badge } from "@shared-classes/DbModels"
 
 export default {
     method: "DELETE",

packages/server/src/controllers/BadgesController/endpoints/getBadges.js

@@ -1,5 +1,5 @@
 import { Schematized } from "@lib"
-import { Badge } from "@models"
+import { Badge } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/BadgesController/endpoints/getUserBadges.js

@@ -1,4 +1,4 @@
-import { User, Badge } from "@models"
+import { User, Badge } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/BadgesController/endpoints/giveToUser.js

@@ -1,4 +1,4 @@
-import { Badge, User } from "@models"
+import { Badge, User } from "@shared-classes/DbModels"
 import { Schematized } from "@lib"
 
 export default {

packages/server/src/controllers/BadgesController/endpoints/putBadge.js

@@ -1,4 +1,4 @@
-import { Badge } from "@models"
+import { Badge } from "@shared-classes/DbModels"
 import { Schematized } from "@lib"
 
 export default {

packages/server/src/controllers/BadgesController/endpoints/removeToUser.js

@@ -1,5 +1,5 @@
 import { Schematized } from "@lib"
-import { Badge, User } from "@models"
+import { Badge, User } from "@shared-classes/DbModels"
 
 export default {
     method: "DELETE",

packages/server/src/controllers/CommentsController/services/deleteComment.js

@@ -1,4 +1,4 @@
-import { Comment } from "../../../models"
+import { Comment } from "@shared-classes/DbModels"
 import CheckUserAdmin from "../../../lib/checkUserAdmin"
 
 export default async (payload) => {

packages/server/src/controllers/CommentsController/services/getComments.js

@@ -1,4 +1,4 @@
-import { User, Comment } from "../../../models"
+import { User, Comment } from "@shared-classes/DbModels"
 
 export default async (payload = {}) => {
     const { parent_id } = payload

packages/server/src/controllers/CommentsController/services/newComment.js

@@ -1,4 +1,4 @@
-import { User, Comment } from "../../../models"
+import { User, Comment } from "@shared-classes/DbModels"
 
 export default async (payload) => {
     const { parent_id, message, user_id } = payload

packages/server/src/controllers/FeaturedEventsController/index.js

@@ -1,6 +1,6 @@
 import { Controller } from "linebridge/dist/server"
 
-import { FeaturedEvent } from "@models"
+import { FeaturedEvent } from "@shared-classes/DbModels"
 import createFeaturedEvent from "./services/createFeaturedEvent"
 
 // TODO: Migrate to new linebridge 0.15 endpoint classes instead of this

packages/server/src/controllers/FeaturedEventsController/services/createFeaturedEvent.js

@@ -1,4 +1,4 @@
-import { FeaturedEvent } from "../../../models"
+import { FeaturedEvent } from "@shared-classes/DbModels"
 
 export default async (payload) => {
     const {

packages/server/src/controllers/FeedController/services/getPlaylistsFromFollowing.js

@@ -1,4 +1,4 @@
-import { Playlist, User, UserFollow } from "@models"
+import { Playlist, User, UserFollow } from "@shared-classes/DbModels"
 
 export default async (payload) => {
     const {

packages/server/src/controllers/FeedController/services/getPlaylistsFromGlobal.js

@@ -1,4 +1,4 @@
-import { Playlist } from "@models"
+import { Playlist } from "@shared-classes/DbModels"
 
 export default async (payload) => {
     const {

packages/server/src/controllers/FeedController/services/getPosts.js

@@ -1,4 +1,4 @@
-import { Post, UserFollow } from "@models"
+import { Post, UserFollow } from "@shared-classes/DbModels"
 
 import fullfillPostsData from "@utils/fullfillPostsData"
 

packages/server/src/controllers/FollowController/endpoints/getFollowStatus.js

@@ -1,4 +1,4 @@
-import { UserFollow } from "@models"
+import { UserFollow } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/FollowController/endpoints/getUserFollowers.js

@@ -1,4 +1,4 @@
-import { User, UserFollow } from "@models"
+import { User, UserFollow } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/FollowController/endpoints/toggleFollow.js

@@ -1,5 +1,5 @@
 import { Schematized } from "@lib"
-import { User, UserFollow } from "@models"
+import { User, UserFollow } from "@shared-classes/DbModels"
 
 import followUser from "../services/followUser"
 import unfollowUser from "../services/unfollowUser"

packages/server/src/controllers/FollowController/services/followUser.js

@@ -1,4 +1,4 @@
-import { User, UserFollow } from "@models"
+import { User, UserFollow } from "@shared-classes/DbModels"
 
 export default async (payload) => {
     if (typeof payload.user_id === "undefined") {

packages/server/src/controllers/FollowController/services/unfollowUser.js

@@ -1,4 +1,4 @@
-import { User, UserFollow } from "@models"
+import { User, UserFollow } from "@shared-classes/DbModels"
 
 export default async (payload) => {
     if (typeof payload.user_id === "undefined") {

packages/server/src/controllers/ModerationController/endpoints/modifyPostLikes.js

@@ -1,4 +1,4 @@
-import { Post, } from "@models"
+import { Post, } from "@shared-classes/DbModels"
 import toggleLike from "../../PostsController/services/toggleLike"
 
 export default {

packages/server/src/controllers/NFCController/endpoints/getTagById.js

@@ -1,4 +1,4 @@
-import { User, NFCTag } from "@models"
+import { User, NFCTag } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/NFCController/endpoints/getTagBySerial.js

@@ -1,4 +1,4 @@
-import { User, NFCTag } from "@models"
+import { User, NFCTag } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/NFCController/endpoints/getTags.js

@@ -1,4 +1,4 @@
-import { NFCTag } from "@models"
+import { NFCTag } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/NFCController/endpoints/registerTag.js

@@ -1,4 +1,4 @@
-import { NFCTag } from "@models"
+import { NFCTag } from "@shared-classes/DbModels"
 
 const allowedUpdateFields = [
     "user_id",

packages/server/src/controllers/PostsController/services/createPost.js

@@ -1,5 +1,5 @@
 import momentTimezone from "moment-timezone"
-import { Post } from "@models"
+import { Post } from "@shared-classes/DbModels"
 
 import getPostData from "./getPostData"
 import flagNsfwByAttachments from "./flagNsfwByAttachments"

packages/server/src/controllers/PostsController/services/deletePost.js

@@ -1,4 +1,4 @@
-import { Post, User } from "../../../models"
+import { Post, User } from "@shared-classes/DbModels"
 
 export default async (payload) => {
     const { post_id, by_user_id } = payload

packages/server/src/controllers/PostsController/services/flagNsfwByAttachments.js

@@ -1,4 +1,4 @@
-import { Post } from "../../../models"
+import { Post } from "@shared-classes/DbModels"
 import indecentPrediction from "../../../utils/indecent-prediction"
 import isNSFW from "../../../utils/is-nsfw"
 

packages/server/src/controllers/PostsController/services/getPostData.js

@@ -1,4 +1,4 @@
-import { Post, SavedPost } from "@models"
+import { Post, SavedPost } from "@shared-classes/DbModels"
 import fullfillPostsData from "@utils/fullfillPostsData"
 
 export default async (payload) => {

packages/server/src/controllers/PostsController/services/modifyPostData.js

@@ -1,4 +1,4 @@
-import { Post } from "@models"
+import { Post } from "@shared-classes/DbModels"
 import getPostData from "./getPostData"
 
 export default async (post_id, modification) => {

packages/server/src/controllers/PostsController/services/toggleLike.js

@@ -1,4 +1,4 @@
-import { PostLike } from "@models"
+import { PostLike } from "@shared-classes/DbModels"
 
 export default async (payload) => {
     let { post_id, user_id, to } = payload

packages/server/src/controllers/PostsController/services/togglePostSave.js

@@ -1,4 +1,4 @@
-import { SavedPost } from "../../../models"
+import { SavedPost } from "@shared-classes/DbModels"
 
 export default async (payload) => {
     let { post_id, user_id } = payload

packages/server/src/controllers/PublicController/endpoints/featuredWallpapers.js

@@ -1,4 +1,4 @@
-import { FeaturedWallpaper } from "../../../models"
+import { FeaturedWallpaper } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/PublicController/endpoints/globalServerLimits.js

@@ -1,4 +1,4 @@
-import { ServerLimit } from "@models"
+import { ServerLimit } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/PublicController/endpoints/newFeaturedWallpaper.js

@@ -1,5 +1,5 @@
 import { Schematized } from "@lib"
-import { FeaturedWallpaper } from "@models"
+import { FeaturedWallpaper } from "@shared-classes/DbModels"
 
 export default {
     method: "POST",

packages/server/src/controllers/RolesController/index.js

@@ -1,5 +1,5 @@
 import { Controller } from "linebridge/dist/server"
-import { Role, User } from "@models"
+import { Role, User } from "@shared-classes/DbModels"
 import { Schematized } from "@lib"
 
 export default class RolesController extends Controller {

packages/server/src/controllers/SearchController/endpoints/getSearch.js

@@ -1,4 +1,5 @@
-import { User } from "@models"
+import { User, Playlist, Track } from "@shared-classes/DbModels"
+import pmap from "p-map"
 
 export default {
     method: "GET",
@@ -9,19 +10,60 @@ export default {
 
         let suggestions = {}
 
-        // search users by username or name
-        const users = await User.find({
-            $or: [
-                { username: { $regex: keywords, $options: "i" } },
-                { fullName: { $regex: keywords, $options: "i" } },
-            ],
-        })
-            .limit(5)
-            .select("username fullName avatar verified")
+        const searchers = [
+            {
+                id: "users",
+                model: User,
+                query: {
+                    $or: [
+                        { username: { $regex: keywords, $options: "i" } },
+                        { fullName: { $regex: keywords, $options: "i" } },
+                    ]
+                },
+                limit: 5,
+                select: "username fullName avatar verified",
+            },
+            {
+                id: "playlists",
+                model: Playlist,
+                query: {
+                    $or: [
+                        { title: { $regex: keywords, $options: "i" } },
+                    ]
+                },
+                limit: 5,
+            },
+            {
+                id: "tracks",
+                model: Track,
+                query: {
+                    $or: [
+                        { title: { $regex: keywords, $options: "i" } },
+                        { author: { $regex: keywords, $options: "i" } },
+                        { album: { $regex: keywords, $options: "i" } },
+                    ]
+                },
+                limit: 5,
+            }
+        ]
 
-        if (users.length > 0) {
-            suggestions["users"] = users
-        }
+        await pmap(
+            searchers,
+            async (searcher) => {
+                let results = await searcher.model.find(searcher.query)
+                    .limit(searcher.limit ?? 5)
+                    .select(searcher.select ?? undefined)
+
+                if (results.length > 0) {
+                    suggestions[searcher.id] = results
+                }
+
+                return
+            },
+            {
+                concurrency: 3
+            }
+        )
 
         return res.json(suggestions)
     }

packages/server/src/controllers/SessionController/endpoints/deleteCurrentSession.js

@@ -1,4 +1,4 @@
-import { Session } from "@models"
+import { Session } from "@shared-classes/DbModels"
 
 export default {
     method: "DELETE",

packages/server/src/controllers/SessionController/endpoints/getSessions.js

@@ -1,4 +1,4 @@
-import { Session } from "@models"
+import { Session } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/SessionController/endpoints/validateSession.js

@@ -1,6 +1,6 @@
 import jwt from "jsonwebtoken"
 
-import { Session } from "@models"
+import { Session } from "@shared-classes/DbModels"
 
 export default {
     method: "POST",

packages/server/src/controllers/StatusController/services/getConnectedUsersFollowing.js

@@ -1,4 +1,4 @@
-import { UserFollow } from "@models"
+import { UserFollow } from "@shared-classes/DbModels"
 
 export default async (payload = {}) => {
     const { from_user_id } = payload

packages/server/src/controllers/StreamingController/endpoints/deleteStreamingProfile.js

@@ -1,4 +1,4 @@
-import { StreamingProfile } from "@models"
+import { StreamingProfile } from "@shared-classes/DbModels"
 
 export default {
     method: "DELETE",

packages/server/src/controllers/StreamingController/endpoints/getProfileFromStreamKey.js

@@ -1,4 +1,4 @@
-import { StreamingProfile } from "@models"
+import { StreamingProfile } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/StreamingController/endpoints/getStreamingCategories.js

@@ -1,4 +1,4 @@
-import { StreamingCategory } from "@models"
+import { StreamingCategory } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/StreamingController/endpoints/getStreamingProfiles.js

@@ -1,4 +1,4 @@
-import { StreamingProfile } from "@models"
+import { StreamingProfile } from "@shared-classes/DbModels"
 import NewStreamingProfile from "@services/newStreamingProfile"
 import composeStreamingSources from "@utils/compose-streaming-sources"
 

packages/server/src/controllers/StreamingController/endpoints/handleStreamPublish.js

@@ -1,4 +1,4 @@
-import { StreamingProfile, User } from "@models"
+import { StreamingProfile, User } from "@shared-classes/DbModels"
 
 export default {
     method: "POST",

packages/server/src/controllers/StreamingController/endpoints/handleStreamUnpublish.js

@@ -1,4 +1,4 @@
-import { StreamingProfile } from "@models"
+import { StreamingProfile } from "@shared-classes/DbModels"
 
 export default {
     method: "POST",

packages/server/src/controllers/StreamingController/endpoints/postStreamingProfile.js

@@ -1,4 +1,4 @@
-import { StreamingProfile } from "@models"
+import { StreamingProfile } from "@shared-classes/DbModels"
 import NewStreamingProfile from "@services/newStreamingProfile"
 
 export default {

packages/server/src/controllers/StreamingController/endpoints/regenerateStreamingKey.js

@@ -1,4 +1,4 @@
-import { StreamingProfile } from "@models"
+import { StreamingProfile } from "@shared-classes/DbModels"
 
 export default {
     method: "POST",

packages/server/src/controllers/SyncController/classes/secureSyncEntry.js

@@ -1,4 +1,4 @@
-import { SyncEntry } from "../../../models"
+import { SyncEntry } from "@shared-classes/DbModels"
 
 import crypto from "crypto"
 

packages/server/src/controllers/UserController/endpoints/checkEmailAvailable.js

@@ -1,4 +1,4 @@
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/UserController/endpoints/checkUsernameAvailable.js

@@ -1,4 +1,4 @@
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/UserController/endpoints/getUserData.js

@@ -1,5 +1,5 @@
 import lodash from "lodash"
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 
 const publicGetters = [
     "_id",

packages/server/src/controllers/UserController/endpoints/getUsersData.js

@@ -1,5 +1,5 @@
 import { Schematized } from "@lib"
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/UserController/endpoints/resolveUserIdFromUsername.js

@@ -1,4 +1,4 @@
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 
 export default {
     method: "GET",

packages/server/src/controllers/UserController/endpoints/selfUpdateData.js

@@ -1,5 +1,5 @@
 import { Schematized } from "@lib"
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 import UpdateUserData from "../services/updateUserData"
 
 const AllowedPublicUpdateFields = [

packages/server/src/controllers/UserController/endpoints/selfUpdatePassword.js

@@ -1,5 +1,5 @@
 import { Schematized } from "@lib"
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 
 import updateUserPassword from "../services/updateUserPassword"
 import bcrypt from "bcrypt"

packages/server/src/controllers/UserController/services/createUser.js

@@ -1,4 +1,4 @@
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 import Avatars from "dicebar_lib"
 import bcrypt from "bcrypt"
 

packages/server/src/controllers/UserController/services/getConnectedUsersFollowing.js

@@ -1,4 +1,4 @@
-import { UserFollow } from "@models"
+import { UserFollow } from "@shared-classes/DbModels"
 
 export default async (payload = {}) => {
     const { from_user_id } = payload

packages/server/src/controllers/UserController/services/updateUserData.js

@@ -1,4 +1,4 @@
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 
 export default async (payload) => {
     if (typeof payload.user_id === "undefined") {

packages/server/src/controllers/UserController/services/updateUserPassword.js

@@ -1,4 +1,4 @@
-import { User } from "@models"
+import { User } from "@shared-classes/DbModels"
 import bcrypt from "bcrypt"
 
 export default async function (payload) {

packages/server/src/events/user_connected.js

@@ -1,4 +1,4 @@
-import { UserFollow } from "../models"
+import { UserFollow } from "@shared-classes/DbModels"
 
 export default async (user_id) => {
     // get followers of the user

packages/server/src/events/user_created.js

@@ -1,4 +1,4 @@
-import { User, UserFollow } from "@models"
+import { User, UserFollow } from "@shared-classes/DbModels"
 
 export default async function (userData) {
     // 

packages/server/src/events/user_disconnected.js

@@ -1,4 +1,4 @@
-import { UserFollow } from "../models"
+import { UserFollow } from "@shared-classes/DbModels"
 
 export default async (user_id) => {
     // get followers of the user

packages/server/src/fixments/additions_to_attachments.js

@@ -1,4 +1,4 @@
-import { Post } from "../models"
+import { Post } from "@shared-classes/DbModels"
 import DBManager from "../classes/DbManager"
 
 async function main() {

packages/server/src/fixments/migrate_posts_likes.js

@@ -3,7 +3,7 @@ require("dotenv").config()
 import fs from "fs"
 import path from "path"
 
-import { Post, PostLike } from "../models"
+import { Post, PostLike } from "@shared-classes/DbModels"
 import { performance } from "perf_hooks"
 import DBManager from "../classes/DbManager"
 

packages/server/src/lib/checkUserAdmin/index.js

@@ -1,4 +1,4 @@
-import { User } from "../../models"
+import { User } from "@shared-classes/DbModels"
 
 export default async (user_id) => {
     if (!user_id) {

packages/server/src/lib/token/index.js

@@ -1,5 +1,5 @@
 import jwt from "jsonwebtoken"
-import { Session, RegenerationToken } from "@models"
+import { Session, RegenerationToken } from "@shared-classes/DbModels"
 
 export async function regenerateSession(expiredToken, refreshToken, aggregateData = {}) {
     // search for a regeneration token with the expired token (Should exist only one)

packages/server/src/middlewares/permissions/index.js

@@ -1,4 +1,4 @@
-import { Config } from "../../models"
+import { Config } from "@shared-classes/DbModels"
 
 export default (req, res, next) => {
     const requestedPath = `${req.method.toLowerCase()}${req.path.toLowerCase()}`

packages/server/src/middlewares/withAuthentication/index.js

@@ -1,4 +1,4 @@
-import { Session, User, authorizedServerTokens } from "@models"
+import { Session, User, authorizedServerTokens } from "@shared-classes/DbModels"
 import { Token } from "@lib"
 
 import SecureEntry from "@lib/secureEntry"