aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2019-01-20 16:10:07 +0300
committerGravatar Vitaly Takmazov2019-01-20 16:10:07 +0300
commita125a8d20c8a95bc877e14716318d6df08622af5 (patch)
treef0cc2dfce8b22961a753e1341bd8c73a28dcd0d1 /src/main
parent920ccf071828cb49e573dd873f1f4c124950c259 (diff)
Do not overwrite user avatar url in reply
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/juick/server/ServerManager.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/main/java/com/juick/server/ServerManager.java b/src/main/java/com/juick/server/ServerManager.java
index 5f96da08..4ea290fc 100644
--- a/src/main/java/com/juick/server/ServerManager.java
+++ b/src/main/java/com/juick/server/ServerManager.java
@@ -98,11 +98,10 @@ public class ServerManager implements NotificationListener {
} else {
// to get quote and attachment
Message op = messagesService.getMessage(jmsg.getMid()).orElseThrow(IllegalStateException::new);
- com.juick.Message reply = messagesService.getReply(jmsg.getMid(), jmsg.getRid());
- subscriptionService.getUsersSubscribedToComments(op, reply, true).stream()
- .filter(u -> userService.isReplyToBL(u, reply))
- .forEach(b -> messagesService.setLastReadComment(b, reply.getMid(), reply.getRid()));
- onJuickMessageReply(reply, subscribedUsers);
+ subscriptionService.getUsersSubscribedToComments(op, jmsg, true).stream()
+ .filter(u -> userService.isReplyToBL(u, jmsg))
+ .forEach(b -> messagesService.setLastReadComment(b, jmsg.getMid(), jmsg.getRid()));
+ onJuickMessageReply(jmsg, subscribedUsers);
}
messageEvent(jmsg, Collections.singletonList(serviceUser));
}