Extremely Unnecessary but Fancy Console.logs

backend/package.json

@@ -5,7 +5,7 @@
   "main": "src/app.ts",
   "scripts": {
     "start": "DEV=true ts-node-transpile-only src/app.ts",
-    "dev": "ts-node-dev --transpile-only src/app.ts",
+    "dev": "ts-node-dev --transpile-only --allow-console-logs src/app.ts",
     "test": "ts-mocha test/test.ts"
   },
   "keywords": [],

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

@@ -1,7 +1,5 @@
 import { Socket } from 'socket.io';
-import { User } 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 { WebSocket } from '../websocket';
@@ -15,11 +13,12 @@ export default class implements WSEvent<'USER_UPDATE'> {
     private guard = Deps.get<WSGuard>(WSGuard),
   ) {}
 
-  public async invoke(ws: WebSocket, client: Socket, { token, username, avatarURL, ignored }: WS.Params.UserUpdate) {
+  public async invoke(ws: WebSocket, client: Socket, { token, username, avatarURL, ignored, email }: WS.Params.UserUpdate) {
     const { id: userId } = await this.guard.decodeKey(token);
     const user = await this.users.getSelf(userId);
 
     const partialUser = {};
+    if (email) partialUser['email'] = email;
     if (avatarURL) partialUser['avatarURL'] = avatarURL;
     if (ignored) partialUser['ignored'] = ignored;
     if (username) partialUser['username'] = username;

backend/test/mock/mock.ts

@@ -1,4 +1,3 @@
-import '../../src/types/entity';
 import { Channel, ChannelDocument } from '../../src/data/models/channel';
 import { Guild, GuildDocument } from '../../src/data/models/guild';
 import { GuildMember, GuildMemberDocument } from '../../src/data/models/guild-member';

backend/test/test.ts

@@ -1,4 +1,6 @@
 import 'mocha';
+import 'colors';
+
 import { config } from 'dotenv';
 import { execSync } from 'child_process';
 config({ path: 'test/.env' });
@@ -15,18 +17,26 @@ use(chaiThings);
 use(should);
 
 (async() => {
-  await mongoose.connect(process.env.MONGO_URI, { 
-    useUnifiedTopology: true, 
-    useNewUrlParser: true, 
-    useFindAndModify: false,
-    useCreateIndex: true,
-  });
+  try {
+    await mongoose.connect(process.env.MONGO_URI, { 
+      useUnifiedTopology: true, 
+      useNewUrlParser: true, 
+      useFindAndModify: false,
+      useCreateIndex: true,
+    });
+    console.log(`Connected to ${process.env.MONGO_URI}`);    
+  } catch {
+    console.log(`Failed to connect to ${process.env.MONGO_URI}`);  
+  }
 
   try {
     // remove glitched test processes
     execSync(`kill -9 $(lsof -i :${process.env.PORT} | tail -n 1 | cut -d ' ' -f5) 2>> /dev/null`);
   } catch {}
 
+  const space = (length = 54) => new Array(length).join(' ');
+  console.log(`${space(51 * 3)}INTEGRATION TESTS${space(54 * 2)}`.bgWhite.black);
+
   // await import('./integration/routes/auth-routes.tests');
   // await import('./integration/routes/invites-routes.tests');
   // await import('./integration/routes/guilds-routes.tests');
@@ -45,17 +55,19 @@ use(should);
   // await import('./integration/ws/message-update.tests');
   // await import('./integration/ws/message-delete.tests');
   // await import('./integration/ws/ready.tests');
-  await import('./integration/ws/user-update.tests');
+  // await import('./integration/ws/user-update.tests');
   // await import('./integration/ws/ws-guard.tests');
+  
+  console.log(`${space(52 * 3)}UNIT TESTS${space(54 * 2)}`.bgWhite.black);  
 
-  // await import('./unit/models/application.tests');
-  // await import('./unit/models/channel.tests');
-  // await import('./unit/models/guild.tests');
-  // await import('./unit/models/guild-member.tests');
-  // await import('./unit/models/invite.tests');
-  // await import('./unit/models/message.tests');
-  // await import('./unit/models/role.tests');
-  // await import('./unit/models/user.tests');
-  // await import('./unit/snowflake-entity.tests');
-  // await import('./unit/ws/ws-cooldowns.tests');
+  await import('./unit/models/application.tests');
+  await import('./unit/models/channel.tests');
+  await import('./unit/models/guild.tests');
+  await import('./unit/models/guild-member.tests');
+  await import('./unit/models/invite.tests');
+  await import('./unit/models/message.tests');
+  await import('./unit/models/role.tests');
+  await import('./unit/models/user.tests');
+  await import('./unit/snowflake-entity.tests');
+  await import('./unit/ws/ws-cooldowns.tests');
 })();

backend/test/unit/models/channel.tests.ts

@@ -3,7 +3,6 @@ import { generateSnowflake } from '../../../src/data/snowflake-entity';
 import { test, given } from 'sazerac';
 import { longArray, longString, mongooseError } from '../../test-utils';
 
-
 test(createChannel, () => {
   given().expect(true);
   given({ guildId: '123' }).expect('Invalid Snowflake ID');

backend/test/unit/models/invite.tests.ts

@@ -1,6 +1,6 @@
 import { generateSnowflake } from '../../../src/data/snowflake-entity';
 import { test, given } from 'sazerac';
-import { longArray, longString, mongooseError } from '../../test-utils';
+import { mongooseError } from '../../test-utils';
 import { Invite } from '../../../src/data/models/invite';
 
 test(createInvite, () => {

backend/test/unit/models/user.tests.ts

@@ -57,15 +57,12 @@ test(createUser, () => {
 
 function createUser(user: any) {
   const error = new User({
-    _id: generateSnowflake(),
     avatarURL: 'a',
     bot: false,
-    badges: [],
-    friendIds: [],
-    friendRequestIds: [],
     guilds: [generateSnowflake()],
     status: 'ONLINE',
     username: `mock-user-${generateSnowflake()}`,
+    discriminator: 1,
     ...user,
   }).validateSync();
 

backend/test/unit/snowflake-entity.tests.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { generateSnowflake, snowflakeToDate } from '../../src/data/snowflake-entity';
-import { patterns } from '../../src/data/types/entity-types';
+import patterns from '../../src/types/patterns';
 
 describe('data/snowflake-entity', () => {
   it('get snowflake, 2 ids in same ms, snowflake is different', () => {

backend/test/unit/ws/ws-cooldowns.tests.ts

@@ -1,6 +1,6 @@
 import { expect } from 'chai';
+import generateInvite from '../../../src/data/utils/generate-invite';
 import { WSCooldowns } from '../../../src/ws/modules/ws-cooldowns';
-import { generateInviteCode } from '../../../src/data/models/invite';
 
 describe('ws-cooldowns', () => {
   let clientId: string;
@@ -8,7 +8,7 @@ describe('ws-cooldowns', () => {
 
   beforeEach(() => {
     cooldowns = new WSCooldowns();
-    clientId = generateInviteCode();
+    clientId = generateInvite();
   });
 
   it('handle, adds cooldown', () => {

backend/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compileOnSave": true,
+  "ts-node": { "files": true },
   "compilerOptions": {
     "downlevelIteration": true,
     "esModuleInterop": true,

types/ws.d.ts

@@ -203,6 +203,7 @@ declare namespace WS {
     export interface UserUpdate {
       avatarURL?: string;
       username?: string;
+      email?: string;
       ignored?: UserTypes.Self['ignored'];
       token: string;
     }