aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/juick/server
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/juick/server')
-rw-r--r--src/main/java/com/juick/server/AdsQueries.java51
-rw-r--r--src/main/java/com/juick/server/CrosspostQueries.java62
-rw-r--r--src/main/java/com/juick/server/MessagesQueries.java663
-rw-r--r--src/main/java/com/juick/server/PMQueries.java145
-rw-r--r--src/main/java/com/juick/server/PushQueries.java74
-rw-r--r--src/main/java/com/juick/server/SQLHelpers.java168
-rw-r--r--src/main/java/com/juick/server/ShowQueries.java32
-rw-r--r--src/main/java/com/juick/server/SubscriptionsQueries.java104
-rw-r--r--src/main/java/com/juick/server/TagQueries.java166
-rw-r--r--src/main/java/com/juick/server/UserQueries.java440
-rw-r--r--src/main/java/com/juick/server/Utils.java86
-rw-r--r--src/main/java/com/juick/server/helpers/PrivacyOpts.java29
-rw-r--r--src/main/java/com/juick/server/protocol/JuickProtocol.java375
-rw-r--r--src/main/java/com/juick/server/protocol/ProtocolReply.java23
-rw-r--r--src/main/java/com/juick/server/protocol/annotation/UserCommand.java31
15 files changed, 0 insertions, 2449 deletions
diff --git a/src/main/java/com/juick/server/AdsQueries.java b/src/main/java/com/juick/server/AdsQueries.java
deleted file mode 100644
index 06590817..00000000
--- a/src/main/java/com/juick/server/AdsQueries.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, ugnich
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-/**
- *
- * @author ugnich
- */
-public class AdsQueries {
-
- public static int getAdMID(JdbcTemplate sql, int uid) {
- if (uid > 0) {
- try {
- return sql.queryForObject("SELECT message_id FROM ads_messages " +
- "WHERE message_id NOT IN (SELECT message_id FROM ads_messages_log WHERE user_id=? " +
- "AND ts>UNIX_TIMESTAMP()-60*60*24 GROUP BY message_id HAVING COUNT(*)>2) ORDER BY RAND() LIMIT 1",
- Integer.class, uid);
- } catch (EmptyResultDataAccessException e) {
- return 0;
- }
- } else {
- try {
- return sql.queryForObject("SELECT message_id FROM ads_messages ORDER BY RAND() LIMIT 1", Integer.class);
- } catch (EmptyResultDataAccessException e) {
- return 0;
- }
- }
- }
-
- public static void logAdMID(JdbcTemplate sql, int uid, int mid) {
- sql.update("INSERT INTO ads_messages_log(user_id,message_id,ts) VALUES (?,?,UNIX_TIMESTAMP())", uid, mid);
- }
-}
diff --git a/src/main/java/com/juick/server/CrosspostQueries.java b/src/main/java/com/juick/server/CrosspostQueries.java
deleted file mode 100644
index 04898d0a..00000000
--- a/src/main/java/com/juick/server/CrosspostQueries.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2013, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.util.Optional;
-
-/**
- *
- * @author ugnich
- */
-public class CrosspostQueries {
-
- public static Optional<Pair<String, String>> getTwitterTokens(JdbcTemplate sql, int uid) {
- try {
- return sql.queryForObject("SELECT access_token,access_token_secret FROM twitter WHERE user_id=? AND crosspost=1",
- (rs, num) -> {
- return Optional.of(Pair.of(rs.getString(1), rs.getString(2)));
- }, uid);
- } catch (EmptyResultDataAccessException e) {
- return Optional.empty();
- }
- }
-
- public static Optional<String> getFacebookToken(JdbcTemplate sql, int uid) {
- try {
- return Optional.of(sql.queryForObject("SELECT access_token FROM facebook WHERE user_id=? AND access_token IS NOT NULL " +
- "AND crosspost=1", String.class, uid));
- } catch (EmptyResultDataAccessException e) {
- return Optional.empty();
- }
- }
-
- public static Optional<Pair<String, String>> getVKTokens(JdbcTemplate sql, int uid) {
- try {
- return sql.queryForObject("SELECT vk_id,access_token FROM vk WHERE user_id=? AND crosspost=1",
- (rs, num) -> {
- return Optional.of(Pair.of(rs.getString(1), rs.getString(2)));
- }, uid);
- } catch (EmptyResultDataAccessException e) {
- return Optional.empty();
- }
- }
-}
diff --git a/src/main/java/com/juick/server/MessagesQueries.java b/src/main/java/com/juick/server/MessagesQueries.java
deleted file mode 100644
index a0242543..00000000
--- a/src/main/java/com/juick/server/MessagesQueries.java
+++ /dev/null
@@ -1,663 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import com.juick.Message;
-import com.juick.User;
-import com.juick.server.helpers.PrivacyOpts;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.jdbc.core.ConnectionCallback;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.Statement;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.logging.Logger;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class MessagesQueries {
-
- private static final Logger LOGGER = Logger.getLogger(MessagesQueries.class.getName());
-
- public static int createMessage(JdbcTemplate sql, int uid, String txt, String attachment, List<com.juick.Tag> tags) {
- KeyHolder holder = new GeneratedKeyHolder();
- sql.update(con -> {
- PreparedStatement stmt = con.prepareStatement("INSERT INTO messages(user_id,attach) VALUES (?,?)",
- Statement.RETURN_GENERATED_KEYS);
- stmt.setInt(1, uid);
- if (attachment != null) {
- stmt.setString(2, attachment);
- } else {
- stmt.setNull(2, Types.VARCHAR);
- }
- return stmt;
- }, holder);
-
- int mid = holder.getKey().intValue();
-
-
- if (mid > 0) {
-
- String tagsNames = "";
- String tagsIDs = "";
-
- for (int i = 0; i < tags.size(); i++) {
- if (i > 0) {
- tagsNames += " ";
- tagsIDs += ",";
- }
- tagsNames += tags.get(i).Name;
- tagsIDs += "(" + mid + "," + tags.get(i).TID + ")";
- }
- if (tags.size() > 0) {
- sql.execute("INSERT INTO messages_tags(message_id,tag_id) VALUES " + tagsIDs);
- }
- final String finalTagsNames = tagsNames;
- sql.update(con -> {
- PreparedStatement stmt = con.prepareStatement("INSERT INTO messages_txt(message_id,tags,txt) " +
- "VALUES (?,?,?)", Statement.NO_GENERATED_KEYS);
- stmt.setInt(1, mid);
- if (finalTagsNames.isEmpty()) {
- stmt.setNull(2, Types.VARCHAR);
- } else {
- stmt.setString(2, finalTagsNames);
- }
- stmt.setString(3, txt);
- return stmt;
- });
- }
-
- return mid;
- }
-
- public static int createReply(JdbcTemplate sql, int mid, int rid, int uid, String txt, String attachment) {
- int ridnew = getReplyIDIncrement(sql, mid);
-
- sql.update( con -> {
- PreparedStatement stmt = con.prepareStatement("INSERT INTO replies(message_id,reply_id,user_id," +
- "replyto,attach,txt) VALUES (?,?,?,?,?,?)", Statement.NO_GENERATED_KEYS);
- stmt.setInt(1, mid);
- stmt.setInt(2, ridnew);
- stmt.setInt(3, uid);
- stmt.setInt(4, rid);
- if (attachment != null) {
- stmt.setString(5, attachment);
- } else {
- stmt.setNull(5, Types.VARCHAR);
- }
- stmt.setString(6, txt);
- return stmt;
- });
-
- if (ridnew > 0) {
- sql.update("UPDATE messages SET replies=replies+1 WHERE message_id=?", mid);
- }
-
- return ridnew;
- }
-
- public static int getReplyIDIncrement(JdbcTemplate sql, int mid) {
- return sql.execute((ConnectionCallback<Integer>) conn -> {
- conn.setAutoCommit(false);
- try (PreparedStatement ps = conn.prepareStatement("UPDATE messages SET maxreplyid=maxreplyid+1 WHERE message_id=?")) {
- ps.setInt(1, mid);
- if (ps.executeUpdate() != 1) {
- throw new IncorrectResultSizeDataAccessException("Cannot find a message to update: " + mid, 1, 0);
- }
- }
- try (PreparedStatement ps = conn.prepareStatement("SELECT maxreplyid FROM messages WHERE message_id=?")) {
- ps.setInt(1, mid);
- try (ResultSet resultSet = ps.executeQuery()) {
- if (resultSet.next()) {
- int rv = resultSet.getInt(1);
- conn.commit();
- return rv;
- } else {
- throw new IncorrectResultSizeDataAccessException("while getting getReplyIDIncrement, mid=" + mid, 1, 0);
- }
- }
- }
- });
-
- }
-
- public static boolean recommendMessage(JdbcTemplate sql, int mid, int vuid) {
- boolean res = sql.update("INSERT IGNORE INTO favorites(user_id,message_id) VALUES (" + vuid + "," + mid + ")") == 1;
- if (res) {
- sql.update("UPDATE messages SET likes=likes+1 WHERE message_id=?", mid);
- }
- return res;
- }
-
- public static boolean canViewThread(JdbcTemplate sql, int mid, int uid) {
- PrivacyOpts privacyOpts;
- try {
- privacyOpts = sql.queryForObject("SELECT user_id,privacy FROM messages WHERE messages.message_id=?",
- (rs, rowNum) -> {
- PrivacyOpts res = new PrivacyOpts();
- res.setUid(rs.getInt(1));
- res.setPrivacy(rs.getInt(2));
- return res;
- }, mid);
- } catch (EmptyResultDataAccessException e) {
- return true;
- }
- return privacyOpts.getPrivacy() >= 0
- || uid == privacyOpts.getUid()
- || ((privacyOpts.getPrivacy() == -1 || privacyOpts.getPrivacy() == -2) && uid > 0
- && UserQueries.isInWL(sql, privacyOpts.getUid(), uid));
- }
-
- public static boolean isReadOnly(JdbcTemplate sql, int mid) {
- try {
- return sql.queryForObject("SELECT readonly FROM messages WHERE message_id=?", new Object[]{mid}, Integer.class) == 1;
- } catch (EmptyResultDataAccessException e) {
- return false;
- }
- }
-
- public static boolean isSubscribed(JdbcTemplate sql, int uid, int mid) {
- try {
- return sql.queryForObject("SELECT 1 FROM subscr_messages WHERE suser_id=? AND message_id=?", new Object[]{uid, mid}, Integer.class) == 1;
- } catch (EmptyResultDataAccessException e) {
- return false;
- }
- }
-
- public static int getMessagePrivacy(JdbcTemplate sql, int mid) {
- try {
- return sql.queryForObject("SELECT privacy FROM messages WHERE message_id=?", new Object[]{mid}, Integer.class);
- } catch (EmptyResultDataAccessException e) {
- return -4;
- }
- }
-
-
- public static com.juick.Message getMessage(JdbcTemplate sql, int mid) {
- try {
- return sql.queryForObject("SELECT messages.user_id,users.nick,"
- + "TIMESTAMPDIFF(MINUTE,messages.ts,NOW()),"
- + "messages.ts,"
- + "messages.readonly,messages.privacy,messages.replies,"
- + "messages.attach,messages.place_id,messages.lat,"
- + "messages.lon,messages.likes,messages.hidden,"
- + "txt.tags,txt.repliesby,txt.txt FROM messages "
- + "INNER JOIN users ON messages.user_id=users.id "
- + "INNER JOIN messages_txt AS txt "
- + "ON messages.message_id=txt.message_id "
- + "WHERE messages.message_id=?", new Object[]{mid},
- (rs, rowNum) -> {
- Message msg = new Message();
- msg.setMID(mid);
- msg.setUser(new User());
- msg.getUser().setUID(rs.getInt(1));
- msg.getUser().setUName(rs.getString(2));
- msg.TimeAgo = rs.getInt(3);
- msg.setDate(rs.getTimestamp(4));
- msg.ReadOnly = rs.getBoolean(5);
- msg.Privacy = rs.getInt(6);
- msg.FriendsOnly = msg.Privacy < 0;
- msg.Replies = rs.getInt(7);
- msg.AttachmentType = rs.getString(8);
- //if (rs.getInt(9) > 0) {
- // msg.Place = PlacesQueries.getPlace(sql, rs.getInt(9));
- //}
- if (rs.getDouble(10) != 0) {
- msg.Place = new com.juick.Place();
- msg.Place.lat = rs.getDouble(10);
- msg.Place.lon = rs.getDouble(11);
- }
- msg.Likes = rs.getInt(12);
- msg.Hidden = rs.getBoolean(13);
- msg.parseTags(rs.getString(14));
- msg.RepliesBy = rs.getString(15);
- msg.setText(rs.getString(16));
- return msg;
- });
- } catch (EmptyResultDataAccessException e) {
- return null;
- }
- }
-
- public static com.juick.Message getReply(JdbcTemplate sql, int mid, int rid) {
- try {
- return sql.queryForObject("SELECT replies.user_id,users.nick,"
- + "replies.replyto,replies.ts,"
- + "replies.attach,replies.txt FROM replies INNER JOIN users "
- + "ON replies.user_id=users.id "
- + "WHERE replies.message_id=? AND replies.reply_id=?",
- new Object[]{mid, rid}, (rs, num) -> {
- Message msg = new Message();
- msg.setMID(mid);
- msg.setRID(rid);
- msg.setUser(new User());
- msg.getUser().setUID(rs.getInt(1));
- msg.getUser().setUName(rs.getString(2));
- msg.ReplyTo = rs.getInt(3);
- msg.setDate(rs.getTimestamp(4));
- msg.AttachmentType = rs.getString(5);
- msg.setText(rs.getString(6));
- return msg;
- });
- } catch (EmptyResultDataAccessException e) {
- return null;
- }
- }
-
- public static User getMessageAuthor(JdbcTemplate sql, int mid) {
- try {
- return sql.queryForObject("SELECT messages.user_id,users.nick "
- + "FROM messages INNER JOIN users "
- + "ON messages.user_id=users.id WHERE messages.message_id=?",
- new Object[]{mid}, (rs, num) -> {
- User res = new com.juick.User();
- res.setUID(rs.getInt(1));
- res.setUName(rs.getString(2));
- return res;
- });
- } catch (EmptyResultDataAccessException e) {
- return null;
- }
- }
-
- public static List<com.juick.Tag> getMessageTags(JdbcTemplate sql, int mid) {
- return sql.query("SELECT tags.tag_id,synonym_id,name,stat_messages FROM tags " +
- "INNER JOIN messages_tags ON (messages_tags.message_id=? AND messages_tags.tag_id=tags.tag_id)",
- new Object[]{mid}, (rs, num) -> {
- com.juick.Tag t = new com.juick.Tag();
- t.TID = rs.getInt(1);
- t.SynonymID = rs.getInt(2);
- t.Name = rs.getString(3);
- t.UsageCnt = rs.getInt(4);
- return t;
- });
- }
-
- public static List<Integer> getMessageTagsIDs(JdbcTemplate sql, int mid) {
- return sql.queryForList("SELECT tag_id FROM messages_tags WHERE message_id=?", new Object[] {mid}, Integer.class);
- }
-
- public static List<String> getMessageRecommendations(JdbcTemplate sql, int mid) {
- return sql.queryForList("SELECT users.nick FROM favorites INNER JOIN users " +
- "ON (favorites.message_id=? AND favorites.user_id=users.id)",
- new Object[] {mid}, String.class);
- }
-
- public static List<Integer> getAll(JdbcTemplate sql, int visitor_uid, int before) {
- if (visitor_uid > 1) {
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM messages WHERE message_id<? AND hidden=0" +
- " AND (privacy>0 OR user_id=?) AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?)" +
- " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
- new Object[]{before, visitor_uid, visitor_uid}, Integer.class);
- } else {
- return sql.queryForList("SELECT message_id FROM messages WHERE hidden=0" +
- " AND (privacy>0 OR user_id=?)" +
- " AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?)" +
- " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
- new Object[]{visitor_uid, visitor_uid}, Integer.class);
- }
- } else {
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM messages WHERE message_id<?" +
- " AND hidden=0 AND privacy>0 AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
- " ORDER BY message_id DESC LIMIT 20",
- new Object[]{before}, Integer.class);
- } else {
- return sql.queryForList("SELECT message_id FROM messages WHERE hidden=0 AND privacy>0" +
- " AND user_id NOT IN (SELECT id from users WHERE banned=1) ORDER BY message_id DESC LIMIT 20",
- Integer.class);
- }
- }
- }
-
- public static List<Integer> getTag(JdbcTemplate sql, int tid, int visitor_uid, int before, int cnt) {
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM (tags INNER JOIN messages_tags " +
- "ON ((tags.synonym_id=? OR tags.tag_id=?) AND tags.tag_id=messages_tags.tag_id)) " +
- "INNER JOIN messages USING(message_id) WHERE messages.message_id<? " +
- "AND (messages.privacy>0 OR messages.user_id=?) ORDER BY message_id DESC LIMIT ?",
- new Object[]{tid, tid, before, visitor_uid, cnt}, Integer.class);
- } else {
- return sql.queryForList("SELECT message_id FROM (tags INNER JOIN messages_tags " +
- "ON ((tags.synonym_id=? OR tags.tag_id=?) AND tags.tag_id=messages_tags.tag_id)) " +
- "INNER JOIN messages USING(message_id) WHERE messages.privacy>0 OR messages.user_id=? " +
- "ORDER BY message_id DESC LIMIT ?",
- new Object[]{tid, tid, visitor_uid, cnt}, Integer.class);
- }
- }
-
- public static List<Integer> getTags(JdbcTemplate sql, String tids, int visitor_uid, int before, int cnt) {
- if (before > 0) {
- return sql.queryForList("SELECT messages.message_id FROM messages_tags " +
- "INNER JOIN messages USING(message_id) WHERE messages_tags.tag_id IN (" + tids + ") " +
- "AND messages.message_id<? AND (messages.privacy>0 OR messages.user_id=?) " +
- "ORDER BY messages.message_id DESC LIMIT ?", new Object[]{before, visitor_uid, cnt}, Integer.class);
- } else {
- return sql.queryForList("SELECT messages.message_id FROM messages_tags " +
- "INNER JOIN messages USING(message_id) WHERE messages_tags.tag_id IN (" + tids + ") " +
- "AND (messages.privacy>0 OR messages.user_id=?) " +
- "ORDER BY messages.message_id DESC LIMIT ?", new Object[]{visitor_uid, cnt}, Integer.class);
- }
- }
-
- public static List<Integer> getPlace(JdbcTemplate sql, int place_id, int visitor_uid, int before) {
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM messages WHERE place_id=? AND message_id<? " +
- "AND (privacy>0 OR user_id=?) ORDER BY message_id DESC LIMIT 20",
- new Object[]{place_id, before, visitor_uid}, Integer.class);
- } else {
- return sql.queryForList("SELECT message_id FROM messages WHERE place_id=? AND (privacy>0 OR user_id=?) " +
- "ORDER BY message_id DESC LIMIT 20", new Object[]{place_id, visitor_uid}, Integer.class);
- }
- }
-
- public static List<Integer> getMyFeed(JdbcTemplate sql, int uid, int before) {
- List<Integer> mids;
- if (before > 0) {
- mids = sql.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 = sql.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(sql.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(sql.queryForList("SELECT message_id FROM messages " +
- "WHERE user_id=? ORDER BY message_id DESC LIMIT 20", Integer.class, uid));
- }
-
- Collections.sort(mids, Collections.reverseOrder());
- int remove = mids.size() - 20;
- for (int i = 0; i < remove; i++) {
- mids.remove(20);
- }
-
- return mids;
- }
-
- public static List<Integer> getPrivate(JdbcTemplate sql, int uid, int before) {
-
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND privacy<0 AND message_id<? " +
- "ORDER BY message_id DESC LIMIT 20", new Object[]{uid, before}, Integer.class);
- } else {
- return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND privacy<0 " +
- "ORDER BY message_id DESC LIMIT 20", new Object[]{uid}, Integer.class);
- }
- }
-
- public static List<Integer> getDiscussions(JdbcTemplate sql, int uid, int before) {
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM subscr_messages WHERE suser_id=? AND message_id<? " +
- "ORDER BY message_id DESC LIMIT 20", Integer.class, uid, before);
- } else {
- return sql.queryForList("SELECT message_id FROM subscr_messages WHERE suser_id=? " +
- "ORDER BY message_id DESC LIMIT 20", Integer.class, uid);
- }
- }
-
- public static List<Integer> getRecommended(JdbcTemplate sql, int uid, int before) {
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM favorites WHERE user_id " +
- "IN (SELECT user_id FROM subscr_users WHERE suser_id=?) AND message_id<? " +
- "ORDER BY message_id DESC LIMIT 20", Integer.class, uid, before);
- } else {
- return sql.queryForList("SELECT message_id FROM favorites WHERE user_id " +
- "IN (SELECT user_id FROM subscr_users WHERE suser_id=?) " +
- "ORDER BY message_id DESC LIMIT 20", Integer.class, uid);
- }
- }
-
- public static List<Integer> getPopular(JdbcTemplate sql, int visitor_uid, int before) {
-
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM messages WHERE message_id<? AND privacy>0 " +
- "AND popular>0 AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
- "ORDER BY message_id DESC LIMIT 20", Integer.class, before, visitor_uid);
- } else {
- return sql.queryForList("SELECT message_id FROM messages WHERE privacy>0 " +
- "AND popular>0 AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
- "ORDER BY message_id DESC LIMIT 20", Integer.class, visitor_uid);
- }
- }
-
- public static List<Integer> getPhotos(JdbcTemplate sql, int visitor_uid, int before) {
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM messages WHERE message_id<? AND (privacy>0 OR user_id=?) " +
- "AND attach IS NOT NULL AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
- "AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
- "ORDER BY message_id DESC LIMIT 20", Integer.class, before, visitor_uid, visitor_uid);
- } else {
- return sql.queryForList("SELECT message_id FROM messages WHERE (privacy>0 OR user_id=?) " +
- "AND attach IS NOT NULL AND user_id NOT IN (SELECT id from users WHERE banned=1) " +
- "AND user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
- "ORDER BY message_id DESC LIMIT 20", Integer.class, visitor_uid, visitor_uid);
- }
- }
-
- public static List<Integer> getSearch(JdbcTemplate sql, JdbcTemplate sqlSearch, String search, int before) {
- List<Integer> mids;
-
- if (before > 0) {
- mids = sqlSearch.queryForList("SELECT id AS message_id FROM messages WHERE MATCH(?) AND id<? " +
- "ORDER BY id DESC LIMIT 25", new Object[]{search, before}, Integer.class);
- } else {
- mids = sqlSearch.queryForList("SELECT id AS message_id FROM messages WHERE MATCH(?) " +
- "ORDER BY id DESC LIMIT 25", new Object[]{search}, Integer.class);
- }
- if (mids.size() > 0) {
- return sql.queryForList("SELECT message_id FROM messages WHERE message_id " +
- "IN (" + Utils.convertArrayInt2String(mids) + ") AND privacy>0 ORDER BY message_id DESC LIMIT 20",
- Integer.class);
- }
- return mids;
- }
-
- public static List<Integer> getUserBlog(JdbcTemplate sql, int UID, int privacy, int before) {
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND message_id<? AND privacy>=" +
- privacy + " ORDER BY message_id DESC LIMIT 20", new Object[]{UID, before}, Integer.class);
- } else {
- return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND privacy>=" + privacy +
- " ORDER BY message_id DESC LIMIT 20", new Object[]{UID}, Integer.class);
- }
- }
-
- public static List<Integer> getUserTag(JdbcTemplate sql, int UID, int TID, int privacy, int before) {
- if (before > 0) {
- return sql.queryForList("SELECT messages.message_id FROM messages_tags INNER JOIN messages " +
- "USING(message_id) WHERE messages.user_id=? AND messages_tags.tag_id=? " +
- "AND messages.message_id<? AND messages.privacy>=" + privacy +
- " ORDER BY messages.message_id DESC LIMIT 20",
- new Object[] {UID, TID, before}, Integer.class);
- } else {
- return sql.queryForList("SELECT messages.message_id FROM messages_tags INNER JOIN messages " +
- "USING(message_id) WHERE messages.user_id=? AND messages_tags.tag_id=? " +
- "AND messages.privacy>=" + privacy + " ORDER BY messages.message_id DESC LIMIT 20",
- new Object[]{UID, TID}, Integer.class);
- }
- }
-
- public static List<Integer> getUserRecommendations(JdbcTemplate sql, int UID, int before) {
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM favorites "
- + "WHERE user_id=? AND message_id<? "
- + "ORDER BY message_id DESC LIMIT 20", Integer.class,
- new Object[]{UID, before});
- } else {
- return sql.queryForList("SELECT message_id FROM favorites "
- + "WHERE user_id=? ORDER BY message_id DESC LIMIT 20",
- Integer.class, new Object[]{UID});
-
- }
- }
-
- public static List<Integer> getUserPhotos(JdbcTemplate sql, int UID, int privacy, int before) {
- if (before > 0) {
- return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND message_id<? AND privacy>=" +
- privacy + " AND attach IS NOT NULL ORDER BY message_id DESC LIMIT 20",
- new Object[] {UID, before}, Integer.class);
- } else {
- return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND privacy>=" + privacy +
- " AND attach IS NOT NULL ORDER BY message_id DESC LIMIT 20",
- new Object[] {UID}, Integer.class);
- }
- }
-
- public static List<Integer> getUserSearch(JdbcTemplate sql, JdbcTemplate sqlSearch, int UID, String search, int privacy, int before) {
- List<Integer> mids;
-
-
- if (before > 0) {
- mids = sqlSearch.queryForList("SELECT id AS message_id FROM messages WHERE user_id=? AND MATCH(?) AND id<? " +
- "ORDER BY id DESC LIMIT 20", new Object[] {UID, search, before}, Integer.class);
- } else {
- mids = sqlSearch.queryForList("SELECT id AS message_id FROM messages WHERE user_id=? AND MATCH(?) " +
- "ORDER BY id DESC LIMIT 20", new Object[] {UID, search}, Integer.class);
- }
-
- if (mids.size() > 0) {
- return sql.queryForList("SELECT message_id FROM messages WHERE message_id IN (" +
- Utils.convertArrayInt2String(mids) + ") AND privacy>=" + privacy + " ORDER BY message_id DESC",
- Integer.class);
- }
- return mids;
- }
-
- public static List<com.juick.Message> getMessages(JdbcTemplate sql, List<Integer> mids) {
- List<com.juick.Message> msgs = new ArrayList<>(20);
-
- return sql.query("SELECT messages.message_id,messages.user_id,users.nick,"
- + "messages_txt.tags,messages.readonly,messages.privacy,messages_txt.txt,"
- + "TIMESTAMPDIFF(MINUTE,messages.ts,NOW()),"
- + "messages.ts,messages.replies,"
- + "messages_txt.repliesby,messages.attach,messages.lat,"
- + "messages.lon,messages.likes "
- + "FROM (messages INNER JOIN messages_txt "
- + "ON messages.message_id=messages_txt.message_id) "
- + "INNER JOIN users ON messages.user_id=users.id "
- + "WHERE messages.message_id "
- + "IN (" + Utils.convertArrayInt2String(mids) + ") "
- + "ORDER BY messages.message_id DESC", (rs, rowNum) -> {
- com.juick.Message msg = new com.juick.Message();
- msg.setUser(new User());
-
- msg.setMID(rs.getInt(1));
- msg.getUser().setUID(rs.getInt(2));
- msg.getUser().setUName(rs.getString(3));
- if (rs.getString(4) != null) {
- msg.parseTags(rs.getString(4));
- }
- msg.ReadOnly = rs.getInt(5) == 1;
- msg.Privacy = rs.getInt(6);
- msg.FriendsOnly = msg.Privacy < 0;
- msg.setText(rs.getString(7));
- msg.TimeAgo = rs.getInt(8);
- msg.setDate(rs.getTimestamp(9));
- msg.Replies = rs.getInt(10);
- msg.RepliesBy = rs.getString(11);
- msg.AttachmentType = rs.getString(12);
- if (rs.getDouble(13) != 0) {
- msg.Place = new com.juick.Place();
- msg.Place.lat = rs.getDouble(13);
- msg.Place.lon = rs.getDouble(14);
- }
- msg.Likes = rs.getInt(15);
- return msg;
- });
- }
-
- public static List<com.juick.Message> getReplies(JdbcTemplate sql, int mid) {
- return sql.query("SELECT replies.reply_id,replies.replyto,replies.user_id,users.nick,users.banned,replies.txt," +
- "TIMESTAMPDIFF(MINUTE,replies.ts,NOW()),replies.ts,replies.attach FROM replies INNER JOIN users " +
- "ON replies.user_id=users.id WHERE replies.message_id=? ORDER BY replies.reply_id ASC",
- new Object[]{mid}, (rs, num) -> {
- com.juick.Message msg = new com.juick.Message();
- msg.setMID(mid);
- msg.setRID(rs.getInt(1));
- msg.ReplyTo = rs.getInt(2);
- msg.setUser(new User());
- msg.getUser().setUID(rs.getInt(3));
- msg.getUser().setUName(rs.getString(4));
- msg.getUser().Banned = rs.getBoolean(5);
- msg.setText(rs.getString(6));
- msg.TimeAgo = rs.getInt(7);
- msg.setDate(rs.getTimestamp(8));
- msg.AttachmentType = rs.getString(9);
- return msg;
- });
- }
-
- public static boolean setMessagePopular(JdbcTemplate sql, int mid, int popular) {
- boolean ret;
- switch (popular) {
- case -2:
- ret = sql.update("UPDATE messages SET hidden=1 WHERE message_id=?", mid) > 0;
- break;
- case -1:
- ret = sql.update("UPDATE messages SET popular=0 WHERE message_id=?", mid) > 0;
- break;
- default:
- ret = sql.update("UPDATE messages SET popular=? WHERE message_id=?", popular, mid) > 0;
- break;
- }
- if (popular == -1) {
- ret = sql.update("INSERT INTO top_ignore_messages VALUES (?)", mid) > 0;
- }
- return ret;
- }
-
- public static boolean setMessagePrivacy(JdbcTemplate sql, int mid) {
- return sql.update("UPDATE messages SET privacy=1 WHERE message_id=?",
- mid) > 0;
- }
- public static boolean deleteMessage(JdbcTemplate sql, int uid, int mid) {
- if (sql.update("DELETE FROM messages WHERE message_id=? AND user_id=?", mid, uid) > 0) {
- sql.update("DELETE FROM messages_txt WHERE message_id=?", mid);
- sql.update("DELETE FROM replies WHERE message_id=?", mid);
- sql.update("DELETE FROM subscr_messages WHERE message_id=?", mid);
- sql.update("DELETE FROM messages_tags WHERE message_id=?", mid);
- return true;
- }
- return false;
- }
-
-}
diff --git a/src/main/java/com/juick/server/PMQueries.java b/src/main/java/com/juick/server/PMQueries.java
deleted file mode 100644
index 74d5df3e..00000000
--- a/src/main/java/com/juick/server/PMQueries.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import com.juick.User;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.util.List;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class PMQueries {
-
- public static boolean createPM(JdbcTemplate sql, int uid_from, int uid_to, String body) {
- boolean ret = sql.update("INSERT INTO pm(user_id,user_id_to,txt) VALUES (?,?,?)",
- uid_from, uid_to, body) > 0;
-
- if (ret) {
- sql.update("INSERT INTO pm_streams(user_id,user_id_to,lastmessage,unread) "
- + "VALUES (?,?,NOW(),1) "
- + "ON DUPLICATE KEY UPDATE lastmessage=NOW(),unread=unread+1",
- uid_from, uid_to);
- }
- return ret;
- }
-
- public static boolean addPMinRoster(JdbcTemplate sql, int uid, String jid) {
- return sql.update("INSERT INTO pm_inroster(user_id,jid) VALUES (?,?)",
- uid, jid) > 0;
- }
-
- public static boolean removePMinRoster(JdbcTemplate sql, int uid, String jid) {
- return sql.update("DELETE FROM pm_inroster WHERE user_id=? AND jid=?", uid, jid) > 0;
- }
-
- public static boolean havePMinRoster(JdbcTemplate sql, int uid, String jid) {
- List<Integer> res = sql.queryForList("SELECT 1 FROM pm_inroster "
- + "WHERE user_id=? AND jid=?", Integer.class,
- uid, jid);
- return res.size() > 0;
- }
-
- public static String getLastView(JdbcTemplate sql, int uid_from, int uid_to) {
- try {
- return sql.queryForObject("SELECT lastview FROM pm_streams WHERE user_id=? AND user_id_to=?", String.class,
- uid_from, uid_to);
- } catch (EmptyResultDataAccessException e) {
- return null;
- }
- }
-
- public static List<User> getPMLastConversationsUsers(JdbcTemplate sql, int uid, int cnt) {
- List<User> qusers = sql.query("SELECT user_id,unread FROM pm_streams "
- + "WHERE user_id_to=? "
- + "ORDER BY unread DESC, lastmessage DESC LIMIT " + cnt, (rs, rowNum) -> {
- com.juick.User u = new com.juick.User();
- u.setUID(rs.getInt(1));
- u.MessagesCount = rs.getInt(2);
- return u;
- }, uid);
- if (!qusers.isEmpty()) {
- UserQueries.fillUsersByID(sql, qusers);
- }
-
- return qusers;
- }
-
- public static boolean haveUserInArray(List<com.juick.User> arr, int uid) {
- for (User user : arr) {
- if (user.getUID() == uid) {
- return true;
- }
- }
- return false;
- }
-
- public static List<com.juick.Message> getPMMessages(JdbcTemplate sql, int uid, int uid_to) {
- List<com.juick.Message> msgs = sql.query("SELECT user_id,txt,ts FROM pm "
- + "WHERE (user_id=? AND user_id_to=?) "
- + "OR (user_id_to=? AND user_id=?) ORDER BY ts DESC LIMIT 20",
- (rs, rowNum) -> {
- com.juick.Message msg = new com.juick.Message();
- int uuid = rs.getInt(1);
- msg.setUser(new User());
- msg.getUser().setUID(uuid);
- msg.setText(rs.getString(2));
- msg.setDate(rs.getTimestamp(3));
- return msg;
- }, uid, uid_to, uid, uid_to);
-
- sql.update("UPDATE pm_streams SET lastview=NOW(),unread=0 "
- + "WHERE user_id_to=? AND user_id=?", uid, uid_to);
-
- return msgs;
- }
-
- public static List<com.juick.Message> getLastPMInbox(JdbcTemplate sql, int uid) {
- return sql.query("SELECT pm.user_id,users.nick,pm.txt,TIMESTAMPDIFF(MINUTE,pm.ts,NOW()),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",
- (rs, num) -> {
- com.juick.Message msg = new com.juick.Message();
- msg.setUser(new User());
- msg.getUser().setUID(rs.getInt(1));
- msg.getUser().setUName(rs.getString(2));
- msg.setText(rs.getString(3));
- msg.TimeAgo = rs.getInt(4);
- msg.setDate(rs.getTimestamp(5));
- return msg;
- }, uid);
- }
-
- public static List<com.juick.Message> getLastPMSent(JdbcTemplate sql, int uid) {
- return sql.query("SELECT pm.user_id_to,users.nick,pm.txt,TIMESTAMPDIFF(MINUTE,pm.ts,NOW())," +
- "pm.ts FROM pm INNER JOIN users ON pm.user_id_to=users.id " +
- "WHERE pm.user_id=? ORDER BY pm.ts DESC LIMIT 20",
- (rs, num) -> {
- com.juick.Message msg = new com.juick.Message();
- msg.setUser(new User());
- msg.getUser().setUID(rs.getInt(1));
- msg.getUser().setUName(rs.getString(2));
- msg.setText(rs.getString(3));
- msg.TimeAgo = rs.getInt(4);
- msg.setDate(rs.getTimestamp(5));
- return msg;
- }, uid);
- }
-}
diff --git a/src/main/java/com/juick/server/PushQueries.java b/src/main/java/com/juick/server/PushQueries.java
deleted file mode 100644
index 54528993..00000000
--- a/src/main/java/com/juick/server/PushQueries.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.juick.server;
-
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.util.StringUtils;
-
-import java.util.List;
-import java.util.Optional;
-
-/**
- *
- * @author ugnich
- */
-public class PushQueries {
-
- public static Optional<String> getAndroidRegID(JdbcTemplate sql, int uid) {
- try {
- return Optional.of(sql.queryForObject("SELECT regid FROM android WHERE user_id=?", String.class, uid));
- } catch (EmptyResultDataAccessException e) {
- return Optional.empty();
- }
-
- }
-
- 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> 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);
- }
-
- public static Optional<String> getWinPhoneURL(JdbcTemplate sql, int uid) {
- try {
- return Optional.of(sql.queryForObject("SELECT url FROM winphone WHERE user_id=?", String.class, uid));
- } catch (EmptyResultDataAccessException e) {
- return Optional.empty();
- }
- }
-
- 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> 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);
- }
-
- public static Optional<String> getAPNSToken(JdbcTemplate sql, int uid) {
- try {
- return Optional.of(sql.queryForObject("SELECT token from ios WHERE user_id=?", String.class, uid));
- } catch (EmptyResultDataAccessException e) {
- return Optional.empty();
- }
- }
-
- 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/SQLHelpers.java b/src/main/java/com/juick/server/SQLHelpers.java
deleted file mode 100644
index 13ebe98a..00000000
--- a/src/main/java/com/juick/server/SQLHelpers.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-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 java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- *
- * @author ugnich
- */
-public class SQLHelpers {
-
- private static final Logger logger = Logger.getLogger(SQLHelpers.class.getName());
-
- public static int execute(Connection sql, String query) {
- int ret = -1;
- PreparedStatement stmt = null;
- try {
- stmt = sql.prepareStatement(query);
- ret = stmt.executeUpdate();
- } catch (SQLException e) {
- logger.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(null, stmt);
- }
- return ret;
- }
-
- public static int executeInt(Connection sql, String query, int param) {
- int ret = -1;
- PreparedStatement stmt = null;
- try {
- stmt = sql.prepareStatement(query);
- stmt.setInt(1, param);
- ret = stmt.executeUpdate();
- } catch (SQLException e) {
- logger.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(null, stmt);
- }
- return ret;
- }
-
- public static int getInt(Connection sql, String query, int defvalue) {
- int ret = defvalue;
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- stmt = sql.prepareStatement(query);
- 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 ret;
- }
-
- public static int getInt(Connection sql, String query, int param, int defvalue) {
- int ret = defvalue;
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- stmt = sql.prepareStatement(query);
- stmt.setInt(1, param);
- 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 ret;
- }
-
- public static int getInt(Connection sql, String query, String param, int defvalue) {
- int ret = defvalue;
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- stmt = sql.prepareStatement(query);
- stmt.setString(1, param);
- 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 ret;
- }
-
- public static String getString(Connection sql, String query, int param) {
- String ret = null;
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- stmt = sql.prepareStatement(query);
- stmt.setInt(1, param);
- rs = stmt.executeQuery();
- if (rs.first()) {
- ret = rs.getString(1);
- }
- } catch (SQLException e) {
- logger.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
- }
- return ret;
- }
-
- public static String getString(Connection sql, String query, String param) {
- String ret = null;
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- stmt = sql.prepareStatement(query);
- stmt.setString(1, param);
- rs = stmt.executeQuery();
- if (rs.first()) {
- ret = rs.getString(1);
- }
- } catch (SQLException e) {
- logger.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
- }
- return ret;
- }
-
- public static List<Integer> getArrayInteger(Connection sql, String query, int param) {
- List<Integer> ret = new ArrayList<>();
-
- PreparedStatement stmt = null;
- ResultSet rs = null;
- try {
- stmt = sql.prepareStatement(query);
- stmt.setInt(1, param);
- rs = stmt.executeQuery();
- rs.beforeFirst();
- while (rs.next()) {
- ret.add(rs.getInt(1));
- }
- } catch (SQLException e) {
- logger.log(Level.SEVERE, "sql exception", e);
- } finally {
- Utils.finishSQL(rs, stmt);
- }
-
- return ret;
- }
-}
diff --git a/src/main/java/com/juick/server/ShowQueries.java b/src/main/java/com/juick/server/ShowQueries.java
deleted file mode 100644
index 3ddff412..00000000
--- a/src/main/java/com/juick/server/ShowQueries.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.juick.server;
-
-import com.juick.User;
-
-import java.util.List;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-/**
- * Created by vt on 10/01/16.
- */
-public class ShowQueries {
-
- public static List<String> getRecommendedUsers(JdbcTemplate sql, User forUser) {
- return sql.queryForList("SELECT users.nick FROM subscr_users INNER JOIN users " +
- "ON subscr_users.user_id=users.id " +
- "WHERE subscr_users.user_id NOT IN (SELECT user_id FROM subscr_users WHERE suser_id=?) " +
- "AND subscr_users.suser_id IN (SELECT user_id FROM subscr_users WHERE suser_id=?) " +
- "AND subscr_users.user_id NOT IN (SELECT bl_user_id FROM bl_users WHERE user_id=?) " +
- "AND subscr_users.user_id!=? AND users.lastmessage>UNIX_TIMESTAMP()-259200 " +
- "GROUP BY subscr_users.user_id ORDER BY count(*) DESC LIMIT 10",
- String.class, new Object[] {forUser.getUID(), forUser.getUID(), forUser.getUID(), forUser.getUID()});
- }
-
- public static List<String> getTopUsers(JdbcTemplate sql) {
- return sql.queryForList("SELECT users.nick,COUNT(subscr_users.suser_id) AS cnt " +
- "FROM (subscr_users INNER JOIN users ON subscr_users.user_id=users.id) " +
- "INNER JOIN useroptions ON users.id=useroptions.user_id " +
- "WHERE useroptions.privacy_view>0 AND users.lastmessage>UNIX_TIMESTAMP()-259200 " +
- "AND users.id!=2 GROUP BY subscr_users.user_id ORDER BY cnt DESC LIMIT 10",
- String.class);
- }
-}
diff --git a/src/main/java/com/juick/server/SubscriptionsQueries.java b/src/main/java/com/juick/server/SubscriptionsQueries.java
deleted file mode 100644
index 7c30285b..00000000
--- a/src/main/java/com/juick/server/SubscriptionsQueries.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * To change this template, choose Tools | Templates
- * and open the template in the editor.
- */
-package com.juick.server;
-
-import com.juick.Tag;
-import com.juick.User;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.util.StringUtils;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.logging.Logger;
-import java.util.stream.Collectors;
-
-/**
- *
- * @author ugnich
- */
-public class SubscriptionsQueries {
-
- private static final Logger logger = Logger.getLogger(SubscriptionsQueries.class.getName());
-
- 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);
- }
- }
-
- public static List<User> getSubscribedUsers(JdbcTemplate sql, int uid, int mid) {
- List<User> userids = UserQueries.getUserReaders(sql, uid);
- Set<Integer> set = new HashSet<>();
- set.addAll(userids.stream().map(User::getUID).collect(Collectors.toList()));
- List<Integer> tags = MessagesQueries.getMessageTagsIDs(sql, mid);
- if (tags.size() > 0) {
- List<Integer> tagUsers = sql.queryForList("SELECT suser_id FROM subscr_tags " +
- "WHERE tag_id IN (" + StringUtils.arrayToCommaDelimitedString(tags.toArray()) + ") AND suser_id!=" + uid, Integer.class);
- set.addAll(tagUsers);
- }
- return UserQueries.getUsersByID(sql, new ArrayList<>(set));
- }
-
- public static List<User> getUsersSubscribedToComments(JdbcTemplate sql, int mid, int ignore_uid) {
- List<Integer> userids = sql.queryForList("SELECT suser_id FROM subscr_messages WHERE message_id=? AND suser_id!=?",
- new Object[] {mid, ignore_uid}, Integer.class);
- if (userids.size() > 0) {
- return UserQueries.getUsersByID(sql, userids);
- } else {
- return new ArrayList<>();
- }
- }
-
- public static List<User> getUsersSubscribedToUserRecommendations(JdbcTemplate sql, int uid, int mid, int muid) {
- List<Integer> tags = MessagesQueries.getMessageTagsIDs(sql, mid);
-
- String query = "SELECT suser_id FROM subscr_users WHERE user_id=" + uid;
- query += " AND user_id NOT IN (SELECT user_id FROM bl_users WHERE bl_user_id=" + muid + ")";
- query += " AND user_id NOT IN (SELECT suser_id FROM subscr_users WHERE user_id=" + muid + ")";
- query += " AND user_id NOT IN (SELECT suser_id FROM subscr_messages WHERE message_id=" + mid + ")";
- query += " AND user_id NOT IN (SELECT user_id FROM favorites WHERE message_id=" + mid + ")";
- query += " AND user_id NOT IN (SELECT subscr_users.suser_id FROM subscr_users INNER JOIN favorites ON (favorites.message_id=" + mid + " AND subscr_users.user_id=favorites.user_id AND favorites.user_id!=" + uid + "))";
- if (!tags.isEmpty()) {
- String tagsStr = Utils.convertArrayInt2String(tags);
- query += " AND user_id NOT IN (SELECT suser_id FROM subscr_tags WHERE tag_id IN (" + tagsStr + "))";
- query += " AND user_id NOT IN (SELECT user_id FROM bl_tags WHERE tag_id IN (" + tagsStr + "))";
- }
- List<Integer> userids = sql.queryForList(query, Integer.class);
- return UserQueries.getUsersByID(sql, userids);
- }
-
- public static boolean subscribeMessage(JdbcTemplate sql, int mid, int vuid) {
- return sql.update("INSERT IGNORE INTO subscr_messages(suser_id,message_id) VALUES (" + vuid + "," + mid + ")") == 1;
- }
- public static boolean unSubscribeMessage(JdbcTemplate sql, int mid, int vuid) {
- return sql.update("DELETE FROM subscr_messages WHERE message_id=? AND suser_id=?",
- mid, vuid) > 0;
- }
- public static boolean subscribeUser(JdbcTemplate sql, User user, User toUser) {
- return sql.update("INSERT IGNORE INTO subscr_users(user_id,suser_id) VALUES (?,?)",
- user.getUID(), toUser.getUID()) == 1;
- }
- public static boolean unSubscribeUser(JdbcTemplate sql, User user, User fromUser) {
- return sql.update("DELETE FROM subscr_users WHERE suser_id=? AND user_id=?",
- user.getUID(), fromUser.getUID()) > 0;
- }
- public static boolean subscribeTag(JdbcTemplate sql, User user, Tag toTag) {
- return sql.update("INSERT IGNORE INTO subscr_tags(tag_id,suser_id) VALUES (?,?)",
- toTag.TID, user.getUID()) == 1;
- }
- public static boolean unSubscribeTag(JdbcTemplate sql, User user, Tag toTag) {
- return sql.update("DELETE FROM subscr_tags WHERE tag_id=? AND suser_id=?",
- toTag.TID, user.getUID()) > 0;
- }
-
-}
diff --git a/src/main/java/com/juick/server/TagQueries.java b/src/main/java/com/juick/server/TagQueries.java
deleted file mode 100644
index 2258a8ea..00000000
--- a/src/main/java/com/juick/server/TagQueries.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import com.juick.Tag;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-
-import java.sql.PreparedStatement;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class TagQueries {
-
- public static com.juick.Tag getTag(JdbcTemplate sql, int tid) {
- try {
- return sql.queryForObject("SELECT synonym_id,name FROM tags WHERE tag_id=?",
- new Object[]{tid}, (rs, num) -> {
- Tag ret = new Tag();
- ret.TID = tid;
- ret.SynonymID = rs.getInt(1);
- ret.Name = rs.getString(2);
- return ret;
- });
- } catch (EmptyResultDataAccessException e) {
- return null;
- }
- }
-
- public static com.juick.Tag getTag(JdbcTemplate sql, String tag, boolean autoCreate) {
- Tag ret = null;
- try {
- ret = sql.queryForObject("SELECT tag_id,synonym_id,name FROM tags WHERE name=?",
- new Object[]{tag}, (rs, rowNum) -> {
- Tag ret1 = new Tag();
- ret1.TID = rs.getInt(1);
- ret1.SynonymID = rs.getInt(2);
- ret1.Name = rs.getString(3);
- return ret1;
- });
- } catch (EmptyResultDataAccessException e) {
- // tag not found
- }
- if (ret == null && autoCreate) {
- ret = new com.juick.Tag();
- ret.TID = createTag(sql, tag);
- ret.Name = tag;
- }
-
- return ret;
- }
-
- public static List<com.juick.Tag> getTags(JdbcTemplate sql, String[] tags, boolean autoCreate) {
- List<Tag> ret = new ArrayList<>();
-
- for (String tag : tags) {
- if (!tag.isEmpty()) {
- Tag t = getTag(sql, tag, autoCreate);
- if (t != null) {
- ret.add(t);
- }
- }
- }
-
- return ret;
- }
-
- public static boolean getTagNoIndex(JdbcTemplate sql, int tag_id) {
- try {
- return sql.queryForObject("SELECT noindex FROM tags WHERE tag_id=?", Integer.class, tag_id) == 1;
- } catch (EmptyResultDataAccessException e) {
- return false;
- }
- }
-
- public static int createTag(JdbcTemplate sql, String name) {
- KeyHolder holder = new GeneratedKeyHolder();
- sql.update(con -> {
- PreparedStatement stmt = con.prepareStatement("INSERT INTO tags(name) VALUES (?)",
- Statement.RETURN_GENERATED_KEYS);
- stmt.setString(1, name);
- return stmt;
- }, holder);
-
- return holder.getKey().intValue();
- }
-
- public static List<com.juick.Tag> getUserTagsAll(JdbcTemplate sql, int uid) {
- return sql.query("SELECT tags.name,COUNT(messages.message_id) " +
- "FROM (messages INNER JOIN messages_tags ON (messages.user_id=? " +
- "AND messages.message_id=messages_tags.message_id)) " +
- "INNER JOIN tags ON messages_tags.tag_id=tags.tag_id GROUP BY tags.tag_id ORDER BY tags.name ASC",
- (rs, rowNum) -> {
- Tag t = new Tag();
- t.Name = rs.getString(1);
- t.UsageCnt = rs.getInt(2);
- return t;
- }, uid);
- }
-
- 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) {
- return sql.queryForList("SELECT name FROM tags WHERE top=1 ORDER BY name ASC", String.class);
- }
- public static List<Tag> updateTags(JdbcTemplate sql, int mid, List<Tag> newTags) {
- List<Tag> currentTags = MessagesQueries.getMessageTags(sql, mid);
- newTags.stream().filter(currentTags::contains)
- .forEach(t -> sql.update("DELETE FROM messages_tags WHERE message_id=? AND tag_id=?", mid, t.TID));
- newTags.stream().filter(t -> !currentTags.contains(t))
- .forEach(t -> sql.update("INSERT INTO messages_tags(message_id,tag_id) VALUES (?,?)", mid, t.TID));
- return MessagesQueries.getMessageTags(sql, mid);
- }
-
- public static List<Tag> fromString(JdbcTemplate sql, String txt, boolean tagsOnly) {
- String patternString = tagsOnly ? "^(?:(?:\\*[^ \\r\\n\\t]+)|\\s)+$" : "^\\*([^ \\r\\n\\t]+)\\s+([\\s\\S]+)";
- Pattern tagsPattern = Pattern.compile(patternString);
- if (tagsPattern.matcher(txt).matches()) {
- Pattern tagPattern = Pattern.compile("\\*([^ \\r\\n\\t]+)");
- Matcher tagMatcher = tagPattern.matcher(txt);
- List<Tag> tags = new ArrayList<>();
- // TODO: process readonly, private, friends, public
- while (tagMatcher.find()) {
- for (int i = 1; i <= tagMatcher.groupCount(); i++) {
- tags.add(getTag(sql, tagMatcher.group(i), true));
- }
- }
- return tags;
- }
- return Collections.emptyList();
- }
- public static String toString(List<Tag> tags) {
- return tags.stream().map(t -> " *" + t.Name)
- .collect(Collectors.joining());
- }
-}
diff --git a/src/main/java/com/juick/server/UserQueries.java b/src/main/java/com/juick/server/UserQueries.java
deleted file mode 100644
index db380d7a..00000000
--- a/src/main/java/com/juick/server/UserQueries.java
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import com.juick.User;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.util.StringUtils;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.*;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class UserQueries {
-
- static final String ABCDEF = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
- public static class UserMapper implements RowMapper<User> {
- @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);
- return user;
- }
- }
-
- public static String getSignUpHashByJID(JdbcTemplate sql, String jid) {
- String hash = sql.queryForObject("SELECT loginhash FROM jids WHERE jid=? AND user_id IS NULL",
- String.class, jid);
- if (hash == null) {
- hash = UUID.randomUUID().toString();
- sql.update("INSERT INTO jids(jid,loginhash) VALUES (?,?)", jid, hash);
- }
- return hash;
- }
- public static String getSignUpHashByTelegramID(JdbcTemplate sql, Long telegramId, String username) {
- try {
- return sql.queryForObject("SELECT loginhash FROM telegram WHERE tg_id=? AND user_id IS NULL",
- String.class, telegramId);
- } catch (EmptyResultDataAccessException e) {
- String hash = UUID.randomUUID().toString();
- sql.update("INSERT INTO telegram(tg_id, loginhash, tg_name) VALUES (?, ?, ?)", telegramId, hash, username);
- return hash;
- }
- }
-
- public static int createUser(JdbcTemplate sql, String username, String password) {
- KeyHolder holder = new GeneratedKeyHolder();
- sql.update(con -> {
- PreparedStatement stmt = con.prepareStatement("INSERT INTO users(nick,passw) VALUES (?,?)",
- Statement.RETURN_GENERATED_KEYS);
- stmt.setString(1, username);
- stmt.setString(2, password);
- return stmt;
- }, holder);
-
- int uid = holder.getKey().intValue();
-
- sql.update("INSERT INTO useroptions(user_id) VALUES (?)", uid);
- sql.update("INSERT INTO subscr_users(user_id,suser_id) VALUES (2,?)", uid);
-
- return uid;
- }
-
- public static Optional<User> getUserByUID(JdbcTemplate sql, int uid) {
- try {
- return Optional.of(sql.queryForObject("SELECT id, nick,banned FROM users WHERE id=?",
- new UserMapper(), uid));
- } catch (EmptyResultDataAccessException e) {
- return Optional.empty();
- }
- }
-
- public static User getUserByName(JdbcTemplate sql, String username) {
- try {
- return sql.queryForObject("SELECT id,nick,banned FROM users WHERE nick=?",
- new UserMapper(),
- username);
- } catch (EmptyResultDataAccessException e) {
- return null;
- }
- }
-
- public static User getUserByJID(JdbcTemplate sql, String jid) {
- try {
- return sql.queryForObject("SELECT id,nick,banned FROM users WHERE id=(SELECT user_id FROM jids WHERE jid=?)",
- new UserMapper(), jid);
- } catch (EmptyResultDataAccessException e) {
- return null;
- }
- }
-
- public static List<User> getUsersByName(JdbcTemplate sql, List<String> unames) {
- if (!unames.isEmpty()) {
- return sql.query("SELECT id,nick,banned FROM users WHERE nick IN (" + Utils.convertArrayString2String(unames) + ")",
- new UserMapper());
- }
- return Collections.emptyList();
- }
-
- public static List<User> getUsersByID(JdbcTemplate sql, List<Integer> uids) {
- if (!uids.isEmpty()) {
- return sql.query("SELECT id,nick,banned FROM users WHERE id IN (" + Utils.convertArrayInt2String(uids) + ")",
- new UserMapper());
- }
- return Collections.emptyList();
- }
-
- public static boolean fillUsersByID(JdbcTemplate sql, List<User> users) {
- boolean ret = false;
-
- String uids = "";
- final int usersSize = users.size();
- for (int i = 0; i < usersSize; i++) {
- if (i > 0) {
- uids += ",";
- }
- uids += users.get(i).getUID();
- }
-
- sql.query("SELECT id,nick,banned FROM users WHERE id IN (" + uids + ")",
- (rs, num) -> {
- User u = new User();
- u.setUID(rs.getInt(1));
- u.setUName(rs.getString(2));
- return u;
- });
-
- return true;
- }
-
- public static List<com.juick.User> getUsersByJID(JdbcTemplate sql, List<String> jids) {
- return sql.query("SELECT users.id,users.nick,jids.jid FROM users "
- + "INNER JOIN jids ON jids.user_id=users.id "
- + "WHERE jids.jid IN (" + Utils.convertArrayString2String(jids) + ")",
- (rs, rowNum) -> {
- com.juick.User user = new com.juick.User();
- user.setUID(rs.getInt(1));
- user.setUName(rs.getString(2));
- user.setJID(rs.getString(3));
- return user;
- });
- }
-
- 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) {
- return sql.queryForObject("SELECT user_id FROM jids WHERE jid=?", Integer.class, jid);
- }
-
- public static int getUIDbyName(JdbcTemplate sql, String uname) {
- try {
- return sql.queryForObject("SELECT id FROM users WHERE nick=?", Integer.class, uname);
- } catch (EmptyResultDataAccessException e) {
- return 0;
- }
- }
-
- public static int getUIDbyHash(JdbcTemplate sql, String hash) {
- try {
- return sql.queryForObject("SELECT user_id FROM logins WHERE hash=?", Integer.class, hash);
- } catch (EmptyResultDataAccessException e) {
- return 0;
- }
- }
-
- public static com.juick.User getUserByHash(JdbcTemplate sql, String hash) {
- try {
- User user = sql.queryForObject("SELECT logins.user_id,users.nick, users.banned FROM logins " +
- "INNER JOIN users ON logins.user_id=users.id WHERE logins.hash=?",
- new UserMapper(), hash);
- user.setAuthHash(hash);
- return user;
- } catch (EmptyResultDataAccessException e) {
- return new User();
- }
- }
-
- public static String getHashByUID(JdbcTemplate sql, int uid) {
- try {
- return sql.queryForObject("SELECT hash FROM logins WHERE user_id=?", String.class, uid);
- } catch (EmptyResultDataAccessException e){
- String hash = generateHash(16);
- sql.update(con -> {
- PreparedStatement stmt = con.prepareStatement("INSERT INTO logins(user_id,hash) VALUES (?,?)");
- stmt.setInt(1, uid);
- stmt.setString(2, hash);
- return stmt;
- });
- return hash;
- }
- }
-
- public static String generateHash(int len) {
- Random rnd = new Random();
- StringBuilder sb = new StringBuilder(len);
- for (int i = 0; i < len; i++) {
- sb.append(ABCDEF.charAt(rnd.nextInt(ABCDEF.length())));
- }
- return sb.toString();
- }
-
- public static boolean checkUserNameValid(String uname) {
- return uname != null && uname.length() >= 2 && uname.length() <= 16 && uname.matches("[a-zA-Z0-9\\-]+");
- }
-
- public static int checkPassword(JdbcTemplate sql, String username, String password) {
- try {
- String realPassword = sql.queryForObject("SELECT passw FROM users WHERE nick=?", String.class, username);
- if (realPassword.equals(password)) {
- User user = UserQueries.getUserByName(sql, username);
- if (user != null) {
- return user.getUID();
- } else {
- return -1;
- }
- } else {
- return -1;
- }
- } catch (EmptyResultDataAccessException e) {
- return -1;
- }
- }
-
- public static int getUserOptionInt(JdbcTemplate sql, int uid, String option, int defaultValue) {
- try {
- return sql.queryForObject("SELECT " + option + " FROM useroptions WHERE user_id=?", Integer.class, uid);
- } catch (EmptyResultDataAccessException e) {
- return defaultValue;
- }
- }
-
- 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(JdbcTemplate sql, int uid) {
- try {
- int res = sql.queryForObject("SELECT users.lastphoto-UNIX_TIMESTAMP() FROM users WHERE id=?",
- Integer.class, uid);
- return res < 3600;
- } catch (EmptyResultDataAccessException e) {
- return false;
- }
- }
-
- public static boolean isInWL(JdbcTemplate sql, int uid, int check) {
- try {
- return sql.queryForObject("SELECT 1 FROM wl_users WHERE user_id=? AND wl_user_id=?",
- Integer.class, uid, check) == 1;
- } catch (EmptyResultDataAccessException e) {
- return false;
- }
- }
-
- public static boolean isInBL(JdbcTemplate sql, int uid, int check) {
- try {
- 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;
- }
- }
-
- public static boolean isInBLAny(JdbcTemplate sql, int uid, int uid2) {
- try {
- return sql.queryForObject("SELECT 1 FROM bl_users "
- + "WHERE (user_id=? AND bl_user_id=?) "
- + "OR (user_id=? AND bl_user_id=?)", new Object[]{uid, uid2, uid2, uid}, Integer.class) == 1;
- } catch (EmptyResultDataAccessException e) {
- return false;
- }
- }
-
- public static List<Integer> checkBL(JdbcTemplate sql, int visitor, List<Integer> uids) {
- if (!uids.isEmpty()) {
- return sql.queryForList("SELECT user_id FROM bl_users WHERE bl_user_id=? and user_id IN (" +
- StringUtils.collectionToCommaDelimitedString(uids) + ")", Integer.class, visitor);
- } else {
- return new ArrayList<>();
- }
- }
-
- public static boolean isSubscribed(JdbcTemplate sql, int uid, int check) {
- try {
- return sql.queryForObject("SELECT 1 FROM subscr_users WHERE suser_id=? AND user_id=?",
- Integer.class, uid, check) == 1;
- } catch (EmptyResultDataAccessException e) {
- return false;
- }
- }
-
- public static List<Integer> getUserRead(JdbcTemplate sql, int uid) {
- return sql.queryForList("SELECT user_id FROM subscr_users WHERE suser_id=?", Integer.class, uid);
- }
-
- 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 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",
- (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 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!=? " +
- "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, uid);
- }
-
- 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(JdbcTemplate sql, User user, String accessToken,
- String accessTokenSecret, String screenName) {
- 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(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(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(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(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 {
- Inactive,
- Active
- }
-
- public static boolean setActiveStatusForJID(JdbcTemplate sql, String JID, ActiveStatus jidStatus) {
- User user = getUserByJID(sql, JID);
- if (user != null) {
- return sql.update(con -> {
- PreparedStatement preparedStatement = con.prepareStatement(
- "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.setString(3, JID);
- return preparedStatement;
-
- }) >= 0;
- }
- return false;
- }
-}
diff --git a/src/main/java/com/juick/server/Utils.java b/src/main/java/com/juick/server/Utils.java
deleted file mode 100644
index 1968150e..00000000
--- a/src/main/java/com/juick/server/Utils.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Juick
- * Copyright (C) 2008-2011, Ugnich Anton
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.juick.server;
-
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.List;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class Utils {
-
- public static String convertArrayInt2String(List<Integer> mids) {
- String q = "";
- for (int i = 0; i < mids.size(); i++) {
- if (i > 0) {
- q += ",";
- }
- q += mids.get(i);
- }
- return q;
- }
-
- public static String convertArrayString2String(List<String> unames) {
- String q = "";
- for (int i = 0; i < unames.size(); i++) {
- if (i > 0) {
- q += ",";
- }
- q += "\"" + unames.get(i) + "\"";
- }
- return q;
- }
-
- public static String buildQueryArray(String query1, int length, String query2) {
- String ret = query1;
- for (int i = 0; i < length; i++) {
- if (i > 0) {
- ret += ",";
- }
- ret += "?";
- }
- ret += query2;
- return ret;
- }
-
- public static void stmtSetStringArray(PreparedStatement stmt, int offset, String strs[]) throws SQLException {
- for (int i = 0; i < strs.length; i++) {
- stmt.setString(offset + i, strs[i]);
- }
- }
-
- public static void finishSQL(ResultSet rs, Statement stmt) {
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException e) {
- }
- }
- if (stmt != null) {
- try {
- stmt.close();
- } catch (SQLException e) {
- }
- }
- }
-}
diff --git a/src/main/java/com/juick/server/helpers/PrivacyOpts.java b/src/main/java/com/juick/server/helpers/PrivacyOpts.java
deleted file mode 100644
index 66cf9410..00000000
--- a/src/main/java/com/juick/server/helpers/PrivacyOpts.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.juick.server.helpers;
-
-/**
- * Created by vt on 16/01/16.
- */
-public class PrivacyOpts {
- private int uid;
- private int privacy;
-
- public PrivacyOpts() {
-
- }
-
- public int getUid() {
- return uid;
- }
-
- public void setUid(int uid) {
- this.uid = uid;
- }
-
- public int getPrivacy() {
- return privacy;
- }
-
- public void setPrivacy(int privacy) {
- this.privacy = privacy;
- }
-}
diff --git a/src/main/java/com/juick/server/protocol/JuickProtocol.java b/src/main/java/com/juick/server/protocol/JuickProtocol.java
deleted file mode 100644
index 1a2e5333..00000000
--- a/src/main/java/com/juick/server/protocol/JuickProtocol.java
+++ /dev/null
@@ -1,375 +0,0 @@
-package com.juick.server.protocol;
-
-import com.juick.*;
-import com.juick.json.MessageSerializer;
-import com.juick.server.*;
-import com.juick.server.protocol.annotation.UserCommand;
-import com.juick.xmpp.extensions.JuickMessage;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-/**
- * Created by oxpa on 22.03.16.
- */
-
-public class JuickProtocol {
- MessageSerializer json = new MessageSerializer();
- JdbcTemplate sql;
- String baseUri;
-
- public JuickProtocol(JdbcTemplate sql, String baseUri) {
- this.sql = sql;
- this.baseUri = baseUri;
- }
-
- /**
- * find command by pattern and invoke
- * @param user who send command
- * @param userInput given by user
- * @return command result
- * @throws InvocationTargetException
- * @throws IllegalAccessException
- * @throws NoSuchMethodException
- */
- public ProtocolReply getReply(User user, String userInput) throws InvocationTargetException,
- IllegalAccessException, NoSuchMethodException {
- Optional<Method> cmd = Arrays.asList(getClass().getDeclaredMethods()).stream()
- .filter(m -> m.isAnnotationPresent(UserCommand.class))
- .filter(m -> Pattern.compile(m.getAnnotation(UserCommand.class).pattern(),
- m.getAnnotation(UserCommand.class).patternFlags()).matcher(userInput).matches())
- .findFirst();
- if (!cmd.isPresent()) {
- // default command - post as new message
- return postMessage(user, userInput);
- } else {
- Matcher matcher = Pattern.compile(cmd.get().getAnnotation(UserCommand.class).pattern(),
- cmd.get().getAnnotation(UserCommand.class).patternFlags()).matcher(userInput);
- List<String> groups = new ArrayList<>();
- while (matcher.find()) {
- for (int i = 1; i <= matcher.groupCount(); i++) {
- groups.add(matcher.group(i));
- }
- }
- return (ProtocolReply) getClass().getMethod(cmd.get().getName(), User.class, String[].class)
- .invoke(this, user, groups.toArray(new String[groups.size()]));
- }
- }
-
- public ProtocolReply postMessage(User user, String input) {
- List<Tag> tags = TagQueries.fromString(sql, input, false);
- String body = input.substring(TagQueries.toString(tags).length());
- int mid = MessagesQueries.createMessage(sql, user.getUID(), body, null, tags);
- //app.events().publishEvent(new JuickMessageEvent(app.messages().getMessage(mid)));
- return new ProtocolReply("New message posted.\n#" + mid + " " + baseUri + mid,
- Optional.of(json.serializeList(Collections.singletonList(MessagesQueries.getMessage(sql, mid)))));
- }
-
- @UserCommand(pattern = "^#(\\++)$", help = "#+ - Show last Juick messages (#++ - second page, ...)")
- public ProtocolReply commandLast(User user, String... arguments) {
- // number of + is the page count
- int page = arguments[0].length();
- List<Integer> mids = MessagesQueries.getAll(sql, user.getUID(), page);
- List<Message> messages = MessagesQueries.getMessages(sql, mids);
- // TODO: message toString
- return new ProtocolReply("Last messages: \n" + String.join("\n", messages.stream().map(Object::toString)
- .collect(Collectors.toList())), Optional.of(json.serializeList(messages)));
- }
-
- @UserCommand(pattern = "^\\s*bl\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
- help = "BL - Show your blacklist")
- public ProtocolReply commandBL(User user_from, String... arguments) {
- List<User> blusers;
- List<String> bltags;
-
- blusers = UserQueries.getUserBLUsers(sql, user_from.getUID());
- bltags = TagQueries.getUserBLTags(sql, user_from.getUID());
-
-
- String txt = "";
- if (bltags.size() > 0) {
- for (String bltag : bltags) {
- txt += "*" + bltag + "\n";
- }
-
- if (blusers.size() > 0) {
- txt += "\n";
- }
- }
- if (blusers.size() > 0) {
- for (User bluser : blusers) {
- txt += "@" + bluser.getUName() + "\n";
- }
- }
- if (txt.isEmpty()) {
- txt = "You don't have any users or tags in your blacklist.";
- }
- return new ProtocolReply(txt, Optional.empty());
- }
-
- @UserCommand(pattern = "^\\@([^\\s\\n\\+]+)(\\+?)$",
- help = "@username+ - Show user's info and last 10 messages (@username++ - second page, ..)")
- public ProtocolReply commandUser(User user, String... arguments) {
- User blogUser = UserQueries.getUserByName(sql, arguments[0]);
- int page = arguments[1].length();
- if (blogUser.getUID() > 0) {
- List<Integer> mids = MessagesQueries.getUserBlog(sql, blogUser.getUID(), 0, page);
- List<Message> messages = MessagesQueries.getMessages(sql, mids);
- return new ProtocolReply(String.format("Last messages from @%s:\n%s", arguments[0],
- String.join("\n", messages.stream()
- .map(Object::toString).collect(Collectors.toList()))),
- Optional.of(json.serializeList(messages)));
- }
- return new ProtocolReply("User not found", Optional.empty());
- }
-
- @UserCommand(pattern = "^\\s*d\\s*\\#([0-9]+)\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
- help = "D #12345 - delete the message")
- public ProtocolReply commandDel(User user, String... args) {
- try {
- int mid = Integer.parseInt(args[0]);
- if (MessagesQueries.deleteMessage(sql, user.getUID(), mid)) {
- return new ProtocolReply(String.format("Message %s deleted", mid), Optional.empty());
- }
- } catch (NumberFormatException e) {
- return new ProtocolReply("Error", Optional.empty());
- }
- return new ProtocolReply("Error", Optional.empty());
- }
-
- @UserCommand(pattern = "^\\s*login\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
- help = "LOGIN - log in to Juick website")
- public ProtocolReply commandLogin(User user, String... arguments) {
- return new ProtocolReply(baseUri + "?" + UserQueries.getHashByUID(sql, user.getUID()),
- Optional.empty());
- }
-
- @UserCommand(pattern = "^(#+)$", help = "# - Show last messages from your feed (## - second page, ...)")
- public ProtocolReply commandMyFeed(User user, String... arguments) {
- // number of # is the page count
- int page = arguments[0].length();
- List<Integer> mids = MessagesQueries.getMyFeed(sql, user.getUID(), page);
- List<Message> messages = MessagesQueries.getMessages(sql, mids);
- // TODO: add instructions for empty feed
- return new ProtocolReply("Your feed: \n" + String.join("\n",
- messages.stream().map(Object::toString).collect(Collectors.toList())),
- Optional.of(json.serializeList(messages)));
- }
-
- @UserCommand(pattern = "^\\s*(on|off)\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
- help = "ON/OFF - Enable/disable subscriptions delivery")
- public ProtocolReply commandOnOff(User user, String[] input) {
- UserQueries.ActiveStatus newStatus;
- String retValUpdated;
- if (input[0].toLowerCase().equals("on")) {
- newStatus = UserQueries.ActiveStatus.Active;
- retValUpdated = "Notifications are activated for " + user.getJID();
- } else {
- newStatus = UserQueries.ActiveStatus.Inactive;
- retValUpdated = "Notifications are disabled for " + user.getJID();
- }
-
- if (UserQueries.setActiveStatusForJID(sql, user.getJID(), newStatus)) {
- return new ProtocolReply(retValUpdated, Optional.empty());
- } else {
- return new ProtocolReply(String.format("Subscriptions status for %s was not changed", user.getJID()),
- Optional.empty());
- }
- }
-
- @UserCommand(pattern = "^\\s*ping\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
- help = "PING - returns you a PONG")
- public ProtocolReply commandPing(User user, String[] input) {
- return new ProtocolReply("PONG", Optional.empty());
- }
-
- @UserCommand(pattern = "^\\@(\\S+)\\s+([\\s\\S]+)$", help = "@username message - send PM to username")
- public ProtocolReply commandPM(User user_from, String... arguments) {
- String user_to = arguments[0];
- String body = arguments[1];
- int ret = 0;
-
- int uid_to = 0;
- String jid_to = null;
- boolean haveInRoster = false;
-
- if (user_to.indexOf('@') > 0) {
- uid_to = UserQueries.getUIDbyJID(sql, user_to);
- } else {
- uid_to = UserQueries.getUIDbyName(sql, user_to);
- }
-
- if (uid_to > 0) {
- if (!UserQueries.isInBLAny(sql, uid_to, user_from.getUID())) {
- if (PMQueries.createPM(sql, user_from.getUID(), uid_to, body)) {
- //jid_to = UserQueries.getJIDsbyUID(sql, uid_to);
- if (jid_to != null) {
- haveInRoster = PMQueries.havePMinRoster(sql, user_from.getUID(), jid_to);
- }
- ret = 200;
- } else {
- ret = 500;
- }
- } else {
- ret = 403;
- }
- } else {
- ret = 404;
- }
-
-
- if (ret == 200) {
- JuickMessage jmsg = new JuickMessage();
- jmsg.setUser(user_from);
- jmsg.setText(body);
- // TODO: add PM payload
- //app.events().publishEvent(new JuickMessageEvent(jmsg));
- /* TODO: move to XMPP component
- if (jid_to != null) {
- Message mm = new Message();
- mm.to = new JID(jid_to);
- mm.type = Message.Type.chat;
- if (haveInRoster) {
- mm.from = new JID(user_from.getUName(), getDomain(), "Juick");
- mm.body = body;
- } else {
- mm.from = new JID("juick", getDomain(), "Juick");
- mm.body = "Private message from @" + user_from.getUName() + ":\n" + body;
- }
- return Collections.singletonList(mm);
- }
- */
- }
- if (ret == 200) {
- return new ProtocolReply("Private message sent", Optional.empty());
- } else {
- return new ProtocolReply("Error " + ret, Optional.empty());
- }
- }
-
- @UserCommand(pattern = "^#(\\d+)(\\+?)$", help = "#1234 - Show message (#1234+ - message with replies)")
- public ProtocolReply commandShow(User user, String... arguments) {
- boolean showReplies = arguments[1].length() > 0;
- int mid;
- try {
- mid = Integer.parseInt(arguments[0]);
- } catch (NumberFormatException e) {
- return new ProtocolReply("Error", Optional.empty());
- }
- Message msg = MessagesQueries.getMessage(sql, mid);
- if (showReplies) {
- List<Message> replies = MessagesQueries.getReplies(sql, mid);
- replies.add(0, msg);
- return new ProtocolReply(String.join("\n",
- replies.stream().map(Object::toString).collect(Collectors.toList())),
- Optional.of(json.serializeList(replies)));
- }
- return new ProtocolReply(msg.toString(), Optional.of(json.serializeList(Collections.singletonList(msg))));
- }
- @UserCommand(pattern = "^(#|\\.)(\\d+)((\\.|\\-|\\/)(\\d+))?\\s([\\s\\S]+)",
- help = "#1234 *tag *tag2 - edit tags\n#1234 text - reply to message")
- public ProtocolReply EditOrReply(User user, String... args) {
- int mid;
- try {
- mid = Integer.parseInt(args[1]);
- } catch (NumberFormatException e) {
- return new ProtocolReply("Error", Optional.empty());
- }
- int rid;
- try {
- rid = Integer.parseInt(args[4]);
- } catch (NumberFormatException e) {
- rid = 0;
- }
- String txt = args[5];
- List<Tag> messageTags = TagQueries.fromString(sql, txt, true);
- if (messageTags.size() > 0) {
- if (user.getUID() != MessagesQueries.getMessageAuthor(sql, mid).getUID()) {
- return new ProtocolReply("It is not your message", Optional.empty());
- }
- TagQueries.updateTags(sql, mid, messageTags);
- return new ProtocolReply("Tags are updated", Optional.empty());
- } else {
- int newrid = MessagesQueries.createReply(sql, mid, rid, user.getUID(), txt, null);
- return new ProtocolReply("Reply posted.\n#" + mid + "/" + newrid + " "
- + baseUri + mid + "/" + newrid,
- Optional.of(json.serializeList(Collections.singletonList(MessagesQueries.getReply(sql, mid, newrid)))));
- }
- }
-
- @UserCommand(pattern = "^(s|u)\\s+#(\\d+)$", help = "S #1234 - subscribe to comments",
- patternFlags = Pattern.CASE_INSENSITIVE)
- public ProtocolReply commandSubscribeMessage(User user, String... args) {
- boolean subscribe = args[0].equalsIgnoreCase("s");
- int mid;
- try {
- mid = Integer.parseInt(args[1]);
- } catch (NumberFormatException e) {
- return new ProtocolReply("Error", Optional.empty());
- }
- if (subscribe) {
- if (SubscriptionsQueries.subscribeMessage(sql, mid, user.getUID())) {
- return new ProtocolReply("Subscribed", Optional.empty());
- }
- } else {
- if (SubscriptionsQueries.unSubscribeMessage(sql, mid, user.getUID())) {
- return new ProtocolReply("Unsubscribed from #" + mid, Optional.empty());
- }
- return new ProtocolReply("You was not subscribed to #" + mid, Optional.empty());
- }
- return new ProtocolReply("Error", Optional.empty());
- }
- @UserCommand(pattern = "^(s|u)\\s+\\@(\\S+)$", help = "S @user - subscribe to user's posts",
- patternFlags = Pattern.CASE_INSENSITIVE)
- public ProtocolReply commandSubscribeUser(User user, String... args) {
- boolean subscribe = args[0].equalsIgnoreCase("s");
- User toUser = UserQueries.getUserByName(sql, args[1]);
- if (toUser.getUID() > 0) {
- if (subscribe) {
- if (SubscriptionsQueries.subscribeUser(sql, user, toUser)) {
- return new ProtocolReply("Subscribed", Optional.empty());
- // TODO: notification
- // TODO: already subscribed case
- }
- } else {
- if (SubscriptionsQueries.unSubscribeUser(sql, user, toUser)) {
- return new ProtocolReply("Unsubscribed from @" + toUser.getUName(), Optional.empty());
- }
- return new ProtocolReply("You was not subscribed to @" + toUser.getUName(), Optional.empty());
- }
- }
- return new ProtocolReply("Error", Optional.empty());
- }
- @UserCommand(pattern = "^(s|u)\\s+\\*(\\S+)$", help = "S *tag - subscribe to tag" +
- "\nU *tag - unsubscribe from tag", patternFlags = Pattern.CASE_INSENSITIVE)
- public ProtocolReply commandSubscribeTag(User user, String... args) {
- boolean subscribe = args[0].equalsIgnoreCase("s");
- Tag tag = TagQueries.getTag(sql, args[1], true);
- if (subscribe) {
- if (SubscriptionsQueries.subscribeTag(sql, user, tag)) {
- return new ProtocolReply("Subscribed", Optional.empty());
- }
- } else {
- if (SubscriptionsQueries.unSubscribeTag(sql, user, tag)) {
- return new ProtocolReply("Unsubscribed from " + tag.Name, Optional.empty());
- }
- return new ProtocolReply("You was not subscribed to " + tag.Name, Optional.empty());
- }
- return new ProtocolReply("Error", Optional.empty());
- }
-
- @UserCommand(pattern = "^\\s*help\\s*$", patternFlags = Pattern.CASE_INSENSITIVE,
- help = "HELP - returns this help message")
- public ProtocolReply commandHelp(User user, String[] input) {
- List<String> commandsHelp = Arrays.asList(getClass().getDeclaredMethods()).stream()
- .filter(m -> m.isAnnotationPresent(UserCommand.class))
- .map(m -> m.getAnnotation(UserCommand.class).help())
- .collect(Collectors.toList());
- return new ProtocolReply(String.join("\n", commandsHelp), Optional.empty());
- }
-}
diff --git a/src/main/java/com/juick/server/protocol/ProtocolReply.java b/src/main/java/com/juick/server/protocol/ProtocolReply.java
deleted file mode 100644
index d9d36a5d..00000000
--- a/src/main/java/com/juick/server/protocol/ProtocolReply.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.juick.server.protocol;
-
-import java.util.Optional;
-
-/**
- * Created by vitalyster on 08.04.2016.
- */
-public class ProtocolReply {
-
- private Optional<String> json;
- private String description;
-
- public ProtocolReply(String text, Optional<String> json) {
- this.description = text;
- this.json = json;
- }
- public String getDescription() {
- return description;
- }
- public Optional<String> getJson() {
- return json;
- }
-}
diff --git a/src/main/java/com/juick/server/protocol/annotation/UserCommand.java b/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
deleted file mode 100644
index af7c4924..00000000
--- a/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.juick.server.protocol.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Created by oxpa on 22.03.16.
- */
-@Target({ElementType.TYPE, ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface UserCommand {
- /**
- *
- * @return a command pattern
- */
- String pattern() default "";
-
- /**
- *
- * @return pattern flags
- */
- int patternFlags() default 0;
-
- /**
- *
- * @return a string used in HELP command output. Basically, only 1 string
- */
- String help() default "";
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 02:18:25 +0000