mirror of
https://github.com/lukevella/rallly.git
synced 2025-06-01 10:11:50 +02:00
Revert "♻️ Improve email abstraction (#861)"
This reverts commit 93cc5b9b4d
.
This commit is contained in:
parent
93cc5b9b4d
commit
1199ca5c53
10 changed files with 141 additions and 738 deletions
|
@ -1,10 +1,10 @@
|
|||
import { prisma } from "@rallly/database";
|
||||
import { sendEmail } from "@rallly/emails";
|
||||
import { absoluteUrl } from "@rallly/utils";
|
||||
import { TRPCError } from "@trpc/server";
|
||||
import { z } from "zod";
|
||||
|
||||
import { createToken, decryptToken } from "../../session";
|
||||
import { emailClient } from "../../utils/email-client";
|
||||
import { generateOtp } from "../../utils/nanoid";
|
||||
import { publicProcedure, router } from "../trpc";
|
||||
import { LoginTokenPayload, RegistrationTokenPayload } from "../types";
|
||||
|
@ -107,7 +107,7 @@ export const auth = router({
|
|||
code,
|
||||
});
|
||||
|
||||
await emailClient.sendTemplate("RegisterEmail", {
|
||||
await sendEmail("RegisterEmail", {
|
||||
to: input.email,
|
||||
subject: `${input.name}, please verify your email address`,
|
||||
props: {
|
||||
|
@ -193,7 +193,7 @@ export const auth = router({
|
|||
code,
|
||||
});
|
||||
|
||||
await emailClient.sendTemplate("LoginEmail", {
|
||||
await sendEmail("LoginEmail", {
|
||||
to: input.email,
|
||||
subject: `${code} is your 6-digit code`,
|
||||
props: {
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import { prisma } from "@rallly/database";
|
||||
import { sendEmail } from "@rallly/emails";
|
||||
import { absoluteUrl, shortUrl } from "@rallly/utils";
|
||||
import { TRPCError } from "@trpc/server";
|
||||
import dayjs from "dayjs";
|
||||
|
@ -9,7 +10,6 @@ import * as ics from "ics";
|
|||
import { z } from "zod";
|
||||
|
||||
import { getTimeZoneAbbreviation } from "../../utils/date";
|
||||
import { emailClient } from "../../utils/email-client";
|
||||
import { nanoid } from "../../utils/nanoid";
|
||||
import {
|
||||
possiblyPublicProcedure,
|
||||
|
@ -133,7 +133,7 @@ export const polls = router({
|
|||
});
|
||||
|
||||
if (user) {
|
||||
await emailClient.sendTemplate("NewPollEmail", {
|
||||
await sendEmail("NewPollEmail", {
|
||||
to: user.email,
|
||||
subject: `Let's find a date for ${poll.title}`,
|
||||
props: {
|
||||
|
@ -678,7 +678,7 @@ export const polls = router({
|
|||
});
|
||||
}
|
||||
|
||||
const emailToHost = emailClient.sendTemplate("FinalizeHostEmail", {
|
||||
const emailToHost = sendEmail("FinalizeHostEmail", {
|
||||
subject: `Date booked for ${poll.title}`,
|
||||
to: poll.user.email,
|
||||
props: {
|
||||
|
@ -702,7 +702,7 @@ export const polls = router({
|
|||
});
|
||||
|
||||
const emailsToParticipants = participantsToEmail.map((p) => {
|
||||
return emailClient.sendTemplate("FinalizeParticipantEmail", {
|
||||
return sendEmail("FinalizeParticipantEmail", {
|
||||
subject: `Date booked for ${poll.title}`,
|
||||
to: p.email,
|
||||
props: {
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
import { prisma } from "@rallly/database";
|
||||
import { sendEmail } from "@rallly/emails";
|
||||
import { absoluteUrl } from "@rallly/utils";
|
||||
import { z } from "zod";
|
||||
|
||||
import { createToken } from "../../../session";
|
||||
import { emailClient } from "../../../utils/email-client";
|
||||
import { publicProcedure, router } from "../../trpc";
|
||||
import { DisableNotificationsPayload } from "../../types";
|
||||
|
||||
|
@ -82,7 +82,7 @@ export const comments = router({
|
|||
{ ttl: 0 },
|
||||
);
|
||||
emailsToSend.push(
|
||||
emailClient.sendTemplate("NewCommentEmail", {
|
||||
sendEmail("NewCommentEmail", {
|
||||
to: email,
|
||||
subject: `${authorName} has commented on ${poll.title}`,
|
||||
props: {
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
import { prisma } from "@rallly/database";
|
||||
import { sendEmail } from "@rallly/emails";
|
||||
import { absoluteUrl } from "@rallly/utils";
|
||||
import { TRPCError } from "@trpc/server";
|
||||
import { z } from "zod";
|
||||
|
||||
import { createToken } from "../../../session";
|
||||
import { emailClient } from "../../../utils/email-client";
|
||||
import { publicProcedure, router } from "../../trpc";
|
||||
import { DisableNotificationsPayload } from "../../types";
|
||||
|
||||
|
@ -107,7 +107,7 @@ export const participants = router({
|
|||
);
|
||||
|
||||
emailsToSend.push(
|
||||
emailClient.sendTemplate("NewParticipantConfirmationEmail", {
|
||||
sendEmail("NewParticipantConfirmationEmail", {
|
||||
to: email,
|
||||
subject: `Thanks for responding to ${poll.title}`,
|
||||
props: {
|
||||
|
@ -144,7 +144,7 @@ export const participants = router({
|
|||
{ ttl: 0 },
|
||||
);
|
||||
emailsToSend.push(
|
||||
emailClient.sendTemplate("NewParticipantEmail", {
|
||||
sendEmail("NewParticipantEmail", {
|
||||
to: email,
|
||||
subject: `${participant.name} has responded to ${poll.title}`,
|
||||
props: {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue