big revamp n stuff

6 files changed, 36 insertions, 62 deletions

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