text changes and remove infra folder
This commit is contained in:
@@ -57,7 +57,7 @@ class ForumEmailService {
|
||||
}
|
||||
|
||||
try {
|
||||
const frontendUrl = process.env.FRONTEND_URL || "http://localhost:3000";
|
||||
const frontendUrl = process.env.FRONTEND_URL;
|
||||
const postUrl = `${frontendUrl}/forum/posts/${post.id}`;
|
||||
|
||||
const timestamp = new Date(comment.createdAt).toLocaleString("en-US", {
|
||||
@@ -77,7 +77,7 @@ class ForumEmailService {
|
||||
|
||||
const htmlContent = await this.templateManager.renderTemplate(
|
||||
"forumCommentToPostAuthor",
|
||||
variables
|
||||
variables,
|
||||
);
|
||||
|
||||
const subject = `${commenter.firstName} ${commenter.lastName} commented on your post`;
|
||||
@@ -85,12 +85,12 @@ class ForumEmailService {
|
||||
const result = await this.emailClient.sendEmail(
|
||||
postAuthor.email,
|
||||
subject,
|
||||
htmlContent
|
||||
htmlContent,
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
logger.info(
|
||||
`Forum comment notification email sent to ${postAuthor.email}`
|
||||
`Forum comment notification email sent to ${postAuthor.email}`,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -124,14 +124,14 @@ class ForumEmailService {
|
||||
replier,
|
||||
post,
|
||||
reply,
|
||||
parentComment
|
||||
parentComment,
|
||||
) {
|
||||
if (!this.initialized) {
|
||||
await this.initialize();
|
||||
}
|
||||
|
||||
try {
|
||||
const frontendUrl = process.env.FRONTEND_URL || "http://localhost:3000";
|
||||
const frontendUrl = process.env.FRONTEND_URL;
|
||||
const postUrl = `${frontendUrl}/forum/posts/${post.id}`;
|
||||
|
||||
const timestamp = new Date(reply.createdAt).toLocaleString("en-US", {
|
||||
@@ -152,7 +152,7 @@ class ForumEmailService {
|
||||
|
||||
const htmlContent = await this.templateManager.renderTemplate(
|
||||
"forumReplyToCommentAuthor",
|
||||
variables
|
||||
variables,
|
||||
);
|
||||
|
||||
const subject = `${replier.firstName} ${replier.lastName} replied to your comment`;
|
||||
@@ -160,12 +160,12 @@ class ForumEmailService {
|
||||
const result = await this.emailClient.sendEmail(
|
||||
commentAuthor.email,
|
||||
subject,
|
||||
htmlContent
|
||||
htmlContent,
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
logger.info(
|
||||
`Forum reply notification email sent to ${commentAuthor.email}`
|
||||
`Forum reply notification email sent to ${commentAuthor.email}`,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -195,14 +195,14 @@ class ForumEmailService {
|
||||
commentAuthor,
|
||||
postAuthor,
|
||||
post,
|
||||
comment
|
||||
comment,
|
||||
) {
|
||||
if (!this.initialized) {
|
||||
await this.initialize();
|
||||
}
|
||||
|
||||
try {
|
||||
const frontendUrl = process.env.FRONTEND_URL || "http://localhost:3000";
|
||||
const frontendUrl = process.env.FRONTEND_URL;
|
||||
const postUrl = `${frontendUrl}/forum/posts/${post.id}`;
|
||||
|
||||
const variables = {
|
||||
@@ -216,7 +216,7 @@ class ForumEmailService {
|
||||
|
||||
const htmlContent = await this.templateManager.renderTemplate(
|
||||
"forumAnswerAcceptedToCommentAuthor",
|
||||
variables
|
||||
variables,
|
||||
);
|
||||
|
||||
const subject = `Your comment was marked as the accepted answer!`;
|
||||
@@ -224,12 +224,12 @@ class ForumEmailService {
|
||||
const result = await this.emailClient.sendEmail(
|
||||
commentAuthor.email,
|
||||
subject,
|
||||
htmlContent
|
||||
htmlContent,
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
logger.info(
|
||||
`Forum answer accepted notification email sent to ${commentAuthor.email}`
|
||||
`Forum answer accepted notification email sent to ${commentAuthor.email}`,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -237,7 +237,7 @@ class ForumEmailService {
|
||||
} catch (error) {
|
||||
logger.error(
|
||||
"Failed to send forum answer accepted notification email:",
|
||||
error
|
||||
error,
|
||||
);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
@@ -263,14 +263,14 @@ class ForumEmailService {
|
||||
participant,
|
||||
commenter,
|
||||
post,
|
||||
comment
|
||||
comment,
|
||||
) {
|
||||
if (!this.initialized) {
|
||||
await this.initialize();
|
||||
}
|
||||
|
||||
try {
|
||||
const frontendUrl = process.env.FRONTEND_URL || "http://localhost:3000";
|
||||
const frontendUrl = process.env.FRONTEND_URL;
|
||||
const postUrl = `${frontendUrl}/forum/posts/${post.id}`;
|
||||
|
||||
const timestamp = new Date(comment.createdAt).toLocaleString("en-US", {
|
||||
@@ -290,7 +290,7 @@ class ForumEmailService {
|
||||
|
||||
const htmlContent = await this.templateManager.renderTemplate(
|
||||
"forumThreadActivityToParticipant",
|
||||
variables
|
||||
variables,
|
||||
);
|
||||
|
||||
const subject = `New activity on a post you're following`;
|
||||
@@ -298,12 +298,12 @@ class ForumEmailService {
|
||||
const result = await this.emailClient.sendEmail(
|
||||
participant.email,
|
||||
subject,
|
||||
htmlContent
|
||||
htmlContent,
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
logger.info(
|
||||
`Forum thread activity notification email sent to ${participant.email}`
|
||||
`Forum thread activity notification email sent to ${participant.email}`,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -311,7 +311,7 @@ class ForumEmailService {
|
||||
} catch (error) {
|
||||
logger.error(
|
||||
"Failed to send forum thread activity notification email:",
|
||||
error
|
||||
error,
|
||||
);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
@@ -331,18 +331,13 @@ class ForumEmailService {
|
||||
* @param {Date} closedAt - Timestamp when discussion was closed
|
||||
* @returns {Promise<{success: boolean, messageId?: string, error?: string}>}
|
||||
*/
|
||||
async sendForumPostClosedNotification(
|
||||
recipient,
|
||||
closer,
|
||||
post,
|
||||
closedAt
|
||||
) {
|
||||
async sendForumPostClosedNotification(recipient, closer, post, closedAt) {
|
||||
if (!this.initialized) {
|
||||
await this.initialize();
|
||||
}
|
||||
|
||||
try {
|
||||
const frontendUrl = process.env.FRONTEND_URL || "http://localhost:3000";
|
||||
const frontendUrl = process.env.FRONTEND_URL;
|
||||
const postUrl = `${frontendUrl}/forum/posts/${post.id}`;
|
||||
|
||||
const timestamp = new Date(closedAt).toLocaleString("en-US", {
|
||||
@@ -352,8 +347,7 @@ class ForumEmailService {
|
||||
|
||||
const variables = {
|
||||
recipientName: recipient.firstName || "there",
|
||||
adminName:
|
||||
`${closer.firstName} ${closer.lastName}`.trim() || "A user",
|
||||
adminName: `${closer.firstName} ${closer.lastName}`.trim() || "A user",
|
||||
postTitle: post.title,
|
||||
postUrl: postUrl,
|
||||
timestamp: timestamp,
|
||||
@@ -361,7 +355,7 @@ class ForumEmailService {
|
||||
|
||||
const htmlContent = await this.templateManager.renderTemplate(
|
||||
"forumPostClosed",
|
||||
variables
|
||||
variables,
|
||||
);
|
||||
|
||||
const subject = `Discussion closed: ${post.title}`;
|
||||
@@ -369,12 +363,12 @@ class ForumEmailService {
|
||||
const result = await this.emailClient.sendEmail(
|
||||
recipient.email,
|
||||
subject,
|
||||
htmlContent
|
||||
htmlContent,
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
logger.info(
|
||||
`Forum post closed notification email sent to ${recipient.email}`
|
||||
`Forum post closed notification email sent to ${recipient.email}`,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -382,7 +376,7 @@ class ForumEmailService {
|
||||
} catch (error) {
|
||||
logger.error(
|
||||
"Failed to send forum post closed notification email:",
|
||||
error
|
||||
error,
|
||||
);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
@@ -401,18 +395,24 @@ class ForumEmailService {
|
||||
* @param {string} deletionReason - Reason for deletion
|
||||
* @returns {Promise<{success: boolean, messageId?: string, error?: string}>}
|
||||
*/
|
||||
async sendForumPostDeletionNotification(postAuthor, admin, post, deletionReason) {
|
||||
async sendForumPostDeletionNotification(
|
||||
postAuthor,
|
||||
admin,
|
||||
post,
|
||||
deletionReason,
|
||||
) {
|
||||
if (!this.initialized) {
|
||||
await this.initialize();
|
||||
}
|
||||
|
||||
try {
|
||||
const supportEmail = process.env.SUPPORT_EMAIL;
|
||||
const frontendUrl = process.env.FRONTEND_URL || "http://localhost:3000";
|
||||
const supportEmail = process.env.CUSTOMER_SUPPORT_EMAIL;
|
||||
const frontendUrl = process.env.FRONTEND_URL;
|
||||
|
||||
const variables = {
|
||||
postAuthorName: postAuthor.firstName || "there",
|
||||
adminName: `${admin.firstName} ${admin.lastName}`.trim() || "An administrator",
|
||||
adminName:
|
||||
`${admin.firstName} ${admin.lastName}`.trim() || "An administrator",
|
||||
postTitle: post.title,
|
||||
deletionReason,
|
||||
supportEmail,
|
||||
@@ -421,7 +421,7 @@ class ForumEmailService {
|
||||
|
||||
const htmlContent = await this.templateManager.renderTemplate(
|
||||
"forumPostDeletionToAuthor",
|
||||
variables
|
||||
variables,
|
||||
);
|
||||
|
||||
const subject = `Important: Your forum post "${post.title}" has been removed`;
|
||||
@@ -429,12 +429,12 @@ class ForumEmailService {
|
||||
const result = await this.emailClient.sendEmail(
|
||||
postAuthor.email,
|
||||
subject,
|
||||
htmlContent
|
||||
htmlContent,
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
logger.info(
|
||||
`Forum post deletion notification email sent to ${postAuthor.email}`
|
||||
`Forum post deletion notification email sent to ${postAuthor.email}`,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -442,7 +442,7 @@ class ForumEmailService {
|
||||
} catch (error) {
|
||||
logger.error(
|
||||
"Failed to send forum post deletion notification email:",
|
||||
error
|
||||
error,
|
||||
);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
@@ -462,19 +462,25 @@ class ForumEmailService {
|
||||
* @param {string} deletionReason - Reason for deletion
|
||||
* @returns {Promise<{success: boolean, messageId?: string, error?: string}>}
|
||||
*/
|
||||
async sendForumCommentDeletionNotification(commentAuthor, admin, post, deletionReason) {
|
||||
async sendForumCommentDeletionNotification(
|
||||
commentAuthor,
|
||||
admin,
|
||||
post,
|
||||
deletionReason,
|
||||
) {
|
||||
if (!this.initialized) {
|
||||
await this.initialize();
|
||||
}
|
||||
|
||||
try {
|
||||
const supportEmail = process.env.SUPPORT_EMAIL;
|
||||
const frontendUrl = process.env.FRONTEND_URL || "http://localhost:3000";
|
||||
const supportEmail = process.env.CUSTOMER_SUPPORT_EMAIL;
|
||||
const frontendUrl = process.env.FRONTEND_URL;
|
||||
const postUrl = `${frontendUrl}/forum/posts/${post.id}`;
|
||||
|
||||
const variables = {
|
||||
commentAuthorName: commentAuthor.firstName || "there",
|
||||
adminName: `${admin.firstName} ${admin.lastName}`.trim() || "An administrator",
|
||||
adminName:
|
||||
`${admin.firstName} ${admin.lastName}`.trim() || "An administrator",
|
||||
postTitle: post.title,
|
||||
postUrl,
|
||||
deletionReason,
|
||||
@@ -483,7 +489,7 @@ class ForumEmailService {
|
||||
|
||||
const htmlContent = await this.templateManager.renderTemplate(
|
||||
"forumCommentDeletionToAuthor",
|
||||
variables
|
||||
variables,
|
||||
);
|
||||
|
||||
const subject = `Your comment on "${post.title}" has been removed`;
|
||||
@@ -491,12 +497,12 @@ class ForumEmailService {
|
||||
const result = await this.emailClient.sendEmail(
|
||||
commentAuthor.email,
|
||||
subject,
|
||||
htmlContent
|
||||
htmlContent,
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
logger.info(
|
||||
`Forum comment deletion notification email sent to ${commentAuthor.email}`
|
||||
`Forum comment deletion notification email sent to ${commentAuthor.email}`,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -504,7 +510,7 @@ class ForumEmailService {
|
||||
} catch (error) {
|
||||
logger.error(
|
||||
"Failed to send forum comment deletion notification email:",
|
||||
error
|
||||
error,
|
||||
);
|
||||
return { success: false, error: error.message };
|
||||
}
|
||||
@@ -531,7 +537,7 @@ class ForumEmailService {
|
||||
}
|
||||
|
||||
try {
|
||||
const frontendUrl = process.env.FRONTEND_URL || "http://localhost:3000";
|
||||
const frontendUrl = process.env.FRONTEND_URL;
|
||||
const postUrl = `${frontendUrl}/forum/posts/${post.id}`;
|
||||
|
||||
const variables = {
|
||||
@@ -546,7 +552,7 @@ class ForumEmailService {
|
||||
|
||||
const htmlContent = await this.templateManager.renderTemplate(
|
||||
"forumItemRequestNotification",
|
||||
variables
|
||||
variables,
|
||||
);
|
||||
|
||||
const subject = `Someone nearby is looking for: ${post.title}`;
|
||||
@@ -554,12 +560,12 @@ class ForumEmailService {
|
||||
const result = await this.emailClient.sendEmail(
|
||||
recipient.email,
|
||||
subject,
|
||||
htmlContent
|
||||
htmlContent,
|
||||
);
|
||||
|
||||
if (result.success) {
|
||||
logger.info(
|
||||
`Item request notification email sent to ${recipient.email}`
|
||||
`Item request notification email sent to ${recipient.email}`,
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user