fix: proper transaction handling

ChatSift · Oct 10, 2023 · df9e192 · df9e192
1 parent 740e0dc
commit df9e192
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 16 deletions.
diff --git a/packages/bot/src/commands/ask.ts b/packages/bot/src/commands/ask.ts
@@ -89,11 +89,13 @@ export default class implements Command<ApplicationCommandType.ChatInput> {
 				};
 
 				// eslint-disable-next-line unicorn/consistent-function-scoping
-				const unwrapErr = (result: Result<unknown, Error>) => {
+				const unwrapErr = <T>(result: Result<T, Error>): T => {
 					if (result.isErr()) {
 						const err = result.unwrapErr();
 						throw new GracefulTransactionFailure(err.message, { cause: err });
 					}
+
+					return result.unwrap();
 				};
 
 				if (ama.modQueue) {
@@ -112,13 +114,24 @@ export default class implements Command<ApplicationCommandType.ChatInput> {
 						}),
 					);
 				} else {
-					unwrapErr(
+					const message = unwrapErr(
 						await this.amaManager.postToAnswersChannel({
 							...basePostData,
 							answersChannel: ama.answersChannel,
 							stage: ama.stageOnly,
 						}),
 					);
+
+					if (message) {
+						await this.prisma.amaQuestion.update({
+							where: {
+								id: amaQuestion.id,
+							},
+							data: {
+								answerMessageId: message.id,
+							},
+						});
+					}
 				}
 
 				return amaQuestion;

diff --git a/packages/bot/src/components/guest-approve.ts b/packages/bot/src/components/guest-approve.ts
@@ -50,6 +50,15 @@ export default class implements Component<ButtonInteraction<'cached'>> {
 				content: result.unwrapErr().message,
 				ephemeral: true,
 			});
+		} else {
+			await this.prisma.amaQuestion.update({
+				where: {
+					id: question.id,
+				},
+				data: {
+					answerMessageId: result.unwrap().id,
+				},
+			});
 		}
 
 		return interaction.update({

diff --git a/packages/bot/src/components/mod-approve.ts b/packages/bot/src/components/mod-approve.ts
@@ -64,6 +64,15 @@ export default class implements Component<ButtonInteraction<'cached'>> {
 					content: result.unwrapErr().message,
 					ephemeral: true,
 				});
+			} else {
+				await this.prisma.amaQuestion.update({
+					where: {
+						id: question.id,
+					},
+					data: {
+						answerMessageId: result.unwrap().id,
+					},
+				});
 			}
 		}
 

diff --git a/packages/bot/src/components/submit-question.ts b/packages/bot/src/components/submit-question.ts
@@ -95,11 +95,13 @@ export default class implements Component<ButtonInteraction<'cached'>> {
 				};
 
 				// eslint-disable-next-line unicorn/consistent-function-scoping
-				const unwrapErr = (result: Result<unknown, Error>) => {
+				const unwrapErr = <T>(result: Result<T, Error>): T => {
 					if (result.isErr()) {
 						const err = result.unwrapErr();
 						throw new GracefulTransactionFailure(err.message, { cause: err });
 					}
+
+					return result.unwrap();
 				};
 
 				if (ama.modQueue) {
@@ -118,13 +120,24 @@ export default class implements Component<ButtonInteraction<'cached'>> {
 						}),
 					);
 				} else {
-					unwrapErr(
+					const message = unwrapErr(
 						await this.amaManager.postToAnswersChannel({
 							...basePostData,
 							answersChannel: ama.answersChannel,
 							stage: ama.stageOnly,
 						}),
 					);
+
+					if (message) {
+						await this.prisma.amaQuestion.update({
+							where: {
+								id: amaQuestion.id,
+							},
+							data: {
+								answerMessageId: message.id,
+							},
+						});
+					}
 				}
 
 				return amaQuestion;

diff --git a/packages/bot/src/struct/AmaManager.ts b/packages/bot/src/struct/AmaManager.ts
@@ -1,7 +1,7 @@
 import { PrismaClient } from '@prisma/client';
 import type { AmaQuestion } from '@prisma/client';
 import { Result } from '@sapphire/result';
-import type { MessageActionRowComponentBuilder, TextChannel, User } from 'discord.js';
+import type { Message, MessageActionRowComponentBuilder, TextChannel, User } from 'discord.js';
 import { ActionRowBuilder, ButtonBuilder, EmbedBuilder, ButtonStyle, Client } from 'discord.js';
 import { singleton } from 'tsyringe';
 import { Colors } from '../util/colors.js';
@@ -136,7 +136,7 @@ export class AmaManager {
 		stage,
 		answersChannel,
 		...embedData
-	}: PostToAnswerChannelData): Promise<Result<unknown, Error>> {
+	}: PostToAnswerChannelData): Promise<Result<Message<true>, Error>> {
 		const embed = this.getBaseEmbed(embedData);
 		embed.setColor(Colors.Blurple);
 
@@ -155,15 +155,6 @@ export class AmaManager {
 			embeds: [embed],
 		});
 
-		await this.prisma.amaQuestion.update({
-			where: {
-				id: question.id,
-			},
-			data: {
-				answerMessageId: message.id,
-			},
-		});
-
-		return Result.ok();
+		return Result.ok(message);
 	}
 }