aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2016-06-27 16:38:56 +0300
committerGravatar Vitaly Takmazov2016-06-27 16:38:56 +0300
commit1f631483bbed66a5afee88eb8341880a40075a7c (patch)
tree796f2b5ff5a8002fa9dfdab28f1bd3762fa8b4f8 /src/main
parent5df4a0d2631e31e4c035aaedec1d6d50e3bdb098 (diff)
fix compilation
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/juick/api/PM.java4
-rw-r--r--src/main/java/com/juick/api/Users.java14
2 files changed, 7 insertions, 11 deletions
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<String> 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<Integer> uids = UserQueries.getUserReaders(sql, uid);
- if (uids.size() > 0) {
- List<com.juick.User> users = UserQueries.getUsersByID(sql, uids);
- if (users.size() > 0) {
- String json = userSerializer.serializeList(users);
- Main.replyJSON(request, response, json);
- return;
- }
- }
+ List<User> users = UserQueries.getUserReaders(sql, uid);
+ String json = userSerializer.serializeList(users);
+ Main.replyJSON(request, response, json);
+ return;
}
response.sendError(404);
}