Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
0-don committed Feb 11, 2024
1 parent fe24ea7 commit f538658
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 123 deletions.
2 changes: 0 additions & 2 deletions prisma/migrations/20231104230041_init/migration.sql

This file was deleted.

25 changes: 0 additions & 25 deletions prisma/migrations/20231105004349_init/migration.sql

This file was deleted.

2 changes: 0 additions & 2 deletions prisma/migrations/20231105012244_init/migration.sql

This file was deleted.

49 changes: 0 additions & 49 deletions prisma/migrations/20240209222701_init/migration.sql

This file was deleted.

8 changes: 0 additions & 8 deletions prisma/migrations/20240209233643_init/migration.sql

This file was deleted.

21 changes: 0 additions & 21 deletions prisma/migrations/20240209235506_init/migration.sql

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,18 @@ CREATE TABLE "MemberGuild" (
CONSTRAINT "MemberGuild_pkey" PRIMARY KEY ("id")
);

-- CreateTable
CREATE TABLE "MemberHelper" (
"id" SERIAL NOT NULL,
"memberId" TEXT NOT NULL,
"guildId" TEXT NOT NULL,
"threadId" TEXT,
"threadOwnerId" TEXT,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,

CONSTRAINT "MemberHelper_pkey" PRIMARY KEY ("id")
);

