From 8bb36fc8b125d7ebf40d6432499197e95989b604 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Tue, 27 Oct 2020 11:27:57 +0300
Subject: Another try to fix List-Unsubscribe

---
 src/main/java/com/juick/EmailManager.java | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/juick/EmailManager.java b/src/main/java/com/juick/EmailManager.java
index f3b0e85b..4ec65c8f 100644
--- a/src/main/java/com/juick/EmailManager.java
+++ b/src/main/java/com/juick/EmailManager.java
@@ -178,14 +178,9 @@ public class EmailManager implements NotificationListener {
             message.setContent(multipart);
             User emailUser = userService.getUserByEmail(to);
             if (!emailUser.isAnonymous()) {
-                message.setHeader("List-Id", "Juick notifications <mail-notifications.juick.com>");
-                message.setHeader("List-Post", "<mailto:juick@juick.com>");
-                message.setHeader("List-Owner", "<mailto:support@juick.com>");
-                message.setHeader("List-Archive", "<https://juick.com/>");
-                message.setHeader("List-Unsubscribe",
-                        String.format("<mailto:unsubscribe@juick.com>,<https://juick.com/settings/unsubscribe?hash=%s>",
-                                userService.getHashByUID(emailUser.getUid())));
-                message.setHeader("List-Unsubscribe-Post", "List-Unsubscribe=One-Click");
+                message.setHeader("List-Id", "<mail-notifications.juick.com>");
+                message.setHeader("List-Unsubscribe","<mailto:unsubscribe@juick.com>");
+                message.setHeader("Feedback-ID", String.format("%d:juick", emailUser.getUid()));
             }
             message.saveChanges();
             transport.connect();
-- 
cgit v1.2.3