Mod Updates

* Clean Init

* Update timer

* Update Datafiles

* Linting

* Save progress

* Save progress

* Saving progress

* Separating button function

* oooo boyo

* Minor change to text

* Little more polish, not the sausage

* Fix ban message

* Update migration file

* Update drug defs

assets/data/combinedDB.json

@@ -32305,6 +32305,11 @@
         "name": "ketamine",
         "note": "No unexpected interactions, though likely to increase blood pressure  but not an issue with sensible doses. Moving around on high doses of  this combination may be ill advised due to risk of physical injury."
       },
+      {
+        "status": "Dangerous",
+        "name": "lithium",
+        "note": "High risk of serotonin syndrome"
+      },
       {
         "status": "Low Risk & Synergy",
         "name": "lsd"
@@ -58418,6 +58423,11 @@
         "name": "lsd",
         "note": "There is a large number of reports indicating a high seizure and psychosis risk from this combination."
       },
+      {
+        "status": "Dangerous",
+        "name": "mdma",
+        "note": "High risk of serotonin syndrome"
+      },
       {
         "status": "Dangerous",
         "name": "mescaline",

assets/data/tripsitCombos.json

@@ -1533,6 +1533,16 @@
       ],
       "status": "Dangerous"
     },
+    "mdma": {
+      "note": "High risk of serotonin syndrome",
+      "sources": [
+        "https://doi.org/10.1176/appi.neuropsych.11080196",
+        "https://www.biologicalpsychiatryjournal.com/article/S0006-3223(98)00161-9/pdf",
+        "https://www.nature.com/articles/1395366",
+        "https://www.cambridge.org/core/journals/advances-in-psychiatric-treatment/article/new-drugs-old-problems-revisiting-pharmacological-management-of-treatmentresistant-depression/D44091E25F9537B93CD6F4580F340645"
+      ],
+      "status": "Dangerous"
+    },
     "mescaline": {
       "note": "There is a large number of reports indicating a high seizure and psychosis risk from this combination.",
       "sources": [
@@ -1822,6 +1832,16 @@
       "note": "No unexpected interactions, though likely to increase blood pressure  but not an issue with sensible doses. Moving around on high doses of  this combination may be ill advised due to risk of physical injury.",
       "status": "Low Risk & Synergy"
     },
+    "lithium": {
+      "note": "High risk of serotonin syndrome",
+      "sources": [
+        "https://doi.org/10.1176/appi.neuropsych.11080196",
+        "https://www.biologicalpsychiatryjournal.com/article/S0006-3223(98)00161-9/pdf",
+        "https://www.nature.com/articles/1395366",
+        "https://www.cambridge.org/core/journals/advances-in-psychiatric-treatment/article/new-drugs-old-problems-revisiting-pharmacological-management-of-treatmentresistant-depression/D44091E25F9537B93CD6F4580F340645"
+      ],
+      "status": "Dangerous"
+    },
     "lsd": {
       "status": "Low Risk & Synergy"
     },

assets/data/tripsitDB.json

@@ -23095,6 +23095,16 @@
         ],
         "status": "Dangerous"
       },
+      "mdma": {
+        "note": "High risk of serotonin syndrome",
+        "sources": [
+          "https://doi.org/10.1176/appi.neuropsych.11080196",
+          "https://www.biologicalpsychiatryjournal.com/article/S0006-3223(98)00161-9/pdf",
+          "https://www.nature.com/articles/1395366",
+          "https://www.cambridge.org/core/journals/advances-in-psychiatric-treatment/article/new-drugs-old-problems-revisiting-pharmacological-management-of-treatmentresistant-depression/D44091E25F9537B93CD6F4580F340645"
+        ],
+        "status": "Dangerous"
+      },
       "mescaline": {
         "note": "There is a large number of reports indicating a high seizure and psychosis risk from this combination.",
         "sources": [
@@ -24196,6 +24206,16 @@
         "note": "No unexpected interactions, though likely to increase blood pressure  but not an issue with sensible doses. Moving around on high doses of  this combination may be ill advised due to risk of physical injury.",
         "status": "Low Risk & Synergy"
       },
+      "lithium": {
+        "note": "High risk of serotonin syndrome",
+        "sources": [
+          "https://doi.org/10.1176/appi.neuropsych.11080196",
+          "https://www.biologicalpsychiatryjournal.com/article/S0006-3223(98)00161-9/pdf",
+          "https://www.nature.com/articles/1395366",
+          "https://www.cambridge.org/core/journals/advances-in-psychiatric-treatment/article/new-drugs-old-problems-revisiting-pharmacological-management-of-treatmentresistant-depression/D44091E25F9537B93CD6F4580F340645"
+        ],
+        "status": "Dangerous"
+      },
       "lsd": {
         "status": "Low Risk & Synergy"
       },

package.json

@@ -26,8 +26,8 @@
     "db:formatSchema": "docker exec -it tripbot npx prisma format",
     "db:validateSchema": "docker exec -it tripbot npx prisma validate",
     "db:generateClient": "npx prisma generate && docker exec -it tripbot npx prisma generate",
-    "db:pushDev": "docker exec -it tripbot npx prisma db push && npx prisma generate",
-    "db:migrateDev": "docker exec -it tripbot npx prisma migrate dev -n betterImageLogging",
+    "db:pushDev": "docker exec -it tripbot npx prisma db push && npm run tripbot:db:generate",
+    "db:migrateDev": "docker exec -it tripbot npx prisma migrate dev -n betterModeration",
     "db:seed": "docker exec -it tripbot npx prisma db seed",
     "## PGADMIN ##": "",
     "pgadmin": "docker compose --project-name tripbot up -d --force-recreate --build tripbot_pgadmin",

src/discord/commands/guild/u.info.ts → src/discord/commands/archive/u.underban.ts

@@ -1,34 +1,40 @@
 import {
+  ActionRowBuilder,
+  ModalBuilder,
+  TextInputBuilder,
   ContextMenuCommandBuilder,
   GuildMember,
+  ModalSubmitInteraction,
 } from 'discord.js';
 import {
   ApplicationCommandType,
+  TextInputStyle,
 } from 'discord-api-types/v10';
 import { UserCommand } from '../../@types/commandDef';
 // import log from '../../../global/utils/log';
 import { moderate } from '../../../global/commands/g.moderate';
 import commandContext from '../../utils/context';
+// import {startLog} from '../../utils/startLog';
+import { UserActionType } from '../../../global/@types/database';
+import { embedTemplate } from '../../utils/embedTemplate';
+import { ban } from '../guild/d.moderate';
 
 const F = f(__filename);
 
-export const uInfo: UserCommand = {
+export const uUnderban: UserCommand = {
   data: new ContextMenuCommandBuilder()
-    .setName('Info')
+    .setName('Underban')
     .setType(ApplicationCommandType.User),
   async execute(interaction) {
     log.info(F, await commandContext(interaction));
-    await interaction.deferReply({ ephemeral: true });
-    await interaction.editReply(await moderate(
-      interaction.member as GuildMember,
-      'INFO',
-      (interaction.options.data[0].member as GuildMember).id,
-      null,
-      null,
-      null,
-    ));
+    await ban(
+      interaction,
+      (interaction.targetMember as GuildMember).id,
+
+    )
+
     return true;
   },
 };
 
-export default uInfo;
+export default uUnderban;