Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cooperative #737

Merged
merged 23 commits into from
Jan 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7ad740d
Clean Init
LunaUrsa Apr 24, 2023
4b3c382
Merge branch 'main' of https://github.com/tripsit/TripBot into Cooper…
LunaUrsa May 23, 2023
6b0c337
Update timer
LunaUrsa May 23, 2023
9e1d5fd
Merge branch 'main' of https://github.com/TripSit/TripBot into Cooper…
LunaUrsa Jul 10, 2023
6e9d16b
Merge branch 'main' of https://github.com/tripsit/TripBot into Cooper…
LunaUrsa Jul 30, 2023
72c3de2
Merge branch 'main' of https://github.com/tripsit/TripBot into Cooper…
LunaUrsa Nov 19, 2023
add6348
Merge branch 'main' of https://github.com/tripsit/TripBot into Cooper…
LunaUrsa Dec 25, 2023
96cbbf2
Update Datafiles
LunaUrsa Dec 25, 2023
319b0b6
Merge branch 'main' of https://github.com/tripsit/TripBot into Cooper…
LunaUrsa Dec 31, 2023
10477b6
Merge branch 'main' of https://github.com/tripsit/TripBot into Cooper…
LunaUrsa Jan 1, 2024
277928e
Linting
LunaUrsa Jan 1, 2024
4af1a56
Save progress
LunaUrsa Jan 2, 2024
1283d2d
Save progress
LunaUrsa Jan 2, 2024
b6c0d19
Saving progress
LunaUrsa Jan 4, 2024
bdb3595
Separating button function
LunaUrsa Jan 5, 2024
c383c5f
Merge branch 'main' of https://github.com/tripsit/TripBot into Cooper…
LunaUrsa Jan 8, 2024
7ddca98
oooo boyo
LunaUrsa Jan 11, 2024
686ad3d
Minor change to text
LunaUrsa Jan 11, 2024
cffae44
Little more polish, not the sausage
LunaUrsa Jan 11, 2024
671228e
Fix ban message
LunaUrsa Jan 11, 2024
28849d6
Update migration file
LunaUrsa Jan 11, 2024
c1c0ae9
Merge branch 'main' of https://github.com/tripsit/TripBot into Cooper…
LunaUrsa Jan 12, 2024
2bfefce
Update drug defs
LunaUrsa Jan 12, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions assets/data/combinedDB.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
Expand Down
20 changes: 20 additions & 0 deletions assets/data/tripsitCombos.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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"
},
Expand Down
20 changes: 20 additions & 0 deletions assets/data/tripsitDB.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down Expand Up @@ -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"
},
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Loading
Loading