ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(backend): correct email from (#8501)

Browse Source
This commit is contained in:
Moriz Wahl 2025-05-07 19:42:39 +02:00 committed by GitHub
parent 290a176407
commit 50bc62428e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/emails/__snapshots__/sendChatMessageMail.spec.ts.snap
View File

@ -3,7 +3,7 @@
exports[`sendChatMessageMail English chat_message template 1`] = ` exports[`sendChatMessageMail English chat_message template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -130,7 +130,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendChatMessageMail German chat_message template 1`] = ` exports[`sendChatMessageMail German chat_message template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>

4
backend/src/emails/__snapshots__/sendEmailVerification.spec.ts.snap
View File

@ -3,7 +3,7 @@
exports[`sendEmailVerification English renders correctly 1`] = ` exports[`sendEmailVerification English renders correctly 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -133,7 +133,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendEmailVerification German renders correctly 1`] = ` exports[`sendEmailVerification German renders correctly 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>

36
backend/src/emails/__snapshots__/sendNotificationMail.spec.ts.snap
View File

@ -3,7 +3,7 @@
exports[`sendNotificationMail English changed_group_member_role template 1`] = ` exports[`sendNotificationMail English changed_group_member_role template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -129,7 +129,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail English commented_on_post template 1`] = ` exports[`sendNotificationMail English commented_on_post template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -257,7 +257,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail English followed_user_posted template 1`] = ` exports[`sendNotificationMail English followed_user_posted template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -385,7 +385,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail English mentioned_in_comment template 1`] = ` exports[`sendNotificationMail English mentioned_in_comment template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -513,7 +513,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail English mentioned_in_post template 1`] = ` exports[`sendNotificationMail English mentioned_in_post template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -640,7 +640,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail English post_in_group template 1`] = ` exports[`sendNotificationMail English post_in_group template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -766,7 +766,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail English removed_user_from_group template 1`] = ` exports[`sendNotificationMail English removed_user_from_group template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -889,7 +889,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail English user_joined_group template 1`] = ` exports[`sendNotificationMail English user_joined_group template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -1016,7 +1016,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail English user_left_group template 1`] = ` exports[`sendNotificationMail English user_left_group template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -1143,7 +1143,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail German changed_group_member_role template 1`] = ` exports[`sendNotificationMail German changed_group_member_role template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
@ -1269,7 +1269,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail German commented_on_post template 1`] = ` exports[`sendNotificationMail German commented_on_post template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
@ -1397,7 +1397,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail German followed_user_posted template 1`] = ` exports[`sendNotificationMail German followed_user_posted template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
@ -1525,7 +1525,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail German mentioned_in_comment template 1`] = ` exports[`sendNotificationMail German mentioned_in_comment template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
@ -1653,7 +1653,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail German mentioned_in_post template 1`] = ` exports[`sendNotificationMail German mentioned_in_post template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
@ -1780,7 +1780,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail German post_in_group template 1`] = ` exports[`sendNotificationMail German post_in_group template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
@ -1906,7 +1906,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail German removed_user_from_group template 1`] = ` exports[`sendNotificationMail German removed_user_from_group template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
@ -2029,7 +2029,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail German user_joined_group template 1`] = ` exports[`sendNotificationMail German user_joined_group template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
@ -2156,7 +2156,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendNotificationMail German user_left_group template 1`] = ` exports[`sendNotificationMail German user_left_group template 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>

8
backend/src/emails/__snapshots__/sendRegistrationMail.spec.ts.snap
View File

@ -3,7 +3,7 @@
exports[`sendRegistrationMail with invite code English renders correctly 1`] = ` exports[`sendRegistrationMail with invite code English renders correctly 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -142,7 +142,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendRegistrationMail with invite code German renders correctly 1`] = ` exports[`sendRegistrationMail with invite code German renders correctly 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>
@ -282,7 +282,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendRegistrationMail without invite code English renders correctly 1`] = ` exports[`sendRegistrationMail without invite code English renders correctly 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -421,7 +421,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendRegistrationMail without invite code German renders correctly 1`] = ` exports[`sendRegistrationMail without invite code German renders correctly 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>

4
backend/src/emails/__snapshots__/sendResetPasswordMail.spec.ts.snap
View File

@ -3,7 +3,7 @@
exports[`sendResetPasswordMail English renders correctly 1`] = ` exports[`sendResetPasswordMail English renders correctly 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -132,7 +132,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendResetPasswordMail German renders correctly 1`] = ` exports[`sendResetPasswordMail German renders correctly 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>

4
backend/src/emails/__snapshots__/sendWrongEmail.spec.ts.snap
View File

@ -3,7 +3,7 @@
exports[`sendWrongEmail English renders correctly 1`] = ` exports[`sendWrongEmail English renders correctly 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
@ -130,7 +130,7 @@ ocelot.social Community [https://ocelot.social]",
exports[`sendWrongEmail German renders correctly 1`] = ` exports[`sendWrongEmail German renders correctly 1`] = `
{ {
"attachments": [], "attachments": [],
"from": "ocelot.social", "from": "ocelot.social <devops@ocelot.social>",
"html": "<!DOCTYPE html> "html": "<!DOCTYPE html>
<html lang="de"> <html lang="de">
<head> <head>

4
backend/src/emails/sendEmail.ts
View File

@ -28,11 +28,13 @@ const defaultParams = {
renderSettingsUrl: true, renderSettingsUrl: true,
} }
const from = `${CONFIG.APPLICATION_NAME} <${CONFIG.EMAIL_DEFAULT_SENDER}>`
const transport = createTransport(nodemailerTransportOptions) const transport = createTransport(nodemailerTransportOptions)
const email = new Email({ const email = new Email({
message: { message: {
from: `${CONFIG.APPLICATION_NAME}`, from,
}, },
transport, transport,
i18n: { i18n: {