aboutsummaryrefslogtreecommitdiff
path: root/juick-server-jdbc/src
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-04-20 11:27:46 +0300
committerGravatar Vitaly Takmazov2018-04-20 14:29:02 +0300
commit0f0009ff1c86fd8ae3af122851034eac21645e11 (patch)
tree6f9d3362f75f2e8528512e8f2f5b0eb249910531 /juick-server-jdbc/src
parentdb14962b7171eb0e713da54eecb032331d551d66 (diff)
server: fix compatibility with likes
Diffstat (limited to 'juick-server-jdbc/src')
-rw-r--r--juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
index 7816ef67..d339d229 100644
--- a/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/juick-server-jdbc/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -337,7 +337,7 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
+ "INNER JOIN messages_txt AS txt "
+ "ON messages.message_id = txt.message_id "
+ "LEFT JOIN favorites "
- + "ON messages.message_id = favorites.message_id "
+ + "ON messages.message_id = favorites.message_id AND favorites.like_id=1 "
+ "WHERE messages.message_id = ? "
+ "GROUP BY mid, rid, replyto, uid, nick, banned, ago, messages.ts, readonly, "
+ "privacy, replies, attach, place_id, lat, lon, tags, repliesby, q",
@@ -422,7 +422,7 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
public List<String> getMessageRecommendations(final int mid) {
return getJdbcTemplate().queryForList(
"SELECT users.nick FROM favorites INNER JOIN users " +
- "ON (favorites.message_id = ? AND favorites.user_id = users.id)",
+ "ON (favorites.message_id = ? AND favorites.user_id = users.id) WHERE favorites.like_id=1",
new Object[]{mid},
String.class);
}
@@ -806,8 +806,8 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
@Override
public Map<Integer,Set<Reaction>> updateReactionsFor(final List<Integer> mids) {
- return getNamedParameterJdbcTemplate().query("select f.message_id as mid, f.like_id as lid, " +
- "r.description as desc, count(f.like_id) as count" +
+ return getNamedParameterJdbcTemplate().query("select f.message_id as mid, f.like_id as lid," +
+ " r.description as descr, count(f.like_id) as cnt" +
" from favorites f LEFT JOIN reactions r ON f.like_id = r.like_id " +
" where f.message_id IN (:mids) " +
" group by f.message_id, f.like_id", new MapSqlParameterSource("mids", mids), (ResultSet rs) -> {
@@ -815,10 +815,10 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
while (rs.next()) {
- int messageId = rs.getInt("message_id");
- int likeId = rs.getInt("like_id");
- int count = rs.getInt("count");
- String description = rs.getString("description");
+ int messageId = rs.getInt("mid");
+ int likeId = rs.getInt("lid");
+ int count = rs.getInt("cnt");
+ String description = rs.getString("descr");
Reaction reaction = new Reaction(likeId);
reaction.setCount(count);
reaction.setDescription(description);