aboutsummaryrefslogtreecommitdiff
path: root/server-core/src/main/java/com/juick/server/UserQueries.java
diff options
context:
space:
mode:
Diffstat (limited to 'server-core/src/main/java/com/juick/server/UserQueries.java')
-rw-r--r--server-core/src/main/java/com/juick/server/UserQueries.java52
1 files changed, 26 insertions, 26 deletions
diff --git a/server-core/src/main/java/com/juick/server/UserQueries.java b/server-core/src/main/java/com/juick/server/UserQueries.java
index bc368390..7400e6b2 100644
--- a/server-core/src/main/java/com/juick/server/UserQueries.java
+++ b/server-core/src/main/java/com/juick/server/UserQueries.java
@@ -47,9 +47,9 @@ public class UserQueries {
@Override
public User mapRow(ResultSet rs, int rowNum) throws SQLException {
User user = new User();
- user.setUID(rs.getInt(1));
- user.setUName(rs.getString(2));
- user.Banned = rs.getBoolean(3);
+ user.setUid(rs.getInt(1));
+ user.setName(rs.getString(2));
+ user.setBanned(rs.getBoolean(3));
return user;
}
}
@@ -150,8 +150,8 @@ public class UserQueries {
+ "WHERE jids.jid IN (\"" + StringUtils.arrayToDelimitedString(jids.toArray(), "\",\"") + "\")",
(rs, rowNum) -> {
com.juick.User user = new com.juick.User();
- user.setUID(rs.getInt(1));
- user.setUName(rs.getString(2));
+ user.setUid(rs.getInt(1));
+ user.setName(rs.getString(2));
user.setJID(rs.getString(3));
return user;
});
@@ -220,7 +220,7 @@ public class UserQueries {
if (realPassword.equals(password)) {
User user = UserQueries.getUserByName(sql, username);
if (user != null) {
- return user.getUID();
+ return user.getUid();
} else {
return -1;
}
@@ -233,12 +233,12 @@ public class UserQueries {
}
public static boolean updatePassword(JdbcTemplate sql, User user, String newPassword) {
- return user.getUID() > 0 && sql.update("UPDATE users SET passw=? WHERE id=?", newPassword, user.getUID()) > 0;
+ return user.getUid() > 0 && sql.update("UPDATE users SET passw=? WHERE id=?", newPassword, user.getUid()) > 0;
}
public static String updateSecretEmail(JdbcTemplate sql, User user) {
String newHash = UserUtils.generateHash(16);
- if (sql.update("INSERT INTO mail(user_id,hash) VALUES (?,?) ON DUPLICATE KEY UPDATE hash=?", user.getUID(), newHash, newHash) > 0) {
+ if (sql.update("INSERT INTO mail(user_id,hash) VALUES (?,?) ON DUPLICATE KEY UPDATE hash=?", user.getUid(), newHash, newHash) > 0) {
return newHash;
}
return "";
@@ -265,7 +265,7 @@ public class UserQueries {
info.setUrl(rs.getString(3));
info.setDescription(rs.getString(4));
return info;
- }), user.getUID());
+ }), user.getUid());
} catch (EmptyResultDataAccessException e) {
return new UserInfo();
}
@@ -273,7 +273,7 @@ public class UserQueries {
public static boolean updateUserInfo(JdbcTemplate sql, User user, UserInfo info) {
return sql.update("INSERT INTO usersinfo(user_id,fullname,country,url,descr) VALUES (?,?,?,?,?) " +
- "ON DUPLICATE KEY UPDATE fullname=?,country=?,url=?,descr=?", user.getUID(), info.getFullName(),
+ "ON DUPLICATE KEY UPDATE fullname=?,country=?,url=?,descr=?", user.getUid(), info.getFullName(),
info.getCountry(), info.getUrl(), info.getDescription(), info.getFullName(),
info.getCountry(), info.getUrl(), info.getDescription()) > 0;
}
@@ -345,8 +345,8 @@ public class UserQueries {
"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));
+ u.setUid(rs.getInt(1));
+ u.setName(rs.getString(2));
return u;
}, uid, cnt);
}
@@ -357,8 +357,8 @@ public class UserQueries {
"WHERE subscr_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));
+ u.setUid(rs.getInt(1));
+ u.setName(rs.getString(2));
return u;
}, uid);
}
@@ -370,8 +370,8 @@ public class UserQueries {
"ORDER BY users.nick",
(rs, num) -> {
com.juick.User u = new com.juick.User();
- u.setUID(rs.getInt(1));
- u.setUName(rs.getString(2));
+ u.setUid(rs.getInt(1));
+ u.setName(rs.getString(2));
return u;
}, uid, uid);
}
@@ -381,8 +381,8 @@ public class UserQueries {
"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));
+ u.setUid(rs.getInt(1));
+ u.setName(rs.getString(2));
return u;
}, uid);
}
@@ -392,9 +392,9 @@ public class UserQueries {
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) {
+ 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;
+ "VALUES (?,1741,'juick\\@twitter.juick.com')", user.getUid()) > 0;
}
return false;
@@ -445,7 +445,7 @@ public class UserQueries {
"UPDATE jids SET active=? WHERE user_id=? AND jid=?");
int newStatus = jidStatus == ActiveStatus.Active ? 1 : 0;
preparedStatement.setInt(1, newStatus);
- preparedStatement.setInt(2, user.getUID());
+ preparedStatement.setInt(2, user.getUid());
preparedStatement.setString(3, JID);
return preparedStatement;
@@ -455,22 +455,22 @@ public class UserQueries {
}
public static List<String> getAllJIDs(JdbcTemplate sql, User user) {
- return sql.queryForList("SELECT jid FROM jids WHERE user_id=?", String.class, user.getUID());
+ return sql.queryForList("SELECT jid FROM jids WHERE user_id=?", String.class, user.getUid());
}
public static List<Auth> getAuthCodes(JdbcTemplate sql, User user) {
return sql.query("SELECT account,authcode FROM auth WHERE user_id=? AND protocol='xmpp'",
- (rs, num) -> new Auth(rs.getString(1), rs.getString(2)), user.getUID());
+ (rs, num) -> new Auth(rs.getString(1), rs.getString(2)), user.getUid());
}
public static List<String> getEmails(JdbcTemplate sql, User user) {
- return sql.queryForList("SELECT email FROM emails WHERE user_id=?", String.class, user.getUID());
+ return sql.queryForList("SELECT email FROM emails WHERE user_id=?", String.class, user.getUid());
}
public static EmailOpts getEmailOpts(JdbcTemplate sql, User user) {
try {
return sql.queryForObject("SELECT email,subscr_hour FROM emails WHERE user_id=? AND subscr_hour IS NOT NULL",
- (rs, num) -> new EmailOpts(rs.getString(1), rs.getInt(2)), user.getUID());
+ (rs, num) -> new EmailOpts(rs.getString(1), rs.getInt(2)), user.getUid());
} catch (EmptyResultDataAccessException e) {
return null;
}
@@ -478,7 +478,7 @@ public class UserQueries {
public static String getEmailHash(JdbcTemplate sql, User user) {
try {
- return sql.queryForObject("SELECT hash FROM mail WHERE user_id=?", String.class, user.getUID())
+ return sql.queryForObject("SELECT hash FROM mail WHERE user_id=?", String.class, user.getUid())
+ "@mail.juick.com";
} catch (EmptyResultDataAccessException e) {
return "";
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 01:46:53 +0000