aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/juick/server/PushQueries.java108
-rw-r--r--src/main/java/com/juick/server/SubscriptionsQueries.java38
-rw-r--r--src/main/java/com/juick/server/TagQueries.java23
-rw-r--r--src/main/java/com/juick/server/UserQueries.java220
4 files changed, 128 insertions, 261 deletions
diff --git a/src/main/java/com/juick/server/PushQueries.java b/src/main/java/com/juick/server/PushQueries.java
index c17972b03..54528993d 100644
--- a/src/main/java/com/juick/server/PushQueries.java
+++ b/src/main/java/com/juick/server/PushQueries.java
@@ -4,14 +4,12 @@
*/
package com.juick.server;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.util.StringUtils;
+
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import java.util.Optional;
/**
*
@@ -19,80 +17,58 @@ import java.util.logging.Logger;
*/
public class PushQueries {
- private static final Logger logger = Logger.getLogger(PushQueries.class.getName());
-
- public static String getAndroidRegID(Connection sql, int uid) {
- return SQLHelpers.getString(sql, "SELECT regid FROM android WHERE user_id=?", uid);
- }
-
- public static List<String> getAndroidSubscribers(Connection sql, int uid) {
- List<String> regids = new ArrayList<>();
-
- PreparedStatement stmt = null;
- ResultSet rs = null;
+ public static Optional<String> getAndroidRegID(JdbcTemplate sql, int uid) {
try {
- stmt = sql.prepareStatement("SELECT regid FROM android INNER JOIN subscr_users ON (subscr_users.user_id=? AND android.user_id=subscr_users.suser_id)");
- stmt.setInt(1, uid);
- rs = stmt.executeQuery();
- rs.beforeFirst();
- while (rs.next()) {
- regids.add(rs.getString(1));
- }
- } catch (SQLException e) {
- logger.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
+ return Optional.of(sql.queryForObject("SELECT regid FROM android WHERE user_id=?", String.class, uid));
+ } catch (EmptyResultDataAccessException e) {
+ return Optional.empty();
}
- return regids;
+
}
- public static String getWinPhoneURL(Connection sql, int uid) {
- return SQLHelpers.getString(sql, "SELECT url FROM winphone WHERE user_id=?", uid);
+ public static List<String> getAndroidSubscribers(JdbcTemplate sql, int uid) {
+ return sql.queryForList("SELECT regid FROM android INNER JOIN subscr_users " +
+ "ON (subscr_users.user_id=? AND android.user_id=subscr_users.suser_id)", String.class, uid);
}
- public static List<String> getWinPhoneSubscribers(Connection sql, int uid) {
- List<String> urls = new ArrayList<>();
+ public static List<String> getAndroidTokens(JdbcTemplate sql, List<Integer> uids) {
+ return sql.queryForList("SELECT regid FROM android INNER JOIN users " +
+ "ON (users.id=android.user_id) WHERE users.id IN (" + StringUtils.collectionToCommaDelimitedString(uids) + ")", String.class);
+ }
- PreparedStatement stmt = null;
- ResultSet rs = null;
+ public static Optional<String> getWinPhoneURL(JdbcTemplate sql, int uid) {
try {
- stmt = sql.prepareStatement("SELECT url FROM winphone INNER JOIN subscr_users ON (subscr_users.user_id=? AND winphone.user_id=subscr_users.suser_id)");
- stmt.setInt(1, uid);
- rs = stmt.executeQuery();
- rs.beforeFirst();
- while (rs.next()) {
- urls.add(rs.getString(1));
- }
- } catch (SQLException e) {
- logger.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
+ return Optional.of(sql.queryForObject("SELECT url FROM winphone WHERE user_id=?", String.class, uid));
+ } catch (EmptyResultDataAccessException e) {
+ return Optional.empty();
}
- return urls;
}
- public static String getAPNSToken(Connection sql, int uid) {
- return SQLHelpers.getString(sql, "SELECT token from ios WHERE user_id=?", uid);
+ public static List<String> getWinPhoneSubscribers(JdbcTemplate sql, int uid) {
+ return sql.queryForList("SELECT url FROM winphone INNER JOIN subscr_users " +
+ "ON (subscr_users.user_id=? AND winphone.user_id=subscr_users.suser_id)", String.class, uid);
}
- public static List<String> getAPNSSubscribers(Connection sql, int uid) {
- List<String> urls = new ArrayList<>();
+ public static List<String> getWindowsTokens(JdbcTemplate sql, List<Integer> uids) {
+ return sql.queryForList("SELECT url FROM winphone INNER JOIN users " +
+ "ON (users.id=winphone.user_id) WHERE users.id IN (" + StringUtils.collectionToCommaDelimitedString(uids) + ")", String.class);
+ }
- PreparedStatement stmt = null;
- ResultSet rs = null;
+ public static Optional<String> getAPNSToken(JdbcTemplate sql, int uid) {
try {
- stmt = sql.prepareStatement("SELECT token FROM ios INNER JOIN subscr_users ON (subscr_users.user_id=? AND ios.user_id=subscr_users.suser_id)");
- stmt.setInt(1, uid);
- rs = stmt.executeQuery();
- rs.beforeFirst();
- while (rs.next()) {
- urls.add(rs.getString(1));
- }
- } catch (SQLException e) {
- logger.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
+ return Optional.of(sql.queryForObject("SELECT token from ios WHERE user_id=?", String.class, uid));
+ } catch (EmptyResultDataAccessException e) {
+ return Optional.empty();
}
- return urls;
}
+
+ public static List<String> getAPNSSubscribers(JdbcTemplate sql, int uid) {
+ return sql.queryForList("SELECT token FROM ios INNER JOIN subscr_users " +
+ "ON (subscr_users.user_id=? AND ios.user_id=subscr_users.suser_id)", String.class, uid);
+ }
+ public static List<String> getAPNSTokens(JdbcTemplate sql, List<Integer> uids) {
+ return sql.queryForList("SELECT token FROM ios INNER JOIN users " +
+ "ON (users.id=ios.user_id) WHERE users.id IN (" + StringUtils.collectionToCommaDelimitedString(uids) + ")", String.class);
+ }
+
}
diff --git a/src/main/java/com/juick/server/SubscriptionsQueries.java b/src/main/java/com/juick/server/SubscriptionsQueries.java
index b271435be..feebfb22e 100644
--- a/src/main/java/com/juick/server/SubscriptionsQueries.java
+++ b/src/main/java/com/juick/server/SubscriptionsQueries.java
@@ -8,15 +8,10 @@ import com.juick.User;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.util.StringUtils;
-import java.sql.Connection;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import java.util.logging.Level;
import java.util.logging.Logger;
/**
@@ -27,31 +22,16 @@ public class SubscriptionsQueries {
private static final Logger logger = Logger.getLogger(SubscriptionsQueries.class.getName());
- public static List<String> getJIDSubscribedToUser(Connection sql, int uid, boolean friendsonly) {
- List<String> jids = new ArrayList<>();
-
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- if (friendsonly == false) {
- stmt = sql.prepareStatement("SELECT jids.jid FROM subscr_users INNER JOIN jids ON (subscr_users.user_id=? AND subscr_users.suser_id=jids.user_id) WHERE jids.active=1");
- stmt.setInt(1, uid);
- } else {
- stmt = sql.prepareStatement("SELECT jids.jid FROM subscr_users INNER JOIN jids ON (subscr_users.user_id=? AND subscr_users.suser_id=jids.user_id) WHERE jids.active=1 AND jids.user_id IN (SELECT wl_user_id FROM wl_users WHERE user_id=?)");
- stmt.setInt(1, uid);
- stmt.setInt(2, uid);
- }
- rs = stmt.executeQuery();
- rs.beforeFirst();
- while (rs.next()) {
- jids.add(rs.getString(1));
- }
- } catch (SQLException e) {
- logger.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
+ public static List<String> getJIDSubscribedToUser(JdbcTemplate sql, int uid, boolean friendsonly) {
+ if (friendsonly == false) {
+ return sql.queryForList("SELECT jids.jid FROM subscr_users INNER JOIN jids " +
+ "ON (subscr_users.user_id=? AND subscr_users.suser_id=jids.user_id) WHERE jids.active=1",
+ String.class, uid);
+ } else {
+ return sql.queryForList("SELECT jids.jid FROM subscr_users INNER JOIN jids " +
+ "ON (subscr_users.user_id=? AND subscr_users.suser_id=jids.user_id) WHERE jids.active=1 " +
+ "AND jids.user_id IN (SELECT wl_user_id FROM wl_users WHERE user_id=?)", String.class, uid, uid);
}
- return jids;
}
public static List<User> getSubscribedUsers(JdbcTemplate sql, int uid, int mid) {
diff --git a/src/main/java/com/juick/server/TagQueries.java b/src/main/java/com/juick/server/TagQueries.java
index d2159b5ab..0094fc22b 100644
--- a/src/main/java/com/juick/server/TagQueries.java
+++ b/src/main/java/com/juick/server/TagQueries.java
@@ -123,25 +123,10 @@ public class TagQueries {
}, uid);
}
- public static List<String> getUserBLTags(Connection sql, int uid) {
- List<String> tags = new ArrayList<>();
-
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- stmt = sql.prepareStatement("SELECT tags.name FROM tags INNER JOIN bl_tags ON (bl_tags.user_id=? AND bl_tags.tag_id=tags.tag_id) ORDER BY tags.name");
- stmt.setInt(1, uid);
- rs = stmt.executeQuery();
- rs.beforeFirst();
- while (rs.next()) {
- tags.add(rs.getString(1));
- }
- } catch (SQLException e) {
- LOGGER.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
- }
- return tags;
+ public static List<String> getUserBLTags(JdbcTemplate sql, int uid) {
+ return sql.queryForList("SELECT tags.name FROM tags INNER JOIN bl_tags " +
+ "ON (bl_tags.user_id=? AND bl_tags.tag_id=tags.tag_id) ORDER BY tags.name",
+ String.class, uid);
}
public static List<String> getPopularTags(JdbcTemplate sql) {
diff --git a/src/main/java/com/juick/server/UserQueries.java b/src/main/java/com/juick/server/UserQueries.java
index 0d6a34853..e7aee0f56 100644
--- a/src/main/java/com/juick/server/UserQueries.java
+++ b/src/main/java/com/juick/server/UserQueries.java
@@ -25,14 +25,11 @@ import org.springframework.jdbc.support.GeneratedKeyHolder;
import org.springframework.jdbc.support.KeyHolder;
import org.springframework.util.StringUtils;
-import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
/**
*
@@ -42,8 +39,6 @@ public class UserQueries {
static final String ABCDEF = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- private static final Logger LOGGER = Logger.getLogger(UserQueries.class.getName());
-
public static class UserMapper implements RowMapper<User> {
@Override
public User mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -163,8 +158,8 @@ public class UserQueries {
});
}
- public static String getJIDbyUID(JdbcTemplate sql, int uid) {
- return sql.queryForObject("SELECT jid FROM jids WHERE user_id=? AND active=1", String.class, uid);
+ public static List<String> getJIDsbyUID(JdbcTemplate sql, int uid) {
+ return sql.queryForList("SELECT jid FROM jids WHERE user_id=? AND active=1", String.class, uid);
}
public static int getUIDbyJID(JdbcTemplate sql, String jid) {
@@ -241,58 +236,26 @@ public class UserQueries {
}
}
- public static int getUserOptionInt(Connection sql, int uid, String option, int defaultValue) {
- int ret = defaultValue;
-
- PreparedStatement stmt = null;
- ResultSet rs = null;
+ public static int getUserOptionInt(JdbcTemplate sql, int uid, String option, int defaultValue) {
try {
- stmt = sql.prepareStatement("SELECT " + option + " FROM useroptions WHERE user_id=?");
- stmt.setInt(1, uid);
- rs = stmt.executeQuery();
- if (rs.first()) {
- ret = rs.getInt(1);
- }
- } catch (SQLException e) {
- LOGGER.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
+ return sql.queryForObject("SELECT " + option + " FROM useroptions WHERE user_id=?", Integer.class, uid);
+ } catch (EmptyResultDataAccessException e) {
+ return defaultValue;
}
- return ret;
}
- public static void setUserOptionInt(Connection sql, int uid, String option, int value) {
- PreparedStatement stmt = null;
- try {
- stmt = sql.prepareStatement("UPDATE useroptions SET " + option + "=? WHERE user_id=?");
- stmt.setInt(1, value);
- stmt.setInt(2, uid);
- stmt.executeUpdate();
- } catch (SQLException e) {
- LOGGER.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(null, stmt);
- }
+ public static void setUserOptionInt(JdbcTemplate sql, int uid, String option, int value) {
+ sql.update("UPDATE useroptions SET " + option + "=? WHERE user_id=?", value, uid);
}
- public static boolean getCanMedia(Connection sql, int uid) {
- boolean ret = false;
-
- PreparedStatement stmt = null;
- ResultSet rs = null;
+ public static boolean getCanMedia(JdbcTemplate sql, int uid) {
try {
- stmt = sql.prepareStatement("SELECT users.lastphoto-UNIX_TIMESTAMP() FROM users WHERE id=?");
- stmt.setInt(1, uid);
- rs = stmt.executeQuery();
- if (rs.first()) {
- ret = rs.getInt(1) < 3600;
- }
- } catch (SQLException e) {
- LOGGER.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
+ int res = sql.queryForObject("SELECT users.lastphoto-UNIX_TIMESTAMP() FROM users WHERE id=?",
+ Integer.class, uid);
+ return res < 3600;
+ } catch (EmptyResultDataAccessException e) {
+ return false;
}
- return ret;
}
public static boolean isInWL(JdbcTemplate sql, int uid, int check) {
@@ -300,25 +263,13 @@ public class UserQueries {
new Object[] {uid, check}, Integer.class) == 1;
}
- public static boolean isInBL(Connection sql, int uid, int check) {
- boolean ret = false;
-
- PreparedStatement stmt = null;
- ResultSet rs = null;
+ public static boolean isInBL(JdbcTemplate sql, int uid, int check) {
try {
- stmt = sql.prepareStatement("SELECT 1 FROM bl_users WHERE user_id=? AND bl_user_id=?");
- stmt.setInt(1, uid);
- stmt.setInt(2, check);
- rs = stmt.executeQuery();
- if (rs.first()) {
- ret = rs.getInt(1) == 1;
- }
- } catch (SQLException e) {
- LOGGER.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
+ return sql.queryForObject("SELECT 1 FROM bl_users WHERE user_id=? AND bl_user_id=?",
+ Integer.class, uid, check) == 1;
+ } catch (EmptyResultDataAccessException e) {
+ return false;
}
- return ret;
}
public static boolean isInBLAny(JdbcTemplate sql, int uid, int uid2) {
@@ -353,33 +304,20 @@ public class UserQueries {
return sql.queryForList("SELECT user_id FROM subscr_users WHERE suser_id=?", Integer.class, uid);
}
- public static List<com.juick.User> getUserReadLeastPopular(Connection sql, int uid, int cnt) {
- List<com.juick.User> users = new ArrayList<>(cnt);
-
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- stmt = sql.prepareStatement("SELECT users.id,users.nick FROM (subscr_users INNER JOIN users_subscr ON (subscr_users.suser_id=? AND subscr_users.user_id=users_subscr.user_id)) INNER JOIN users ON subscr_users.user_id=users.id ORDER BY cnt LIMIT ?");
- stmt.setInt(1, uid);
- stmt.setInt(2, cnt);
- rs = stmt.executeQuery();
- rs.beforeFirst();
- while (rs.next()) {
- com.juick.User u = new com.juick.User();
- u.setUID(rs.getInt(1));
- u.setUName(rs.getString(2));
- users.add(u);
- }
- } catch (SQLException e) {
- LOGGER.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
- }
-
- return users;
+ public static List<com.juick.User> getUserReadLeastPopular(JdbcTemplate sql, int uid, int cnt) {
+ return sql.query("SELECT users.id,users.nick FROM (subscr_users " +
+ "INNER JOIN users_subscr ON (subscr_users.suser_id=? " +
+ "AND subscr_users.user_id=users_subscr.user_id)) INNER JOIN users " +
+ "ON subscr_users.user_id=users.id ORDER BY cnt LIMIT ?",
+ (rs, num) -> {
+ com.juick.User u = new com.juick.User();
+ u.setUID(rs.getInt(1));
+ u.setUName(rs.getString(2));
+ return u;
+ }, uid, cnt);
}
- public List<User> getUserReaders(JdbcTemplate sql, int uid) {
+ public static List<User> getUserReaders(JdbcTemplate sql, int uid) {
return sql.query("SELECT users.id, users.nick FROM subscr_users " +
"INNER JOIN users ON subscr_users.suser_id=users.id " +
"WHERE subscr_users.user_id=? ORDER BY users.nick",
@@ -391,7 +329,7 @@ public class UserQueries {
}, uid);
}
- public List<User> getUserFriends(JdbcTemplate sql, int uid) {
+ public static List<User> getUserFriends(JdbcTemplate sql, int uid) {
return sql.query("SELECT users.id,users.nick FROM subscr_users " +
"INNER JOIN users ON subscr_users.user_id=users.id " +
"WHERE subscr_users.suser_id=? AND users.id!=? " +
@@ -404,72 +342,60 @@ public class UserQueries {
}, uid, uid);
}
- public static List<com.juick.User> getUserBLUsers(Connection sql, int uid) {
- List<com.juick.User> users = new ArrayList<>();
-
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- stmt = sql.prepareStatement("SELECT users.id,users.nick FROM users INNER JOIN bl_users ON(bl_users.bl_user_id=users.id) WHERE bl_users.user_id=? ORDER BY users.nick");
- stmt.setInt(1, uid);
- rs = stmt.executeQuery();
- rs.beforeFirst();
- while (rs.next()) {
- com.juick.User u = new com.juick.User();
- u.setUID(rs.getInt(1));
- u.setUName(rs.getString(2));
- users.add(u);
- }
- } catch (SQLException e) {
- LOGGER.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
- }
-
- return users;
+ public static List<com.juick.User> getUserBLUsers(JdbcTemplate sql, int uid) {
+ return sql.query("SELECT users.id,users.nick FROM users INNER JOIN bl_users " +
+ "ON(bl_users.bl_user_id=users.id) WHERE bl_users.user_id=? ORDER BY users.nick",
+ (rs, num) -> {
+ com.juick.User u = new com.juick.User();
+ u.setUID(rs.getInt(1));
+ u.setUName(rs.getString(2));
+ return u;
+ }, uid);
}
- public static boolean linkTwitterAccount(Connection sql, User user, String accessToken,
+ public static boolean linkTwitterAccount(JdbcTemplate sql, User user, String accessToken,
String accessTokenSecret, String screenName) {
- try {
- PreparedStatement stmt =
- sql.prepareStatement("INSERT INTO twitter(user_id,access_token,access_token_secret,uname) " +
- "VALUES (?,?,?,?)" +
- " ON DUPLICATE KEY UPDATE access_token=?,access_token_secret=?,uname=?");
- stmt.setInt(1, user.getUID());
- stmt.setString(2, accessToken);
- stmt.setString(3, accessTokenSecret);
- stmt.setString(4, screenName);
- stmt.setString(5, accessToken);
- stmt.setString(6, accessTokenSecret);
- stmt.setString(7, screenName);
- if (stmt.execute()) {
- PreparedStatement stmt2 =
- sql.prepareStatement("INSERT INTO subscr_users(user_id,suser_id,jid) " +
- "VALUES (?,1741,'juick\\@twitter.juick.com')");
- stmt2.setInt(1, user.getUID());
- return stmt2.execute();
- }
- } catch (SQLException e) {
- LOGGER.log(Level.SEVERE, "sql exception", e);
+ if (sql.update("INSERT INTO twitter(user_id,access_token,access_token_secret,uname) " +
+ "VALUES (?,?,?,?)" +
+ " ON DUPLICATE KEY UPDATE access_token=?,access_token_secret=?,uname=?",
+ user.getUID(), accessToken, accessTokenSecret, screenName, accessToken, accessTokenSecret, screenName) > 0) {
+ return sql.update("INSERT INTO subscr_users(user_id,suser_id,jid) " +
+ "VALUES (?,1741,'juick\\@twitter.juick.com')", user.getUID()) > 0;
}
return false;
+
}
- public static int getStatsIRead(Connection sql, int uid) {
- return SQLHelpers.getInt(sql, "SELECT COUNT(*) FROM subscr_users WHERE suser_id=?", uid, 0);
+ public static int getStatsIRead(JdbcTemplate sql, int uid) {
+ try {
+ return sql.queryForObject("SELECT COUNT(*) FROM subscr_users WHERE suser_id=?", Integer.class, uid);
+ } catch (EmptyResultDataAccessException e) {
+ return 0;
+ }
}
- public static int getStatsMyReaders(Connection sql, int uid) {
- return SQLHelpers.getInt(sql, "SELECT COUNT(*) FROM subscr_users WHERE user_id=?", uid, 0);
+ public static int getStatsMyReaders(JdbcTemplate sql, int uid) {
+ try {
+ return sql.queryForObject("SELECT COUNT(*) FROM subscr_users WHERE user_id=?", Integer.class, uid);
+ } catch (EmptyResultDataAccessException e) {
+ return 0;
+ }
}
- public static int getStatsMessages(Connection sql, int uid) {
- return SQLHelpers.getInt(sql, "SELECT COUNT(*) FROM messages WHERE user_id=?", uid, 0);
+ public static int getStatsMessages(JdbcTemplate sql, int uid) {
+ try {
+ return sql.queryForObject("SELECT COUNT(*) FROM messages WHERE user_id=?", Integer.class, uid);
+ } catch (EmptyResultDataAccessException e) {
+ return 0;
+ }
}
- public static int getStatsReplies(Connection sql, int uid) {
- return SQLHelpers.getInt(sql, "SELECT COUNT(*) FROM replies WHERE user_id=?", uid, 0);
+ public static int getStatsReplies(JdbcTemplate sql, int uid) {
+ try {
+ return sql.queryForObject("SELECT COUNT(*) FROM replies WHERE user_id=?", Integer.class, uid);
+ } catch (EmptyResultDataAccessException e) {
+ return 0;
+ }
}
public enum ActiveStatus {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-02 07:23:44 +0000