reorganize project

18 files changed, 48 insertions, 910 deletions

diff --git a/.gitignore b/.gitignore
index dcbb1110..a0b033e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,6 @@ deps/*
 .idea/*
 *.iml
 **/juick.conf
-**/logging.properties
\ No newline at end of file
+**/logging.properties
+*/build/**
+.gradle/**
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 5a62cfd2..a3741657 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,69 +1,25 @@
-subprojects {
-    apply plugin: 'java'
-    repositories {
-        mavenCentral()
-    }
-}
 buildscript {
     repositories {
         mavenCentral()
-        jcenter()
     }
     dependencies {
         classpath 'org.akhikhl.gretty:gretty:+'
-        classpath 'com.tkruse.gradle:gradle-groovysh-plugin:1.0.7'
     }
 }
-
 apply plugin: 'java'
-apply plugin: 'war'
-apply plugin: 'org.akhikhl.gretty'
-apply plugin: 'com.github.tkruse.groovysh'
 
 repositories {
     mavenCentral()
     jcenter()
 }
-
-def core = project(':deps:com.juick')
-def server = project(':deps:com.juick.server')
-def xmpp = project(':deps:com.juick.xmpp')
-def json = project(':deps:com.juick.json')
-
-project(':deps:com.juick.server') {
-    dependencies {
-        compile core
-    }
-}
-project(':deps:com.juick.xmpp') {
-    dependencies {
-        compile core
-    }
-}
-project(':deps:com.juick.json') {
-    dependencies {
-	compile core
-    }
-}
 dependencies {
-    compile core
-    compile server
-    compile xmpp
-    compile json
-    compile "org.apache.commons:commons-lang3:3.4"
-    compile "org.springframework:spring-jdbc:4.2.6.RELEASE"
-    providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
-    compile 'javax.inject:javax.inject:1'
-    compile 'com.github.pengrad:java-telegram-bot-api:2.1.1'
-    compile 'com.neovisionaries:nv-websocket-client:1.27'
+    testCompile project(':juick-core')
+    testCompile 'org.springframework:spring-jdbc:4.3.1.RELEASE'
     testCompile 'ch.vorburger.mariaDB4j:mariaDB4j:2.1.3'
     testCompile 'org.slf4j:slf4j-jdk14:1.7.13'
-    providedRuntime 'mysql:mysql-connector-java:5.1.39'
     testCompile 'junit:junit:4.12'
+    testRuntime 'mysql:mysql-connector-java:5.1.39'
 }
+
 compileJava.options.encoding = 'UTF-8'
-gretty {
-    httpPort = 8080
-    contextPath = '/'
-    servletContainer = 'tomcat8'
-}
+
diff --git a/deps/com.juick b/deps/com.juick
deleted file mode 160000
-Subproject 39ec74abe77cdab5aa8f50c2524e6f71c2dbbd0
diff --git a/deps/com.juick.json b/deps/com.juick.json
deleted file mode 160000
-Subproject 9dfad84fa487960fde4cc4b0ac6760c8dd5f4ac
diff --git a/deps/com.juick.server b/deps/com.juick.server
deleted file mode 160000
-Subproject 53a4aaacf585e70aadd3b1133319a5bb1e08f0c
diff --git a/juick-api/build.gradle b/juick-api/build.gradle
new file mode 100644
index 00000000..a947c603
--- /dev/null
+++ b/juick-api/build.gradle
@@ -0,0 +1,36 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.tkruse.gradle:gradle-groovysh-plugin:1.0.8'
+    }
+}
+
+apply plugin: 'java'
+apply plugin: 'war'
+apply plugin: 'org.akhikhl.gretty'
+apply plugin: 'com.github.tkruse.groovysh'
+
+repositories {
+    mavenCentral()
+}
+
+dependencies {
+    compile project(':juick-core')
+    compile project(':deps:com.juick.xmpp')
+    compile "org.apache.commons:commons-lang3:3.4"
+    compile "org.springframework:spring-jdbc:4.3.1.RELEASE"
+    providedCompile 'javax.servlet:javax.servlet-api:3.1.0'
+    compile 'javax.inject:javax.inject:1'
+    compile 'com.github.pengrad:java-telegram-bot-api:2.1.1'
+    compile 'com.neovisionaries:nv-websocket-client:1.27'
+    providedRuntime 'mysql:mysql-connector-java:5.1.39'
+    testCompile 'junit:junit:4.12'
+}
+compileJava.options.encoding = 'UTF-8'
+gretty {
+    httpPort = 8080
+    contextPath = '/'
+    servletContainer = 'tomcat8'
+}
diff --git a/src/main/java/com/juick/api/Main.java b/juick-api/src/main/java/com/juick/api/Main.java
index c632d8fc..afd7c11c 100644
--- a/src/main/java/com/juick/api/Main.java
+++ b/juick-api/src/main/java/com/juick/api/Main.java
@@ -105,8 +105,8 @@ public class Main extends HttpServlet implements Stream.StreamListener {
     }
 
     @Override
-    public void onStreamFail(String msg) {
-        log("XMPP failed: " + msg);
+    public void onStreamFail(Exception e) {
+        log("XMPP failed", e);
     }
 
     @Override
diff --git a/src/main/java/com/juick/api/Messages.java b/juick-api/src/main/java/com/juick/api/Messages.java
index 18c868f4..b7131c31 100644
--- a/src/main/java/com/juick/api/Messages.java
+++ b/juick-api/src/main/java/com/juick/api/Messages.java
@@ -84,7 +84,7 @@ public class Messages {
             }
         } else {
             if (!StringUtils.isEmpty(popular)) {
-                feedMessages(request, response, MessagesQueries.getPopular(sql, before_mid));
+                feedMessages(request, response, MessagesQueries.getPopular(sql, vuid, before_mid));
             } else if (!StringUtils.isEmpty(media)) {
                 feedMessages(request, response, MessagesQueries.getPhotos(sql, vuid, before_mid));
             } else if (!StringUtils.isEmpty(tag)) {
diff --git a/src/main/java/com/juick/api/Others.java b/juick-api/src/main/java/com/juick/api/Others.java
index 12849f90..12849f90 100644
--- a/src/main/java/com/juick/api/Others.java
+++ b/juick-api/src/main/java/com/juick/api/Others.java
diff --git a/src/main/java/com/juick/api/PM.java b/juick-api/src/main/java/com/juick/api/PM.java
index 631ae978..631ae978 100644
--- a/src/main/java/com/juick/api/PM.java
+++ b/juick-api/src/main/java/com/juick/api/PM.java
diff --git a/src/main/java/com/juick/api/TelegramBotHook.java b/juick-api/src/main/java/com/juick/api/TelegramBotHook.java
index e1094ff6..e1094ff6 100644
--- a/src/main/java/com/juick/api/TelegramBotHook.java
+++ b/juick-api/src/main/java/com/juick/api/TelegramBotHook.java
diff --git a/src/main/java/com/juick/api/Users.java b/juick-api/src/main/java/com/juick/api/Users.java
index e85c517a..e85c517a 100644
--- a/src/main/java/com/juick/api/Users.java
+++ b/juick-api/src/main/java/com/juick/api/Users.java
diff --git a/src/main/java/com/juick/api/Utils.java b/juick-api/src/main/java/com/juick/api/Utils.java
index ca0518e1..ca0518e1 100644
--- a/src/main/java/com/juick/api/Utils.java
+++ b/juick-api/src/main/java/com/juick/api/Utils.java
diff --git a/src/main/webapp/WEB-INF/juick.conf.example b/juick-api/src/main/webapp/WEB-INF/juick.conf.example
index 61ebbc29..61ebbc29 100644
--- a/src/main/webapp/WEB-INF/juick.conf.example
+++ b/juick-api/src/main/webapp/WEB-INF/juick.conf.example
diff --git a/src/main/webapp/WEB-INF/web.xml b/juick-api/src/main/webapp/WEB-INF/web.xml
index 533a6882..533a6882 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/juick-api/src/main/webapp/WEB-INF/web.xml
diff --git a/juick-www/build.gradle b/juick-www/build.gradle
index c71b682f..1cfab4af 100644
--- a/juick-www/build.gradle
+++ b/juick-www/build.gradle
@@ -6,7 +6,6 @@ buildscript {
     dependencies {
         classpath 'com.eriwen:gradle-css-plugin:1.11.1'
         classpath 'com.eriwen:gradle-js-plugin:1.12.1'
-        classpath 'org.akhikhl.gretty:gretty:+'
         classpath 'com.tkruse.gradle:gradle-groovysh-plugin:1.0.8'
     }
 }
diff --git a/schema.sql b/schema.sql
deleted file mode 100644
index d54d6937..00000000
--- a/schema.sql
+++ /dev/null
@@ -1,837 +0,0 @@
--- 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
-
-/*!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 `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 AUTO_INCREMENT=10850 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 AUTO_INCREMENT=2814769 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 AUTO_INCREMENT=2697 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 AUTO_INCREMENT=29932 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 AUTO_INCREMENT=9 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(48) NOT 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 AUTO_INCREMENT=115285 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 `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 AUTO_INCREMENT=29642 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 2015-12-17 10:49:43
diff --git a/src/main/resources/schema.sql b/src/test/resources/schema.sql
index cdc97b86..980573ae 100644
--- a/src/main/resources/schema.sql
+++ b/src/test/resources/schema.sql
@@ -3,6 +3,7 @@
 -- Host: localhost    Database: juick
 -- ------------------------------------------------------
 -- Server version	5.5.44-0+deb8u1
+use juick;
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -15,7 +16,6 @@
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
 /*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
 
-use juick;
 --
 -- Table structure for table `ads_messages`
 --