1 files changed, 5 insertions, 5 deletions
diff --git a/juick-server/src/main/java/com/juick/server/EmailManager.java b/juick-server/src/main/java/com/juick/server/EmailManager.java
index 66e84358..8e07f7d3 100644
--- a/juick-server/src/main/java/com/juick/server/EmailManager.java
+++ b/juick-server/src/main/java/com/juick/server/EmailManager.java
@@ -50,19 +50,19 @@ public class EmailManager implements ApplicationListener<MessageEvent> {
         }
         if (MessageUtils.isPM(msg)) {
             String subject = String.format("Private message from %s", msg.getUser().getName());
-            emailService.getEmails(msg.getTo().getUid(), true).forEach(email -> {
+            emailService.getEmails(msg.getTo(), true).forEach(email -> {
                 emailNotify(email, subject, msg);
             });
         } else if (MessageUtils.isReply(msg)) {
             Message originalMessage = messagesService.getMessage(msg.getMid());
             String subject = String.format("New reply to %s", originalMessage.getUser().getName());
             subscribedUsers.stream()
-                    .flatMap(user -> emailService.getEmails(user.getUid(), true).stream())
+                    .flatMap(user -> emailService.getEmails(user, true).stream())
                     .forEach(email -> emailNotify(email, subject, msg));
         } else {
             String subject = String.format("New message from %s", msg.getUser().getName());
             subscribedUsers
-                    .forEach(user -> emailService.getEmails(user.getUid(), true)
+                    .forEach(user -> emailService.getEmails(user, true)
                             .forEach(email -> emailNotify(email, subject, msg)));
         }
     }
@@ -96,7 +96,7 @@ public class EmailManager implements ApplicationListener<MessageEvent> {
                             ", discussion or tag. Reply to this email directly or view it on Juick: %s.",
                     formatPost(msg), formatUrl(msg));
             MimeBodyPart textBodyPart = new MimeBodyPart();
-            String hash = userService.getHashByUID(userService.getUserByEmail(email).getUid());
+            String hash = userService.getHashForUser(userService.getUserByEmail(email));
             textBodyPart.setContent(plainText, "text/plain; charset=UTF-8");
             String htmlText = String.format("%s<br /><br />--<br />You are receiving this because you are subscribed to this user" +
                             ", discussion or tag. Reply to this email directly or <a href=\"%s\"><img src=\"https://api.juick.com/thread/mark_read/%d-%d.gif?hash=%s\" />view it</a> on Juick." +
@@ -110,7 +110,7 @@ public class EmailManager implements ApplicationListener<MessageEvent> {
             multipart.addBodyPart(htmlBodyPart);
             message.setContent(multipart);
             message.setHeader("List-Unsubscribe", String.format("https://juick.com/settings?hash=%s",
-                    userService.getHashByUID(userService.getUserByEmail(email).getUid())));
+                    userService.getHashForUser(userService.getUserByEmail(email))));
             message.saveChanges();
             transport.connect();
             transport.sendMessage(message, message.getAllRecipients());