1 files changed, 18 insertions, 30 deletions
diff --git a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
index 5019ef0c..422c9616 100644
--- a/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/MessagesServiceImpl.java
@@ -459,37 +459,25 @@ public class MessagesServiceImpl extends BaseJdbcService implements MessagesServ
     @Transactional(readOnly = true)
     @Override
     public List<Integer> getMyFeed(final int uid, final int before) {
-        List<Integer> mids;
-        if (before > 0) {
-            mids = getJdbcTemplate().queryForList("SELECT message_id FROM messages " +
-                            "INNER JOIN subscr_users ON (subscr_users.suser_id=? AND subscr_users.user_id=messages.user_id) " +
-                            "WHERE message_id<? AND (privacy>=0 OR (privacy>=-2 AND privacy<=-1 AND messages.user_id " +
-                            "IN (SELECT user_id FROM wl_users WHERE wl_user_id=?))) ORDER BY message_id DESC LIMIT 20",
-                    Integer.class, uid, before, uid);
-        } else {
-            mids = getJdbcTemplate().queryForList("SELECT message_id FROM messages " +
-                            "INNER JOIN subscr_users ON (subscr_users.suser_id=? " +
-                            "AND subscr_users.user_id=messages.user_id) " +
-                            "WHERE (privacy>=0 OR (privacy>=-2 AND privacy<=-1 AND messages.user_id " +
-                            "IN (SELECT user_id FROM wl_users WHERE wl_user_id=?))) ORDER BY message_id DESC LIMIT 20",
-                    Integer.class, uid, uid);
-        }
-
-
-        if (before > 0) {
-            mids.addAll(getJdbcTemplate().queryForList("SELECT message_id FROM messages " +
-                            "WHERE user_id=? AND message_id<? ORDER BY message_id DESC LIMIT 20", Integer.class,
-                    uid, before));
-        } else {
-            mids.addAll(getJdbcTemplate().queryForList("SELECT message_id FROM messages " +
-                    "WHERE user_id=? ORDER BY message_id DESC LIMIT 20", Integer.class, uid));
-        }
+        SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
+                .addValue("uid", uid)
+                .addValue("before", before);
 
-        mids.sort(Collections.reverseOrder());
-        int remove = mids.size() - 20;
-        for (int i = 0; i < remove; i++) {
-            mids.remove(20);
-        }
+        List<Integer> mids = getNamedParameterJdbcTemplate().queryForList(
+                "(SELECT message_id FROM messages " +
+                        " INNER JOIN subscr_users ON (subscr_users.suser_id = :uid AND subscr_users.user_id = messages.user_id) " +
+                        " WHERE " +
+                        (before > 0 ?
+                                " message_id < :before AND " : "") +
+                        " (privacy >= 0 OR (privacy >= -2 AND privacy <= -1" +
+                        " AND EXISTS (SELECT 1 FROM wl_users w WHERE w.wl_user_id = :uid and w.user_id = messages.user_id)))) " +
+                        " UNION " +
+                        " (SELECT message_id FROM messages WHERE user_id=:uid " +
+                        (before > 0 ?
+                                " AND message_id < :before " : "") +
+                        ") ORDER BY message_id ASC LIMIT 20",
+                sqlParameterSource,
+                Integer.class);
 
         return mids;
     }