No old deps.

README.md

@@ -17,11 +17,16 @@ Custom Frontend and Backend that is similar to Discord.
    From app folder:
    ```
    mkdir -p backend/keys
-     && ssh-keygen -t rsa -b 2048 -m PEM -f backend/keys/jwt
-     && openssl rand -rand /dev/urandom 256 > backend/keys/message
+   ssh-keygen -t rsa -b 2048 -m PEM -f backend/keys/jwt
    ```
 3. Install npm packages.
-   From app folder: `cd frontend && npm i && cd ../backend && npm i`
+   From app folder:
+   ```
+   cd frontend
+   npm i
+   cd ../backend
+   npm i
+   ```
 
 ---
 

backend/src/data/guilds.ts

@@ -1,17 +1,12 @@
 import { Guild, GuildDocument } from './models/guild';
 import DBWrapper from './db-wrapper';
 import { generateSnowflake } from './snowflake-entity';
-import Deps from '../utils/deps';
-import Channels from './channels';
-import GuildMembers from './guild-members';
-import Roles from './roles';
-import { SelfUserDocument, User, UserDocument } from './models/user';
+import { SelfUserDocument, User } from './models/user';
 import { Invite } from './models/invite';
 import { APIError } from '../rest/modules/api-error';
 import { Channel } from './models/channel';
 import { Role } from './models/role';
 import { GuildMember } from './models/guild-member';
-import Users from './users';
 
 export default class Guilds extends DBWrapper<string, GuildDocument> {
   public async get(id: string | undefined) {

backend/src/rest/routes/channel-routes.ts

@@ -4,7 +4,7 @@ import Messages from '../../data/messages';
 import { SelfUserDocument } from '../../data/models/user';
 import Pings from '../../data/pings';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WebSocket } from '../../ws/websocket';
 import { WSGuard } from '../../ws/modules/ws-guard';
 import { APIError } from '../modules/api-error';

backend/src/rest/routes/dev-routes.ts

@@ -2,7 +2,7 @@ import { Router } from 'express';
 import { App } from '../../data/models/app';
 import Users from '../../data/users';
 import generateInvite from '../../data/utils/generate-invite';
-import Deps from '../../utils/deps';
+
 import { updateUser, validateUser } from '../modules/middleware';
 import { WSGuard } from '../../ws/modules/ws-guard';
 

backend/src/rest/routes/guilds-routes.ts

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import Deps from '../../utils/deps';
+
 import Users from '../../data/users';
 import Guilds from '../../data/guilds';
 import { WebSocket } from '../../ws/websocket';

backend/src/rest/routes/users-routes.ts

@@ -1,7 +1,7 @@
 import { Router } from 'express';
 import { User } from '../../data/models/user';
 import Users from '../../data/users';
-import Deps from '../../utils/deps';
+
 import generateInvite from '../../data/utils/generate-invite';
 import { Guild } from '../../data/models/guild';
 import { Role } from '../../data/models/role';

backend/src/utils/deps.ts

@@ -1,14 +0,0 @@
-export default class Deps {  
-  private static deps = new Map<any, any>();
-
-  public static get<T>(type: any): T {
-    return this.deps.get(type)
-      ?? this.add(type, new type());
-  }
-  
-  public static add<T>(type: any, instance: T): T {
-    return this.deps
-      .set(type, instance)
-      .get(type);
-  }
-}

backend/src/ws/modules/ws-guard.ts

@@ -1,5 +1,5 @@
 import { Guild } from '../../data/models/guild';
-import Deps from '../../utils/deps';
+
 import { WebSocket } from '../websocket';
 import { Socket } from 'socket.io';
 import Channels from '../../data/channels';

backend/src/ws/modules/ws-rooms.ts

@@ -1,7 +1,7 @@
 import { Socket } from 'socket.io';
 import { Channel } from '../../data/models/channel';
 import { SelfUserDocument } from '../../data/models/user';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from './ws-guard';
 
 export class WSRooms {

backend/src/ws/websocket.ts

@@ -4,7 +4,7 @@ import { WSEvent } from './ws-events/ws-event';
 import { resolve } from 'path';
 import { readdirSync } from 'fs';
 import { WSCooldowns } from './modules/ws-cooldowns';
-import Deps from '../utils/deps';
+
 import { SessionManager } from './modules/session-manager';
 import { WS } from '../types/ws';
 

backend/src/ws/ws-events/channel-create.ts

@@ -2,7 +2,7 @@ import { Socket } from 'socket.io';
 import Channels from '../../data/channels';
 import { Guild } from '../../data/models/guild';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent } from './ws-event';

backend/src/ws/ws-events/channel-delete.ts

@@ -1,5 +1,5 @@
 import { Socket } from 'socket.io';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/channel-join.ts

@@ -1,6 +1,6 @@
 import Channels from '../../data/channels';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSEvent } from './ws-event';
 import { WebSocket } from '../websocket';
 import { Socket } from 'socket.io';

