big revamp n stuff

8 files changed, 39 insertions, 65 deletions

diff --git a/server/src/database/index.ts b/server/src/database/index.ts
index 3e56d53..ad14794 100644
--- a/server/src/database/index.ts
+++ b/server/src/database/index.ts
@@ -1,5 +1,5 @@
-import ReactionGuildModel from './models/ReactionGuildModel';
+import GuildModel from './models/GuildModel';
 import ReactionModel from './models/ReactionModel';
 import SettingsProvider from './structures/SettingsProvider';
 
-export { SettingsProvider, ReactionGuildModel, ReactionModel };
\ No newline at end of file
+export { SettingsProvider, GuildModel, ReactionModel };
\ No newline at end of file
diff --git a/server/src/database/models/DarlingModel.ts b/server/src/database/models/DarlingModel.ts
deleted file mode 100644
index 3f98037..0000000
--- a/server/src/database/models/DarlingModel.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import mongoose from 'mongoose';
-const darlingSchema = new mongoose.Schema({
-    _id: mongoose.Schema.Types.ObjectId,
-    username: String,
-    userID: String,
-    guildname: String,
-    guildID: String,
-    time: String
-});
-export = mongoose.model('Darling', darlingSchema);
\ No newline at end of file
diff --git a/server/src/database/models/FanArtModel.ts b/server/src/database/models/FanArtModel.ts
deleted file mode 100644
index c2d983e..0000000
--- a/server/src/database/models/FanArtModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import mongoose from 'mongoose';
-const fanArtSchema = new mongoose.Schema({
-    _id: mongoose.Schema.Types.ObjectId,
-    username: String,
-    userID: String,
-    guildname: String,
-    guildID: String,
-    channelname: String,
-    channelID: String,
-    time: String
-});
-export = mongoose.model('FanArt', fanArtSchema);
\ No newline at end of file
diff --git a/server/src/database/models/GoodbyeModel.ts b/server/src/database/models/GoodbyeModel.ts
deleted file mode 100644
index 04cc7c4..0000000
--- a/server/src/database/models/GoodbyeModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import mongoose from 'mongoose';
-const goodbyeSchema = new mongoose.Schema({
-    _id: mongoose.Schema.Types.ObjectId,
-    username: String,
-    userID: String,
-    guildname: String,
-    guildID: String,
-    channelname: String,
-    channelID: String,
-    time: String
-});
-export = mongoose.model('Goodbye', goodbyeSchema);
\ No newline at end of file
diff --git a/server/src/database/models/GuildModel.ts b/server/src/database/models/GuildModel.ts
new file mode 100644
index 0000000..de079ec
--- /dev/null
+++ b/server/src/database/models/GuildModel.ts
@@ -0,0 +1,36 @@
+import { Document, Schema, model } from 'mongoose';
+
+export interface Guild extends Document {
+    id: string;
+    prefix: string;
+    premium: boolean;
+    expiresAt: Date;
+    darling?: string;
+    welcome?: string;
+    goodbye?: string;
+    fanart?: string;
+}
+
+const Guild: Schema = new Schema({
+    id: String,
+    prefix: String,
+    premium: Boolean,
+    expiresAt: Date,
+    darling: {
+        required: false,
+        type: String
+    },
+    welcome: {
+        required: false,
+        type: String
+    },
+    goodbye: {
+        required: false,
+        type: String
+    },
+    fanart: {
+        required: false,
+        type: String
+    }
+}, { strict: false });
+export default model<Guild>('Guild', Guild);
\ No newline at end of file
diff --git a/server/src/database/models/ReactionGuildModel.ts b/server/src/database/models/ReactionGuildModel.ts
deleted file mode 100644
index 6389b56..0000000
--- a/server/src/database/models/ReactionGuildModel.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Document, Schema, model } from 'mongoose';
-
-export interface Guild extends Document {
-    id: string;
-    prefix: string;
-    premium: boolean;
-    expiresAt: Date;
-}
-
-const Guild: Schema = new Schema({
-    id: String,
-    prefix: String,
-    premium: Boolean,
-    expiresAt: Date
-}, { strict: false });
-export default model<Guild>('Guild', Guild);
\ No newline at end of file
diff --git a/server/src/database/models/WelcomeModel.ts b/server/src/database/models/WelcomeModel.ts
deleted file mode 100644
index 2a26a6f..0000000
--- a/server/src/database/models/WelcomeModel.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import mongoose from 'mongoose';
-const welcomeSchema = new mongoose.Schema({
-    _id: mongoose.Schema.Types.ObjectId,
-    username: String,
-    userID: String,
-    guildname: String,
-    guildID: String,
-    channelname: String,
-    channelID: String,
-    time: String
-});
-export = mongoose.model('Welcome', welcomeSchema);
\ No newline at end of file
diff --git a/server/src/database/structures/SettingsProvider.ts b/server/src/database/structures/SettingsProvider.ts
index 0a2325a..c82c109 100644
--- a/server/src/database/structures/SettingsProvider.ts
+++ b/server/src/database/structures/SettingsProvider.ts
@@ -2,7 +2,7 @@ import { Collection } from 'discord.js';
 import { connect, Model, connection, Connection } from 'mongoose';
 import { Logger } from 'winston';
 import ReactionModel, { Reaction } from '../models/ReactionModel';
-import GuildModel, { Guild } from '../models/ReactionGuildModel';
+import GuildModel, { Guild } from '../models/GuildModel';
 import { MONGO_EVENTS } from '../utils/Constants'
 import BotClient from '../../client/BotClient';
 import { mongoDBUri } from '../../Config';