added welcome-leave commands and updated activitytypes

backend/index.js

@@ -143,28 +143,45 @@ app.get('/api/servers/:guildId/channels', async (req, res) => {
 app.get('/api/servers/:guildId/welcome-leave-settings', (req, res) => {
   const { guildId } = req.params;
   const db = readDb();
-  const settings = db[`${guildId}_welcome_leave`] || {
+  const settings = db[guildId] || {};
+
+  const welcomeLeaveSettings = {
     welcome: {
-      enabled: false,
-      channel: '',
-      message: 'Welcome to the server, {user}!',
-      customMessage: '',
+      enabled: settings.welcomeEnabled || false,
+      channel: settings.welcomeChannel || '',
+      message: settings.welcomeMessage || 'Welcome to the server, {user}!',
+      customMessage: settings.welcomeCustomMessage || '',
     },
     leave: {
-      enabled: false,
-      channel: '',
-      message: '{user} has left the server.',
-      customMessage: '',
+      enabled: settings.leaveEnabled || false,
+      channel: settings.leaveChannel || '',
+      message: settings.leaveMessage || '{user} has left the server.',
+      customMessage: settings.leaveCustomMessage || '',
     },
   };
-  res.json(settings);
+
+  res.json(welcomeLeaveSettings);
 });
 
 app.post('/api/servers/:guildId/welcome-leave-settings', (req, res) => {
   const { guildId } = req.params;
   const newSettings = req.body;
   const db = readDb();
-  db[`${guildId}_welcome_leave`] = newSettings;
+
+  if (!db[guildId]) {
+    db[guildId] = {};
+  }
+
+  db[guildId].welcomeEnabled = newSettings.welcome.enabled;
+  db[guildId].welcomeChannel = newSettings.welcome.channel;
+  db[guildId].welcomeMessage = newSettings.welcome.message;
+  db[guildId].welcomeCustomMessage = newSettings.welcome.customMessage;
+
+  db[guildId].leaveEnabled = newSettings.leave.enabled;
+  db[guildId].leaveChannel = newSettings.leave.channel;
+  db[guildId].leaveMessage = newSettings.leave.message;
+  db[guildId].leaveCustomMessage = newSettings.leave.customMessage;
+
   writeDb(db);
   res.json({ success: true });
 });