backend/src/ws/ws-events/channel-leave.ts

@@ -1,6 +1,6 @@
 import Channels from '../../data/channels';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WSEvent } from './ws-event';
 import { WebSocket } from '../websocket';

backend/src/ws/ws-events/channel-update.ts

@@ -1,5 +1,5 @@
 import { Socket } from 'socket.io';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/disconnect.ts

@@ -3,7 +3,7 @@ import Channels from '../../data/channels';
 import { SelfUserDocument, UserDocument } from '../../data/models/user';
 import Users from '../../data/users';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WebSocket } from '../websocket';
 import ChannelLeave from './channel-leave';
 import { WSEvent } from './ws-event';

backend/src/ws/ws-events/guild-create.ts

@@ -2,7 +2,7 @@ import { Socket } from 'socket.io';
 import Guilds from '../../data/guilds';
 import Users from '../../data/users';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSRooms } from '../modules/ws-rooms';
 import { WebSocket } from '../websocket';
 import { WSEvent } from './ws-event';

backend/src/ws/ws-events/guild-delete.ts

@@ -7,7 +7,7 @@ import { Message } from '../../data/models/message';
 import { Role } from '../../data/models/role';
 import { User } from '../../data/models/user';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent } from './ws-event';

backend/src/ws/ws-events/guild-member-add.ts

@@ -5,7 +5,7 @@ import Invites from '../../data/invites';
 import { InviteDocument } from '../../data/models/invite';
 import Users from '../../data/users';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSRooms } from '../modules/ws-rooms';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/guild-member-remove.ts

@@ -7,7 +7,7 @@ import { User } from '../../data/models/user';
 import Users from '../../data/users';
 import { PermissionTypes } from '../../types/permission-types';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/guild-member-update.ts

@@ -3,7 +3,7 @@ import GuildMembers from '../../data/guild-members';
 import Guilds from '../../data/guilds';
 import Roles from '../../data/roles';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/guild-role-create.ts

@@ -3,7 +3,7 @@ import { PermissionTypes } from '../../types/permission-types';
 import { Guild } from '../../data/models/guild';
 import { Role } from '../../data/models/role';
 import { generateSnowflake } from '../../data/snowflake-entity';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/guild-role-delete.ts

@@ -1,7 +1,7 @@
 import { Socket } from 'socket.io';
 import { PermissionTypes } from '../../types/permission-types';
 import { Role } from '../../data/models/role';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/guild-role-update.ts

@@ -1,5 +1,5 @@
 import { Socket } from 'socket.io';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/guild-update.ts

@@ -1,5 +1,5 @@
 import { Socket } from 'socket.io';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/invite-create.ts

@@ -2,7 +2,7 @@ import { Socket } from 'socket.io';
 import Invites from '../../data/invites';
 import { PermissionTypes } from '../../types/permission-types';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/invite-delete.ts

@@ -2,7 +2,7 @@ import { Socket } from 'socket.io';
 import Invites from '../../data/invites';
 import { Guild } from '../../data/models/guild';
 import { PermissionTypes } from '../../types/permission-types';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/message-create.ts

@@ -1,7 +1,7 @@
 import { Socket } from 'socket.io';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import Messages from '../../data/messages';
 import Users from '../../data/users';

backend/src/ws/ws-events/message-delete.ts

@@ -4,7 +4,7 @@ import Messages from '../../data/messages';
 import { Message } from '../../data/models/message';
 import { PermissionTypes } from '../../types/permission-types';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent } from './ws-event';

backend/src/ws/ws-events/message-update.ts

@@ -3,7 +3,7 @@ import { MessageDocument } from '../../data/models/message';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';
 import got from 'got';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import Messages from '../../data/messages';
 import { WS } from '../../types/ws';

backend/src/ws/ws-events/ready.ts

