1 files changed, 18 insertions, 30 deletions

diff --git a/juick-server/src/main/java/com/juick/service/PMQueriesServiceImpl.java b/juick-server/src/main/java/com/juick/service/PMQueriesServiceImpl.java
index b68e0236..01b825e4 100644
--- a/juick-server/src/main/java/com/juick/service/PMQueriesServiceImpl.java
+++ b/juick-server/src/main/java/com/juick/service/PMQueriesServiceImpl.java
@@ -34,16 +34,16 @@ public class PMQueriesServiceImpl extends BaseJdbcService implements PMQueriesSe
 
     @Transactional
     @Override
-    public boolean createPM(final int uidFrom, final int uid_to, final String body) {
+    public boolean createPM(final User me, final User to, final String body) {
         boolean ret = getJdbcTemplate().update(
                 "INSERT INTO pm(user_id, user_id_to, txt) VALUES (?, ?, ?)",
-                uidFrom, uid_to, body) > 0;
+                me.getUid(), to.getUid(), body) > 0;
 
         if (ret) {
             try {
                 getJdbcTemplate().update(
                         "INSERT INTO pm_streams(user_id, user_id_to, lastmessage, unread) VALUES (?, ?, NOW(), 1)",
-                        uidFrom, uid_to);
+                        me.getUid(), to.getUid());
             } catch (DuplicateKeyException e) {
                 // ignore
             }
@@ -53,43 +53,31 @@ public class PMQueriesServiceImpl extends BaseJdbcService implements PMQueriesSe
 
     @Transactional
     @Override
-    public boolean addPMinRoster(final int uid, final String jid) {
+    public boolean addPMinRoster(final User me, final String jid) {
         return getJdbcTemplate().update(
-                "INSERT INTO pm_inroster(user_id, jid) VALUES (?, ?) ON DUPLICATE KEY UPDATE user_id=user_id", uid, jid) > 0;
+                "INSERT INTO pm_inroster(user_id, jid) VALUES (?, ?) ON DUPLICATE KEY UPDATE user_id=user_id", me.getUid(), jid) > 0;
     }
 
     @Transactional
     @Override
-    public boolean removePMinRoster(final int uid, final String jid) {
+    public boolean removePMinRoster(final User me, final String jid) {
         return getJdbcTemplate().update(
-                "DELETE FROM pm_inroster WHERE user_id = ? AND jid = ?", uid, jid) > 0;
+                "DELETE FROM pm_inroster WHERE user_id = ? AND jid = ?", me.getUid(), jid) > 0;
     }
 
     @Transactional
     @Override
-    public boolean havePMinRoster(final int uid, final String jid) {
+    public boolean havePMinRoster(final User me, final String jid) {
         List<Integer> res = getJdbcTemplate().queryForList(
                 "SELECT 1 FROM pm_inroster WHERE user_id = ? AND jid = ?",
                 Integer.class,
-                uid, jid);
+                me.getUid(), jid);
         return res.size() > 0;
     }
 
     @Transactional(readOnly = true)
     @Override
-    public String getLastView(final int uidFrom, final int uidTo) {
-        List<String> list = getJdbcTemplate().queryForList(
-                "SELECT lastview FROM pm_streams WHERE user_id = ? AND user_id_to = ?",
-                String.class,
-                uidFrom, uidTo);
-
-        return list.isEmpty() ?
-                null : list.get(0);
-    }
-
-    @Transactional(readOnly = true)
-    @Override
-    public List<User> getPMLastConversationsUsers(final int uid, final int cnt) {
+    public List<User> getPMLastConversationsUsers(final User me, final int cnt) {
         return getJdbcTemplate().query(
                 "SELECT pm_streams.user_id, users.nick, pm_streams.unread FROM pm_streams "
                         + "INNER JOIN users ON users.id = pm_streams.user_id "
@@ -102,15 +90,15 @@ public class PMQueriesServiceImpl extends BaseJdbcService implements PMQueriesSe
                     u.setUnreadCount(rs.getInt(3));
                     return u;
                 },
-                uid, cnt);
+                me.getUid(), cnt);
     }
 
     @Transactional
     @Override
-    public List<com.juick.Message> getPMMessages(final int uid, final int uidTo) {
+    public List<com.juick.Message> getPMMessages(final User me, final User to) {
         SqlParameterSource sqlParameterSource = new MapSqlParameterSource()
-                .addValue("uid", uid)
-                .addValue("uidTo", uidTo);
+                .addValue("uid", me.getUid())
+                .addValue("uidTo", to.getUid());
 
         List<com.juick.Message> msgs = getNamedParameterJdbcTemplate().query(
                 "SELECT pm.user_id, pm.txt, pm.ts, users.nick FROM pm INNER JOIN users ON users.id=pm.user_id WHERE (user_id = :uid AND user_id_to = :uidTo) "
@@ -137,7 +125,7 @@ public class PMQueriesServiceImpl extends BaseJdbcService implements PMQueriesSe
 
     @Transactional(readOnly = true)
     @Override
-    public List<com.juick.Message> getLastPMInbox(final int uid) {
+    public List<com.juick.Message> getLastPMInbox(final User me) {
         return getJdbcTemplate().query(
                 "SELECT pm.user_id, users.nick, pm.txt, pm.ts " +
                         "FROM pm INNER JOIN users ON pm.user_id=users.id WHERE pm.user_id_to=? ORDER BY pm.ts DESC LIMIT 20",
@@ -150,12 +138,12 @@ public class PMQueriesServiceImpl extends BaseJdbcService implements PMQueriesSe
                     msg.setTimestamp(rs.getTimestamp(4).toInstant());
                     return msg;
                 },
-                uid);
+                me.getUid());
     }
 
     @Transactional(readOnly = true)
     @Override
-    public List<com.juick.Message> getLastPMSent(final int uid) {
+    public List<com.juick.Message> getLastPMSent(final User me) {
         return getJdbcTemplate().query(
                 "SELECT pm.user_id_to, users.nick, pm.txt, " +
                         "pm.ts FROM pm INNER JOIN users ON pm.user_id_to=users.id " +
@@ -169,6 +157,6 @@ public class PMQueriesServiceImpl extends BaseJdbcService implements PMQueriesSe
                     msg.setTimestamp(rs.getTimestamp(4).toInstant());
                     return msg;
                 },
-                uid);
+                me.getUid());
     }
 }