juick-www: now on spring-webmvc

9 files changed, 0 insertions, 1774 deletions

diff --git a/juick-server/src/main/java/com/juick/server/AdsQueries.java b/juick-server/src/main/java/com/juick/server/AdsQueries.java
deleted file mode 100644
index 06590817..00000000
--- a/juick-server/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/juick-server/src/main/java/com/juick/server/CrosspostQueries.java b/juick-server/src/main/java/com/juick/server/CrosspostQueries.java
deleted file mode 100644
index 9d0b5f4c..00000000
--- a/juick-server/src/main/java/com/juick/server/CrosspostQueries.java
+++ /dev/null
@@ -1,88 +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 com.juick.server.helpers.ApplicationStatus;
-import org.apache.commons.lang3.StringUtils;
-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) -> 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 ApplicationStatus isFBCrossPostEnabled(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT 1, crosspost FROM facebook WHERE user_id=? LIMIT 1", (rs, num) -> {
-                ApplicationStatus status = new ApplicationStatus();
-                status.setConnected(rs.getInt(1) > 0);
-                status.setCrosspostEnabled(rs.getBoolean(2));
-                return status;
-            }, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return new ApplicationStatus();
-        }
-    }
-
-    public static String getTwitterName(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT uname FROM twitter WHERE user_id=?", String.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return StringUtils.EMPTY;
-        }
-    }
-
-    public static String getTelegramName(JdbcTemplate sql, int uid) {
-        try {
-            return sql.queryForObject("SELECT tg_name FROM telegram WHERE user_id=?", String.class, uid);
-        } catch (EmptyResultDataAccessException e) {
-            return StringUtils.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) -> Optional.of(Pair.of(rs.getString(1), rs.getString(2))), uid);
-        } catch (EmptyResultDataAccessException e) {
-            return Optional.empty();
-        }
-    }
-}
diff --git a/juick-server/src/main/java/com/juick/server/MessagesQueries.java b/juick-server/src/main/java/com/juick/server/MessagesQueries.java
deleted file mode 100644
index f3de1f9b..00000000
--- a/juick-server/src/main/java/com/juick/server/MessagesQueries.java
+++ /dev/null
@@ -1,660 +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.Tag;
-import com.juick.User;
-import com.juick.server.helpers.PrivacyOpts;
-import com.juick.server.helpers.TagStats;
-import com.juick.util.MessageUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-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.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
-import org.springframework.util.StringUtils;
-
-import java.sql.*;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- *
- * @author Ugnich Anton
- */
-public class MessagesQueries {
-
-    public static class MessageMapper implements RowMapper<Message> {
-        @Override
-        public Message mapRow(ResultSet rs, int rowNum) throws SQLException {
-            Message msg = new Message();
-            msg.setMid(rs.getInt(1));
-            msg.setRid(rs.getInt(2));
-            msg.setReplyto(rs.getInt(3));
-            User user = new User();
-            user.setUid(rs.getInt(4));
-            user.setName(rs.getString(5));
-            user.setBanned(rs.getBoolean(6));
-            msg.setUser(user);
-            msg.TimeAgo = rs.getInt(7);
-            msg.setDate(rs.getTimestamp(8));
-            msg.ReadOnly = rs.getBoolean(9);
-            msg.setPrivacy(rs.getInt(10));
-            msg.FriendsOnly = msg.getPrivacy() < 0;
-            msg.setReplies(rs.getInt(11));
-            msg.setAttachmentType(rs.getString(12));
-            if (rs.getDouble(13) != 0) {
-                msg.Place = new com.juick.Place();
-                msg.Place.lat = rs.getDouble(14);
-                msg.Place.lon = rs.getDouble(15);
-            }
-            msg.setLikes(rs.getInt(16));
-            msg.Hidden = rs.getBoolean(17);
-            // parse tags string
-            String tagsStr = rs.getString(18);
-            if (tagsStr != null) {
-                Arrays.stream(tagsStr.split(" ")).forEach(t -> msg.getTags().add(new Tag(t)));
-            }
-            msg.setRepliesBy(rs.getString(19));
-            msg.setText(rs.getString(20));
-            msg.setReplyQuote(MessageUtils.formatQuote(rs.getString(21)));
-            return msg;
-        }
-    }
-
-    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 = org.apache.commons.lang3.StringUtils.EMPTY;
-            String tagsIDs = org.apache.commons.lang3.StringUtils.EMPTY;
-
-            for (int i = 0; i < tags.size(); i++) {
-                if (i > 0) {
-                    tagsNames += " ";
-                    tagsIDs += ",";
-                }
-                tagsNames += tags.get(i).getName();
-                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);
-            final int replyNo;
-            try (PreparedStatement ps = conn.prepareStatement("START TRANSACTION")) {
-                ps.executeUpdate();
-            }
-            try (PreparedStatement ps = conn.prepareStatement("SELECT maxreplyid+1 FROM messages WHERE message_id=? FOR UPDATE")) {
-                ps.setInt(1, mid);
-                try (ResultSet resultSet = ps.executeQuery()) {
-                    if (resultSet.next()) {
-                        replyNo = resultSet.getInt(1);
-                    } else {
-                        throw new IncorrectResultSizeDataAccessException("while getting getReplyIDIncrement, mid=" + mid, 1, 0);
-                    }
-                }
-            }
-            try (PreparedStatement ps = conn.prepareStatement("UPDATE messages SET maxreplyid=? WHERE message_id=?")) {
-                ps.setInt(1, replyNo);
-                ps.setInt(2, mid);
-                if (ps.executeUpdate() != 1) {
-                    throw new IncorrectResultSizeDataAccessException("Cannot find a message to update: " + mid, 1, 0);
-                }
-            }
-            conn.commit();
-            return replyNo;
-        });
-
-    }
-
-    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.message_id, 0 as rid, 0 as replyto, "
-                            + "messages.user_id,users.nick, 0 as banned, "
-                            + "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, '' as q 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 MessageMapper(), mid);
-        } 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, IFNULL(q.txt,t.txt) as quote FROM replies INNER JOIN users "
-                            + "ON replies.user_id=users.id "
-                            + "LEFT JOIN replies q "
-                            + "ON replies.message_id=q.message_id and replies.replyto=q.reply_id "
-                            + "LEFT JOIN messages_txt t ON replies.message_id=t.message_id "
-                            + "WHERE replies.message_id=? AND replies.reply_id=?",
-                    (rs, num) -> {
-                        Message msg = new Message();
-                        msg.setMid(mid);
-                        msg.setRid(rid);
-                        msg.setUser(new User());
-                        msg.getUser().setUid(rs.getInt(1));
-                        msg.getUser().setName(rs.getString(2));
-                        msg.setReplyto(rs.getInt(3));
-                        msg.setDate(rs.getTimestamp(4));
-                        msg.setAttachmentType(rs.getString(5));
-                        msg.setText(rs.getString(6));
-                        String quote = rs.getString(7);
-                        if (!StringUtils.isEmpty(quote)) {
-                            msg.setReplyQuote(MessageUtils.formatQuote(quote));
-                        }
-                        return msg;
-                    }, mid, rid);
-        } 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.setName(rs.getString(2));
-                        return res;
-                    });
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    public static List<TagStats> 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)",
-                (rs, num) -> {
-                    com.juick.Tag t = new com.juick.Tag(StringEscapeUtils.unescapeHtml4(rs.getString(3)));
-                    t.TID = rs.getInt(1);
-                    t.SynonymID = rs.getInt(2);
-                    TagStats s = new TagStats();
-                    s.setTag(t);
-                    s.setUsageCount(rs.getInt(4));
-                    return s;
-                }, mid);
-    }
-
-    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", Integer.class, search, before);
-        } else {
-            mids = sqlSearch.queryForList("SELECT id AS message_id FROM messages WHERE MATCH(?) " +
-                    "ORDER BY id DESC LIMIT 25", Integer.class, search);
-        }
-        if (mids.size() > 0) {
-            return sql.queryForList("SELECT message_id FROM messages WHERE message_id " +
-                    "IN (" + StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") 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", Integer.class, UID, before);
-        } else {
-            return sql.queryForList("SELECT message_id FROM messages WHERE user_id=? AND privacy>=" + privacy +
-                    " ORDER BY message_id DESC LIMIT 20", Integer.class, UID);
-        }
-    }
-
-    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",
-                    Integer.class, UID, TID, before);
-        } 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",
-                    Integer.class, UID, TID);
-        }
-    }
-
-    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,
-                    UID, before);
-        } else {
-            return sql.queryForList("SELECT message_id FROM favorites "
-                    + "WHERE user_id=? ORDER BY message_id DESC LIMIT 20",
-                    Integer.class, 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 (" +
-                           StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") AND privacy>=" + privacy + " ORDER BY message_id DESC",
-                   Integer.class);
-        }
-        return mids;
-    }
-
-    public static List<com.juick.Message> getMessages(JdbcTemplate sql, List<Integer> mids) {
-        if (!mids.isEmpty()) {
-            return sql.query("SELECT messages.message_id, 0 as rid, 0 as replyto, "
-                    + "messages.user_id,users.nick, 0 as banned, "
-                    + "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,"
-                    + "messages_txt.tags,messages_txt.repliesby, messages_txt.txt, '' as q "
-                    + "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 (" + StringUtils.arrayToCommaDelimitedString(mids.toArray()) + ") "
-                    + "ORDER BY messages.message_id DESC", new MessageMapper());
-        }
-        return Collections.emptyList();
-    }
-
-    public static List<com.juick.Message> getReplies(JdbcTemplate sql, int mid) {
-        return sql.query("SELECT ? as mid, replies.reply_id,replies.replyto, " +
-                        "replies.user_id,users.nick,users.banned, " +
-                        "TIMESTAMPDIFF(MINUTE,replies.ts,NOW()),replies.ts," +
-                        "0 as readonly, 0 as privacy, 0 as replies," +
-                        "replies.attach, 0 as place_id, 0 as lat," +
-                        "0 as lon, 0 as likes, 0 as hidden," +
-                        "NULL as tags,NULL as repliesby, replies.txt, " +
-                        "IFNULL(qw.txt, t.txt) as q " +
-                        "FROM replies INNER JOIN users " +
-                        "ON replies.user_id=users.id " +
-                        "LEFT JOIN replies qw ON replies.message_id=qw.message_id and replies.replyto=qw.reply_id " +
-                        "LEFT JOIN messages_txt t on replies.message_id=t.message_id " +
-                        "WHERE replies.message_id=? " +
-                        "ORDER BY replies.reply_id ASC",
-                new MessageMapper(), mid, mid);
-    }
-
-    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/juick-server/src/main/java/com/juick/server/PMQueries.java b/juick-server/src/main/java/com/juick/server/PMQueries.java
deleted file mode 100644
index c79c04b6..00000000
--- a/juick-server/src/main/java/com/juick/server/PMQueries.java
+++ /dev/null
@@ -1,133 +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) {
-        return sql.query("SELECT pm_streams.user_id, users.nick, pm_streams.unread FROM pm_streams "
-                + "INNER JOIN users ON users.id = pm_streams.user_id "
-                + "WHERE pm_streams.user_id_to=? "
-                + "ORDER BY pm_streams.unread DESC, pm_streams.lastmessage DESC LIMIT " + cnt, (rs, rowNum) -> {
-            com.juick.User u = new com.juick.User();
-            u.setUid(rs.getInt(1));
-            u.setName(rs.getString(2));
-            u.setUnreadCount(rs.getInt(3));
-            return u;
-        }, uid);
-    }
-
-    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().setName(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().setName(rs.getString(2));
-                    msg.setText(rs.getString(3));
-                    msg.TimeAgo = rs.getInt(4);
-                    msg.setDate(rs.getTimestamp(5));
-                    return msg;
-                }, uid);
-    }
-}
diff --git a/juick-server/src/main/java/com/juick/server/PrivacyQueries.java b/juick-server/src/main/java/com/juick/server/PrivacyQueries.java
deleted file mode 100644
index 40fc82c4..00000000
--- a/juick-server/src/main/java/com/juick/server/PrivacyQueries.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.juick.server;
-
-import com.juick.Tag;
-import com.juick.User;
-import org.springframework.jdbc.core.JdbcTemplate;
-
-/**
- * Created by vitalyster on 19.10.2016.
- */
-public class PrivacyQueries {
-    public enum PrivacyResult {
-        Removed, Added
-    }
-    public static PrivacyResult blacklistUser(JdbcTemplate jdbc, User user, User target) {
-        int result = jdbc.update("DELETE FROM bl_users WHERE user_id=? AND bl_user_id=?", user.getUid(), target.getUid());
-        if (result > 0) {
-            return PrivacyResult.Removed;
-        } else {
-            jdbc.update("INSERT INTO bl_users(user_id,bl_user_id) VALUES (?,?)", user.getUid(), target.getUid());
-            return PrivacyResult.Added;
-        }
-    }
-    public static PrivacyResult blacklistTag(JdbcTemplate jdbc, User user, Tag tag) {
-        int result = jdbc.update("DELETE FROM bl_tags WHERE user_id=? AND tag_id=?", user.getUid(), tag.TID);
-        if (result > 0) {
-            return PrivacyResult.Removed;
-        } else {
-            jdbc.update("INSERT INTO bl_tags(user_id,tag_id) VALUES (?,?)", user.getUid(), tag.TID);
-            return PrivacyResult.Added;
-        }
-    }
-}
diff --git a/juick-server/src/main/java/com/juick/server/ShowQueries.java b/juick-server/src/main/java/com/juick/server/ShowQueries.java
deleted file mode 100644
index fde388c3..00000000
--- a/juick-server/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, 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/juick-server/src/main/java/com/juick/server/SubscriptionsQueries.java b/juick-server/src/main/java/com/juick/server/SubscriptionsQueries.java
deleted file mode 100644
index b6cfbbd0..00000000
--- a/juick-server/src/main/java/com/juick/server/SubscriptionsQueries.java
+++ /dev/null
@@ -1,127 +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 com.juick.server.helpers.NotifyOpts;
-import org.springframework.dao.EmptyResultDataAccessException;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.util.StringUtils;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-/**
- *
- * @author ugnich
- */
-public class SubscriptionsQueries {
-
-    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) {
-        User author = MessagesQueries.getMessageAuthor(sql, 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) {
-            String tagsStr = StringUtils.arrayToCommaDelimitedString(tags.toArray());
-            List<Integer> tagUsers = sql.queryForList("SELECT suser_id FROM subscr_tags " +
-                    "WHERE tag_id IN (" + tagsStr + ") AND suser_id!=? " +
-                    " AND suser_id NOT IN (SELECT user_id FROM bl_users WHERE bl_user_id=?)" +
-                    " AND suser_id NOT IN (SELECT user_id FROM bl_tags WHERE tag_id IN (" + tagsStr + "))", Integer.class, uid, author.getUid());
-            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!=?",
-                Integer.class, mid, ignore_uid);
-        if (userids.size() > 0) {
-            return UserQueries.getUsersByID(sql, userids);
-        } else {
-            return Collections.emptyList();
-        }
-    }
-
-    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 = StringUtils.arrayToCommaDelimitedString(tags.toArray());
-                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 (?,?)",
-                toUser.getUid(), user.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;
-    }
-
-    public static NotifyOpts getNotifyOptions(JdbcTemplate sql, User user) {
-        try {
-            return sql.queryForObject("SELECT jnotify,subscr_notify,recommendations FROM useroptions WHERE user_id=?",
-                    (rs, num) -> {
-                        NotifyOpts options = new NotifyOpts();
-                        options.setRepliesEnabled(rs.getInt(1) > 0);
-                        options.setSubscriptionsEnabled(rs.getInt(2) > 0);
-                        options.setRecommendationsEnabled(rs.getInt(3) > 0);
-                        return options;
-                    }, user.getUid());
-        } catch (EmptyResultDataAccessException e) {
-            return new NotifyOpts();
-        }
-    }
-
-    public static boolean setNotifyOptions(JdbcTemplate sql, User user, NotifyOpts options) {
-        return sql.update("UPDATE useroptions SET jnotify=? WHERE user_id=?", options.isRepliesEnabled() ? 1 : 0,
-                user.getUid()) > 0 &&
-                sql.update("UPDATE useroptions SET subscr_notify=? WHERE user_id=?", options.isSubscriptionsEnabled() ? 1 : 0,
-                        user.getUid()) > 0 &&
-                sql.update("UPDATE useroptions SET recommendations=? WHERE user_id=?", options.isRecommendationsEnabled() ? 1 : 0,
-                        user.getUid()) > 0;
-    }
-}
diff --git a/juick-server/src/main/java/com/juick/server/TagQueries.java b/juick-server/src/main/java/com/juick/server/TagQueries.java
deleted file mode 100644
index 6d416a37..00000000
--- a/juick-server/src/main/java/com/juick/server/TagQueries.java
+++ /dev/null
@@ -1,164 +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 com.juick.server.helpers.TagStats;
-import org.apache.commons.lang3.StringEscapeUtils;
-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=?",
-                    (rs, num) -> {
-                        Tag ret = new Tag(StringEscapeUtils.unescapeHtml4(rs.getString(2)));
-                        ret.TID = tid;
-                        ret.SynonymID = rs.getInt(1);
-                        return ret;
-                    }, tid);
-        } 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=?",
-                    (rs, rowNum) -> {
-                        Tag ret1 = new Tag(StringEscapeUtils.unescapeHtml4(rs.getString(3)));
-                        ret1.TID = rs.getInt(1);
-                        ret1.SynonymID = rs.getInt(2);
-                        return ret1;
-                    }, StringEscapeUtils.escapeHtml4(tag));
-        } catch (EmptyResultDataAccessException e) {
-            // tag not found
-        }
-        if (ret == null && autoCreate) {
-            ret = new com.juick.Tag(tag);
-            ret.TID = createTag(sql, 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, StringEscapeUtils.escapeHtml4(name));
-                return stmt;
-        }, holder);
-
-        return holder.getKey().intValue();
-    }
-
-    public static List<TagStats> getTagsStats(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) -> {
-                    TagStats s = new TagStats();
-                    s.setTag(new Tag(StringEscapeUtils.unescapeHtml4(rs.getString(1))));
-                    s.setUsageCount(rs.getInt(2));
-                    return s;
-                }, 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).stream()
-                .map(StringEscapeUtils::unescapeHtml4).collect(Collectors.toList());
-    }
-    public static List<Tag> updateTags(JdbcTemplate sql, int mid, List<Tag> newTags) {
-        List<Tag> currentTags = MessagesQueries.getMessageTags(sql, mid).stream()
-                .map(TagStats::getTag).collect(Collectors.toList());
-        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).stream()
-                .map(TagStats::getTag).collect(Collectors.toList());
-    }
-
-    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();
-    }
-}
diff --git a/juick-server/src/main/java/com/juick/server/UserQueries.java b/juick-server/src/main/java/com/juick/server/UserQueries.java
deleted file mode 100644
index 7a669230..00000000
--- a/juick-server/src/main/java/com/juick/server/UserQueries.java
+++ /dev/null
@@ -1,487 +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 com.juick.server.helpers.Auth;
-import com.juick.server.helpers.EmailOpts;
-import com.juick.server.helpers.UserInfo;
-import com.juick.util.UserUtils;
-import org.springframework.dao.DuplicateKeyException;
-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.setName(rs.getString(2));
-            user.setBanned(rs.getBoolean(3));
-            return user;
-        }
-    }
-
-    public static String getSignUpHashByJID(JdbcTemplate sql, String jid) {
-        String hash;
-        try {
-            hash = sql.queryForObject("SELECT loginhash FROM jids WHERE jid=? AND user_id IS NULL",
-                    String.class, jid);
-        } catch (EmptyResultDataAccessException e) {
-            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();
-        try {
-            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);
-        } catch (DuplicateKeyException e) {
-            return -1;
-        }
-
-        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 (\"" + StringUtils.arrayToDelimitedString(unames.toArray(), "\",\"") + "\")",
-                    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 (" + StringUtils.arrayToCommaDelimitedString(uids.toArray()) + ")",
-                    new UserMapper());
-        }
-        return Collections.emptyList();
-    }
-
-    public static List<com.juick.User> getUsersByJID(JdbcTemplate sql, List<String> jids) {
-        if (!jids.isEmpty()) {
-            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 (\"" + StringUtils.arrayToDelimitedString(jids.toArray(), "\",\"") + "\")",
-                    (rs, rowNum) -> {
-                        com.juick.User user = new com.juick.User();
-                        user.setUid(rs.getInt(1));
-                        user.setName(rs.getString(2));
-                        user.setJid(rs.getString(3));
-                        return user;
-                    });
-        }
-        return Collections.emptyList();
-    }
-
-    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) {
-        try {
-            return sql.queryForObject("SELECT user_id FROM jids WHERE jid=?", Integer.class, jid);
-        } catch (EmptyResultDataAccessException e) {
-            return 0;
-        }
-    }
-
-    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 = UserUtils.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 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 boolean updatePassword(JdbcTemplate sql, User user, String newPassword) {
-        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) {
-            return newHash;
-        }
-        return org.apache.commons.lang3.StringUtils.EMPTY;
-    }
-
-    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 UserInfo getUserInfo(JdbcTemplate sql, User user) {
-        try {
-            return sql.queryForObject("SELECT fullname,country,url,descr FROM usersinfo WHERE user_id=?", ((rs, rowNum) -> {
-                UserInfo info = new UserInfo();
-                info.setFullName(rs.getString(1));
-                info.setCountry(rs.getString(2));
-                info.setUrl(rs.getString(3));
-                info.setDescription(rs.getString(4));
-                return info;
-            }), user.getUid());
-        } catch (EmptyResultDataAccessException e) {
-            return new UserInfo();
-        }
-    }
-
-    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(),
-                info.getCountry(), info.getUrl(), info.getDescription(), info.getFullName(),
-                info.getCountry(), info.getUrl(), info.getDescription()) > 0;
-    }
-
-    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.setName(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.setName(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.setName(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.setName(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;
-    }
-
-    public static List<String> getAllJIDs(JdbcTemplate sql, User user) {
-        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());
-    }
-
-    public static List<String> getEmails(JdbcTemplate sql, User user) {
-        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());
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
-    }
-
-    public static String getEmailHash(JdbcTemplate sql, User user) {
-        try {
-            return sql.queryForObject("SELECT hash FROM mail WHERE user_id=?", String.class, user.getUid())
-                    + "@mail.juick.com";
-        } catch (EmptyResultDataAccessException e) {
-            return org.apache.commons.lang3.StringUtils.EMPTY;
-        }
-    }
-}