+
+ 
+
+
+
+
+",
+ "subject": "ocelot.social – Notification: New chat message",
+ "text": "HELLO CHATRECEIVER,
+
+you have received a new chat message from chatSender
+[http://webapp:3000/user/chatSender/chatsender].
+
+Show Chat [http://webapp:3000/chat]
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+PS: If you don't want to receive e-mails anymore, change your notification
+settings [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendChatMessageMail German chat_message template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello chatReceiver,
+
+
+
+
+ you have received a new chat message from chatSender. +
Show Chat +
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
PS: If you don't want to receive e-mails anymore, change your notification settings!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Benachrichtigung: Neue Chat Nachricht",
+ "text": "HALLO CHATRECEIVER,
+
+du hast eine neue Chat-Nachricht von chatSender
+[http://webapp:3000/user/chatSender/chatsender] erhalten.
+
+Chat anzeigen [http://webapp:3000/chat]
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine
+Benachrichtigungseinstellungen [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
diff --git a/backend/src/emails/__snapshots__/sendEmailVerification.spec.ts.snap b/backend/src/emails/__snapshots__/sendEmailVerification.spec.ts.snap
new file mode 100644
index 000000000..87815f5e6
--- /dev/null
+++ b/backend/src/emails/__snapshots__/sendEmailVerification.spec.ts.snap
@@ -0,0 +1,261 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`sendEmailVerification English renders correctly 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo chatReceiver,
+
+
+
+
+ du hast eine neue Chat-Nachricht von chatSender erhalten. +
Chat anzeigen +
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine Benachrichtigungseinstellungen!
+
+
+
+
+
+
+
+",
+ "subject": "New E-Mail Address ocelot.social",
+ "text": "HELLO USER,
+
+So, you want to change your e-mail? No problem! Just click the button below to
+verify your new address:
+
+Verify e-mail address
+[http://webapp:3000/settings/my-email-address/verify?email=user%40example.org&nonce=123456]
+
+If you don't want to change your e-mail address feel free to ignore this
+message.
+
+If the above button doesn't work, you can also copy the following code into your
+browser window: 123456
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendEmailVerification German renders correctly 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello User,
+
+
+
+
+ So, you want to change your e-mail? No problem! Just click the button below to verify your new address:
Verify e-mail address +If you don't want to change your e-mail address feel free to ignore this message.
+If the above button doesn't work, you can also copy the following code into your browser window: 123456
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
+
+
+
+
+
+
+",
+ "subject": "Neue E-Mail Addresse ocelot.social",
+ "text": "HALLO USER,
+
+Du möchtest also deine E-Mail ändern? Kein Problem! Mit Klick auf diesen Button
+kannst Du Deine neue E-Mail Adresse bestätigen:
+
+E-Mail Adresse bestätigen
+[http://webapp:3000/settings/my-email-address/verify?email=user%40example.org&nonce=123456]
+
+Falls Du deine E-Mail Adresse doch nicht ändern möchtest, kannst du diese
+Nachricht einfach ignorieren.
+
+Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in
+Dein Browserfenster kopieren: 123456
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
diff --git a/backend/src/emails/__snapshots__/sendNotificationMail.spec.ts.snap b/backend/src/emails/__snapshots__/sendNotificationMail.spec.ts.snap
new file mode 100644
index 000000000..1c4f0dc8e
--- /dev/null
+++ b/backend/src/emails/__snapshots__/sendNotificationMail.spec.ts.snap
@@ -0,0 +1,2281 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`sendNotificationMail English changed_group_member_role template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo User,
+
+
+
+
+ Du möchtest also deine E-Mail ändern? Kein Problem! Mit Klick auf diesen Button kannst Du Deine neue E-Mail Adresse bestätigen:
E-Mail Adresse bestätigen +Falls Du deine E-Mail Adresse doch nicht ändern möchtest, kannst du diese Nachricht einfach ignorieren.
+Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: 123456
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Notification: Role in group changed",
+ "text": "HELLO JENNY ROSTOCK,
+
+your role in the group “The Group” has been changed. Click on the button to view
+this group:
+
+View group [http://webapp:3000/group/g1/the-group]
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+PS: If you don't want to receive e-mails anymore, change your notification
+settings [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail English commented_on_post template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello Jenny Rostock,
+
+
+
+
+ your role in the group “The Group” has been changed. Click on the button to view this group:
View group +
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
PS: If you don't want to receive e-mails anymore, change your notification settings!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Notification: New comment on post",
+ "text": "HELLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig] commented on a post that
+you are observing with the title “New Post”. Click on the button to view this
+comment:
+
+View comment [http://webapp:3000/post/p1/new-post#commentId-c1]
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+PS: If you don't want to receive e-mails anymore, change your notification
+settings [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail English followed_user_posted template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello Jenny Rostock,
+
+
+
+
+ Peter Lustig commented on a post that you are observing with the title “New Post”. Click on the button to view this comment: +
View comment +
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
PS: If you don't want to receive e-mails anymore, change your notification settings!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Notification: New post by followd user",
+ "text": "HELLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig], a user you are
+following, wrote a new post with the title “New Post”. Click on the button to
+view this post:
+
+View post [http://webapp:3000/post/p1/new-post]
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+PS: If you don't want to receive e-mails anymore, change your notification
+settings [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail English mentioned_in_comment template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello Jenny Rostock,
+
+
+
+
+ Peter Lustig, a user you are following, wrote a new post with the title “New Post”. Click on the button to view this post: +
View post +
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
PS: If you don't want to receive e-mails anymore, change your notification settings!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Notification: Mentioned in comment",
+ "text": "HELLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig] mentioned you in a
+comment to the post with the title “New Post”. Click on the button to view this
+comment:
+
+View comment [http://webapp:3000/post/p1/new-post#commentId-c1]
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+PS: If you don't want to receive e-mails anymore, change your notification
+settings [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail English mentioned_in_post template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello Jenny Rostock,
+
+
+
+
+ Peter Lustig mentioned you in a comment to the post with the title “New Post”. Click on the button to view this comment: +
View comment +
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
PS: If you don't want to receive e-mails anymore, change your notification settings!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Notification: Mentioned in post",
+ "text": "HELLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig] mentioned you in a post
+with the title “New Post”. Click on the button to view this post:
+
+View post [http://webapp:3000/post/p1/new-post]
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+PS: If you don't want to receive e-mails anymore, change your notification
+settings [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail English post_in_group template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello Jenny Rostock,
+
+
+
+
+ Peter Lustig mentioned you in a post with the title “New Post”. Click on the button to view this post: +
View post +
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
PS: If you don't want to receive e-mails anymore, change your notification settings!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Notification: New post in group",
+ "text": "HELLO JENNY ROSTOCK,
+
+someone wrote a new post with the title “New Post” in one of your groups. Click
+on the button to view this post:
+
+View post [http://webapp:3000/post/p1/new-post]
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+PS: If you don't want to receive e-mails anymore, change your notification
+settings [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail English removed_user_from_group template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello Jenny Rostock,
+
+
+
+
+ someone wrote a new post with the title “New Post” in one of your groups. Click on the button to view this post:
View post +
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
PS: If you don't want to receive e-mails anymore, change your notification settings!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Notification: Removed from group",
+ "text": "HELLO JENNY ROSTOCK,
+
+you have been removed from the group “The Group”.
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+PS: If you don't want to receive e-mails anymore, change your notification
+settings [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail English user_joined_group template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello Jenny Rostock,
+
+
+
+
+ you have been removed from the group “The Group”.
+
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
PS: If you don't want to receive e-mails anymore, change your notification settings!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Notification: User joined group",
+ "text": "HELLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig] joined the group “The
+Group”. Click on the button to view this group:
+
+View group [http://webapp:3000/group/g1/the-group]
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+PS: If you don't want to receive e-mails anymore, change your notification
+settings [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail English user_left_group template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello Jenny Rostock,
+
+
+
+
+ Peter Lustig joined the group “The Group”. Click on the button to view this group: +
View group +
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
PS: If you don't want to receive e-mails anymore, change your notification settings!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Notification: User left group",
+ "text": "HELLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig] left the group “The
+Group”. Click on the button to view this group:
+
+View group [http://webapp:3000/group/g1/the-group]
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+PS: If you don't want to receive e-mails anymore, change your notification
+settings [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail German changed_group_member_role template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello Jenny Rostock,
+
+
+
+
+ Peter Lustig left the group “The Group”. Click on the button to view this group: +
View group +
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
PS: If you don't want to receive e-mails anymore, change your notification settings!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Benachrichtigung: Rolle in Gruppe geändert",
+ "text": "HALLO JENNY ROSTOCK,
+
+deine Rolle in der Gruppe „The Group“ wurde geändert. Klicke auf den Knopf, um
+diese Gruppe zu sehen:
+
+Gruppe ansehen [http://webapp:3000/group/g1/the-group]
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine
+Benachrichtigungseinstellungen [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail German commented_on_post template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo Jenny Rostock,
+
+
+
+
+ deine Rolle in der Gruppe „The Group“ wurde geändert. Klicke auf den Knopf, um diese Gruppe zu sehen:
Gruppe ansehen +
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine Benachrichtigungseinstellungen!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Benachrichtigung: Neuer Kommentar zu Beitrag",
+ "text": "HALLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig] hat einen Beitrag den du
+beobachtest mit dem Titel „New Post“ kommentiert. Klicke auf den Knopf, um
+diesen Kommentar zu sehen:
+
+Kommentar ansehen [http://webapp:3000/post/p1/new-post#commentId-c1]
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine
+Benachrichtigungseinstellungen [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail German followed_user_posted template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo Jenny Rostock,
+
+
+
+
+ Peter Lustig hat einen Beitrag den du beobachtest mit dem Titel „New Post“ kommentiert. Klicke auf den Knopf, um diesen Kommentar zu sehen: +
Kommentar ansehen +
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine Benachrichtigungseinstellungen!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Benachrichtigung: Neuer Beitrag von gefolgtem Nutzer",
+ "text": "HALLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig], ein Nutzer dem du
+folgst, hat einen neuen Beitrag mit dem Titel „New Post“ geschrieben. Klicke auf
+den Knopf, um diesen Beitrag zu sehen:
+
+Beitrag ansehen [http://webapp:3000/post/p1/new-post]
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine
+Benachrichtigungseinstellungen [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail German mentioned_in_comment template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo Jenny Rostock,
+
+
+
+
+ Peter Lustig, ein Nutzer dem du folgst, hat einen neuen Beitrag mit dem Titel „New Post“ geschrieben. Klicke auf den Knopf, um diesen Beitrag zu sehen: +
Beitrag ansehen +
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine Benachrichtigungseinstellungen!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Benachrichtigung: Erwähnung in Kommentar",
+ "text": "HALLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig] hat dich in einem
+Kommentar zu dem Beitrag mit dem Titel „New Post“ erwähnt. Klicke auf den Knopf,
+um den Kommentar zu sehen:
+
+Kommentar ansehen [http://webapp:3000/post/p1/new-post#commentId-c1]
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine
+Benachrichtigungseinstellungen [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail German mentioned_in_post template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo Jenny Rostock,
+
+
+
+
+ Peter Lustig hat dich in einem Kommentar zu dem Beitrag mit dem Titel „New Post“ erwähnt. Klicke auf den Knopf, um den Kommentar zu sehen: +
Kommentar ansehen +
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine Benachrichtigungseinstellungen!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Benachrichtigung: Erwähnung in Beitrag",
+ "text": "HALLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig] hat Dich in einem Beitrag
+mit dem Titel „New Post“ erwähnt. Klicke auf den Knopf, um den Beitrag zu sehen:
+
+Beitrag ansehen [http://webapp:3000/post/p1/new-post]
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine
+Benachrichtigungseinstellungen [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail German post_in_group template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo Jenny Rostock,
+
+
+
+
+ Peter Lustig hat Dich in einem Beitrag mit dem Titel „New Post“ erwähnt. Klicke auf den Knopf, um den Beitrag zu sehen: +
Beitrag ansehen +
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine Benachrichtigungseinstellungen!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Benachrichtigung: Neuer Beitrag in Gruppe",
+ "text": "HALLO JENNY ROSTOCK,
+
+jemand hat einen neuen Beitrag mit dem Titel „New Post“ in einer deiner Gruppen
+geschrieben. Klicke auf den Knopf, um diesen Beitrag zu sehen:
+
+Beitrag ansehen [http://webapp:3000/post/p1/new-post]
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine
+Benachrichtigungseinstellungen [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail German removed_user_from_group template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo Jenny Rostock,
+
+
+
+
+ jemand hat einen neuen Beitrag mit dem Titel „New Post“ in einer deiner Gruppen geschrieben. Klicke auf den Knopf, um diesen Beitrag zu sehen:
Beitrag ansehen +
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine Benachrichtigungseinstellungen!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Benachrichtigung: Aus Gruppe entfernt",
+ "text": "HALLO JENNY ROSTOCK,
+
+du wurdest aus der Gruppe „The Group“ entfernt.
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine
+Benachrichtigungseinstellungen [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail German user_joined_group template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo Jenny Rostock,
+
+
+
+
+ du wurdest aus der Gruppe „The Group“ entfernt.
+
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine Benachrichtigungseinstellungen!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Benachrichtigung: Nutzer tritt Gruppe bei",
+ "text": "HALLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig] ist der Gruppe „The
+Group“ beigetreten. Klicke auf den Knopf, um diese Gruppe zu sehen:
+
+Gruppe ansehen [http://webapp:3000/group/g1/the-group]
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine
+Benachrichtigungseinstellungen [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendNotificationMail German user_left_group template 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo Jenny Rostock,
+
+
+
+
+ Peter Lustig ist der Gruppe „The Group“ beigetreten. Klicke auf den Knopf, um diese Gruppe zu sehen: +
Gruppe ansehen +
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine Benachrichtigungseinstellungen!
+
+
+
+
+
+
+
+",
+ "subject": "ocelot.social – Benachrichtigung: Nutzer verlässt Gruppe",
+ "text": "HALLO JENNY ROSTOCK,
+
+Peter Lustig [http://webapp:3000/user/u2/peter-lustig] hat die Gruppe „The
+Group“ verlassen. Klicke auf den Knopf, um diese Gruppe zu sehen:
+
+Gruppe ansehen [http://webapp:3000/group/g1/the-group]
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine
+Benachrichtigungseinstellungen [http://webapp:3000/settings/notifications]!
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
diff --git a/backend/src/emails/__snapshots__/sendRegistrationMail.spec.ts.snap b/backend/src/emails/__snapshots__/sendRegistrationMail.spec.ts.snap
new file mode 100644
index 000000000..d4a1ded8a
--- /dev/null
+++ b/backend/src/emails/__snapshots__/sendRegistrationMail.spec.ts.snap
@@ -0,0 +1,559 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`sendRegistrationMail with invite code English renders correctly 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo Jenny Rostock,
+
+
+
+
+ Peter Lustig hat die Gruppe „The Group“ verlassen. Klicke auf den Knopf, um diese Gruppe zu sehen: +
Gruppe ansehen +
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine Benachrichtigungseinstellungen!
+
+
+
+
+
+
+
+",
+ "subject": "Welcome to ocelot.social",
+ "text": "WELCOME TO OCELOT.SOCIAL!
+
+Thank you for joining our cause – it's awesome to have you on board. There's
+just one tiny step missing before we can start shaping the world together …
+Please confirm your e-mail address by clicking the button below:
+
+Confirm your e-mail address
+[http://webapp:3000/registration?email=user%40example.org&nonce=123456&inviteCode=welcome&method=invite-code]
+
+If the above button doesn't work, you can also copy the following code into your
+browser window: 123456
+
+However, this only works if you have registered through our website.
+
+If you didn't sign up for ocelot.social we recommend you to check it out! It's a
+social network from people for people who want to connect and change the world
+together.
+
+PS: If you ignore this e-mail we will not create an account for you. ;)
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendRegistrationMail with invite code German renders correctly 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Welcome to ocelot.social!
+
+
+
+
+ Thank you for joining our cause – it's awesome to have you on board. There's just one tiny step missing before we can start shaping the world together … Please confirm your e-mail address by clicking the button below:
Confirm your e-mail address +If the above button doesn't work, you can also copy the following code into your browser window: 123456
+However, this only works if you have registered through our website.
+If you didn't sign up for ocelot.social we recommend you to check it out! It's a social network from people for people who want to connect and change the world together. +
+PS: If you ignore this e-mail we will not create an account for you. ;)
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
+
+
+
+
+
+
+",
+ "subject": "Willkommen bei ocelot.social",
+ "text": "WILLKOMMEN BEI OCELOT.SOCIAL!
+
+Danke, dass du dich angemeldet hast – wir freuen uns, dich dabei zu haben. Jetzt
+fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können
+… Bitte bestätige Deine E-Mail Adresse:
+
+Bestätige Deine E-Mail Adresse
+[http://webapp:3000/registration?email=user%40example.org&nonce=123456&inviteCode=welcome&method=invite-code]
+
+Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in
+Dein Browserfenster kopieren: 123456
+
+Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert
+hast.
+
+Falls Du Dich nicht selbst bei ocelot.social angemeldet hast, schau doch mal
+vorbei! Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen.
+
+PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese E-Mail einfach
+ignorieren. ;)
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendRegistrationMail without invite code English renders correctly 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Willkommen bei ocelot.social!
+
+
+
+
+ Danke, dass du dich angemeldet hast – wir freuen uns, dich dabei zu haben. Jetzt fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können … Bitte bestätige Deine E-Mail Adresse:
Bestätige Deine E-Mail Adresse +Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: 123456
+Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert hast.
+Falls Du Dich nicht selbst bei ocelot.social angemeldet hast, schau doch mal vorbei! Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen. +
+PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese E-Mail einfach ignorieren. ;)
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
+
+
+
+
+
+
+",
+ "subject": "Welcome to ocelot.social",
+ "text": "WELCOME TO OCELOT.SOCIAL!
+
+Thank you for joining our cause – it's awesome to have you on board. There's
+just one tiny step missing before we can start shaping the world together …
+Please confirm your e-mail address by clicking the button below:
+
+Confirm your e-mail address
+[http://webapp:3000/registration?email=user%40example.org&nonce=123456&method=invite-mail]
+
+If the above button doesn't work, you can also copy the following code into your
+browser window: 123456
+
+However, this only works if you have registered through our website.
+
+If you didn't sign up for ocelot.social we recommend you to check it out! It's a
+social network from people for people who want to connect and change the world
+together.
+
+PS: If you ignore this e-mail we will not create an account for you. ;)
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendRegistrationMail without invite code German renders correctly 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Welcome to ocelot.social!
+
+
+
+
+ Thank you for joining our cause – it's awesome to have you on board. There's just one tiny step missing before we can start shaping the world together … Please confirm your e-mail address by clicking the button below:
Confirm your e-mail address +If the above button doesn't work, you can also copy the following code into your browser window: 123456
+However, this only works if you have registered through our website.
+If you didn't sign up for ocelot.social we recommend you to check it out! It's a social network from people for people who want to connect and change the world together. +
+PS: If you ignore this e-mail we will not create an account for you. ;)
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
+
+
+
+
+
+
+",
+ "subject": "Willkommen bei ocelot.social",
+ "text": "WILLKOMMEN BEI OCELOT.SOCIAL!
+
+Danke, dass du dich angemeldet hast – wir freuen uns, dich dabei zu haben. Jetzt
+fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können
+… Bitte bestätige Deine E-Mail Adresse:
+
+Bestätige Deine E-Mail Adresse
+[http://webapp:3000/registration?email=user%40example.org&nonce=123456&method=invite-mail]
+
+Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in
+Dein Browserfenster kopieren: 123456
+
+Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert
+hast.
+
+Falls Du Dich nicht selbst bei ocelot.social angemeldet hast, schau doch mal
+vorbei! Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen.
+
+PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese E-Mail einfach
+ignorieren. ;)
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
diff --git a/backend/src/emails/__snapshots__/sendResetPasswordMail.spec.ts.snap b/backend/src/emails/__snapshots__/sendResetPasswordMail.spec.ts.snap
new file mode 100644
index 000000000..da62c9a34
--- /dev/null
+++ b/backend/src/emails/__snapshots__/sendResetPasswordMail.spec.ts.snap
@@ -0,0 +1,260 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`sendResetPasswordMail English renders correctly 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Willkommen bei ocelot.social!
+
+
+
+
+ Danke, dass du dich angemeldet hast – wir freuen uns, dich dabei zu haben. Jetzt fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können … Bitte bestätige Deine E-Mail Adresse:
Bestätige Deine E-Mail Adresse +Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: 123456
+Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert hast.
+Falls Du Dich nicht selbst bei ocelot.social angemeldet hast, schau doch mal vorbei! Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen. +
+PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese E-Mail einfach ignorieren. ;)
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
+
+
+
+
+
+
+",
+ "subject": "Reset Password ocelot.social",
+ "text": "HELLO JENNY ROSTOCK,
+
+So, you forgot your password? No problem! Just click the button below to reset
+it within the next 24 hours:
+
+Confirm your e-mail address
+[http://webapp:3000/password-reset/change-password?email=user%40example.org&nonce=123456]
+
+If you didn't request a new password feel free to ignore this e-mail.
+
+If the above button doesn't work you can also copy the following code into your
+browser window: 123456
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendResetPasswordMail German renders correctly 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hello Jenny Rostock,
+
+
+
+
+ So, you forgot your password? No problem! Just click the button below to reset it within the next 24 hours:
Confirm your e-mail address +If you didn't request a new password feel free to ignore this e-mail.
+If the above button doesn't work you can also copy the following code into your browser window: 123456
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
+
+
+
+
+
+
+",
+ "subject": "Neues Passwort ocelot.social",
+ "text": "HALLO JENNY ROSTOCK,
+
+Du hast also dein Passwort vergessen? Kein Problem! Mit Klick auf diesen Button
+kannst du innerhalb der nächsten 24 Stunden dein Passwort zurücksetzen:
+
+Bestätige Deine E-Mail Adresse
+[http://webapp:3000/password-reset/change-password?email=user%40example.org&nonce=123456]
+
+Falls du kein neues Passwort angefordert hast, kannst du diese E-Mail einfach
+ignorieren.
+
+Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in
+Dein Browserfenster kopieren: 123456
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
diff --git a/backend/src/emails/__snapshots__/sendWrongEmail.spec.ts.snap b/backend/src/emails/__snapshots__/sendWrongEmail.spec.ts.snap
new file mode 100644
index 000000000..b2052d808
--- /dev/null
+++ b/backend/src/emails/__snapshots__/sendWrongEmail.spec.ts.snap
@@ -0,0 +1,255 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`sendWrongEmail English renders correctly 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Hallo Jenny Rostock,
+
+
+
+
+ Du hast also dein Passwort vergessen? Kein Problem! Mit Klick auf diesen Button kannst du innerhalb der nächsten 24 Stunden dein Passwort zurücksetzen:
Bestätige Deine E-Mail Adresse +Falls du kein neues Passwort angefordert hast, kannst du diese E-Mail einfach ignorieren.
+Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in Dein Browserfenster kopieren: 123456
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+
+
+
+
+
+
+
+",
+ "subject": "Wrong E-mail? ocelot.social",
+ "text": "WELCOME TO OCELOT.SOCIAL!
+
+You requested a password reset but unfortunately we couldn't find an account
+associated with your e-mail address. Did you maybe use another one when you
+signed up?
+
+Try a different e-mail [http://webapp:3000/password-reset/request]
+
+If you don't have an account at ocelot.social yet or if you didn't want to reset
+your password, please ignore this e-mail.
+
+See you soon on ocelot.social [https://ocelot.social]!
+
+– The ocelot.social Team
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
+
+exports[`sendWrongEmail German renders correctly 1`] = `
+{
+ "attachments": [],
+ "from": "ocelot.social
+ Welcome to ocelot.social!
+
+
+
+
+ You requested a password reset but unfortunately we couldn't find an account associated with your e-mail address. Did you maybe use another one when you signed up?
Try a different e-mail +If you don't have an account at ocelot.social yet or if you didn't want to reset your password, please ignore this e-mail. +
+
+
+ See you soon on ocelot.social!
+– The ocelot.social Team
+
+
+
+
+
+
+
+",
+ "subject": "Falsche Mailaddresse? ocelot.social",
+ "text": "WILLKOMMEN BEI OCELOT.SOCIAL!
+
+Du hast bei uns ein neues Passwort angefordert – leider haben wir aber keinen
+Account mit deiner E-Mailadresse gefunden. Kann es sein, dass du mit einer
+anderen Adresse bei uns angemeldet bist?
+
+Versuch' es mit einer anderen E-Mail [http://webapp:3000/password-reset/request]
+
+Wenn du noch keinen Account bei ocelot.social hast oder dein Password gar nicht
+ändern willst, kannst du diese E-Mail einfach ignorieren!
+
+Bis bald bei ocelot.social [https://ocelot.social]!
+
+– Dein ocelot.social Team
+
+
+ocelot.social Community [https://ocelot.social]",
+ "to": "user@example.org",
+}
+`;
diff --git a/backend/src/emails/locales/de.json b/backend/src/emails/locales/de.json
new file mode 100644
index 000000000..9e0ce843a
--- /dev/null
+++ b/backend/src/emails/locales/de.json
@@ -0,0 +1,71 @@
+{
+ "notification": "Benachrichtigung",
+ "subjects": {
+ "changedGroupMemberRole": "Rolle in Gruppe geändert",
+ "chatMessage": "Neue Chat Nachricht",
+ "commentedOnPost": "Neuer Kommentar zu Beitrag",
+ "followedUserPosted": "Neuer Beitrag von gefolgtem Nutzer",
+ "mentionedInComment": "Erwähnung in Kommentar",
+ "mentionedInPost": "Erwähnung in Beitrag",
+ "newEmail": "Neue E-Mail Addresse",
+ "removedUserFromGroup": "Aus Gruppe entfernt",
+ "postInGroup": "Neuer Beitrag in Gruppe",
+ "resetPassword": "Neues Passwort",
+ "userJoinedGroup": "Nutzer tritt Gruppe bei",
+ "userLeftGroup": "Nutzer verlässt Gruppe",
+ "wrongEmail": "Falsche Mailaddresse?"
+ },
+ "registration": {
+ "introduction": "Danke, dass du dich angemeldet hast – wir freuen uns, dich dabei zu haben. Jetzt fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können … Bitte bestätige Deine E-Mail Adresse:",
+ "codeHint": "Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: ",
+ "codeHintException": "Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert hast.",
+ "notYouStart": "Falls Du Dich nicht selbst bei ",
+ "notYouEnd": " angemeldet hast, schau doch mal vorbei! Wir sind ein gemeinnütziges Aktionsnetzwerk – von Menschen für Menschen.",
+ "ps": "PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese E-Mail einfach ignorieren. ;)"
+ },
+ "emailVerification": {
+ "codeHint": "Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: ",
+ "introduction": "Du möchtest also deine E-Mail ändern? Kein Problem! Mit Klick auf diesen Button kannst Du Deine neue E-Mail Adresse bestätigen:",
+ "doNotChange": "Falls Du deine E-Mail Adresse doch nicht ändern möchtest, kannst du diese Nachricht einfach ignorieren. "
+ },
+ "buttons": {
+ "confirmEmail": "Bestätige Deine E-Mail Adresse",
+ "resetPassword": "Passwort zurücksetzen",
+ "tryAgain": "Versuch' es mit einer anderen E-Mail",
+ "verifyEmail": "E-Mail Adresse bestätigen",
+ "viewChat": "Chat anzeigen",
+ "viewComment": "Kommentar ansehen",
+ "viewGroup": "Gruppe ansehen",
+ "viewPost": "Beitrag ansehen"
+ },
+ "general": {
+ "greeting": "Hallo",
+ "seeYou": "Bis bald bei ",
+ "yourTeam": "– Dein {team} Team",
+ "settingsHint": "PS: Möchtest du keine E-Mails mehr erhalten, dann ändere deine ",
+ "settingsName": "Benachrichtigungseinstellungen",
+ "welcome": "Willkommen bei"
+ },
+ "resetPassword": {
+ "codeHint": "Sollte der Button für dich nicht funktionieren, kannst du auch folgenden Code in Dein Browserfenster kopieren: ",
+ "ignore": "Falls du kein neues Passwort angefordert hast, kannst du diese E-Mail einfach ignorieren.",
+ "introduction": "Du hast also dein Passwort vergessen? Kein Problem! Mit Klick auf diesen Button kannst du innerhalb der nächsten 24 Stunden dein Passwort zurücksetzen:"
+ },
+ "wrongEmail": {
+ "codeHint": "Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: ",
+ "ignoreEnd": " hast oder dein Password gar nicht ändern willst, kannst du diese E-Mail einfach ignorieren!",
+ "ignoreStart": "Wenn du noch keinen Account bei ",
+ "introduction": "Du hast bei uns ein neues Passwort angefordert – leider haben wir aber keinen Account mit deiner E-Mailadresse gefunden. Kann es sein, dass du mit einer anderen Adresse bei uns angemeldet bist?"
+ },
+ "changedGroupMemberRole": "deine Rolle in der Gruppe „{groupName}“ wurde geändert. Klicke auf den Knopf, um diese Gruppe zu sehen:",
+ "chatMessageStart": "du hast eine neue Chat-Nachricht von ",
+ "chatMessageEnd": " erhalten.",
+ "commentedOnPost": " hat einen Beitrag den du beobachtest mit dem Titel „{postTitle}“ kommentiert. Klicke auf den Knopf, um diesen Kommentar zu sehen:",
+ "followedUserPosted": ", ein Nutzer dem du folgst, hat einen neuen Beitrag mit dem Titel „{postTitle}“ geschrieben. Klicke auf den Knopf, um diesen Beitrag zu sehen:",
+ "mentionedInComment": " hat dich in einem Kommentar zu dem Beitrag mit dem Titel „{postTitle}“ erwähnt. Klicke auf den Knopf, um den Kommentar zu sehen:",
+ "mentionedInPost": " hat Dich in einem Beitrag mit dem Titel „{postTitle}“ erwähnt. Klicke auf den Knopf, um den Beitrag zu sehen:",
+ "postInGroup": "jemand hat einen neuen Beitrag mit dem Titel „{postTitle}“ in einer deiner Gruppen geschrieben. Klicke auf den Knopf, um diesen Beitrag zu sehen:",
+ "removedUserFromGroup": "du wurdest aus der Gruppe „{groupName}“ entfernt.",
+ "userJoinedGroup": " ist der Gruppe „{groupName}“ beigetreten. Klicke auf den Knopf, um diese Gruppe zu sehen:",
+ "userLeftGroup": " hat die Gruppe „{groupName}“ verlassen. Klicke auf den Knopf, um diese Gruppe zu sehen:"
+}
diff --git a/backend/src/emails/locales/en.json b/backend/src/emails/locales/en.json
new file mode 100644
index 000000000..30ca64655
--- /dev/null
+++ b/backend/src/emails/locales/en.json
@@ -0,0 +1,70 @@
+{
+ "notification": "Notification",
+ "subjects": {
+ "changedGroupMemberRole": "Role in group changed",
+ "chatMessage": "New chat message",
+ "commentedOnPost": "New comment on post",
+ "followedUserPosted": "New post by followd user",
+ "mentionedInComment": "Mentioned in comment",
+ "mentionedInPost": "Mentioned in post",
+ "newEmail": "New E-Mail Address",
+ "removedUserFromGroup": "Removed from group",
+ "postInGroup": "New post in group",
+ "resetPassword": "Reset Password",
+ "userJoinedGroup": "User joined group",
+ "userLeftGroup": "User left group",
+ "wrongEmail": "Wrong E-mail?"
+ },
+ "registration": {
+ "introduction": "Thank you for joining our cause – it's awesome to have you on board. There's just one tiny step missing before we can start shaping the world together … Please confirm your e-mail address by clicking the button below:",
+ "codeHint": "If the above button doesn't work, you can also copy the following code into your browser window: ",
+ "codeHintException": "However, this only works if you have registered through our website.",
+ "notYouStart": "If you didn't sign up for ",
+ "notYouEnd": " we recommend you to check it out! It's a social network from people for people who want to connect and change the world together.",
+ "ps": "PS: If you ignore this e-mail we will not create an account for you. ;)"
+ },
+ "emailVerification": {
+ "codeHint": "If the above button doesn't work, you can also copy the following code into your browser window: ",
+ "introduction": "So, you want to change your e-mail? No problem! Just click the button below to verify your new address:",
+ "doNotChange": "If you don't want to change your e-mail address feel free to ignore this message. "
+ },
+ "buttons": {
+ "confirmEmail": "Confirm your e-mail address",
+ "resetPassword": "Reset password",
+ "tryAgain": "Try a different e-mail",
+ "verifyEmail": "Verify e-mail address",
+ "viewChat": "Show Chat",
+ "viewComment": "View comment",
+ "viewGroup": "View group",
+ "viewPost": "View post"
+ },
+ "general": {
+ "greeting": "Hello",
+ "seeYou": "See you soon on ",
+ "yourTeam": "– The {team} Team",
+ "settingsHint": "PS: If you don't want to receive e-mails anymore, change your ",
+ "settingsName": "notification settings",
+ "welcome": "Welcome to"
+ },
+ "resetPassword": {
+ "codeHint": "If the above button doesn't work you can also copy the following code into your browser window: ",
+ "ignore": "If you didn't request a new password feel free to ignore this e-mail.",
+ "introduction": "So, you forgot your password? No problem! Just click the button below to reset it within the next 24 hours:"
+ },
+ "wrongEmail": {
+ "ignoreEnd": " yet or if you didn't want to reset your password, please ignore this e-mail.",
+ "ignoreStart": "If you don't have an account at ",
+ "introduction": "You requested a password reset but unfortunately we couldn't find an account associated with your e-mail address. Did you maybe use another one when you signed up?"
+ },
+ "changedGroupMemberRole": "your role in the group “{groupName}” has been changed. Click on the button to view this group:",
+ "chatMessageStart": "you have received a new chat message from ",
+ "chatMessageEnd": ".",
+ "commentedOnPost": " commented on a post that you are observing with the title “{postTitle}”. Click on the button to view this comment:",
+ "followedUserPosted": ", a user you are following, wrote a new post with the title “{postTitle}”. Click on the button to view this post:",
+ "mentionedInComment": " mentioned you in a comment to the post with the title “{postTitle}”. Click on the button to view this comment:",
+ "mentionedInPost": " mentioned you in a post with the title “{postTitle}”. Click on the button to view this post:",
+ "removedUserFromGroup": "you have been removed from the group “{groupName}”.",
+ "postInGroup": "someone wrote a new post with the title “{postTitle}” in one of your groups. Click on the button to view this post:",
+ "userJoinedGroup": " joined the group “{groupName}”. Click on the button to view this group:",
+ "userLeftGroup": " left the group “{groupName}”. Click on the button to view this group:"
+}
diff --git a/backend/src/emails/sendChatMessageMail.spec.ts b/backend/src/emails/sendChatMessageMail.spec.ts
new file mode 100644
index 000000000..45835bbc3
--- /dev/null
+++ b/backend/src/emails/sendChatMessageMail.spec.ts
@@ -0,0 +1,87 @@
+import { sendChatMessageMail } from './sendEmail'
+
+const senderUser = {
+ allowEmbedIframes: false,
+ createdAt: '2025-04-30T00:16:49.610Z',
+ deleted: false,
+ disabled: false,
+ emailNotificationsChatMessage: true,
+ emailNotificationsCommentOnObservedPost: true,
+ emailNotificationsFollowingUsers: true,
+ emailNotificationsGroupMemberJoined: true,
+ emailNotificationsGroupMemberLeft: true,
+ emailNotificationsGroupMemberRemoved: true,
+ emailNotificationsGroupMemberRoleChanged: true,
+ emailNotificationsMention: true,
+ emailNotificationsPostInGroup: true,
+ encryptedPassword: '$2b$10$n.WujXapJrvn498lS97MD.gn8QwjWI9xlf8ckEYYtMTOPadMidcbG',
+ id: 'chatSender',
+ locale: 'en',
+ name: 'chatSender',
+ role: 'user',
+ showShoutsPublicly: false,
+ slug: 'chatsender',
+ termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z',
+ termsAndConditionsAgreedVersion: '0.0.1',
+ updatedAt: '2025-04-30T00:16:49.610Z',
+}
+
+const recipientUser = {
+ allowEmbedIframes: false,
+ createdAt: '2025-04-30T00:16:49.716Z',
+ deleted: false,
+ disabled: false,
+ emailNotificationsChatMessage: true,
+ emailNotificationsCommentOnObservedPost: true,
+ emailNotificationsFollowingUsers: true,
+ emailNotificationsGroupMemberJoined: true,
+ emailNotificationsGroupMemberLeft: true,
+ emailNotificationsGroupMemberRemoved: true,
+ emailNotificationsGroupMemberRoleChanged: true,
+ emailNotificationsMention: true,
+ emailNotificationsPostInGroup: true,
+ encryptedPassword: '$2b$10$KOrCHvEB5CM7D.P3VcX2z.pSSBZKZhPqHW/QKym6V1S6fiG..xtBq',
+ id: 'chatReceiver',
+ locale: 'en',
+ name: 'chatReceiver',
+ role: 'user',
+ showShoutsPublicly: false,
+ slug: 'chatreceiver',
+ termsAndConditionsAgreedAt: '2019-08-01T10:47:19.212Z',
+ termsAndConditionsAgreedVersion: '0.0.1',
+ updatedAt: '2025-04-30T00:16:49.716Z',
+}
+
+describe('sendChatMessageMail', () => {
+ describe('English', () => {
+ beforeEach(() => {
+ recipientUser.locale = 'en'
+ })
+
+ it('chat_message template', async () => {
+ await expect(
+ sendChatMessageMail({
+ email: 'user@example.org',
+ senderUser,
+ recipientUser,
+ }),
+ ).resolves.toMatchSnapshot()
+ })
+ })
+
+ describe('German', () => {
+ beforeEach(() => {
+ recipientUser.locale = 'de'
+ })
+
+ it('chat_message template', async () => {
+ await expect(
+ sendChatMessageMail({
+ email: 'user@example.org',
+ senderUser,
+ recipientUser,
+ }),
+ ).resolves.toMatchSnapshot()
+ })
+ })
+})
diff --git a/backend/src/emails/sendEmail.ts b/backend/src/emails/sendEmail.ts
new file mode 100644
index 000000000..580cc2f58
--- /dev/null
+++ b/backend/src/emails/sendEmail.ts
@@ -0,0 +1,321 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/restrict-template-expressions */
+import path from 'node:path'
+
+import Email from 'email-templates'
+import { createTransport } from 'nodemailer'
+
+// import type Email as EmailType from '@types/email-templates'
+
+import CONFIG, { nodemailerTransportOptions } from '@config/index'
+import logosWebapp from '@config/logos'
+import metadata from '@config/metadata'
+import { UserDbProperties } from '@db/types/User'
+
+const welcomeImageUrl = new URL(logosWebapp.LOGO_WELCOME_PATH, CONFIG.CLIENT_URI)
+const settingsUrl = new URL('/settings/notifications', CONFIG.CLIENT_URI)
+
+const defaultParams = {
+ welcomeImageUrl,
+ APPLICATION_NAME: CONFIG.APPLICATION_NAME,
+ ORGANIZATION_NAME: metadata.ORGANIZATION_NAME,
+ ORGANIZATION_URL: CONFIG.ORGANIZATION_URL,
+ supportUrl: CONFIG.SUPPORT_URL,
+ settingsUrl,
+ renderSettingsUrl: true,
+}
+
+const from = `${CONFIG.APPLICATION_NAME} <${CONFIG.EMAIL_DEFAULT_SENDER}>`
+
+const transport = createTransport(nodemailerTransportOptions)
+
+const email = new Email({
+ message: {
+ from,
+ },
+ transport,
+ i18n: {
+ locales: ['en', 'de'],
+ defaultLocale: 'en',
+ retryInDefaultLocale: false,
+ directory: path.join(__dirname, 'locales'),
+ updateFiles: false,
+ objectNotation: true,
+ mustacheConfig: {
+ tags: ['{', '}'],
+ disable: false,
+ },
+ },
+ send: CONFIG.SEND_MAIL,
+ preview: false,
+ // This is very useful to see the emails sent by the unit tests
+ /*
+ preview: {
+ open: {
+ app: 'brave-browser',
+ },
+ },
+ */
+})
+
+interface OriginalMessage {
+ to: string
+ from: string
+ attachments: string[]
+ subject: string
+ html: string
+ text: string
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const sendNotificationMail = async (notification: any): Promise
+ Willkommen bei ocelot.social!
+
+
+
+
+ Du hast bei uns ein neues Passwort angefordert – leider haben wir aber keinen Account mit deiner E-Mailadresse gefunden. Kann es sein, dass du mit einer anderen Adresse bei uns angemeldet bist?
Versuch' es mit einer anderen E-Mail +Wenn du noch keinen Account bei ocelot.social hast oder dein Password gar nicht ändern willst, kannst du diese E-Mail einfach ignorieren! +
+
+
+ Bis bald bei ocelot.social!
+– Dein ocelot.social Team
+|
- |
- |||
-
|
-
| - | -|||
|
- |
- |||
-
|
-
|
- |
- |||
-
|
- |||
-
|
- |||
-
|
-
|
- |
- |||
-
|
- |||
-
|
- |||
-
|
-
| - | -|||
|
- |
- |||
-
|
- |||
-
|
- |||
-
|
-
|
- |
- |||
-
|
- |||
-
|
- |||
-
|
-
-
-
-
-
-
-
-
-
-
-
- {{englishHint}}
- - {{> content}} - - -|
- - {{ORGANIZATION_NAME}} - - - - |
-
|
- |
- |||
-
|
- |||
-
|
- |||
-
|
-
| - | -|||
|
- |
- |||
-
|
- |||
-
|
- |||
-
|
-
|
- |
- ||||
-
|
- ||||
-
|
- ||||
-
|
-
| - | -||||
|
- |
- ||||
-
|
- ||||
-
|
- ||||
-
|
-
|
- |
- |||
-
|
- |||
-
|
- |||
-
|
-
| - | -|||
|
- |
- |||
-
|
- |||
-
|
- |||
-
|
-
{{ $t(`notifications.reason.${notification.reason}`) }}
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue index 276da8490..576abb213 100644 --- a/webapp/components/NotificationMenu/NotificationMenu.vue +++ b/webapp/components/NotificationMenu/NotificationMenu.vue @@ -127,7 +127,7 @@ export default { apollo: { notifications: { query() { - return notificationQuery(this.$i18n) + return notificationQuery() }, variables() { return { diff --git a/webapp/components/NotificationsTable/NotificationsTable.spec.js b/webapp/components/NotificationsTable/NotificationsTable.spec.js index 0d3560787..5fbfc338a 100644 --- a/webapp/components/NotificationsTable/NotificationsTable.spec.js +++ b/webapp/components/NotificationsTable/NotificationsTable.spec.js @@ -88,7 +88,7 @@ describe('NotificationsTable.vue', () => { }) it('renders the author', () => { - const userinfo = firstRowNotification.find('.user-teaser > .info') + const userinfo = firstRowNotification.find('.user-teaser .info') expect(userinfo.text()).toContain(postNotification.from.author.name) }) @@ -121,7 +121,7 @@ describe('NotificationsTable.vue', () => { }) it('renders the author', () => { - const userinfo = secondRowNotification.find('.user-teaser > .info') + const userinfo = secondRowNotification.find('.user-teaser .info') expect(userinfo.text()).toContain(commentNotification.from.author.name) }) diff --git a/webapp/components/PasswordReset/Request.spec.js b/webapp/components/PasswordReset/Request.spec.js index 50d6495bd..e2f082242 100644 --- a/webapp/components/PasswordReset/Request.spec.js +++ b/webapp/components/PasswordReset/Request.spec.js @@ -59,7 +59,12 @@ describe('Request', () => { }) it('delivers email to backend', () => { - const expected = expect.objectContaining({ variables: { email: 'mail@example.org' } }) + const expected = expect.objectContaining({ + variables: { + email: 'mail@example.org', + locale: 'en', + }, + }) expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expected) }) @@ -92,7 +97,12 @@ describe('Request', () => { }) it('normalizes email to lower case letters', () => { - const expected = expect.objectContaining({ variables: { email: 'mail@gmail.com' } }) + const expected = expect.objectContaining({ + variables: { + email: 'mail@gmail.com', + locale: 'en', + }, + }) expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expected) }) }) diff --git a/webapp/components/PasswordReset/Request.vue b/webapp/components/PasswordReset/Request.vue index 5398c13ed..3eebeba65 100644 --- a/webapp/components/PasswordReset/Request.vue +++ b/webapp/components/PasswordReset/Request.vue @@ -85,13 +85,13 @@ export default { }, async handleSubmit() { const mutation = gql` - mutation ($email: String!) { - requestPasswordReset(email: $email) + mutation ($email: String!, $locale: String!) { + requestPasswordReset(email: $email, locale: $locale) } ` try { const { email } = this - await this.$apollo.mutate({ mutation, variables: { email } }) + await this.$apollo.mutate({ mutation, variables: { email, locale: this.$i18n.locale() } }) this.submitted = true setTimeout(() => { diff --git a/webapp/components/Registration/RegistrationSlideEmail.vue b/webapp/components/Registration/RegistrationSlideEmail.vue index 6d6454ac9..96441dee8 100644 --- a/webapp/components/Registration/RegistrationSlideEmail.vue +++ b/webapp/components/Registration/RegistrationSlideEmail.vue @@ -36,8 +36,8 @@ import normalizeEmail from '~/components/utils/NormalizeEmail' import translateErrorMessage from '~/components/utils/TranslateErrorMessage' export const SignupMutation = gql` - mutation ($email: String!, $inviteCode: String) { - Signup(email: $email, inviteCode: $inviteCode) { + mutation ($email: String!, $locale: String!, $inviteCode: String) { + Signup(email: $email, locale: $locale, inviteCode: $inviteCode) { email } } @@ -140,7 +140,7 @@ export default { async onNextClick() { const { email } = this.formData const { inviteCode = null } = this.sliderData.collectedInputData - const variables = { email, inviteCode } + const variables = { email, inviteCode, locale: this.$i18n.locale() } if (this.sliderData.collectedInputData.emailSend && !this.sendEmailAgain) { return true diff --git a/webapp/components/Registration/Signup.spec.js b/webapp/components/Registration/Signup.spec.js index 7ef2dc994..2ee413b8b 100644 --- a/webapp/components/Registration/Signup.spec.js +++ b/webapp/components/Registration/Signup.spec.js @@ -25,6 +25,9 @@ describe('Signup', () => { loading: false, mutate: jest.fn().mockResolvedValue({ data: { Signup: { email: 'mail@example.org' } } }), }, + $i18n: { + locale: () => 'de', + }, } propsData = {} }) @@ -64,7 +67,7 @@ describe('Signup', () => { it('delivers email to backend', () => { const expected = expect.objectContaining({ mutation: SignupMutation, - variables: { email: 'mAIL@exAMPLE.org', inviteCode: null }, + variables: { email: 'mAIL@exAMPLE.org', locale: 'de', inviteCode: null }, }) expect(mocks.$apollo.mutate).toHaveBeenCalledWith(expected) }) diff --git a/webapp/components/Registration/Signup.vue b/webapp/components/Registration/Signup.vue index 91b9ecd61..156c43d4e 100644 --- a/webapp/components/Registration/Signup.vue +++ b/webapp/components/Registration/Signup.vue @@ -70,8 +70,8 @@ import { SweetalertIcon } from 'vue-sweetalert-icons' import translateErrorMessage from '~/components/utils/TranslateErrorMessage' export const SignupMutation = gql` - mutation ($email: String!, $inviteCode: String) { - Signup(email: $email, inviteCode: $inviteCode) { + mutation ($email: String!, $locale: String!, $inviteCode: String) { + Signup(email: $email, locale: $locale, inviteCode: $inviteCode) { email } } @@ -121,7 +121,7 @@ export default { try { const response = await this.$apollo.mutate({ mutation: SignupMutation, - variables: { email, inviteCode: null }, + variables: { email, locale: this.$i18n.locale(), inviteCode: null }, }) this.data = response.data setTimeout(() => { diff --git a/webapp/components/UserTeaser/LocationInfo.spec.js b/webapp/components/UserTeaser/LocationInfo.spec.js new file mode 100644 index 000000000..2b100e66d --- /dev/null +++ b/webapp/components/UserTeaser/LocationInfo.spec.js @@ -0,0 +1,31 @@ +import { render } from '@testing-library/vue' +import LocationInfo from './LocationInfo.vue' + +const localVue = global.localVue + +describe('LocationInfo', () => { + const Wrapper = ({ withDistance }) => { + return render(LocationInfo, { + localVue, + propsData: { + locationData: { + name: 'Paris', + distanceToMe: withDistance ? 100 : null, + }, + }, + mocks: { + $t: jest.fn((t) => t), + }, + }) + } + + it('renders with distance', () => { + const wrapper = Wrapper({ withDistance: true }) + expect(wrapper.container).toMatchSnapshot() + }) + + it('renders without distance', () => { + const wrapper = Wrapper({ withDistance: false }) + expect(wrapper.container).toMatchSnapshot() + }) +}) diff --git a/webapp/components/UserTeaser/LocationInfo.vue b/webapp/components/UserTeaser/LocationInfo.vue new file mode 100644 index 000000000..67dc46c27 --- /dev/null +++ b/webapp/components/UserTeaser/LocationInfo.vue @@ -0,0 +1,44 @@ + +
+
+
+
+
+
+
diff --git a/webapp/components/UserTeaser/UserTeaser.spec.js b/webapp/components/UserTeaser/UserTeaser.spec.js
index 354308109..8a67285ac 100644
--- a/webapp/components/UserTeaser/UserTeaser.spec.js
+++ b/webapp/components/UserTeaser/UserTeaser.spec.js
@@ -1,113 +1,250 @@
-import { mount, RouterLinkStub } from '@vue/test-utils'
+import { render, screen, fireEvent } from '@testing-library/vue'
+import { RouterLinkStub } from '@vue/test-utils'
import UserTeaser from './UserTeaser.vue'
import Vuex from 'vuex'
const localVue = global.localVue
-const filter = jest.fn((str) => str)
-localVue.filter('truncate', filter)
+// Mock Math.random, used in Dropdown
+Object.assign(Math, {
+ random: () => 0,
+})
+
+const waitForPopover = async () => await new Promise((resolve) => setTimeout(resolve, 1000))
+
+let mockIsTouchDevice
+jest.mock('../utils/isTouchDevice', () => ({
+ isTouchDevice: jest.fn(() => mockIsTouchDevice),
+}))
+
+const userTilda = {
+ name: 'Tilda Swinton',
+ slug: 'tilda-swinton',
+ id: 'user1',
+ avatar: '/avatars/tilda-swinton',
+ badgeVerification: {
+ id: 'bv1',
+ icon: '/icons/verified',
+ description: 'Verified',
+ isDefault: false,
+ },
+ badgeTrophiesSelected: [
+ {
+ id: 'trophy1',
+ icon: '/icons/trophy1',
+ description: 'Trophy 1',
+ isDefault: false,
+ },
+ {
+ id: 'trophy2',
+ icon: '/icons/trophy2',
+ description: 'Trophy 2',
+ isDefault: false,
+ },
+ {
+ id: 'empty',
+ icon: '/icons/empty',
+ description: 'Empty',
+ isDefault: true,
+ },
+ ],
+}
describe('UserTeaser', () => {
- let propsData
- let mocks
- let stubs
- let getters
+ const Wrapper = ({
+ isModerator = false,
+ withLinkToProfile = true,
+ onTouchScreen = false,
+ withAvatar = true,
+ user = userTilda,
+ withPopoverEnabled = true,
+ }) => {
+ mockIsTouchDevice = onTouchScreen
- beforeEach(() => {
- propsData = {}
-
- mocks = {
- $t: jest.fn(),
- }
- stubs = {
- NuxtLink: RouterLinkStub,
- }
- getters = {
- 'auth/user': () => {
- return {}
+ const store = new Vuex.Store({
+ getters: {
+ 'auth/user': () => {
+ return {}
+ },
+ 'auth/isModerator': () => isModerator,
},
- 'auth/isModerator': () => false,
- }
+ })
+ return render(UserTeaser, {
+ localVue,
+ store,
+ propsData: {
+ user,
+ linkToProfile: withLinkToProfile,
+ showAvatar: withAvatar,
+ showPopover: withPopoverEnabled,
+ },
+ stubs: {
+ NuxtLink: RouterLinkStub,
+ 'user-teaser-popover': true,
+ 'v-popover': true,
+ 'client-only': true,
+ },
+ mocks: {
+ $t: jest.fn((t) => t),
+ },
+ })
+ }
+
+ it('renders anonymous user', () => {
+ const wrapper = Wrapper({ user: null })
+ expect(wrapper.container).toMatchSnapshot()
})
- describe('mount', () => {
- const Wrapper = () => {
- const store = new Vuex.Store({
- getters,
+ describe('given an user', () => {
+ describe('without linkToProfile, on touch screen', () => {
+ let wrapper
+ beforeEach(() => {
+ wrapper = Wrapper({ withLinkToProfile: false, onTouchScreen: true })
})
- return mount(UserTeaser, { store, propsData, mocks, stubs, localVue })
- }
- it('renders anonymous user', () => {
- const wrapper = Wrapper()
- expect(wrapper.text()).toBe('')
- expect(mocks.$t).toHaveBeenCalledWith('profile.userAnonym')
+ it('renders', () => {
+ expect(wrapper.container).toMatchSnapshot()
+ })
+
+ describe('when clicking the user name', () => {
+ beforeEach(async () => {
+ const userName = screen.getByText('Tilda Swinton')
+ await fireEvent.click(userName)
+ await waitForPopover()
+ })
+
+ it('renders the popover', () => {
+ expect(wrapper.container).toMatchSnapshot()
+ })
+ })
+
+ describe('when clicking the user avatar', () => {
+ beforeEach(async () => {
+ const userAvatar = screen.getByAltText('Tilda Swinton')
+ await fireEvent.click(userAvatar)
+ await waitForPopover()
+ })
+
+ it('renders the popover', () => {
+ expect(wrapper.container).toMatchSnapshot()
+ })
+ })
})
- describe('given an user', () => {
+ describe('with linkToProfile, on touch screen', () => {
+ let wrapper
beforeEach(() => {
- propsData.user = {
- name: 'Tilda Swinton',
- slug: 'tilda-swinton',
- }
+ wrapper = Wrapper({ withLinkToProfile: true, onTouchScreen: true })
})
- it('renders user name', () => {
- const wrapper = Wrapper()
- expect(mocks.$t).not.toHaveBeenCalledWith('profile.userAnonym')
- expect(wrapper.text()).toMatch('Tilda Swinton')
+ it('renders', () => {
+ expect(wrapper.container).toMatchSnapshot()
})
- describe('user is deleted', () => {
- beforeEach(() => {
- propsData.user.deleted = true
+ describe('when clicking the user name', () => {
+ beforeEach(async () => {
+ const userName = screen.getByText('Tilda Swinton')
+ await fireEvent.click(userName)
})
+ it('renders the popover', () => {
+ expect(wrapper.container).toMatchSnapshot()
+ })
+ })
+ })
+
+ describe('without linkToProfile, on desktop', () => {
+ let wrapper
+ beforeEach(() => {
+ wrapper = Wrapper({ withLinkToProfile: false, onTouchScreen: false })
+ })
+
+ it('renders', () => {
+ expect(wrapper.container).toMatchSnapshot()
+ })
+
+ describe('when hovering the user name', () => {
+ beforeEach(async () => {
+ const userName = screen.getByText('Tilda Swinton')
+ await fireEvent.mouseOver(userName)
+ await waitForPopover()
+ })
+
+ it('renders the popover', () => {
+ expect(wrapper.container).toMatchSnapshot()
+ })
+ })
+
+ describe('when hovering the user avatar', () => {
+ beforeEach(async () => {
+ const userAvatar = screen.getByAltText('Tilda Swinton')
+ await fireEvent.mouseOver(userAvatar)
+ await waitForPopover()
+ })
+
+ it('renders the popover', () => {
+ expect(wrapper.container).toMatchSnapshot()
+ })
+ })
+ })
+
+ describe('with linkToProfile, on desktop', () => {
+ let wrapper
+ beforeEach(() => {
+ wrapper = Wrapper({ withLinkToProfile: true, onTouchScreen: false })
+ })
+
+ it('renders', () => {
+ expect(wrapper.container).toMatchSnapshot()
+ })
+
+ describe('when hovering the user name', () => {
+ beforeEach(async () => {
+ const userName = screen.getByText('Tilda Swinton')
+ await fireEvent.mouseOver(userName)
+ await waitForPopover()
+ })
+
+ it('renders the popover', () => {
+ expect(wrapper.container).toMatchSnapshot()
+ })
+ })
+ })
+
+ describe('avatar is disabled', () => {
+ it('does not render the avatar', () => {
+ const wrapper = Wrapper({ withAvatar: false })
+ expect(wrapper.container).toMatchSnapshot()
+ })
+ })
+
+ describe('user is deleted', () => {
+ it('renders anonymous user', () => {
+ const wrapper = Wrapper({ user: { ...userTilda, deleted: true } })
+ expect(wrapper.container).toMatchSnapshot()
+ })
+
+ describe('even if the current user is a moderator', () => {
it('renders anonymous user', () => {
- const wrapper = Wrapper()
- expect(wrapper.text()).not.toMatch('Tilda Swinton')
- expect(mocks.$t).toHaveBeenCalledWith('profile.userAnonym')
- })
-
- describe('even if the current user is a moderator', () => {
- beforeEach(() => {
- getters['auth/isModerator'] = () => true
- })
-
- it('renders anonymous user', () => {
- const wrapper = Wrapper()
- expect(wrapper.text()).not.toMatch('Tilda Swinton')
- expect(mocks.$t).toHaveBeenCalledWith('profile.userAnonym')
+ const wrapper = Wrapper({
+ user: { ...userTilda, deleted: true },
+ isModerator: true,
})
+ expect(wrapper.container).toMatchSnapshot()
})
})
+ })
- describe('user is disabled', () => {
- beforeEach(() => {
- propsData.user.disabled = true
- })
+ describe('user is disabled', () => {
+ it('renders anonymous user', () => {
+ const wrapper = Wrapper({ user: { ...userTilda, disabled: true } })
+ expect(wrapper.container).toMatchSnapshot()
+ })
- it('renders anonymous user', () => {
- const wrapper = Wrapper()
- expect(wrapper.text()).not.toMatch('Tilda Swinton')
- expect(mocks.$t).toHaveBeenCalledWith('profile.userAnonym')
- })
-
- describe('current user is a moderator', () => {
- beforeEach(() => {
- getters['auth/isModerator'] = () => true
- })
-
- it('renders user name', () => {
- const wrapper = Wrapper()
- expect(wrapper.text()).not.toMatch('Anonymous')
- expect(wrapper.text()).toMatch('Tilda Swinton')
- })
-
- it('has "disabled-content" class', () => {
- const wrapper = Wrapper()
- expect(wrapper.classes()).toContain('disabled-content')
- })
+ describe('current user is a moderator', () => {
+ it('renders user name', () => {
+ const wrapper = Wrapper({ user: { ...userTilda, disabled: true }, isModerator: true })
+ expect(wrapper.container).toMatchSnapshot()
})
})
})
diff --git a/webapp/components/UserTeaser/UserTeaser.vue b/webapp/components/UserTeaser/UserTeaser.vue
index a9e556bf4..4bc72576e 100644
--- a/webapp/components/UserTeaser/UserTeaser.vue
+++ b/webapp/components/UserTeaser/UserTeaser.vue
@@ -4,57 +4,34 @@
{{ $t('profile.userAnonym') }}
+
+ {{ distance }}
+
-
+
diff --git a/webapp/components/UserTeaser/__snapshots__/LocationInfo.spec.js.snap b/webapp/components/UserTeaser/__snapshots__/LocationInfo.spec.js.snap
new file mode 100644
index 000000000..50ce23f9a
--- /dev/null
+++ b/webapp/components/UserTeaser/__snapshots__/LocationInfo.spec.js.snap
@@ -0,0 +1,51 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`LocationInfo renders with distance 1`] = `
+
-
-
-
+
+
-
-
-
-
- {{ userSlug }}
- {{ userName }}
-
-
-
- {{ userSlug }}
- {{ userName }}
-
-
-
-
- {{ $t('group.in') }}
-
-
-
- {{ groupSlug }}
- {{ groupName }}
-
-
-
-
-
-
+
+`;
+
+exports[`LocationInfo renders without distance 1`] = `
+
+
+
+
+
+ Paris
+
+
+
+
+ location.distance
+
+
+
+`;
diff --git a/webapp/components/UserTeaser/__snapshots__/UserTeaser.spec.js.snap b/webapp/components/UserTeaser/__snapshots__/UserTeaser.spec.js.snap
new file mode 100644
index 000000000..b8fc6cae9
--- /dev/null
+++ b/webapp/components/UserTeaser/__snapshots__/UserTeaser.spec.js.snap
@@ -0,0 +1,1136 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`UserTeaser given an user avatar is disabled does not render the avatar 1`] = `
+
+
+
+
+
+ Paris
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user user is deleted even if the current user is a moderator renders anonymous user 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @tilda-swinton
+
+
+
+ Tilda Swinton
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user user is deleted renders anonymous user 1`] = `
+
+
+
+`;
+
+exports[`UserTeaser given an user user is disabled current user is a moderator renders user name 1`] = `
+
+
+`;
+
+exports[`UserTeaser given an user user is disabled renders anonymous user 1`] = `
+
+
+
+
+
+
+
+
+
+ TS
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+
+
+ @tilda-swinton
+
+
+
+ Tilda Swinton
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user with linkToProfile, on desktop renders 1`] = `
+
+
+`;
+
+exports[`UserTeaser given an user with linkToProfile, on desktop when hovering the user name renders the popover 1`] = `
+
+
+
+
+
+
+
+
+
+ TS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @tilda-swinton
+
+
+
+ Tilda Swinton
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user with linkToProfile, on touch screen renders 1`] = `
+
+
+
+
+
+
+
+
+
+ TS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @tilda-swinton
+
+
+
+ Tilda Swinton
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user with linkToProfile, on touch screen when clicking the user name renders the popover 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user without linkToProfile, on desktop renders 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user without linkToProfile, on desktop when hovering the user avatar renders the popover 1`] = `
+
+
+
+
+
+
+
+
+
+ TS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @tilda-swinton
+
+
+
+ Tilda Swinton
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user without linkToProfile, on desktop when hovering the user name renders the popover 1`] = `
+
+
+
+
+
+
+
+
+
+ TS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @tilda-swinton
+
+
+
+ Tilda Swinton
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user without linkToProfile, on touch screen renders 1`] = `
+
+
+
+
+
+
+
+
+
+ TS
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @tilda-swinton
+
+
+
+ Tilda Swinton
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user without linkToProfile, on touch screen when clicking the user avatar renders the popover 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser given an user without linkToProfile, on touch screen when clicking the user name renders the popover 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
+
+exports[`UserTeaser renders anonymous user 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
diff --git a/webapp/components/UserTeaser/__snapshots__/UserTeaserHelper.spec.js.snap b/webapp/components/UserTeaser/__snapshots__/UserTeaserHelper.spec.js.snap
new file mode 100644
index 000000000..2257e8a51
--- /dev/null
+++ b/webapp/components/UserTeaser/__snapshots__/UserTeaserHelper.spec.js.snap
@@ -0,0 +1,19 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`UserTeaserHelper with linkToProfile and popover enabled, on touch screen renders button 1`] = `
+
+
+
+`;
+
+exports[`UserTeaserHelper with linkToProfile, on desktop renders link 1`] = `
+
+`;
+
+exports[`UserTeaserHelper without linkToProfile renders span 1`] = `
+
+
+
+`;
diff --git a/webapp/components/UserTeaser/__snapshots__/UserTeaserPopover.spec.js.snap b/webapp/components/UserTeaser/__snapshots__/UserTeaserPopover.spec.js.snap
new file mode 100644
index 000000000..3eab03611
--- /dev/null
+++ b/webapp/components/UserTeaser/__snapshots__/UserTeaserPopover.spec.js.snap
@@ -0,0 +1,547 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`UserTeaserPopover does not show badges when disabled 1`] = `
+
+
+
+`;
+
+exports[`UserTeaserPopover given a non-touch device does not show button when userLink is provided 1`] = `
+
+
+
+`;
+
+exports[`UserTeaserPopover given a touch device does not show button when userLink is not provided 1`] = `
+
+
+
+`;
+
+exports[`UserTeaserPopover given a touch device shows button when userLink is provided 1`] = `
+
+
+
+`;
+
+exports[`UserTeaserPopover shows badges when enabled 1`] = `
+
+
+
+`;
diff --git a/webapp/components/utils/isTouchDevice.js b/webapp/components/utils/isTouchDevice.js
new file mode 100644
index 000000000..a6bc17752
--- /dev/null
+++ b/webapp/components/utils/isTouchDevice.js
@@ -0,0 +1,2 @@
+export const isTouchDevice = () =>
+ 'ontouchstart' in window || navigator.MaxTouchPoints > 0 || navigator.msMaxTouchPoints > 0
diff --git a/webapp/graphql/Fragments.js b/webapp/graphql/Fragments.js
index 77af830e8..e1704923f 100644
--- a/webapp/graphql/Fragments.js
+++ b/webapp/graphql/Fragments.js
@@ -17,9 +17,11 @@ export const locationFragment = (lang) => gql`
fragment location on User {
locationName
location {
+ id
name: name${lang}
lng
lat
+ distanceToMe
}
}
`
@@ -50,6 +52,19 @@ export const userCountsFragment = gql`
}
`
+export const userTeaserFragment = (lang) => gql`
+ ${badgesFragment}
+ ${locationFragment(lang)}
+
+ fragment userTeaser on User {
+ followedByCount
+ contributionsCount
+ commentedCount
+ ...badges
+ ...location
+ }
+`
+
export const postFragment = gql`
fragment post on Post {
id
diff --git a/webapp/graphql/User.js b/webapp/graphql/User.js
index 75342ef2a..7440b5051 100644
--- a/webapp/graphql/User.js
+++ b/webapp/graphql/User.js
@@ -7,6 +7,7 @@ import {
postFragment,
commentFragment,
groupFragment,
+ userTeaserFragment,
} from './Fragments'
export const profileUserQuery = (i18n) => {
@@ -125,7 +126,7 @@ export const mapUserQuery = (i18n) => {
`
}
-export const notificationQuery = (_i18n) => {
+export const notificationQuery = () => {
return gql`
${userFragment}
${commentFragment}
@@ -483,6 +484,18 @@ export const userDataQuery = (i18n) => {
`
}
+export const userTeaserQuery = (i18n) => {
+ const lang = i18n.locale().toUpperCase()
+ return gql`
+ ${userTeaserFragment(lang)}
+ query ($id: ID!) {
+ User(id: $id) {
+ ...userTeaser
+ }
+ }
+ `
+}
+
export const setTrophyBadgeSelected = gql`
mutation ($slot: Int!, $badgeId: ID) {
setTrophyBadgeSelected(slot: $slot, badgeId: $badgeId) {
diff --git a/webapp/layouts/blank.vue b/webapp/layouts/blank.vue
index bd8d4f29a..06010ee3b 100644
--- a/webapp/layouts/blank.vue
+++ b/webapp/layouts/blank.vue
@@ -1,7 +1,7 @@
+