From 1f631483bbed66a5afee88eb8341880a40075a7c Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Mon, 27 Jun 2016 16:38:56 +0300 Subject: fix compilation --- src/main/java/com/juick/api/PM.java | 4 ++-- src/main/java/com/juick/api/Users.java | 14 +++++--------- 2 files changed, 7 insertions(+), 11 deletions(-) (limited to 'src/main/java/com/juick/api') diff --git a/src/main/java/com/juick/api/PM.java b/src/main/java/com/juick/api/PM.java index c7123d0a..631ae978 100644 --- a/src/main/java/com/juick/api/PM.java +++ b/src/main/java/com/juick/api/PM.java @@ -87,8 +87,8 @@ public class PM { Main.replyJSON(request, response, messageSerializer.serialize(jmsg).toString()); - String jid = UserQueries.getJIDbyUID(sql, uid); - if (jid != null) { + List jids = UserQueries.getJIDsbyUID(sql, uid); + for (String jid: jids) { Message mm = new Message(); mm.to = new JID(jid); mm.type = Message.Type.chat; diff --git a/src/main/java/com/juick/api/Users.java b/src/main/java/com/juick/api/Users.java index 57f8c4b9..e85c517a 100644 --- a/src/main/java/com/juick/api/Users.java +++ b/src/main/java/com/juick/api/Users.java @@ -1,5 +1,6 @@ package com.juick.api; +import com.juick.User; import com.juick.json.UserSerializer; import com.juick.server.UserQueries; import org.springframework.jdbc.core.JdbcTemplate; @@ -115,15 +116,10 @@ public class Users { } if (uid > 0) { - List uids = UserQueries.getUserReaders(sql, uid); - if (uids.size() > 0) { - List users = UserQueries.getUsersByID(sql, uids); - if (users.size() > 0) { - String json = userSerializer.serializeList(users); - Main.replyJSON(request, response, json); - return; - } - } + List users = UserQueries.getUserReaders(sql, uid); + String json = userSerializer.serializeList(users); + Main.replyJSON(request, response, json); + return; } response.sendError(404); } -- cgit v1.2.3