1 files changed, 17 insertions, 4 deletions
diff --git a/juick-api/src/main/java/com/juick/api/Subscriptions.java b/juick-api/src/main/java/com/juick/api/Subscriptions.java
index 49990080..4c767dc9 100644
--- a/juick-api/src/main/java/com/juick/api/Subscriptions.java
+++ b/juick-api/src/main/java/com/juick/api/Subscriptions.java
@@ -1,7 +1,9 @@
 package com.juick.api;
 
+import com.juick.Message;
 import com.juick.User;
 import com.juick.json.UserSerializer;
+import com.juick.server.MessagesQueries;
 import com.juick.server.SubscriptionsQueries;
 import com.juick.server.UserQueries;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -17,19 +19,30 @@ import java.util.List;
  */
 public class Subscriptions {
     JdbcTemplate jdbc;
+    UserSerializer userSerializer = new UserSerializer();
 
     public Subscriptions(JdbcTemplate jdbc) {
         this.jdbc = jdbc;
     }
     public void doGet(HttpServletRequest request, HttpServletResponse response, int vuid) throws IOException {
         User visitor = UserQueries.getUserByUID(jdbc, vuid).orElse(new User());
-        if (!(visitor.getUID() > 0) && !(visitor.getUName().equals("juick"))) {
+        if ((visitor.getUID() == 0) && !(visitor.getUName().equals("juick"))) {
             response.sendError(403);
+            return;
         }
         int uid = NumberUtils.toInt(request.getParameter("uid"), 0);
         int mid = NumberUtils.toInt(request.getParameter("mid"), 0);
-        List<User> users = SubscriptionsQueries.getSubscribedUsers(jdbc, uid, mid);
-        UserSerializer userSerializer = new UserSerializer();
-        Main.replyJSON(request, response, userSerializer.serializeList(users));
+        if (uid > 0) {
+            List<User> users = SubscriptionsQueries.getSubscribedUsers(jdbc, uid, mid);
+            Main.replyJSON(request, response, userSerializer.serializeList(users));
+        } else {
+            // thread
+            Message msg = MessagesQueries.getMessage(jdbc, mid);
+            if (msg != null) {
+                List<User> users = SubscriptionsQueries.getUsersSubscribedToComments(jdbc, mid, msg.getUser().getUID());
+                Main.replyJSON(request, response, userSerializer.serializeList(users));
+            }
+        }
+        response.sendError(400);
     }
 }