-- CreateTable
CREATE TABLE "MemberRole" (
"id" SERIAL NOT NULL,
Expand All @@ -70,13 +82,28 @@ CREATE TABLE "MemberRole" (
);

-- CreateTable
CREATE TABLE "MemberBump" (
CREATE TABLE "MemberCommandHistory" (
"id" SERIAL NOT NULL,
"memberId" TEXT NOT NULL,
"guildId" TEXT NOT NULL,
"count" INTEGER NOT NULL,
"command" TEXT NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,

CONSTRAINT "MemberBump_pkey" PRIMARY KEY ("id")
CONSTRAINT "MemberCommandHistory_pkey" PRIMARY KEY ("id")
);

-- CreateTable
CREATE TABLE "MemberDeletedMessages" (
"id" SERIAL NOT NULL,
"deletedByMemberId" TEXT NOT NULL,
"messageMemberId" TEXT NOT NULL,
"guildId" TEXT NOT NULL,
"messageId" TEXT NOT NULL,
"channelId" TEXT NOT NULL,
"content" TEXT NOT NULL,
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,

CONSTRAINT "MemberDeletedMessages_pkey" PRIMARY KEY ("id")
);

-- CreateIndex
Expand All @@ -94,9 +121,6 @@ CREATE UNIQUE INDEX "MemberGuild_memberId_guildId_key" ON "MemberGuild"("memberI
-- CreateIndex
CREATE UNIQUE INDEX "MemberRole_memberId_roleId_key" ON "MemberRole"("memberId", "roleId");

-- CreateIndex
CREATE UNIQUE INDEX "MemberBump_memberId_guildId_key" ON "MemberBump"("memberId", "guildId");

-- AddForeignKey
ALTER TABLE "GuildVoiceEvents" ADD CONSTRAINT "GuildVoiceEvents_memberId_fkey" FOREIGN KEY ("memberId") REFERENCES "Member"("memberId") ON DELETE CASCADE ON UPDATE CASCADE;

Expand All @@ -115,15 +139,29 @@ ALTER TABLE "MemberGuild" ADD CONSTRAINT "MemberGuild_memberId_fkey" FOREIGN KEY
-- AddForeignKey
ALTER TABLE "MemberGuild" ADD CONSTRAINT "MemberGuild_guildId_fkey" FOREIGN KEY ("guildId") REFERENCES "Guild"("guildId") ON DELETE RESTRICT ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "MemberHelper" ADD CONSTRAINT "MemberHelper_memberId_fkey" FOREIGN KEY ("memberId") REFERENCES "Member"("memberId") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "MemberHelper" ADD CONSTRAINT "MemberHelper_guildId_fkey" FOREIGN KEY ("guildId") REFERENCES "Guild"("guildId") ON DELETE RESTRICT ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "MemberRole" ADD CONSTRAINT "MemberRole_memberId_fkey" FOREIGN KEY ("memberId") REFERENCES "Member"("memberId") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "MemberRole" ADD CONSTRAINT "MemberRole_guildId_fkey" FOREIGN KEY ("guildId") REFERENCES "Guild"("guildId") ON DELETE RESTRICT ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "MemberBump" ADD CONSTRAINT "MemberBump_memberId_fkey" FOREIGN KEY ("memberId") REFERENCES "Member"("memberId") ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE "MemberCommandHistory" ADD CONSTRAINT "MemberCommandHistory_memberId_fkey" FOREIGN KEY ("memberId") REFERENCES "Member"("memberId") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "MemberCommandHistory" ADD CONSTRAINT "MemberCommandHistory_guildId_fkey" FOREIGN KEY ("guildId") REFERENCES "Guild"("guildId") ON DELETE RESTRICT ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "MemberBump" ADD CONSTRAINT "MemberBump_guildId_fkey" FOREIGN KEY ("guildId") REFERENCES "Guild"("guildId") ON DELETE RESTRICT ON UPDATE CASCADE;
ALTER TABLE "MemberDeletedMessages" ADD CONSTRAINT "MemberDeletedMessages_deletedByMemberId_fkey" FOREIGN KEY ("deletedByMemberId") REFERENCES "Member"("memberId") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "MemberDeletedMessages" ADD CONSTRAINT "MemberDeletedMessages_messageMemberId_fkey" FOREIGN KEY ("messageMemberId") REFERENCES "Member"("memberId") ON DELETE CASCADE ON UPDATE CASCADE;

-- AddForeignKey
ALTER TABLE "MemberDeletedMessages" ADD CONSTRAINT "MemberDeletedMessages_guildId_fkey" FOREIGN KEY ("guildId") REFERENCES "Guild"("guildId") ON DELETE RESTRICT ON UPDATE CASCADE;
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import { deletedMessagesEmbed } from "../../lib/embeds.js";
import { prisma } from "../../prisma.js";

@Discord()
export class LogDeletedMessages {
export class LogDeletedMessagesHistory {
@Slash({
name: "log-deleted-messages",
name: "log-deleted-messages-history",
description: "Show deleted messages",
defaultMemberPermissions: PermissionFlagsBits.DeafenMembers,
})
Expand Down
12 changes: 6 additions & 6 deletions src/commands/user/Ai.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class Ai {
type: ApplicationCommandOptionType.Attachment,
})
image: Attachment,
interaction: CommandInteraction,
interaction: CommandInteraction
) {
let fileLink: string | undefined = undefined;
if (image?.contentType?.startsWith("image")) {
Expand All @@ -43,7 +43,7 @@ export class Ai {
)?.roles.cache;
if (!userRoles?.some((r) => MEMBER_ROLES.includes(r.name as any)))
return await interaction.reply(
"You need to be a member to upload an image",
"You need to be a member to upload an image"
);
fileLink = new URL(image.url).origin + new URL(image.url).pathname;
}
Expand Down Expand Up @@ -77,7 +77,7 @@ export class Ai {
const thread = await this.createThread(
channel as TextChannel,
interaction.member as GuildMember,
text,
text
);
askAi({
channel: thread,
Expand All @@ -87,21 +87,21 @@ export class Ai {
withHeaders: true,
});
await interaction.editReply(
"Please continue the conversation in the thread below",
"Please continue the conversation in the thread below"
);
}
} catch (err) {
error(err);
await interaction.editReply(
"An error occurred while processing your request.",
"An error occurred while processing your request."
);
}
}

private async createThread(
channel: TextChannel,
member: GuildMember,
text: string,
text: string
): Promise<ThreadChannel> {
const threadName = `${member.displayName}: ${text.substring(0, 50)}`;
const thread = await channel.threads.create({
Expand Down

0 comments on commit f538658

Please sign in to comment.