merge common projects

33 files changed, 2045 insertions, 0 deletions

diff --git a/juick-common/src/main/java/com/juick/server/component/DisconnectedEvent.java b/juick-common/src/main/java/com/juick/server/component/DisconnectedEvent.java
new file mode 100644
index 000000000..9da6d7a97
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/component/DisconnectedEvent.java
@@ -0,0 +1,14 @@
+package com.juick.server.component;
+
+import org.springframework.context.ApplicationEvent;
+
+public class DisconnectedEvent extends ApplicationEvent {
+    /**
+     * Create a new ApplicationEvent.
+     *
+     * @param source the object on which the event initially occurred (never {@code null})
+     */
+    public DisconnectedEvent(Object source) {
+        super(source);
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/component/JuickServerComponent.java b/juick-common/src/main/java/com/juick/server/component/JuickServerComponent.java
new file mode 100644
index 000000000..792f446f1
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/component/JuickServerComponent.java
@@ -0,0 +1,71 @@
+package com.juick.server.component;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.PingMessage;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import javax.inject.Inject;
+import java.io.IOException;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class JuickServerComponent extends TextWebSocketHandler {
+    private static Logger logger = LoggerFactory.getLogger(JuickServerComponent.class);
+    @Inject
+    private ApplicationEventPublisher applicationEventPublisher;
+    @Inject
+    private ObjectMapper jsonMapper;
+
+    private WebSocketSession session;
+    private final AtomicBoolean closeFlag = new AtomicBoolean(false);
+
+    @PostConstruct
+    public void init() {
+        closeFlag.set(false);
+    }
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+        logger.info("WebSocket connected");
+        this.session = session;
+    }
+
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
+        logger.info("WebSocket disconnected with code {}: {}", status.getCode(), status.getReason());
+        applicationEventPublisher.publishEvent(new DisconnectedEvent(this));
+    }
+
+    @Override
+    protected void handleTextMessage(WebSocketSession session, TextMessage text) throws Exception {
+        com.juick.Message jmsg = jsonMapper.readValue(text.asBytes(), com.juick.Message.class);
+
+        if (logger.isInfoEnabled()) // prevent writeValueAsString execution if logger disabled
+            logger.info("got jmsg: {}", jsonMapper.writeValueAsString(jmsg));
+        if (!closeFlag.get()) {
+            applicationEventPublisher.publishEvent(new MessageEvent(this, jmsg));
+        }
+    }
+
+    @Scheduled(fixedRate = 30000, initialDelay = 30000)
+    public void ping() throws IOException {
+        if (session != null && session.isOpen()) {
+            logger.debug("Sending WebSocket ping");
+            session.sendMessage(new PingMessage());
+        } else if (!closeFlag.get()) {
+            applicationEventPublisher.publishEvent(new DisconnectedEvent(this));
+        }
+    }
+    @PreDestroy
+    public void close() {
+        closeFlag.set(true);
+    }
+
+}
diff --git a/juick-common/src/main/java/com/juick/server/component/JuickServerReconnectManager.java b/juick-common/src/main/java/com/juick/server/component/JuickServerReconnectManager.java
new file mode 100644
index 000000000..a662e4fb6
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/component/JuickServerReconnectManager.java
@@ -0,0 +1,22 @@
+package com.juick.server.component;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationListener;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.client.WebSocketConnectionManager;
+
+import javax.inject.Inject;
+
+@Component
+public class JuickServerReconnectManager implements ApplicationListener<DisconnectedEvent> {
+    private static Logger logger = LoggerFactory.getLogger(JuickServerReconnectManager.class);
+    @Inject
+    private WebSocketConnectionManager webSocketConnectionManager;
+    @Override
+    public void onApplicationEvent(DisconnectedEvent event) {
+        logger.info("retrying...");
+        webSocketConnectionManager.stop();
+        webSocketConnectionManager.start();
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/component/MessageEvent.java b/juick-common/src/main/java/com/juick/server/component/MessageEvent.java
new file mode 100644
index 000000000..048de6a6e
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/component/MessageEvent.java
@@ -0,0 +1,22 @@
+package com.juick.server.component;
+
+import com.juick.Message;
+import org.springframework.context.ApplicationEvent;
+
+public class MessageEvent extends ApplicationEvent {
+    private Message message;
+    /**
+     * Create a new ApplicationEvent.
+     *
+     * @param source the object on which the event initially occurred (never {@code null})
+     * @param message app message
+     */
+    public MessageEvent(Object source, Message message) {
+        super(source);
+        this.message = message;
+    }
+
+    public Message getMessage() {
+        return message;
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/component/UserUpdatedEvent.java b/juick-common/src/main/java/com/juick/server/component/UserUpdatedEvent.java
new file mode 100644
index 000000000..059aeefda
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/component/UserUpdatedEvent.java
@@ -0,0 +1,23 @@
+package com.juick.server.component;
+
+import com.juick.User;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.lang.NonNull;
+
+public class UserUpdatedEvent extends ApplicationEvent {
+    private User user;
+    /**
+     * Generated when user is updated (avatar changed, etc).
+     *
+     * @param source the object on which the event initially occurred (never {@code null})
+     * @param user updated user
+     */
+    public UserUpdatedEvent(@NonNull Object source, User user) {
+        super(source);
+        this.user = user;
+    }
+
+    public User getUser() {
+        return user;
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java b/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
new file mode 100644
index 000000000..d9b842afb
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/configuration/BaseWebConfiguration.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.configuration;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.juick.server.xmpp.JidConverter;
+import com.juick.server.xmpp.s2s.BasicXmppSession;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.format.support.DefaultFormattingConversionService;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.web.multipart.MultipartResolver;
+import org.springframework.web.multipart.commons.CommonsMultipartResolver;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+import rocks.xmpp.core.session.Extension;
+import rocks.xmpp.core.session.XmppSessionConfiguration;
+import rocks.xmpp.core.session.debug.LogbackDebugger;
+
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * Created by vitalyster on 28.06.2016.
+ */
+@Configuration
+public class BaseWebConfiguration implements WebMvcConfigurer, SchedulingConfigurer {
+
+
+    @Override
+    public void configurePathMatch(PathMatchConfigurer configurer) {
+        configurer.setUseSuffixPatternMatch(false);
+    }
+
+    @Override
+    public void configureMessageConverters(List<HttpMessageConverter<?>> converters) {
+        MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter(jsonMapper());
+        converters.add(converter);
+    }
+
+    @Bean
+    public ObjectMapper jsonMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY);
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT);
+        mapper.registerModule(new Jdk8Module());
+        mapper.registerModule(new JavaTimeModule());
+        return mapper;
+    }
+
+    @Bean
+    public MultipartResolver multipartResolver() {
+        CommonsMultipartResolver resolver = new CommonsMultipartResolver();
+        resolver.setMaxUploadSize(10000000);
+        return resolver;
+    }
+
+    @Override
+    public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+        taskRegistrar.setScheduler(taskExecutor());
+    }
+
+    @Bean(destroyMethod="shutdown")
+    public Executor taskExecutor() {
+        return Executors.newScheduledThreadPool(100);
+    }
+    @Value("${hostname:localhost}")
+    private String hostname;
+
+    @Bean
+    public ExecutorService service() {
+        return Executors.newCachedThreadPool();
+    }
+    @Bean
+    public BasicXmppSession session() {
+        XmppSessionConfiguration configuration = XmppSessionConfiguration.builder()
+                .extensions(Extension.of(com.juick.Message.class))
+                .debugger(LogbackDebugger.class)
+                .build();
+        return BasicXmppSession.create(hostname, configuration);
+    }
+    @Bean
+    public static ConversionService conversionService() {
+        DefaultFormattingConversionService cs = new DefaultFormattingConversionService();
+        cs.addConverter(new JidConverter());
+        return cs;
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/configuration/JuickServerWebsocketConfiguration.java b/juick-common/src/main/java/com/juick/server/configuration/JuickServerWebsocketConfiguration.java
new file mode 100644
index 000000000..18501eaff
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/configuration/JuickServerWebsocketConfiguration.java
@@ -0,0 +1,72 @@
+package com.juick.server.configuration;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.juick.server.component.JuickServerComponent;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.http.client.InterceptingClientHttpRequestFactory;
+import org.springframework.http.client.support.BasicAuthorizationInterceptor;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.client.HttpClientErrorException;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.socket.client.WebSocketConnectionManager;
+import org.springframework.web.socket.client.standard.StandardWebSocketClient;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import javax.inject.Inject;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+@Lazy
+@Configuration
+@EnableScheduling
+public class JuickServerWebsocketConfiguration {
+    private static final Logger logger = LoggerFactory.getLogger(JuickServerWebsocketConfiguration.class);
+    @Value("${websocket_url:ws://localhost:8080/ws/}")
+    private String baseUri;
+    @Value("${api_user:juick}")
+    private String serviceUser;
+    @Value("${api_password:secret}")
+    private String servicePassword;
+    @Inject
+    ObjectMapper jsonMapper;
+    @Inject
+    private JuickServerComponent juickServerComponent;
+    @Bean
+    public RestTemplate rest() {
+        RestTemplate rest = new RestTemplate();
+        List<ClientHttpRequestInterceptor> interceptors = Collections.singletonList(
+                new BasicAuthorizationInterceptor(serviceUser, servicePassword));
+
+        rest.setRequestFactory(new InterceptingClientHttpRequestFactory(rest.getRequestFactory(), interceptors));
+        return rest;
+    }
+    @Bean
+    public WebSocketConnectionManager connectionManager() {
+        String hash = StringUtils.EMPTY;
+        try {
+            ResponseEntity<String> response = rest().exchange("https://api.juick.com/auth",
+                    HttpMethod.GET, null, String.class);
+            hash = jsonMapper.readValue(response.getBody(), String.class);
+        } catch (HttpClientErrorException | IOException e) {
+            logger.warn("service component is not authenticated", e);
+        }
+        String websocketURI = UriComponentsBuilder.fromUriString(baseUri)
+                .queryParam("hash", hash).build().toUriString();
+        WebSocketConnectionManager manager = new WebSocketConnectionManager(client(), juickServerComponent, websocketURI);
+        return manager;
+    }
+    @Bean
+    public StandardWebSocketClient client() {
+        return new StandardWebSocketClient();
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/configuration/StorageConfiguration.java b/juick-common/src/main/java/com/juick/server/configuration/StorageConfiguration.java
new file mode 100644
index 000000000..94b230375
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/configuration/StorageConfiguration.java
@@ -0,0 +1,14 @@
+package com.juick.server.configuration;
+
+import com.juick.service.ImagesService;
+import com.juick.service.ImagesServiceImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class StorageConfiguration {
+    @Bean
+    public ImagesService imagesService() {
+        return new ImagesServiceImpl();
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/helpers/AnonymousUser.java b/juick-common/src/main/java/com/juick/server/helpers/AnonymousUser.java
new file mode 100644
index 000000000..122bbe295
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/helpers/AnonymousUser.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.helpers;
+
+import com.juick.User;
+
+/**
+ * Created by aalexeev on 12/11/16.
+ */
+public final class AnonymousUser extends User {
+    public static final AnonymousUser INSTANCE = new AnonymousUser();
+
+    private AnonymousUser() {
+        super.setUid(getUid());
+        super.setName(getName());
+        super.setAvatar(getAvatar());
+        super.setFullName(getFullName());
+        super.setMessagesCount(getMessagesCount());
+        super.setAuthHash(getAuthHash());
+        super.setBanned(isBanned());
+        super.setCredentials(getCredentials());
+        super.setLang(getLang());
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return obj == this || obj instanceof AnonymousUser;
+    }
+
+    @Override
+    public int getUid() {
+        return 0;
+    }
+
+    @Override
+    public String getName() {
+        return "Anonymous";
+    }
+
+    @Override
+    public String getFullName() {
+        return getName();
+    }
+
+    @Override
+    public String getAuthHash() {
+        return null;
+    }
+
+    @Override
+    public Integer getUnreadCount() {
+        return 0;
+    }
+
+    @Override
+    public boolean isBanned() {
+        return false;
+    }
+
+    @Override
+    public Object getAvatar() {
+        return null;
+    }
+
+    @Override
+    public String getCredentials() {
+        return null;
+    }
+
+    @Override
+    public String getLang() {
+        return "__";
+    }
+
+    @Override
+    public int getMessagesCount() {
+        return 0;
+    }
+
+    @Override
+    public boolean isAnonymous() {
+        return true;
+    }
+
+    @Override
+    public void setUid(int uid) {
+    }
+
+    @Override
+    public void setName(String name) {
+    }
+
+    @Override
+    public void setFullName(String fullName) {
+    }
+
+    @Override
+    public void setAuthHash(String authHash) {
+    }
+
+    @Override
+    public void setUnreadCount(Integer count) {
+    }
+
+    @Override
+    public void setBanned(boolean banned) {
+    }
+
+    @Override
+    public void setAvatar(Object avatar) {
+    }
+
+    @Override
+    public void setCredentials(String credentials) {
+    }
+
+    @Override
+    public void setLang(String lang) {
+    }
+
+    @Override
+    public void setMessagesCount(int messagesCount) {
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/helpers/ApplicationStatus.java b/juick-common/src/main/java/com/juick/server/helpers/ApplicationStatus.java
new file mode 100644
index 000000000..8f57b2a65
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/helpers/ApplicationStatus.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.helpers;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * Created by vt on 03/09/16.
+ */
+public class ApplicationStatus {
+    private boolean connected;
+    private boolean crosspostEnabled;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("connected", connected)
+                .append("crosspostEnabled", crosspostEnabled)
+                .toString();
+    }
+
+    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/juick-common/src/main/java/com/juick/server/helpers/Auth.java b/juick-common/src/main/java/com/juick/server/helpers/Auth.java
new file mode 100644
index 000000000..d01efadd2
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/helpers/Auth.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.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/juick-common/src/main/java/com/juick/server/helpers/NotifyOpts.java b/juick-common/src/main/java/com/juick/server/helpers/NotifyOpts.java
new file mode 100644
index 000000000..0e49a424e
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/helpers/NotifyOpts.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.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/juick-common/src/main/java/com/juick/server/helpers/PrivacyOpts.java b/juick-common/src/main/java/com/juick/server/helpers/PrivacyOpts.java
new file mode 100644
index 000000000..86281d4af
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/helpers/PrivacyOpts.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.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/juick-common/src/main/java/com/juick/server/helpers/PrivateChats.java b/juick-common/src/main/java/com/juick/server/helpers/PrivateChats.java
new file mode 100644
index 000000000..6e446f982
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/helpers/PrivateChats.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.helpers;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.juick.User;
+
+import java.util.List;
+
+/**
+ * Created by vt on 24/11/2016.
+ */
+public class PrivateChats {
+    private List<User> users;
+
+    @JsonProperty("pms")
+    public List<User> getUsers() {
+        return users;
+    }
+
+    public void setUsers(List<User> users) {
+        this.users = users;
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/helpers/ResponseReply.java b/juick-common/src/main/java/com/juick/server/helpers/ResponseReply.java
new file mode 100644
index 000000000..91ba2b8aa
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/helpers/ResponseReply.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.helpers;
+
+import java.util.Date;
+
+/**
+ * Created by vitalyster on 13.12.2016.
+ */
+public class ResponseReply {
+    private String muname;
+    private int mid;
+    private int rid;
+    private String uname;
+    private String description;
+    private Date pubDate;
+    private String attachmentType;
+
+    public String getMuname() {
+        return muname;
+    }
+
+    public void setMuname(String muname) {
+        this.muname = muname;
+    }
+
+    public int getMid() {
+        return mid;
+    }
+
+    public void setMid(int mid) {
+        this.mid = mid;
+    }
+
+    public int getRid() {
+        return rid;
+    }
+
+    public void setRid(int rid) {
+        this.rid = rid;
+    }
+
+    public String getUname() {
+        return uname;
+    }
+
+    public void setUname(String uname) {
+        this.uname = uname;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public Date getPubDate() {
+        return pubDate;
+    }
+
+    public void setPubDate(Date pubDate) {
+        this.pubDate = pubDate;
+    }
+
+    public String getAttachmentType() {
+        return attachmentType;
+    }
+
+    public void setAttachmentType(String attachmentType) {
+        this.attachmentType = attachmentType;
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/helpers/TagStats.java b/juick-common/src/main/java/com/juick/server/helpers/TagStats.java
new file mode 100644
index 000000000..ab24983f5
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/helpers/TagStats.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.helpers;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.juick.Tag;
+
+/**
+ * Created by vitalyster on 01.12.2016.
+ */
+public class TagStats {
+    private Tag tag;
+    private int usageCount;
+
+    public Tag getTag() {
+        return tag;
+    }
+
+    public void setTag(Tag tag) {
+        this.tag = tag;
+    }
+
+    @JsonProperty("messages")
+    public int getUsageCount() {
+        return usageCount;
+    }
+
+    public void setUsageCount(int usageCount) {
+        this.usageCount = usageCount;
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/helpers/UserInfo.java b/juick-common/src/main/java/com/juick/server/helpers/UserInfo.java
new file mode 100644
index 000000000..284cd2e8d
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/helpers/UserInfo.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.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/juick-common/src/main/java/com/juick/server/protocol/JuickProtocol.java b/juick-common/src/main/java/com/juick/server/protocol/JuickProtocol.java
new file mode 100644
index 000000000..1be34a3f8
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/protocol/JuickProtocol.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.protocol;
+
+import com.juick.Message;
+import com.juick.Tag;
+import com.juick.User;
+import com.juick.formatters.PlainTextFormatter;
+import com.juick.server.protocol.annotation.UserCommand;
+import com.juick.server.util.TagUtils;
+import com.juick.service.*;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.commons.lang3.reflect.MethodUtils;
+
+import javax.inject.Inject;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+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 {
+
+    private String baseUri;
+    private ProtocolListener listener;
+
+    @Inject
+    UserService userService;
+    @Inject
+    TagService tagService;
+    @Inject
+    MessagesService messagesService;
+    @Inject
+    SubscriptionService subscriptionService;
+    @Inject
+    PMQueriesService pmQueriesService;
+    @Inject
+    PrivacyQueriesService privacyQueriesService;
+    @Inject
+    ShowQueriesService showQueriesService;
+
+    public JuickProtocol(String baseUri) {
+        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 String getReply(User user, String userInput) throws InvocationTargetException,
+            IllegalAccessException, NoSuchMethodException {
+        Optional<Method> cmd = MethodUtils.getMethodsListWithAnnotation(getClass(), UserCommand.class).stream()
+                .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.trim());
+        } else {
+            Matcher matcher = Pattern.compile(cmd.get().getAnnotation(UserCommand.class).pattern(),
+                    cmd.get().getAnnotation(UserCommand.class).patternFlags()).matcher(userInput.trim());
+            List<String> groups = new ArrayList<>();
+            while (matcher.find()) {
+                for (int i = 1; i <= matcher.groupCount(); i++) {
+                    groups.add(matcher.group(i));
+                }
+            }
+            return (String) getClass().getMethod(cmd.get().getName(), User.class, String[].class)
+                    .invoke(this, user, groups.toArray(new String[groups.size()]));
+        }
+    }
+
+    public String postMessage(User user, String input) {
+        List<Tag> tags = tagService.fromString(input, false);
+        String body = input.substring(TagUtils.toString(tags).length());
+        int mid = messagesService.createMessage(user.getUid(), body, null, tags);
+        subscriptionService.subscribeMessage(mid, user.getUid());
+        listener.messagePosted(messagesService.getMessage(mid));
+        return "New message posted.\n#" + mid + " " + baseUri + mid;
+    }
+
+
+
+
+    @UserCommand(pattern = "^d\\s*\\#([0-9]+)$", patternFlags = Pattern.CASE_INSENSITIVE,
+            help = "D #12345 - delete the message")
+    public String commandDel(User user, String... args) {
+        int mid = NumberUtils.toInt(args[0], 0);
+        if (messagesService.deleteMessage(user.getUid(), mid)) {
+            return String.format("Message %s deleted", mid);
+        }
+        return "Error";
+    }
+
+
+    @UserCommand(pattern = "^(#+)$", help = "# - Show last messages from your feed (## - second page, ...)")
+    public String commandMyFeed(User user, String... arguments) {
+        // number of # is the page count
+        int page = arguments[0].length() - 1;
+        List<Integer> mids = messagesService.getMyFeed(user.getUid(), page, false);
+        List<Message> messages = messagesService.getMessages(mids);
+        // TODO: add instructions for empty feed
+        return "Your feed: \n" + String.join("\n",
+                messages.stream().map(PlainTextFormatter::formatPost).collect(Collectors.toList()));
+    }
+    @UserCommand(pattern = "^(#|\\.)(\\d+)((\\.|\\-|\\/)(\\d+))?\\s([\\s\\S]+)",
+    help = "#1234 *tag *tag2 - edit tags\n#1234 text - reply to message")
+    public String EditOrReply(User user, String... args) {
+        int mid = NumberUtils.toInt(args[1]);
+        int rid = NumberUtils.toInt(args[4], 0);
+        String txt = args[5];
+        List<Tag> messageTags = tagService.fromString(txt, true);
+        if (messageTags.size() > 0) {
+            if (user.getUid() != messagesService.getMessageAuthor(mid).getUid()) {
+                return "It is not your message";
+            }
+            tagService.updateTags(mid, messageTags);
+            return "Tags are updated";
+        } else {
+            int newrid = messagesService.createReply(mid, rid, user.getUid(), txt, null);
+            listener.messagePosted(messagesService.getReply(mid, newrid));
+            return "Reply posted.\n#" + mid + "/" + newrid + " "
+                    + baseUri + mid + "#" + newrid;
+        }
+    }
+
+
+    @UserCommand(pattern = "^(s|u)\\s+\\@(\\S+)$", help = "S @user - subscribe to user's posts",
+            patternFlags = Pattern.CASE_INSENSITIVE)
+    public String commandSubscribeUser(User user, String... args) {
+        boolean subscribe = args[0].equalsIgnoreCase("s");
+        User toUser = userService.getUserByName(args[1]);
+        if (toUser.getUid() > 0) {
+            if (subscribe) {
+                if (subscriptionService.subscribeUser(user, toUser)) {
+                    listener.userSubscribed(user, toUser);
+                    return "Subscribed";
+                    // TODO: already subscribed case
+                }
+            } else {
+                if (subscriptionService.unSubscribeUser(user, toUser)) {
+                    return "Unsubscribed from @" + toUser.getName();
+                }
+                return "You was not subscribed to @" + toUser.getName();
+            }
+        }
+        return "Error";
+    }
+
+    public String getBaseUri() {
+        return baseUri;
+    }
+
+    public ProtocolListener getListener() {
+        return listener;
+    }
+
+    public void setListener(ProtocolListener listener) {
+        this.listener = listener;
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/protocol/ProtocolListener.java b/juick-common/src/main/java/com/juick/server/protocol/ProtocolListener.java
new file mode 100644
index 000000000..f051e6d0c
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/protocol/ProtocolListener.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.protocol;
+
+import com.juick.Message;
+import com.juick.User;
+
+/**
+ * Created by vitalyster on 19.12.2016.
+ */
+public interface ProtocolListener {
+    void privateMessage(User from, User to, String body);
+    void userSubscribed(User from, User to);
+    void messagePosted(Message msg);
+}
diff --git a/juick-common/src/main/java/com/juick/server/protocol/annotation/UserCommand.java b/juick-common/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
new file mode 100644
index 000000000..ab37a4e17
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/protocol/annotation/UserCommand.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.protocol.annotation;
+
+import org.apache.commons.lang3.StringUtils;
+
+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 StringUtils.EMPTY;
+
+    /**
+     *
+     * @return pattern flags
+     */
+    int patternFlags() default 0;
+
+    /**
+     *
+     * @return a string used in HELP command output. Basically, only 1 string
+     */
+    String help() default StringUtils.EMPTY;
+}
diff --git a/juick-common/src/main/java/com/juick/server/util/HashUtils.java b/juick-common/src/main/java/com/juick/server/util/HashUtils.java
new file mode 100644
index 000000000..b45004577
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/util/HashUtils.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.util;
+
+import java.util.Random;
+
+/**
+ * Created by vitalyster on 29.06.2017.
+ */
+public class HashUtils {
+    private static final String ABCDEF = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    public static String generateHash(final 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();
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java b/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java
new file mode 100644
index 000000000..1c3b4e66c
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/util/HttpBadRequestException.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.util;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+/**
+ * Created by vt on 24/11/2016.
+ */
+@ResponseStatus(value = HttpStatus.BAD_REQUEST)
+public class HttpBadRequestException extends RuntimeException {
+    public HttpBadRequestException() {
+        super(StringUtils.EMPTY, null, false, false);
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/util/HttpForbiddenException.java b/juick-common/src/main/java/com/juick/server/util/HttpForbiddenException.java
new file mode 100644
index 000000000..3251ca389
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/util/HttpForbiddenException.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.util;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+/**
+ * Created by vt on 24/11/2016.
+ */
+@ResponseStatus(value = HttpStatus.FORBIDDEN)
+public class HttpForbiddenException extends RuntimeException {
+    public HttpForbiddenException() {
+        super(StringUtils.EMPTY, null, false, false);
+    }
+
+}
diff --git a/juick-common/src/main/java/com/juick/server/util/HttpNotFoundException.java b/juick-common/src/main/java/com/juick/server/util/HttpNotFoundException.java
new file mode 100644
index 000000000..f66ece8b6
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/util/HttpNotFoundException.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.util;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+/**
+ * Created by vt on 24/11/2016.
+ */
+@ResponseStatus(value = HttpStatus.NOT_FOUND)
+public class HttpNotFoundException extends RuntimeException {
+    public HttpNotFoundException() {
+        super(StringUtils.EMPTY, null, false, false);
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/util/HttpUtils.java b/juick-common/src/main/java/com/juick/server/util/HttpUtils.java
new file mode 100644
index 000000000..35f594f35
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/util/HttpUtils.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.util;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.UUID;
+
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class HttpUtils {
+    private static final Logger logger = LoggerFactory.getLogger(HttpUtils.class);
+
+    public static String receiveMultiPartFile(MultipartFile attach, String tmpDir) {
+        if (attach !=null && !attach.isEmpty()) {
+            String partname = attach.getOriginalFilename();
+            if (partname != null && partname.length() > 0) {
+                String attachmentType = partname.substring(partname.length() - 3).toLowerCase();
+                if (attachmentType.equals("jpg") || attachmentType.equals("peg") || attachmentType.equals("png")) {
+                    if (attachmentType.equals("peg")) {
+                        attachmentType = "jpg";
+                    }
+                    String attachmentFName = DigestUtils.md5Hex(UUID.randomUUID().toString()) + "." + attachmentType;
+                    try {
+                        Files.write(Paths.get(tmpDir, attachmentFName),
+                                attach.getBytes());
+                        return attachmentFName;
+                    } catch (IOException e) {
+                        logger.warn("file receive error", e);
+                    }
+                }
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+    public static String downloadImage(URL url, String tmpDir) throws Exception {
+        URLConnection urlConn;
+        try {
+            urlConn = url.openConnection();
+        } catch (IOException e) {
+            logger.error(String.format("Failed open url: %s", url.toString()));
+            throw e;
+        }
+
+        try (InputStream is = urlConn.getInputStream()) {
+            String mime = urlConn.getContentType();
+
+            String attachmentType;
+            if (mime != null && mime.equals("image/jpeg")) {
+                attachmentType = "jpg";
+            } else if (mime != null && mime.equals("image/png")) {
+                attachmentType = "png";
+            } else if (url.getFile().toLowerCase().endsWith("jpg")) {
+                attachmentType = "jpg";
+            } else if (url.getFile().toLowerCase().endsWith("png")) {
+                attachmentType = "png";
+            } else {
+                throw new Exception("Wrong file type: " + mime);
+            }
+
+            String attachmentFName = DigestUtils.md5Hex(UUID.randomUUID().toString()) + "." + attachmentType;
+            Files.copy(is, Paths.get(tmpDir, attachmentFName));
+            return attachmentFName;
+        } catch (Exception e) {
+            logger.error(String.format("Failed download image by url: %s", url.toString()), e);
+            throw e;
+        }
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/util/ImageUtils.java b/juick-common/src/main/java/com/juick/server/util/ImageUtils.java
new file mode 100644
index 000000000..94ecf71ea
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/util/ImageUtils.java
@@ -0,0 +1,168 @@
+
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.util;
+
+import org.apache.commons.imaging.ImageInfo;
+import org.apache.commons.imaging.ImageReadException;
+import org.apache.commons.imaging.Imaging;
+import org.apache.commons.imaging.common.ImageMetadata;
+import org.apache.commons.imaging.formats.jpeg.JpegImageMetadata;
+import org.apache.commons.imaging.formats.tiff.TiffField;
+import org.apache.commons.imaging.formats.tiff.constants.TiffTagConstants;
+import org.apache.commons.io.FilenameUtils;
+import org.imgscalr.Scalr;
+import org.imgscalr.Scalr.Rotation;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+public class ImageUtils {
+
+/**
+ * Returns <code>BufferedImage</code>, same as <code>ImageIO.read()</code> does.
+ *
+ * <p>JPEG images with EXIF metadata are rotated according to Orientation tag.
+ *
+ * @param imageFile a <code>File</code> to read from.
+ */
+    private static BufferedImage readImageWithOrientation(File imageFile)
+            throws IOException {
+
+        BufferedImage image = ImageIO.read(imageFile);
+        if (!FilenameUtils.getExtension(imageFile.getName()).equals("jpg")) {
+            return image;
+        }
+
+        try {
+            ImageMetadata metadata = Imaging.getMetadata(imageFile);
+
+            if (metadata instanceof JpegImageMetadata) {
+                JpegImageMetadata jpegMetadata = (JpegImageMetadata) metadata;
+                TiffField orientationField = jpegMetadata.findEXIFValue(TiffTagConstants.TIFF_TAG_ORIENTATION);
+
+                if (orientationField != null) {
+                    int orientation = orientationField.getIntValue();
+                    switch (orientation) {
+                        case TiffTagConstants.ORIENTATION_VALUE_ROTATE_90_CW:
+                            image = Scalr.rotate(image, Rotation.CW_90);
+                            break;
+                        case TiffTagConstants.ORIENTATION_VALUE_ROTATE_180:
+                            image = Scalr.rotate(image, Rotation.CW_180);
+                            break;
+                        case TiffTagConstants.ORIENTATION_VALUE_ROTATE_270_CW:
+                            image = Scalr.rotate(image, Rotation.CW_270);
+                            break;
+                        case TiffTagConstants.ORIENTATION_VALUE_MIRROR_HORIZONTAL:
+                            image = Scalr.rotate(image, Rotation.FLIP_HORZ);
+                            break;
+                        case TiffTagConstants.ORIENTATION_VALUE_MIRROR_VERTICAL:
+                            image = Scalr.rotate(image, Rotation.FLIP_VERT);
+                            break;
+                        case TiffTagConstants.ORIENTATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_90_CW:
+                            image = Scalr.rotate(Scalr.rotate(image, Rotation.FLIP_HORZ), Rotation.CW_90);
+                            break;
+                        case TiffTagConstants.ORIENTATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_270_CW:
+                            image = Scalr.rotate(Scalr.rotate(image, Rotation.FLIP_HORZ), Rotation.CW_270);
+                            break;
+                        case TiffTagConstants.ORIENTATION_VALUE_HORIZONTAL_NORMAL:
+                        default:
+                            // do nothing
+                            break;
+                    }
+                }
+            }
+        } catch (ImageReadException e) {
+            // failed to read metadata.
+            // nothing to do here, return image as is.
+        }
+
+        return image;
+    }
+
+    /**
+     * Move attached image from temp folder to image folder.
+     * Create preview images in corresponding folders.
+     *
+     * @param tempFilename   Name of the image file in the temp folder.
+     * @param outputFilename Name that will be used in the image folder.
+     * @param tmpDir         Path string for the temp folder.
+     * @param imgDir         Path string for the image folder.
+     */
+    public static void saveImageWithPreviews(String tempFilename, String outputFilename, String tmpDir, String imgDir)
+            throws IOException {
+        String ext = FilenameUtils.getExtension(outputFilename);
+
+        Path outputImagePath = Paths.get(imgDir, "p", outputFilename);
+        Files.move(Paths.get(tmpDir, tempFilename), outputImagePath);
+        BufferedImage originalImage = readImageWithOrientation(outputImagePath.toFile());
+
+        int width = originalImage.getWidth();
+        int height = originalImage.getHeight();
+        int maxDimension = (width > height) ? width : height;
+        BufferedImage image1024 = (maxDimension > 1024) ? Scalr.resize(originalImage, 1024) : originalImage;
+        BufferedImage image0512 = (maxDimension > 512) ? Scalr.resize(originalImage, 512) : originalImage;
+        BufferedImage image0160 = (maxDimension > 160) ? Scalr.resize(originalImage, 160) : originalImage;
+        ImageIO.write(image1024, ext, Paths.get(imgDir, "photos-1024", outputFilename).toFile());
+        ImageIO.write(image0512, ext, Paths.get(imgDir, "photos-512", outputFilename).toFile());
+        ImageIO.write(image0160, ext, Paths.get(imgDir, "ps", outputFilename).toFile());
+    }
+
+    /**
+     * Save new avatar in all required sizes.
+     *
+     * @param tempFilename Name of the image file in the temp folder.
+     * @param uid          User id that is used to build image file names.
+     * @param tmpDir       Path string for the temp folder.
+     * @param imgDir       Path string for the image folder.
+     */
+    public static void saveAvatar(String tempFilename, int uid, String tmpDir, String imgDir)
+            throws IOException {
+        String ext = FilenameUtils.getExtension(tempFilename);
+        String originalName = String.format("%s.%s", uid, ext);
+        Path originalPath = Paths.get(imgDir, "ao", originalName);
+        Files.move(Paths.get(tmpDir, tempFilename), originalPath, StandardCopyOption.REPLACE_EXISTING);
+        BufferedImage originalImage = ImageIO.read(originalPath.toFile());
+
+        String targetExt = "png";
+        String targetName = String.format("%s.%s", uid, targetExt);
+        ImageIO.write(Scalr.resize(originalImage, 96), targetExt, Paths.get(imgDir, "a", targetName).toFile());
+        ImageIO.write(Scalr.resize(originalImage, 32), targetExt, Paths.get(imgDir, "as", targetName).toFile());
+    }
+
+    public static Integer getImageHeight(File imageFile) throws IOException, ImageReadException {
+        if (imageFile.exists()) {
+            ImageInfo info = Imaging.getImageInfo(imageFile);
+            return info.getHeight();
+        }
+        return 0;
+    }
+    public static Integer getImageWidth(File imageFile) throws IOException, ImageReadException {
+        if (imageFile.exists()) {
+            ImageInfo info = Imaging.getImageInfo(imageFile);
+            return info.getWidth();
+        }
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/juick-common/src/main/java/com/juick/server/util/TagUtils.java b/juick-common/src/main/java/com/juick/server/util/TagUtils.java
new file mode 100644
index 000000000..9edeab32a
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/util/TagUtils.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.util;
+
+import com.juick.Tag;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Created by aalexeev on 11/13/16.
+ */
+public class TagUtils {
+    private TagUtils() {
+        throw new IllegalStateException();
+    }
+
+    public static String toString(final List<Tag> tags) {
+        if (CollectionUtils.isEmpty(tags))
+            return StringUtils.EMPTY;
+
+        return tags.stream().map(t -> " *" + t.getName())
+                .collect(Collectors.joining());
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/util/UserUtils.java b/juick-common/src/main/java/com/juick/server/util/UserUtils.java
new file mode 100644
index 000000000..ab5c320b3
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/util/UserUtils.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.util;
+
+import com.juick.User;
+import com.juick.server.helpers.AnonymousUser;
+import com.juick.service.security.entities.JuickUser;
+import javax.annotation.Nonnull;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * Created by aalexeev on 11/14/16.
+ */
+public class UserUtils {
+    private UserUtils() {
+        throw new IllegalStateException();
+    }
+
+    public static Authentication getAuthentication() {
+        return SecurityContextHolder.getContext().getAuthentication();
+    }
+
+    public static Object getPrincipal(final Authentication authentication) {
+        return authentication == null ? null : authentication.getPrincipal();
+    }
+
+    @Nonnull
+    public static User getCurrentUser() {
+        Object principal = getPrincipal(getAuthentication());
+
+        if (principal instanceof JuickUser)
+            return ((JuickUser) principal).getUser();
+
+        if (principal instanceof User)
+            return (User) principal;
+
+        return AnonymousUser.INSTANCE;
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/util/WebUtils.java b/juick-common/src/main/java/com/juick/server/util/WebUtils.java
new file mode 100644
index 000000000..9dd628eeb
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/util/WebUtils.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.util;
+
+import java.util.regex.Pattern;
+
+/**
+ * Created by aalexeev on 11/28/16.
+ */
+public class WebUtils {
+    private WebUtils() {
+        throw new IllegalStateException();
+    }
+
+    private static final Pattern USER_NAME_PATTERN = Pattern.compile("[a-zA-Z-_\\d]{2,16}");
+
+    private static final Pattern POST_NUMBER_PATTERN = Pattern.compile("-?\\d+");
+
+    private static final Pattern JID_PATTERN = Pattern.compile("^[a-zA-Z0-9\\\\-\\\\_\\\\@\\\\.]{6,64}$");
+
+
+    public static boolean isPostNumber(final String aString) {
+        return aString != null && POST_NUMBER_PATTERN.matcher(aString).matches();
+    }
+
+    public static boolean isNotPostNumber(final String aString) {
+        return !isPostNumber(aString);
+    }
+
+    public static boolean isUserName(final String aString) {
+        return aString != null && USER_NAME_PATTERN.matcher(aString).matches();
+    }
+
+    public static boolean isNotUserName(final String aString) {
+        return !isUserName(aString);
+    }
+
+    public static boolean isJid(final String aString) {
+        return aString != null && JID_PATTERN.matcher(aString).matches();
+    }
+
+    public static boolean isNotJid(final String aString) {
+        return !isJid(aString);
+    }
+
+
+}
diff --git a/juick-common/src/main/java/com/juick/server/xmpp/JidConverter.java b/juick-common/src/main/java/com/juick/server/xmpp/JidConverter.java
new file mode 100644
index 000000000..e9a9707eb
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/xmpp/JidConverter.java
@@ -0,0 +1,13 @@
+package com.juick.server.xmpp;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.lang.Nullable;
+import rocks.xmpp.addr.Jid;
+
+public class JidConverter implements Converter<String, Jid> {
+    @Nullable
+    @Override
+    public Jid convert(String jidStr) {
+        return Jid.of(jidStr);
+    }
+}
diff --git a/juick-common/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java b/juick-common/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java
new file mode 100644
index 000000000..6956a99a4
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/xmpp/extensions/JuickMessage.java
@@ -0,0 +1,162 @@
+/*
+ * 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.xmpp.extensions;
+
+import com.juick.Tag;
+import com.juick.xmpp.StanzaChild;
+import com.juick.xmpp.utils.XmlUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class JuickMessage extends com.juick.Message implements StanzaChild {
+    public final static String XMLNS = "http://juick.com/message";
+    public final static String TagName = "juick";
+    private SimpleDateFormat df;
+    public JuickMessage() {
+        df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        df.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
+
+    @Override
+    public String getXMLNS() {
+        return XMLNS;
+    }
+    @Override
+    public JuickMessage parse(XmlPullParser parser) throws XmlPullParserException, IOException, ParseException {
+        JuickMessage jmsg = new JuickMessage();
+        final String sMID = parser.getAttributeValue(null, "mid");
+        if (sMID != null) {
+            jmsg.setMid(Integer.parseInt(sMID));
+        }
+        final String sRID = parser.getAttributeValue(null, "rid");
+        if (sRID != null) {
+            jmsg.setRid(Integer.parseInt(sRID));
+        }
+        final String sReplyTo = parser.getAttributeValue(null, "replyto");
+        if (sReplyTo != null) {
+            jmsg.setReplyto(Integer.parseInt(sReplyTo));
+        }
+        final String sPrivacy = parser.getAttributeValue(null, "privacy");
+        if (sPrivacy != null) {
+            jmsg.setPrivacy(Integer.parseInt(sPrivacy));
+        }
+        final String sFriendsOnly = parser.getAttributeValue(null, "friendsonly");
+        if (sFriendsOnly != null) {
+            jmsg.FriendsOnly = true;
+        }
+        final String sReadOnly = parser.getAttributeValue(null, "readonly");
+        if (sReadOnly != null) {
+            jmsg.ReadOnly = true;
+        }
+        jmsg.setTimestamp(df.parse(parser.getAttributeValue(null, "ts")).toInstant());
+        jmsg.setAttachmentType(parser.getAttributeValue(null, "attach"));
+        while (parser.next() == XmlPullParser.START_TAG) {
+            final String tag = parser.getName();
+            final String xmlns = parser.getNamespace();
+            if (tag.equals("body")) {
+                jmsg.setText(XmlUtils.getTagText(parser));
+            } else if (tag.equals(JuickUser.TagName) && xmlns != null && xmlns.equals(JuickUser.XMLNS)) {
+                jmsg.setUser(new JuickUser().parse(parser));
+            } else if (tag.equals("tag")) {
+                jmsg.getTags().add(new Tag(XmlUtils.getTagText(parser)));
+            } else {
+                XmlUtils.skip(parser);
+            }
+        }
+        return jmsg;
+    }
+    @Override
+    public String toString() {
+        StringBuilder ret = new StringBuilder("<").append(TagName).append(" xmlns=\"").append(XMLNS).append("\"");
+        if (getMid() > 0) {
+            ret.append(" mid=\"").append(getMid()).append("\"");
+        }
+        if (getRid() > 0) {
+            ret.append(" rid=\"").append(getRid()).append("\"");
+        }
+        if (getReplyto() > 0) {
+            ret.append(" replyto=\"").append(getReplyto()).append("\"");
+        }
+        ret.append(" privacy=\"").append(getPrivacy()).append("\"");
+        if (FriendsOnly) {
+            ret.append(" friendsonly=\"1\"");
+        }
+        if (ReadOnly) {
+            ret.append(" readonly=\"1\"");
+        }
+        if (getTimestamp() != null) {
+            ret.append(" ts=\"").append(df.format(Date.from(getTimestamp()))).append("\"");
+        }
+        if (getAttachmentType() != null) {
+            ret.append(" attach=\"").append(getAttachmentType()).append("\"");
+        }
+        ret.append(">");
+        if (getUser() != null) {
+            ret.append(JuickUser.toString(getUser()));
+        }
+        if (getText() != null) {
+            ret.append("<body>").append(StringEscapeUtils.escapeXml10(StringUtils.defaultString(getText()))).append("</body>");
+        }
+        for (Tag Tag : getTags()) {
+            ret.append("<tag>").append(StringEscapeUtils.escapeXml10(Tag.getName())).append("</tag>");
+        }
+        ret.append("</").append(TagName).append(">");
+        return ret.toString();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (!(obj instanceof JuickMessage)) {
+            return false;
+        }
+        JuickMessage jmsg = (JuickMessage) obj;
+        return (this.getMid() == jmsg.getMid() && this.getRid() == jmsg.getRid());
+    }
+    @Override
+    public int compareTo(Object obj) throws ClassCastException {
+        if (!(obj instanceof JuickMessage)) {
+            throw new ClassCastException();
+        }
+        JuickMessage jmsg = (JuickMessage) obj;
+        if (this.getMid() != jmsg.getMid()) {
+            if (this.getMid() > jmsg.getMid()) {
+                return -1;
+            } else {
+                return 1;
+            }
+        }
+        if (this.getRid() != jmsg.getRid()) {
+            if (this.getRid() < jmsg.getRid()) {
+                return -1;
+            } else {
+                return 1;
+            }
+        }
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/juick-common/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java b/juick-common/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java
new file mode 100644
index 000000000..534efcc9e
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/xmpp/extensions/JuickUser.java
@@ -0,0 +1,65 @@
+/*
+ * 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.xmpp.extensions;
+import com.juick.xmpp.StanzaChild;
+import com.juick.xmpp.utils.XmlUtils;
+import org.apache.commons.text.StringEscapeUtils;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+/**
+ *
+ * @author Ugnich Anton
+ */
+public class JuickUser extends com.juick.User implements StanzaChild {
+    public final static String XMLNS = "http://juick.com/user";
+    public final static String TagName = "user";
+    public JuickUser() {
+    }
+    @Override
+    public String getXMLNS() {
+        return XMLNS;
+    }
+    @Override
+    public JuickUser parse(final XmlPullParser parser) throws XmlPullParserException, IOException {
+        JuickUser juser = new JuickUser();
+        String strUID = parser.getAttributeValue(null, "uid");
+        if (strUID != null) {
+            juser.setUid(Integer.parseInt(strUID));
+        }
+        juser.setName(parser.getAttributeValue(null, "uname"));
+        XmlUtils.skip(parser);
+        return juser;
+    }
+    public static String toString(com.juick.User user) {
+        String str = "<" + TagName + " xmlns='" + XMLNS + "'";
+        if (user.getUid() > 0) {
+            str += " uid='" + user.getUid() + "'";
+        }
+        if (user.getName() != null && user.getName().length() > 0) {
+            str += " uname='" + StringEscapeUtils.escapeXml10(user.getName()) + "'";
+        }
+        str += "/>";
+        return str;
+    }
+    @Override
+    public String toString() {
+        return toString(this);
+    }
+}
\ No newline at end of file
diff --git a/juick-common/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java b/juick-common/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
new file mode 100644
index 000000000..647f27171
--- /dev/null
+++ b/juick-common/src/main/java/com/juick/server/xmpp/s2s/BasicXmppSession.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2008-2017, Juick
+ *
+ * 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.xmpp.s2s;
+
+import rocks.xmpp.addr.Jid;
+import rocks.xmpp.core.XmppException;
+import rocks.xmpp.core.session.ConnectionConfiguration;
+import rocks.xmpp.core.session.XmppSession;
+import rocks.xmpp.core.session.XmppSessionConfiguration;
+import rocks.xmpp.core.stanza.model.IQ;
+import rocks.xmpp.core.stanza.model.Message;
+import rocks.xmpp.core.stanza.model.Presence;
+import rocks.xmpp.core.stanza.model.server.ServerIQ;
+import rocks.xmpp.core.stanza.model.server.ServerMessage;
+import rocks.xmpp.core.stanza.model.server.ServerPresence;
+import rocks.xmpp.core.stream.model.StreamElement;
+
+/**
+ * Created by vitalyster on 06.02.2017.
+ */
+public class BasicXmppSession extends XmppSession {
+    protected BasicXmppSession(String xmppServiceDomain, XmppSessionConfiguration configuration, ConnectionConfiguration... connectionConfigurations) {
+        super(xmppServiceDomain, configuration, connectionConfigurations);
+    }
+
+    public static BasicXmppSession create(String xmppServiceDomain, XmppSessionConfiguration configuration) {
+        BasicXmppSession session = new BasicXmppSession(xmppServiceDomain, configuration);
+        notifyCreationListeners(session);
+        return session;
+    }
+
+    @Override
+    public void connect(Jid from) throws XmppException {
+
+    }
+
+    @Override
+    public Jid getConnectedResource() {
+        return null;
+    }
+
+    @Override
+    protected StreamElement prepareElement(StreamElement element) {
+        if (element instanceof Message) {
+            element = ServerMessage.from((Message) element);
+        } else if (element instanceof Presence) {
+            element = ServerPresence.from((Presence) element);
+        } else if (element instanceof IQ) {
+            element = ServerIQ.from((IQ) element);
+        }
+
+        return element;
+    }
+}