From 220c990b77af58edc9acf38b00ddcc833b399418 Mon Sep 17 00:00:00 2001 From: Sayak Mukhopadhyay Date: Thu, 13 Jul 2017 17:49:44 +0530 Subject: [PATCH] Added primary property to distinguish between important and not important stuff while preparing BGS reports --- src/db/interfaces/guild.ts | 2 ++ src/db/schemas/guild.ts | 2 ++ src/modules/discord/commands/monitorFactions.ts | 7 ++++++- src/modules/discord/commands/monitorSystems.ts | 7 ++++++- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/db/interfaces/guild.ts b/src/db/interfaces/guild.ts index 8c629f5..34177b4 100644 --- a/src/db/interfaces/guild.ts +++ b/src/db/interfaces/guild.ts @@ -23,6 +23,7 @@ export interface IGuild { created_at: Date, updated_at: Date, monitor_systems: [{ + primary: boolean, system_name: string, system_pos: { x: number, @@ -31,6 +32,7 @@ export interface IGuild { } }], monitor_factions: [{ + primary: boolean, faction_name: string }] } diff --git a/src/db/schemas/guild.ts b/src/db/schemas/guild.ts index 4bb6e7e..7c8dcf6 100644 --- a/src/db/schemas/guild.ts +++ b/src/db/schemas/guild.ts @@ -32,6 +32,7 @@ export let guildSchema: Schema = new Schema({ updated_at: Date, monitor_systems: [{ _id: false, + primary: Boolean, system_name: String, system_pos: { x: Number, @@ -41,6 +42,7 @@ export let guildSchema: Schema = new Schema({ }], monitor_factions: [{ _id: false, + primary: Boolean, faction_name: String }] }); diff --git a/src/modules/discord/commands/monitorFactions.ts b/src/modules/discord/commands/monitorFactions.ts index 3f94979..5f4ace2 100644 --- a/src/modules/discord/commands/monitorFactions.ts +++ b/src/modules/discord/commands/monitorFactions.ts @@ -43,7 +43,7 @@ export class MonitorFactions { } } - add(message: discord.Message, argsArray: string[]) { + add(message: discord.Message, argsArray: string[], primary: boolean = false) { Access.has(message.member, [Access.ADMIN, Access.BGS, Access.FORBIDDEN]) .then(() => { if (argsArray.length >= 2) { @@ -82,6 +82,7 @@ export class MonitorFactions { { guild_id: guildId }, { updated_at: new Date(), + primary: primary, $addToSet: { monitor_factions: monitorFactions } }) .then(guild => { @@ -135,6 +136,10 @@ export class MonitorFactions { }) } + addprimary(message: discord.Message, argsArray: string[]) { + this.add(message, argsArray, true); + } + remove(message: discord.Message, argsArray: string[]) { Access.has(message.member, [Access.ADMIN, Access.BGS, Access.FORBIDDEN]) .then(() => { diff --git a/src/modules/discord/commands/monitorSystems.ts b/src/modules/discord/commands/monitorSystems.ts index ac4052d..1e29a88 100644 --- a/src/modules/discord/commands/monitorSystems.ts +++ b/src/modules/discord/commands/monitorSystems.ts @@ -43,7 +43,7 @@ export class MonitorSystems { } } - add(message: discord.Message, argsArray: string[]) { + add(message: discord.Message, argsArray: string[], primary: boolean = false) { Access.has(message.member, [Access.ADMIN, Access.BGS, Access.FORBIDDEN]) .then(() => { if (argsArray.length >= 2) { @@ -87,6 +87,7 @@ export class MonitorSystems { { guild_id: guildId }, { updated_at: new Date(), + primary: primary, $addToSet: { monitor_systems: monitorSystems } }) .then(guild => { @@ -140,6 +141,10 @@ export class MonitorSystems { }) } + addprimary(message: discord.Message, argsArray: string[]) { + this.add(message, argsArray, true); + } + remove(message: discord.Message, argsArray: string[]) { Access.has(message.member, [Access.ADMIN, Access.BGS, Access.FORBIDDEN]) .then(() => {