server core module

25 files changed, 3594 insertions, 0 deletions

diff --git a/server-core/src/main/java/com/juick/configuration/DataConfiguration.java b/server-core/src/main/java/com/juick/configuration/DataConfiguration.java
new file mode 100644
index 00000000..f31dbcdb
--- /dev/null
+++ b/server-core/src/main/java/com/juick/configuration/DataConfiguration.java
@@ -0,0 +1,55 @@
+package com.juick.configuration;
+
+import org.apache.commons.dbcp2.BasicDataSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+import org.springframework.core.env.Environment;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.datasource.DataSourceTransactionManager;
+import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.annotation.TransactionManagementConfigurer;
+
+import javax.annotation.Resource;
+import javax.sql.DataSource;
+
+/**
+ * Created by aalexeev on 11/11/16.
+ */
+@Configuration
+@EnableTransactionManagement
+@PropertySource(value = {"classpath:juick.conf"})
+public class DataConfiguration implements TransactionManagementConfigurer {
+    @Resource
+    private Environment env;
+
+    @Bean
+    public DataSource dataSource() {
+        BasicDataSource dataSource = new BasicDataSource();
+
+        dataSource.setDriverClassName(env.getProperty("datasource_driver", "com.mysql.jdbc.Driver"));
+        dataSource.setUrl(env.getProperty("datasource_url"));
+        dataSource.setUsername(env.getProperty("datasource_user", ""));
+        dataSource.setPassword(env.getProperty("datasource_password", ""));
+
+        dataSource.setValidationQuery("select 1");
+
+        return dataSource;
+    }
+
+    @Bean
+    public PlatformTransactionManager transactionManager() {
+        return new DataSourceTransactionManager(dataSource());
+    }
+
+    @Override
+    public PlatformTransactionManager annotationDrivenTransactionManager() {
+        return transactionManager();
+    }
+
+    @Bean
+    public JdbcTemplate jdbcTemplate() {
+        return new JdbcTemplate(dataSource());
+    }
+}
diff --git a/server-core/src/main/java/com/juick/server/AdsQueries.java b/server-core/src/main/java/com/juick/server/AdsQueries.java
new file mode 100644
index 00000000..06590817
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/AdsQueries.java
@@ -0,0 +1,51 @@
+/*
+ * 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/server-core/src/main/java/com/juick/server/CrosspostQueries.java b/server-core/src/main/java/com/juick/server/CrosspostQueries.java
new file mode 100644
index 00000000..827dad09
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/CrosspostQueries.java
@@ -0,0 +1,87 @@
+/*
+ * 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.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 "";
+        }
+    }
+
+    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 "";
+        }
+    }
+
+    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/server-core/src/main/java/com/juick/server/MessagesQueries.java b/server-core/src/main/java/com/juick/server/MessagesQueries.java
new file mode 100644
index 00000000..b824feba
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/MessagesQueries.java
@@ -0,0 +1,666 @@
+/*
+ * 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 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.ReplyTo = rs.getInt(3);
+            User user = new User();
+            user.setUID(rs.getInt(4));
+            user.setUName(rs.getString(5));
+            user.Banned = rs.getBoolean(6);
+            msg.setUser(user);
+            msg.TimeAgo = rs.getInt(7);
+            msg.setDate(rs.getTimestamp(8));
+            msg.ReadOnly = rs.getBoolean(9);
+            msg.Privacy = rs.getInt(10);
+            msg.FriendsOnly = msg.Privacy < 0;
+            msg.Replies = rs.getInt(11);
+            msg.AttachmentType = 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.Likes = 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.Tags.add(new Tag(t)));
+            }
+            msg.RepliesBy = rs.getString(19);
+            msg.setText(rs.getString(20));
+            msg.setReplyQuote(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 = "";
+            String tagsIDs = "";
+
+            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().setUName(rs.getString(2));
+                        msg.ReplyTo = rs.getInt(3);
+                        msg.setDate(rs.getTimestamp(4));
+                        msg.AttachmentType = rs.getString(5);
+                        msg.setText(rs.getString(6));
+                        String quote = rs.getString(7);
+                        if (!StringUtils.isEmpty(quote)) {
+                            msg.setReplyQuote(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.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(StringEscapeUtils.unescapeHtml4(rs.getString(3)));
+                    t.TID = rs.getInt(1);
+                    t.SynonymID = rs.getInt(2);
+                    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", 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;
+    }
+
+    private static String formatQuote(String quote) {
+        if (quote.length() > 50) {
+            quote = ">" + quote.substring(0, 47).replace('\n', ' ') + "...\n";
+        } else if (quote.length() > 0) {
+            quote = ">" + quote.replace('\n', ' ') + "\n";
+        }
+        return quote;
+    }
+
+}
diff --git a/server-core/src/main/java/com/juick/server/PMQueries.java b/server-core/src/main/java/com/juick/server/PMQueries.java
new file mode 100644
index 00000000..d7855002
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/PMQueries.java
@@ -0,0 +1,133 @@
+/*
+ * 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.setUName(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().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/server-core/src/main/java/com/juick/server/PrivacyQueries.java b/server-core/src/main/java/com/juick/server/PrivacyQueries.java
new file mode 100644
index 00000000..53b13505
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/PrivacyQueries.java
@@ -0,0 +1,32 @@
+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/server-core/src/main/java/com/juick/server/PushQueries.java b/server-core/src/main/java/com/juick/server/PushQueries.java
new file mode 100644
index 00000000..904b3c0d
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/PushQueries.java
@@ -0,0 +1,44 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.juick.server;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+/**
+ *
+ * @author ugnich
+ */
+public class PushQueries {
+
+    public static List<String> getAndroidRegID(JdbcTemplate sql, int uid) {
+        return sql.queryForList("SELECT regid FROM android WHERE user_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  List<String> getWinPhoneURL(JdbcTemplate sql, int uid) {
+        return sql.queryForList("SELECT url FROM winphone WHERE user_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  List<String> getAPNSToken(JdbcTemplate sql, int uid) {
+        return sql.queryForList("SELECT token from ios WHERE user_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/server-core/src/main/java/com/juick/server/ShowQueries.java b/server-core/src/main/java/com/juick/server/ShowQueries.java
new file mode 100644
index 00000000..b55117c1
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/ShowQueries.java
@@ -0,0 +1,32 @@
+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/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java b/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java
new file mode 100644
index 00000000..9a09a5cd
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/SubscriptionsQueries.java
@@ -0,0 +1,125 @@
+/*
+ * 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) {
+            List<Integer> tagUsers = sql.queryForList("SELECT suser_id FROM subscr_tags " +
+                    "WHERE tag_id IN (" + StringUtils.arrayToCommaDelimitedString(tags.toArray()) + ") AND suser_id!=? " +
+                    " AND suser_id NOT IN (SELECT user_id FROM bl_users WHERE bl_user_id=?)", 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/server-core/src/main/java/com/juick/server/TagQueries.java b/server-core/src/main/java/com/juick/server/TagQueries.java
new file mode 100644
index 00000000..0e3c0c06
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/TagQueries.java
@@ -0,0 +1,164 @@
+/*
+ * 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.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<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(StringEscapeUtils.unescapeHtml4(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).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);
+        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.getName())
+                .collect(Collectors.joining());
+    }
+}
diff --git a/server-core/src/main/java/com/juick/server/UserQueries.java b/server-core/src/main/java/com/juick/server/UserQueries.java
new file mode 100644
index 00000000..50e3562f
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/UserQueries.java
@@ -0,0 +1,496 @@
+/*
+ * 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 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.setUName(rs.getString(2));
+            user.Banned = 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.setUName(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 = 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 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 = 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 "";
+    }
+
+    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.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;
+    }
+    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 "";
+        }
+    }
+}
diff --git a/server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java b/server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java
new file mode 100644
index 00000000..986c8275
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/helpers/ApplicationStatus.java
@@ -0,0 +1,25 @@
+package com.juick.server.helpers;
+
+/**
+ * Created by vt on 03/09/16.
+ */
+public class ApplicationStatus {
+    private boolean connected;
+    private boolean crosspostEnabled;
+
+    public boolean isConnected() {
+        return connected;
+    }
+
+    public void setConnected(boolean connected) {
+        this.connected = connected;
+    }
+
+    public boolean isCrosspostEnabled() {
+        return crosspostEnabled;
+    }
+
+    public void setCrosspostEnabled(boolean crosspostEnabled) {
+        this.crosspostEnabled = crosspostEnabled;
+    }
+}
diff --git a/server-core/src/main/java/com/juick/server/helpers/Auth.java b/server-core/src/main/java/com/juick/server/helpers/Auth.java
new file mode 100644
index 00000000..3e1f0bd9
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/helpers/Auth.java
@@ -0,0 +1,22 @@
+package com.juick.server.helpers;
+
+/**
+ * Created by vt on 09/02/16.
+ */
+public class Auth {
+    private String account;
+    private String authCode;
+
+    public Auth(String account, String authCode) {
+        this.account = account;
+        this.authCode = authCode;
+    }
+
+    public String getAccount() {
+        return account;
+    }
+
+    public String getAuthCode() {
+        return authCode;
+    }
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/com/juick/server/helpers/EmailOpts.java b/server-core/src/main/java/com/juick/server/helpers/EmailOpts.java
new file mode 100644
index 00000000..679d1a8d
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/helpers/EmailOpts.java
@@ -0,0 +1,24 @@
+package com.juick.server.helpers;
+
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Created by vitalyster on 09.02.2016.
+ */
+public class EmailOpts {
+    private String email;
+    private String subscriptionHour;
+
+    public EmailOpts(String email, int subscriptionHour) {
+        this.email = email;
+        this.subscriptionHour = StringUtils.leftPad(String.format("%d", subscriptionHour), 2, "0");
+    }
+
+    public String getSubscriptionHour() {
+        return subscriptionHour;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java b/server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java
new file mode 100644
index 00000000..377b0a50
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/helpers/NotifyOpts.java
@@ -0,0 +1,34 @@
+package com.juick.server.helpers;
+
+/**
+ * Created by vt on 03/09/16.
+ */
+public class NotifyOpts {
+    private boolean repliesEnabled;
+    private boolean subscriptionsEnabled;
+    private boolean recommendationsEnabled;
+
+    public boolean isRepliesEnabled() {
+        return repliesEnabled;
+    }
+
+    public void setRepliesEnabled(boolean repliesEnabled) {
+        this.repliesEnabled = repliesEnabled;
+    }
+
+    public boolean isSubscriptionsEnabled() {
+        return subscriptionsEnabled;
+    }
+
+    public void setSubscriptionsEnabled(boolean subscriptionsEnabled) {
+        this.subscriptionsEnabled = subscriptionsEnabled;
+    }
+
+    public boolean isRecommendationsEnabled() {
+        return recommendationsEnabled;
+    }
+
+    public void setRecommendationsEnabled(boolean recommendationsEnabled) {
+        this.recommendationsEnabled = recommendationsEnabled;
+    }
+}
diff --git a/server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java b/server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java
new file mode 100644
index 00000000..66cf9410
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/helpers/PrivacyOpts.java
@@ -0,0 +1,29 @@
+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/server-core/src/main/java/com/juick/server/helpers/Status.java b/server-core/src/main/java/com/juick/server/helpers/Status.java
new file mode 100644
index 00000000..f68baae5
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/helpers/Status.java
@@ -0,0 +1,19 @@
+package com.juick.server.helpers;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Created by vitalyster on 25.07.2016.
+ */
+public class Status {
+    private String value;
+
+    public Status(String value) {
+        this.value = value;
+    }
+
+    @JsonProperty("status")
+    public String getValue() {
+        return value;
+    }
+}
diff --git a/server-core/src/main/java/com/juick/server/helpers/UserInfo.java b/server-core/src/main/java/com/juick/server/helpers/UserInfo.java
new file mode 100644
index 00000000..5a4b6894
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/helpers/UserInfo.java
@@ -0,0 +1,43 @@
+package com.juick.server.helpers;
+
+/**
+ * Created by vt on 03/09/16.
+ */
+public class UserInfo {
+    private String fullName;
+    private String country;
+    private String url;
+    private String description;
+
+    public String getFullName() {
+        return fullName;
+    }
+
+    public void setFullName(String fullName) {
+        this.fullName = fullName;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}
diff --git a/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java b/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java
new file mode 100644
index 00000000..5faddd3a
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/protocol/JuickProtocol.java
@@ -0,0 +1,458 @@
+package com.juick.server.protocol;
+
+import com.juick.Message;
+import com.juick.Tag;
+import com.juick.User;
+import com.juick.formatters.PlainTextFormatter;
+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.stream(getClass().getDeclaredMethods())
+                .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);
+        SubscriptionsQueries.subscribeMessage(sql, mid, user.getUID());
+        //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() - 1;
+        List<Integer> mids = MessagesQueries.getAll(sql, user.getUID(), page);
+        List<Message> messages = MessagesQueries.getMessages(sql, mids);
+        return new ProtocolReply("Last messages: \n" + String.join("\n", messages.stream().map(PlainTextFormatter::formatPost)
+                .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 = "^bl\\s+@([^\\s\\n\\+]+)", patternFlags = Pattern.CASE_INSENSITIVE,
+            help = "BL @username - add @username to your blacklist")
+    public ProtocolReply blacklistUser(User from, String... arguments) {
+        User blUser = UserQueries.getUserByName(sql, arguments[0]);
+        if (blUser != null) {
+            PrivacyQueries.PrivacyResult result = PrivacyQueries.blacklistUser(sql, from, blUser);
+            if (result == PrivacyQueries.PrivacyResult.Added) {
+                return new ProtocolReply("User added to your blacklist", Optional.empty());
+            } else {
+                return new ProtocolReply("User removed from your blacklist", Optional.empty());
+            }
+        }
+        return new ProtocolReply("User not found", Optional.empty());
+    }
+
+    @UserCommand(pattern = "^bl\\s\\*(\\S+)$", patternFlags = Pattern.CASE_INSENSITIVE,
+            help = "BL *tag - add *tag to your blacklist")
+    public ProtocolReply blacklistTag(User from, String... arguments) {
+        User blUser = UserQueries.getUserByName(sql, arguments[0]);
+        if (blUser != null) {
+            Tag tag = TagQueries.getTag(sql, arguments[0], false);
+            if (tag != null) {
+                PrivacyQueries.PrivacyResult result = PrivacyQueries.blacklistTag(sql, from, tag);
+                if (result == PrivacyQueries.PrivacyResult.Added) {
+                    return new ProtocolReply("Tag added to your blacklist", Optional.empty());
+                } else {
+                    return new ProtocolReply("Tag removed from your blacklist", Optional.empty());
+                }
+            }
+        }
+        return new ProtocolReply("Tag not found", Optional.empty());
+    }
+
+    @UserCommand(pattern = "@", help = "@ - Show recommendations and popular personal blogs")
+    public ProtocolReply commandUsers(User currentUser, String... args) {
+        StringBuilder msg = new StringBuilder();
+        msg.append("Recommended blogs");
+        List<String> recommendedUsers = ShowQueries.getRecommendedUsers(sql, currentUser);
+        if (recommendedUsers.size() > 0) {
+            for (String user : recommendedUsers) {
+                msg.append("\n@").append(user);
+            }
+        } else {
+            msg.append("\nNo recommendations now. Subscribe to more blogs. ;)");
+        }
+        msg.append("\n\nTop 10 personal blogs:");
+        List<String> topUsers = ShowQueries.getTopUsers(sql);
+        if (topUsers.size() > 0) {
+            for (String user : topUsers) {
+                msg.append("\n@").append(user);
+            }
+        } else {
+            msg.append("\nNo top users. Empty DB? ;)");
+        }
+        return new ProtocolReply(msg.toString(), Optional.empty());
+    }
+
+    @UserCommand(pattern = "\\*", help = "* - Show your tags")
+    public ProtocolReply commandTags(User currentUser, String... args) {
+        List<Tag> tags = TagQueries.getUserTagsAll(sql, currentUser.getUID());
+        String msg = "Your tags: (tag - messages)\n" +
+                tags.stream()
+                        .map(t -> String.format("\n*%s - %d", t.getName(), t.UsageCnt)).collect(Collectors.joining());
+        return new ProtocolReply(msg, Optional.empty());
+    }
+
+    @UserCommand(pattern = "!", help = "! - Show your favorite messages")
+    public ProtocolReply commandFavorites(User currentUser, String... args) {
+        List<Integer> mids = MessagesQueries.getUserRecommendations(sql, currentUser.getUID(), 0);
+        if (mids.size() > 0) {
+            List<Message> messages = MessagesQueries.getMessages(sql, mids);
+            return new ProtocolReply("Favorite messages: \n" + String.join("\n", messages.stream().map(PlainTextFormatter::formatPost)
+                    .collect(Collectors.toList())), Optional.of(json.serializeList(messages)));
+        }
+        return new ProtocolReply("No favorite messages, try to \"like\" something ;)", 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 != null) {
+            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() - 1;
+        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(PlainTextFormatter::formatPost).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 (msg != null) {
+            if (showReplies) {
+                List<Message> replies = MessagesQueries.getReplies(sql, mid);
+                replies.add(0, msg);
+                return new ProtocolReply(String.join("\n",
+                        replies.stream().map(PlainTextFormatter::formatPost).collect(Collectors.toList())),
+                        Optional.of(json.serializeList(replies)));
+            }
+            return new ProtocolReply(PlainTextFormatter.formatPost(msg), Optional.of(json.serializeList(Collections.singletonList(msg))));
+        }
+        return new ProtocolReply("Message not found", Optional.empty());
+    }
+    @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.getName(), Optional.empty());
+            }
+            return new ProtocolReply("You was not subscribed to " + tag.getName(), 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.stream(getClass().getDeclaredMethods())
+                .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/server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java b/server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java
new file mode 100644
index 00000000..d9d36a5d
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/protocol/ProtocolReply.java
@@ -0,0 +1,23 @@
+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/server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java b/server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
new file mode 100644
index 00000000..af7c4924
--- /dev/null
+++ b/server-core/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
@@ -0,0 +1,31 @@
+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 "";
+}
diff --git a/server-core/src/main/java/com/juick/util/ThreadHelper.java b/server-core/src/main/java/com/juick/util/ThreadHelper.java
new file mode 100644
index 00000000..7304d158
--- /dev/null
+++ b/server-core/src/main/java/com/juick/util/ThreadHelper.java
@@ -0,0 +1,36 @@
+package com.juick.util;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by aalexeev on 11/11/16.
+ */
+public class ThreadHelper {
+    private ThreadHelper() {
+        throw new IllegalStateException();
+    }
+
+    private static Logger logger = LoggerFactory.getLogger(ThreadHelper.class);
+
+    public static void shutdownAndAwaitTermination(ExecutorService pool) {
+        pool.shutdown(); // Disable new tasks from being submitted
+        try {
+            // Wait a while for existing tasks to terminate
+            if (!pool.awaitTermination(5, TimeUnit.SECONDS)) {
+                pool.shutdownNow(); // Cancel currently executing tasks
+                // Wait a while for tasks to respond to being cancelled
+                if (!pool.awaitTermination(5, TimeUnit.SECONDS))
+                    logger.error("Pool did not terminate");
+            }
+        } catch (InterruptedException ie) {
+            // (Re-)Cancel if current thread also interrupted
+            pool.shutdownNow();
+            // Preserve interrupt status
+            Thread.currentThread().interrupt();
+        }
+    }
+}
diff --git a/server-core/src/main/resources/juick.conf.example b/server-core/src/main/resources/juick.conf.example
new file mode 100644
index 00000000..306a4e93
--- /dev/null
+++ b/server-core/src/main/resources/juick.conf.example
@@ -0,0 +1,45 @@
+#Driver
+datasource_driver=net.sf.log4jdbc.DriverSpy
+!datasource_driver=com.mysql.jdbc.Driver
+
+#Url
+!datasource_url=jdbc:mysql://localhost:3306/juick?autoReconnect=true&zeroDateTimeBehavior=convertToNull&characterEncoding=UTF8
+datasource_url=jdbc:log4jdbc:mysql://localhost:3306/juick?autoReconnect=true&zeroDateTimeBehavior=convertToNull&characterEncoding=UTF8
+
+#Username
+datasource_user=
+
+#Password
+datasource_password=
+
+twitter_consumer_key=
+twitter_consumer_secret=
+
+crosspost_jid=
+ws_jid=
+push_jid=
+
+xmpp_host=
+xmpp_port=
+xmpp_password=
+
+push_xmpp_password=
+
+wns_application_sip=
+wns_client_secret=
+gcm_key=
+
+hostname=
+componentname=
+component_name=
+component_host=
+component_port=
+s2s_port=
+xmppbot_jid=juick@juick.com/Juick
+
+keystore=
+keystore_password=
+broken_ssl_hosts=
+banned_hosts=
+
+upload_tmp_dir=
\ No newline at end of file
diff --git a/server-core/src/main/resources/logback.xml.example b/server-core/src/main/resources/logback.xml.example
new file mode 100644
index 00000000..05a3cfdf
--- /dev/null
+++ b/server-core/src/main/resources/logback.xml.example
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="true">
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <!-- encoders are assigned the type
+             ch.qos.logback.classic.encoder.PatternLayoutEncoder by default -->
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- log SQL (pre-execution) plus exceptions caused by SQL -->
+    <!-- <logger name="jdbc.sqlonly" level="debug"/>-->
+
+    <!-- log SQL with timing information, post execution -->
+    <!-- <logger name="jdbc.sqltiming" level="debug"/> -->
+
+    <!-- only use the two logs below to trace ALL JDBC information, NOTE: This can be very voluminous! -->
+
+    <!-- log all jdbc calls except ResultSet calls -->
+    <!-- <logger name="jdbc.audit" level="debug"/> -->
+
+    <!-- log the jdbc ResultSet calls -->
+    <!-- <logger name="jdbc.resultset" level="debug"/> -->
+
+    <!-- log connection open/close events and dump of all open connection numbers -->
+    <!-- <logger name="jdbc.connection" level="debug"/> -->
+
+    <!-- this log is for internal debugging of log4jdbc, itself -->
+    <!-- debug logging for log4jdbc itself -->
+    <!-- <logger name="log4jdbc.debug" level="debug"/> -->
+
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/server-core/src/main/resources/schema.sql b/server-core/src/main/resources/schema.sql
new file mode 100644
index 00000000..90bb4ed4
--- /dev/null
+++ b/server-core/src/main/resources/schema.sql
@@ -0,0 +1,885 @@
+-- MySQL dump 10.13  Distrib 5.5.44, for debian-linux-gnu (x86_64)
+--
+-- Host: localhost    Database: juick
+-- ------------------------------------------------------
+-- Server version	5.5.44-0+deb8u1-log
+use juick;
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `ads_messages`
+--
+
+DROP TABLE IF EXISTS `ads_messages`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ads_messages` (
+  `message_id` int(10) unsigned NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `ads_messages_log`
+--
+
+DROP TABLE IF EXISTS `ads_messages_log`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ads_messages_log` (
+  `user_id` int(10) unsigned NOT NULL,
+  `message_id` int(10) unsigned NOT NULL,
+  `ts` int(10) unsigned NOT NULL DEFAULT '0'
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `android`
+--
+
+DROP TABLE IF EXISTS `android`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `android` (
+  `user_id` int(10) unsigned NOT NULL,
+  `regid` char(255) NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  UNIQUE KEY `regid` (`regid`),
+  KEY `user_id` (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `auth`
+--
+
+DROP TABLE IF EXISTS `auth`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `auth` (
+  `user_id` int(10) unsigned NOT NULL,
+  `protocol` enum('xmpp','email','sms') NOT NULL,
+  `account` char(64) NOT NULL,
+  `authcode` char(8) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `bl_tags`
+--
+
+DROP TABLE IF EXISTS `bl_tags`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `bl_tags` (
+  `user_id` int(10) unsigned NOT NULL,
+  `tag_id` int(10) unsigned NOT NULL,
+  KEY `tag_id` (`tag_id`),
+  KEY `user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `bl_users`
+--
+
+DROP TABLE IF EXISTS `bl_users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `bl_users` (
+  `user_id` int(10) unsigned NOT NULL,
+  `bl_user_id` int(10) unsigned NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`user_id`,`bl_user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `captcha`
+--
+
+DROP TABLE IF EXISTS `captcha`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `captcha` (
+  `jid` char(64) NOT NULL,
+  `hash` char(16) NOT NULL,
+  `confirmed` tinyint(4) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `captchaimg`
+--
+
+DROP TABLE IF EXISTS `captchaimg`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `captchaimg` (
+  `id` char(16) NOT NULL,
+  `txt` char(6) NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `ip` char(16) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `emails`
+--
+
+DROP TABLE IF EXISTS `emails`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `emails` (
+  `user_id` int(10) unsigned NOT NULL,
+  `email` char(64) NOT NULL,
+  `subscr_hour` tinyint(4) DEFAULT NULL,
+  KEY `email` (`email`) USING HASH
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `facebook`
+--
+
+DROP TABLE IF EXISTS `facebook`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `facebook` (
+  `user_id` int(10) unsigned DEFAULT NULL,
+  `fb_id` bigint(20) unsigned NOT NULL,
+  `loginhash` char(36) DEFAULT NULL,
+  `access_token` char(255) DEFAULT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `fb_name` char(64) NOT NULL,
+  `fb_link` char(64) NOT NULL,
+  `crosspost` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  KEY `user_id` (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `favorites`
+--
+
+DROP TABLE IF EXISTS `favorites`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `favorites` (
+  `user_id` int(10) unsigned NOT NULL,
+  `message_id` int(10) unsigned NOT NULL,
+  `ts` datetime NOT NULL,
+  UNIQUE KEY `user_id_2` (`user_id`,`message_id`),
+  KEY `user_id` (`user_id`),
+  KEY `message_id` (`message_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `friends_facebook`
+--
+
+DROP TABLE IF EXISTS `friends_facebook`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `friends_facebook` (
+  `user_id` int(10) unsigned NOT NULL,
+  `friend_id` bigint(20) unsigned NOT NULL,
+  UNIQUE KEY `user_id` (`user_id`,`friend_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `images`
+--
+
+DROP TABLE IF EXISTS `images`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `images` (
+  `mid` int(10) unsigned NOT NULL,
+  `rid` int(10) unsigned NOT NULL,
+  `thumb` int(10) unsigned NOT NULL,
+  `small` int(10) unsigned NOT NULL,
+  `medium` int(10) unsigned NOT NULL,
+  `height` int(10) unsigned NOT NULL,
+  `width` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`mid`,`rid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `ios`
+--
+
+DROP TABLE IF EXISTS `ios`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `ios` (
+  `user_id` int(10) unsigned NOT NULL,
+  `token` char(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  UNIQUE KEY `token` (`token`),
+  KEY `user_id` (`user_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `jids`
+--
+
+DROP TABLE IF EXISTS `jids`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `jids` (
+  `user_id` int(10) unsigned DEFAULT NULL,
+  `jid` char(64) NOT NULL,
+  `active` tinyint(1) NOT NULL DEFAULT '1',
+  `loginhash` char(36) DEFAULT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  UNIQUE KEY `jid` (`jid`),
+  KEY `user_id` (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `logins`
+--
+
+DROP TABLE IF EXISTS `logins`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `logins` (
+  `user_id` int(10) unsigned NOT NULL,
+  `hash` char(16) NOT NULL,
+  UNIQUE KEY `user_id` (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `mail`
+--
+
+DROP TABLE IF EXISTS `mail`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mail` (
+  `user_id` int(10) unsigned NOT NULL,
+  `hash` char(16) NOT NULL,
+  PRIMARY KEY (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `meon`
+--
+
+DROP TABLE IF EXISTS `meon`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `meon` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `link` char(255) NOT NULL,
+  `name` char(32) NOT NULL,
+  `ico` smallint(5) unsigned DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `messages`
+--
+
+DROP TABLE IF EXISTS `messages`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `messages` (
+  `message_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `user_id` int(10) unsigned NOT NULL,
+  `lang` enum('en','ru','fr','fa','__') NOT NULL DEFAULT '__',
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `replies` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `maxreplyid` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `privacy` tinyint(4) NOT NULL DEFAULT '1',
+  `readonly` tinyint(1) NOT NULL DEFAULT '0',
+  `attach` enum('jpg','mp4','png') DEFAULT NULL,
+  `place_id` int(10) unsigned DEFAULT NULL,
+  `lat` decimal(10,7) DEFAULT NULL,
+  `lon` decimal(10,7) DEFAULT NULL,
+  `popular` tinyint(4) NOT NULL DEFAULT '0',
+  `hidden` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `likes` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`message_id`),
+  KEY `user_id` (`user_id`),
+  KEY `ts` (`ts`),
+  KEY `attach` (`attach`),
+  KEY `place_id` (`place_id`),
+  KEY `popular` (`popular`),
+  KEY `hidden` (`hidden`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `messages_access`
+--
+
+DROP TABLE IF EXISTS `messages_access`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `messages_access` (
+  `message_id` int(10) unsigned NOT NULL,
+  `user_id` int(10) unsigned NOT NULL,
+  KEY `message_id` (`message_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `messages_tags`
+--
+
+DROP TABLE IF EXISTS `messages_tags`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `messages_tags` (
+  `message_id` int(10) unsigned NOT NULL,
+  `tag_id` int(10) unsigned NOT NULL,
+  UNIQUE KEY `message_id_2` (`message_id`,`tag_id`),
+  KEY `message_id` (`message_id`),
+  KEY `tag_id` (`tag_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `messages_txt`
+--
+
+DROP TABLE IF EXISTS `messages_txt`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `messages_txt` (
+  `message_id` int(10) unsigned NOT NULL,
+  `tags` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `repliesby` varchar(96) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `txt` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  PRIMARY KEY (`message_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `messages_votes`
+--
+
+DROP TABLE IF EXISTS `messages_votes`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `messages_votes` (
+  `message_id` int(10) unsigned NOT NULL,
+  `user_id` int(10) unsigned NOT NULL,
+  `vote` tinyint(4) NOT NULL DEFAULT '1',
+  UNIQUE KEY `message_id` (`message_id`,`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `places`
+--
+
+DROP TABLE IF EXISTS `places`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `places` (
+  `place_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `lat` decimal(10,7) NOT NULL,
+  `lon` decimal(10,7) NOT NULL,
+  `name` char(64) NOT NULL,
+  `descr` char(255) DEFAULT NULL,
+  `url` char(128) DEFAULT NULL,
+  `user_id` int(10) unsigned NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  PRIMARY KEY (`place_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `places_tags`
+--
+
+DROP TABLE IF EXISTS `places_tags`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `places_tags` (
+  `place_id` int(10) unsigned NOT NULL,
+  `tag_id` int(10) unsigned NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `pm`
+--
+
+DROP TABLE IF EXISTS `pm`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pm` (
+  `user_id` int(10) unsigned NOT NULL,
+  `user_id_to` int(10) unsigned NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `txt` text NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `pm_inroster`
+--
+
+DROP TABLE IF EXISTS `pm_inroster`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pm_inroster` (
+  `user_id` int(10) unsigned NOT NULL,
+  `jid` char(64) NOT NULL,
+  UNIQUE KEY `user_id_2` (`user_id`,`jid`),
+  KEY `user_id` (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `pm_streams`
+--
+
+DROP TABLE IF EXISTS `pm_streams`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pm_streams` (
+  `user_id` int(10) unsigned NOT NULL,
+  `user_id_to` int(10) unsigned NOT NULL,
+  `lastmessage` datetime NOT NULL,
+  `lastview` datetime DEFAULT NULL,
+  `unread` smallint(5) unsigned NOT NULL DEFAULT '0',
+  UNIQUE KEY `user_id` (`user_id`,`user_id_to`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `presence`
+--
+
+DROP TABLE IF EXISTS `presence`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `presence` (
+  `user_id` int(10) unsigned NOT NULL,
+  `jid` char(64) DEFAULT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  UNIQUE KEY `jid` (`jid`)
+) ENGINE=MEMORY DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `reader_links`
+--
+
+DROP TABLE IF EXISTS `reader_links`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `reader_links` (
+  `link_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `rss_id` int(10) unsigned NOT NULL,
+  `url` char(255) NOT NULL,
+  `title` char(255) NOT NULL,
+  `ts` datetime NOT NULL,
+  PRIMARY KEY (`link_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `reader_rss`
+--
+
+DROP TABLE IF EXISTS `reader_rss`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `reader_rss` (
+  `rss_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `url` char(255) NOT NULL,
+  `lastcheck` datetime NOT NULL,
+  PRIMARY KEY (`rss_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `replies`
+--
+
+DROP TABLE IF EXISTS `replies`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `replies` (
+  `message_id` int(10) unsigned NOT NULL,
+  `reply_id` smallint(5) unsigned NOT NULL,
+  `user_id` int(10) unsigned NOT NULL,
+  `replyto` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `attach` enum('jpg','mp4','png') COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `txt` mediumtext COLLATE utf8mb4_unicode_ci NOT NULL,
+  KEY `message_id` (`message_id`),
+  KEY `user_id` (`user_id`),
+  KEY `ts` (`ts`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `sphinx`
+--
+
+DROP TABLE IF EXISTS `sphinx`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `sphinx` (
+  `counter_id` tinyint(3) unsigned NOT NULL,
+  `max_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`counter_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `subscr_messages`
+--
+
+DROP TABLE IF EXISTS `subscr_messages`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `subscr_messages` (
+  `message_id` int(10) unsigned NOT NULL,
+  `suser_id` int(10) unsigned NOT NULL,
+  UNIQUE KEY `message_id` (`message_id`,`suser_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `subscr_tags`
+--
+
+DROP TABLE IF EXISTS `subscr_tags`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `subscr_tags` (
+  `tag_id` int(10) unsigned NOT NULL,
+  `suser_id` int(10) unsigned NOT NULL,
+  `jid` char(64) NOT NULL,
+  `active` bit(1) NOT NULL DEFAULT b'1',
+  UNIQUE KEY `tag_id` (`tag_id`,`suser_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `subscr_users`
+--
+
+DROP TABLE IF EXISTS `subscr_users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `subscr_users` (
+  `user_id` int(10) unsigned NOT NULL,
+  `suser_id` int(10) unsigned NOT NULL,
+  `jid` char(64) DEFAULT NULL,
+  `active` bit(1) NOT NULL DEFAULT b'1',
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  UNIQUE KEY `user_id` (`user_id`,`suser_id`),
+  KEY `suser_id` (`suser_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `tags`
+--
+
+DROP TABLE IF EXISTS `tags`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `tags` (
+  `tag_id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `synonym_id` int(10) unsigned DEFAULT NULL,
+  `name` char(70) DEFAULT NULL,
+  `top` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `noindex` tinyint(1) unsigned NOT NULL DEFAULT '0',
+  `stat_messages` int(10) unsigned NOT NULL DEFAULT '0',
+  `stat_users` smallint(5) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`tag_id`),
+  KEY `synonym_id` (`synonym_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `tags_ignore`
+--
+
+DROP TABLE IF EXISTS `tags_ignore`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `tags_ignore` (
+  `tag_id` int(10) unsigned NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `tags_synonyms`
+--
+
+DROP TABLE IF EXISTS `tags_synonyms`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `tags_synonyms` (
+  `name` char(64) NOT NULL,
+  `changeto` char(64) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `telegram`
+--
+
+DROP TABLE IF EXISTS `telegram`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `telegram` (
+  `user_id` int(10) unsigned DEFAULT NULL,
+  `tg_id` bigint(20) NOT NULL,
+  `tg_name` char(64) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `loginhash` char(36) COLLATE utf8mb4_unicode_ci DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `telegram_chats`
+--
+
+DROP TABLE IF EXISTS `telegram_chats`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `telegram_chats` (
+  `chat_id` bigint(20) DEFAULT NULL,
+  UNIQUE KEY `chat_id` (`chat_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `top_ignore_messages`
+--
+
+DROP TABLE IF EXISTS `top_ignore_messages`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `top_ignore_messages` (
+  `message_id` int(10) unsigned NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `top_ignore_tags`
+--
+
+DROP TABLE IF EXISTS `top_ignore_tags`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `top_ignore_tags` (
+  `tag_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`tag_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `top_ignore_users`
+--
+
+DROP TABLE IF EXISTS `top_ignore_users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `top_ignore_users` (
+  `user_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `twitter`
+--
+
+DROP TABLE IF EXISTS `twitter`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `twitter` (
+  `user_id` int(10) unsigned NOT NULL,
+  `access_token` char(64) NOT NULL,
+  `access_token_secret` char(64) NOT NULL,
+  `uname` char(64) NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `crosspost` tinyint(1) unsigned NOT NULL DEFAULT '1',
+  PRIMARY KEY (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `useroptions`
+--
+
+DROP TABLE IF EXISTS `useroptions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `useroptions` (
+  `user_id` int(10) unsigned NOT NULL,
+  `jnotify` tinyint(1) NOT NULL DEFAULT '1',
+  `subscr_active` tinyint(1) NOT NULL DEFAULT '1',
+  `off_ts` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `xmppxhtml` tinyint(1) NOT NULL DEFAULT '0',
+  `subscr_notify` tinyint(1) NOT NULL DEFAULT '1',
+  `recommendations` tinyint(1) NOT NULL DEFAULT '1',
+  `privacy_view` tinyint(1) NOT NULL DEFAULT '1',
+  `privacy_reply` tinyint(1) NOT NULL DEFAULT '1',
+  `privacy_pm` tinyint(1) NOT NULL DEFAULT '1',
+  `repliesview` tinyint(1) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`user_id`),
+  KEY `recommendations` (`recommendations`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `users`
+--
+
+DROP TABLE IF EXISTS `users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users` (
+  `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+  `nick` char(64) NOT NULL,
+  `passw` char(32) NOT NULL,
+  `lang` enum('en','ru','fr','fa','__') NOT NULL DEFAULT '__',
+  `banned` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `lastmessage` int(11) NOT NULL DEFAULT '0',
+  `lastpm` int(11) NOT NULL DEFAULT '0',
+  `lastphoto` int(11) NOT NULL DEFAULT '0',
+  `karma` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `nick` (`nick`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `users_refs`
+--
+
+DROP TABLE IF EXISTS `users_refs`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users_refs` (
+  `user_id` int(10) unsigned NOT NULL,
+  `ref` int(10) unsigned NOT NULL,
+  KEY `ref` (`ref`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `users_subscr`
+--
+
+DROP TABLE IF EXISTS `users_subscr`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `users_subscr` (
+  `user_id` int(10) unsigned NOT NULL,
+  `cnt` smallint(5) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `usersinfo`
+--
+
+DROP TABLE IF EXISTS `usersinfo`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `usersinfo` (
+  `user_id` int(10) unsigned NOT NULL,
+  `jid` char(32) DEFAULT NULL,
+  `fullname` char(32) DEFAULT NULL,
+  `country` char(32) DEFAULT NULL,
+  `url` char(64) DEFAULT NULL,
+  `gender` char(32) DEFAULT NULL,
+  `bday` char(10) DEFAULT NULL,
+  `descr` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `vk`
+--
+
+DROP TABLE IF EXISTS `vk`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vk` (
+  `user_id` int(10) unsigned DEFAULT NULL,
+  `vk_id` bigint(20) NOT NULL,
+  `loginhash` char(36) DEFAULT NULL,
+  `access_token` char(128) NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `vk_name` char(64) NOT NULL,
+  `vk_link` char(64) NOT NULL,
+  `crosspost` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  KEY `user_id` (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `winphone`
+--
+
+DROP TABLE IF EXISTS `winphone`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `winphone` (
+  `user_id` int(10) unsigned NOT NULL,
+  `url` char(255) NOT NULL,
+  `ts` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  UNIQUE KEY `url` (`url`),
+  KEY `user_id` (`user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `wl_users`
+--
+
+DROP TABLE IF EXISTS `wl_users`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `wl_users` (
+  `user_id` int(10) unsigned NOT NULL,
+  `wl_user_id` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`user_id`,`wl_user_id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2016-09-03 14:32:11