From 920ccf071828cb49e573dd873f1f4c124950c259 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 20 Jan 2019 15:51:36 +0300
Subject: AvatarWebPath -> AvatarUrl

---
 src/main/java/com/juick/server/CommandsManager.java | 6 +++---
 src/main/java/com/juick/server/api/PM.java          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main/java/com/juick')

diff --git a/src/main/java/com/juick/server/CommandsManager.java b/src/main/java/com/juick/server/CommandsManager.java
index 087ba444..4a7f90ef 100644
--- a/src/main/java/com/juick/server/CommandsManager.java
+++ b/src/main/java/com/juick/server/CommandsManager.java
@@ -130,7 +130,7 @@ public class CommandsManager {
             imagesService.saveImageWithPreviews(attachmentFName, fname);
         }
         Message msg = messagesService.getMessage(mid).orElseThrow(IllegalStateException::new);
-        msg.getUser().setAvatar(webApp.getAvatarWebPath(msg.getUser()));
+        msg.getUser().setAvatar(webApp.getAvatarUrl(msg.getUser()));
         subscriptionService.subscribeMessage(msg, user);
 
         applicationEventPublisher.publishEvent(new MessageReadEvent(this, user, msg));
@@ -164,7 +164,7 @@ public class CommandsManager {
         String body = arguments[1];
 
         User user_to = userService.getUserByName(arguments[0]);
-        user_to.setAvatar(webApp.getAvatarWebPath(user_to));
+        user_to.setAvatar(webApp.getAvatarUrl(user_to));
         if (!user_to.isAnonymous()) {
             if (!userService.isInBLAny(user_to.getUid(), user_from.getUid())) {
                 if (pmQueriesService.createPM(user_from.getUid(), user_to.getUid(), body)) {
@@ -541,7 +541,7 @@ public class CommandsManager {
             Message original = messagesService.getMessage(mid).orElseThrow(IllegalStateException::new);
             subscriptionService.subscribeMessage(original, user);
             Message reply = messagesService.getReply(mid, newrid);
-            reply.getUser().setAvatar(webApp.getAvatarWebPath(reply.getUser()));
+            reply.getUser().setAvatar(webApp.getAvatarUrl(reply.getUser()));
             applicationEventPublisher.publishEvent(new MessageEvent(this, reply, subscriptionService.getUsersSubscribedToComments(original, reply)));
             return CommandResult.build(reply,"Reply posted.\n#" + mid + "/" + newrid + " "
                     + "https://juick.com/m/" + mid + "#" + newrid,
diff --git a/src/main/java/com/juick/server/api/PM.java b/src/main/java/com/juick/server/api/PM.java
index 242cd31c..e61fef6e 100644
--- a/src/main/java/com/juick/server/api/PM.java
+++ b/src/main/java/com/juick/server/api/PM.java
@@ -99,7 +99,7 @@ public class PM {
             jmsg.setUser(visitor);
             jmsg.setText(body);
             jmsg.setTo(userTo);
-            jmsg.getUser().setAvatar(webApp.getAvatarWebPath(jmsg.getUser()));
+            jmsg.getUser().setAvatar(webApp.getAvatarUrl(jmsg.getUser()));
             applicationEventPublisher.publishEvent(new MessageEvent(this, jmsg, Collections.singletonList(jmsg.getTo())));
             return jmsg;
 
-- 
cgit v1.2.3