@@ -3,7 +3,7 @@ import Channels from '../../data/channels';
 import { SelfUserDocument } from '../../data/models/user';
 import Users from '../../data/users';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WSRooms } from '../modules/ws-rooms';
 import { WebSocket } from '../websocket';

backend/src/ws/ws-events/user-delete.ts

@@ -3,7 +3,7 @@ import { Socket } from 'socket.io';
 import { WebSocket } from '../websocket';
 import { WS } from '../../types/ws';
 import Users from '../../data/users';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import generateInvite from '../../data/utils/generate-invite';
 

backend/src/ws/ws-events/user-update.ts

@@ -2,7 +2,7 @@ import { Socket } from 'socket.io';
 import Users from '../../data/users';
 import { EmailFunctions } from '../../email/email-functions';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { WSGuard } from '../modules/ws-guard';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/src/ws/ws-events/voice-data.ts

@@ -1,6 +1,6 @@
 import { Socket } from 'socket.io';
 import { WS } from '../../types/ws';
-import Deps from '../../utils/deps';
+
 import { VoiceService } from '../../voice/voice-service';
 import { WebSocket } from '../websocket';
 import { WSEvent, } from './ws-event';

backend/test/integration/routes/auth-routes.tests.ts

@@ -1,7 +1,7 @@
 import { Mock } from '../../mock/mock';
 import { EmailMock } from '../../mock/email-mock';
 import { assert, expect, spy } from 'chai';
-import Deps from '../../../src/utils/deps';
+
 import request from 'supertest';
 import Users from '../../../src/data/users';
 import { User, SelfUserDocument } from '../../../src/data/models/user';

backend/test/integration/routes/channel-routes.tests.ts

@@ -1,5 +1,5 @@
 import { Mock } from '../../mock/mock';
-import Deps from '../../../src/utils/deps';
+
 import { API } from '../../../src/api/server';
 import request from 'supertest';
 import Users from '../../../src/data/users';

backend/test/integration/routes/guilds-routes.tests.ts

@@ -1,5 +1,5 @@
 import { Mock } from '../../mock/mock';
-import Deps from '../../../src/utils/deps';
+
 import { API } from '../../../src/api/server';
 import request from 'supertest';
 import Users from '../../../src/data/users';

backend/test/integration/routes/invites-routes.tests.ts

@@ -1,5 +1,5 @@
 import { Mock } from '../../mock/mock';
-import Deps from '../../../src/utils/deps';
+
 import { API } from '../../../src/api/server';
 import request from 'supertest';
 import Users from '../../../src/data/users';

backend/test/integration/ws/guild-member-add.tests.ts

@@ -1,6 +1,6 @@
 import GuildMemberAdd from '../../../src/ws/ws-events/guild-member-add';
 import { WebSocket } from '../../../src/ws/websocket';
-import Deps from '../../../src/utils/deps';
+
 import io from 'socket.io-client';
 import { Mock } from '../../mock/mock';
 import { UserDocument } from '../../../src/data/models/user';

backend/test/integration/ws/ready.tests.ts

@@ -1,4 +1,4 @@
-import Deps from '../../../src/utils/deps';
+
 import Ready from '../../../src/ws/ws-events/ready';
 import Disconnect from '../../../src/ws/ws-events/disconnect';
 import { User, UserDocument } from '../../../src/data/models/user';

backend/test/integration/ws/user-update.tests.ts

@@ -4,7 +4,7 @@ import io from 'socket.io-client';
 import{ Mock } from '../../mock/mock';
 import{ SelfUserDocument, User } from '../../../src/data/models/user';
 import { expect } from 'chai';
-import Deps from '../../../src/utils/deps';
+
 import Users from '../../../src/data/users';
 
 describe.only('user-update', () => {

backend/test/integration/ws/ws-guard.tests.ts

@@ -1,4 +1,4 @@
-import Deps from '../../../src/utils/deps';
+
 import io from 'socket.io-client';
 import { Mock } from '../../mock/mock';
 import { GuildDocument } from '../../../src/data/models/guild';

backend/test/mock/mock.ts

@@ -11,7 +11,7 @@ import Messages from '../../src/data/messages';
 import Invites from '../../src/data/invites';
 import { App } from '../../src/data/models/app';
 import { WebSocket } from '../../src/ws/websocket';
-import Deps from '../../src/utils/deps';
+
 import Guilds from '../../src/data/guilds';
 import GuildMembers from '../../src/data/guild-members';
 import Channels from '../../src/data/channels';