drop www files

17 files changed, 0 insertions, 2098 deletions

diff --git a/juick-www/src/main/java/com/juick/Application.java b/juick-www/src/main/java/com/juick/Application.java
deleted file mode 100644
index 47c167545..000000000
--- a/juick-www/src/main/java/com/juick/Application.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.juick;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.transaction.annotation.EnableTransactionManagement;
-
-@SpringBootApplication
-@EnableTransactionManagement
-@ComponentScan(basePackages = {"com.juick.www", "com.juick.service"})
-public class Application extends SpringBootServletInitializer {
-
-    @Override
-    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-        setRegisterErrorPageFilter(false);
-        return builder.sources(Application.class);
-    }
-
-    public static void main(String[] args) {
-        SpringApplication.run(Application.class, args);
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/service/CloudflareCache.java b/juick-www/src/main/java/com/juick/service/CloudflareCache.java
deleted file mode 100644
index 64e048dc2..000000000
--- a/juick-www/src/main/java/com/juick/service/CloudflareCache.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.juick.service;
-
-import com.juick.service.cloudflare.FilesPayload;
-import com.juick.User;
-import com.juick.server.component.UserUpdatedEvent;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.ApplicationListener;
-import org.springframework.http.*;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.util.UriComponents;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import java.util.Arrays;
-
-public class CloudflareCache implements ApplicationListener<UserUpdatedEvent> {
-    private static final Logger logger = LoggerFactory.getLogger(CloudflareCache.class);
-    @Value("${cloudflare_auth_email:email@example.com}")
-    private String authEmail;
-    @Value("${cloudflare_api_key:secret}")
-    private String apiKey;
-    @Value("${cloudflare_zone_id:zoneid}")
-    private String zoneId;
-    private final static String baseUri = "https://api.cloudflare.com/client/v4";
-    @Override
-    public void onApplicationEvent(UserUpdatedEvent event) {
-        User user = event.getUser();
-        logger.debug("Purging Cloudflare cache for {} avatar", user.getName());
-        UriComponents uriComponents = UriComponentsBuilder.fromUriString("{baseUri}/zones/{zoneId}/purge_cache")
-                .buildAndExpand(baseUri, zoneId);
-        HttpHeaders httpHeaders = new HttpHeaders();
-        httpHeaders.add("X-Auth-Email", authEmail);
-        httpHeaders.add("X-Auth-Key", apiKey);
-        httpHeaders.setContentType(MediaType.APPLICATION_JSON);
-        FilesPayload payload = new FilesPayload();
-        payload.setFiles(Arrays.asList(
-                String.format("http://i.juick.com/a/%d.png", user.getUid()),
-                String.format("http://i.juick.com/as/%d.png", user.getUid()),
-                String.format("http://i.juick.com/a/%d.jpg", user.getUid()),
-                String.format("http://i.juick.com/as/%d.jpg", user.getUid()),
-                String.format("https://i.juick.com/a/%d.png", user.getUid()),
-                String.format("https://i.juick.com/as/%d.png", user.getUid()),
-                String.format("https://i.juick.com/a/%d.jpg", user.getUid()),
-                String.format("https://i.juick.com/as/%d.jpg", user.getUid())
-        ));
-        RestTemplate api = new RestTemplate();
-        api.getMessageConverters().add(new MappingJackson2HttpMessageConverter());
-        ResponseEntity<String> response = api.exchange(uriComponents.toUri(),
-                HttpMethod.DELETE,
-                new HttpEntity<>(payload, httpHeaders), String.class);
-        logger.info("Cloudflare response: {}", response.getBody());
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/service/cloudflare/FilesPayload.java b/juick-www/src/main/java/com/juick/service/cloudflare/FilesPayload.java
deleted file mode 100644
index 35d9e72f5..000000000
--- a/juick-www/src/main/java/com/juick/service/cloudflare/FilesPayload.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.juick.service.cloudflare;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class FilesPayload {
-    private List<String> files;
-
-    public FilesPayload() {
-        files = new ArrayList<>();
-    }
-
-    public List<String> getFiles() {
-        return files;
-    }
-
-    public void setFiles(List<String> files) {
-        this.files = files;
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/HelpService.java b/juick-www/src/main/java/com/juick/www/HelpService.java
deleted file mode 100644
index 8e56916f3..000000000
--- a/juick-www/src/main/java/com/juick/www/HelpService.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.www;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.cache.annotation.Cacheable;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.regex.Pattern;
-
-/**
- * Created by aalexeev on 12/11/16.
- */
-public class HelpService {
-    private static final Pattern LANG_PATTERN = Pattern.compile("[a-z]{2}");
-
-    private static final Pattern PAGE_PATTERN = Pattern.compile("[a-zA-Z0-9\\-_]+");
-
-    private final String helpPath;
-
-
-    public HelpService(String helpPath) {
-        this.helpPath = helpPath;
-    }
-
-    @Cacheable("help")
-    public String getHelp(final String page, final String lang) {
-        if (canBePage(page) && canBeLang(lang)) {
-            String path = StringUtils.joinWith("/", helpPath, lang, page + ".md");
-
-            try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(path)) {
-                if (is != null)
-                    return IOUtils.toString(is, StandardCharsets.UTF_8);
-            } catch (IOException e) {
-            }
-        }
-        return null;
-    }
-
-    public boolean canBePage(final String anything) {
-        return anything != null && PAGE_PATTERN.matcher(anything).matches();
-    }
-
-    public boolean canBeLang(final String anything) {
-        return anything != null && LANG_PATTERN.matcher(anything).matches();
-    }
-
-    public String getHelpPath() {
-        return helpPath;
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/WebApp.java b/juick-www/src/main/java/com/juick/www/WebApp.java
deleted file mode 100644
index 4e8b3a11b..000000000
--- a/juick-www/src/main/java/com/juick/www/WebApp.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.www;
-
-import com.juick.Tag;
-import com.juick.service.TagService;
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.resource.ResourceUrlProvider;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Stream;
-
-/**
- *
- * @author Ugnich Anton
- */
-@Component
-public class WebApp {
-    @Inject
-    private TagService tagService;
-    @Inject
-    private ResourceUrlProvider resourceUrlProvider;
-
-    public List<Tag> parseTags(String tagsStr) {
-        List<Tag> tags = new ArrayList<>();
-        if (tagsStr != null && !tagsStr.isEmpty()) {
-            Stream<String> tagsList = Arrays.stream(tagsStr.split("[ \\,]"))
-                    .distinct().map( t -> {
-                if (t.startsWith("*")) {
-                    t = t.substring(1);
-                }
-                if (t.length() > 64) {
-                    t = t.substring(0, 64);
-                }
-                return t;
-            });
-            tags = tagService.getTags(tagsList, true);
-            while (tags.size() > 5) {
-                tags.remove(5);
-            }
-        }
-        return tags;
-    }
-
-    public String getStyleUrl() {
-        return resourceUrlProvider.getForLookupPath("/style.css");
-    }
-
-    public String getScriptsUrl() {
-        return resourceUrlProvider.getForLookupPath("/scripts.js");
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/configuration/EmbeddedAPIConfig.java b/juick-www/src/main/java/com/juick/www/configuration/EmbeddedAPIConfig.java
deleted file mode 100644
index 0541ac259..000000000
--- a/juick-www/src/main/java/com/juick/www/configuration/EmbeddedAPIConfig.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.juick.www.configuration;
-
-import com.juick.server.configuration.PostConfig;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-@ConditionalOnClass(name = "com.juick.server.api.Post")
-public class EmbeddedAPIConfig {
-    @Bean
-    public ConfigurableApplicationContext apiContext() {
-        return new SpringApplicationBuilder()
-                .sources(PostConfig.class)
-                .run("--server.port=8081", "--spring.jmx.enabled=false");
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/configuration/SapeConfiguration.java b/juick-www/src/main/java/com/juick/www/configuration/SapeConfiguration.java
deleted file mode 100644
index 68ff28d28..000000000
--- a/juick-www/src/main/java/com/juick/www/configuration/SapeConfiguration.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.www.configuration;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import ru.sape.Sape;
-
-/**
- * Created by vitalyster on 29.03.2017.
- */
-@Configuration
-public class SapeConfiguration {
-    @Value("${sape_user:secret}")
-    private String token;
-
-    @Bean
-    public Sape sape() {
-        return new Sape(token, "juick.com", 2000, 3600);
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java b/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
deleted file mode 100644
index b13d03f50..000000000
--- a/juick-www/src/main/java/com/juick/www/configuration/WebSecurityConfig.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * 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.www.configuration;
-
-import com.juick.service.UserService;
-import com.juick.service.security.HashParamAuthenticationFilter;
-import com.juick.service.security.JuickUserDetailsService;
-import com.juick.service.security.entities.JuickUser;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.builders.WebSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.springframework.security.core.userdetails.UserDetailsService;
-import org.springframework.security.web.authentication.RememberMeServices;
-import org.springframework.security.web.authentication.rememberme.TokenBasedRememberMeServices;
-import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
-
-import javax.annotation.Resource;
-
-/**
- * Created by aalexeev on 11/21/16.
- */
-@EnableWebSecurity
-public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-    @Value("${auth_remember_me_key:secret}")
-    private String rememberMeKey;
-    @Value("${web_domain:localhost}")
-    private String webDomain;
-    @Resource
-    private UserService userService;
-
-    private final String COOKIE_NAME = "juick-remember-me";
-
-    @Bean("userDetailsService")
-    @Override
-    public UserDetailsService userDetailsServiceBean() throws Exception {
-        return super.userDetailsServiceBean();
-    }
-
-    @Override
-    public UserDetailsService userDetailsService() {
-        return new JuickUserDetailsService(userService);
-    }
-
-    @Bean("authenticationManager")
-    @Override
-    public AuthenticationManager authenticationManagerBean() throws Exception {
-        return super.authenticationManagerBean();
-    }
-
-    @Override
-    protected void configure(HttpSecurity http) throws Exception {
-        http.addFilterAfter(hashParamAuthenticationFilter(), BasicAuthenticationFilter.class);
-        http
-                .authorizeRequests()
-                .antMatchers("/settings", "/pm/**", "/**/bl", "/_twitter", "/post", "/post2", "/comment")
-                .authenticated()
-                .anyRequest().permitAll()
-                .and()
-                .anonymous().principal(JuickUser.ANONYMOUS_USER).authorities(JuickUser.ANONYMOUS_AUTHORITY)
-                .and()
-                .sessionManagement().invalidSessionUrl("/")
-                .and()
-                .logout()
-                .invalidateHttpSession(true)
-                .logoutUrl("/logout")
-                .logoutSuccessUrl("/login?logout")
-                .deleteCookies("hash", COOKIE_NAME)
-                .and()
-                .formLogin()
-                .loginPage("/login")
-                .permitAll()
-                .defaultSuccessUrl("/")
-                .loginProcessingUrl("/login")
-                .usernameParameter("username")
-                .passwordParameter("password")
-                .failureUrl("/login?error=1")
-                .and()
-                .rememberMe()
-                .rememberMeCookieDomain(webDomain).key(rememberMeKey)
-                .rememberMeServices(rememberMeServices())
-                .and()
-                .csrf().disable()
-                .authenticationProvider(authenticationProvider())
-                .headers().defaultsDisabled().cacheControl();
-    }
-
-    @Bean
-    public DaoAuthenticationProvider authenticationProvider() throws Exception {
-        DaoAuthenticationProvider authenticationProvider = new DaoAuthenticationProvider();
-
-        authenticationProvider.setUserDetailsService(userDetailsService());
-
-        return authenticationProvider;
-    }
-
-    @Bean
-    public HashParamAuthenticationFilter hashParamAuthenticationFilter() throws Exception {
-        return new HashParamAuthenticationFilter(userService, rememberMeServices());
-    }
-
-    @Bean
-    public RememberMeServices rememberMeServices() throws Exception {
-        TokenBasedRememberMeServices services = new TokenBasedRememberMeServices(
-                rememberMeKey, userDetailsService());
-
-        services.setCookieName(COOKIE_NAME);
-        services.setCookieDomain(webDomain);
-        services.setAlwaysRemember(true);
-        services.setTokenValiditySeconds(6 * 30 * 24 * 3600);
-        services.setUseSecureCookie(false); // TODO set true if https is supports
-
-        return services;
-    }
-
-    @Override
-    public void configure(WebSecurity web) throws Exception {
-        web.debug(false);
-        web.ignoring().antMatchers("/style.css*", "/scripts.js*", "/h2-console/**", "/.well-known/**");
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java b/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
deleted file mode 100644
index edee3b878..000000000
--- a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.www.configuration;
-
-import com.juick.server.configuration.BaseWebConfiguration;
-import com.juick.server.configuration.StorageConfiguration;
-import com.juick.service.CloudflareCache;
-import com.juick.service.TagService;
-import com.juick.service.UserService;
-import com.juick.www.HelpService;
-import com.mitchellbosecke.pebble.PebbleEngine;
-import com.mitchellbosecke.pebble.extension.FormatterExtension;
-import com.mitchellbosecke.pebble.loader.ClasspathLoader;
-import com.mitchellbosecke.pebble.loader.Loader;
-import com.mitchellbosecke.pebble.spring4.PebbleViewResolver;
-import com.mitchellbosecke.pebble.spring4.extension.SpringExtension;
-import org.apache.commons.codec.CharEncoding;
-import org.commonmark.ext.autolink.AutolinkExtension;
-import org.commonmark.node.Link;
-import org.commonmark.parser.Parser;
-import org.commonmark.renderer.html.HtmlRenderer;
-import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.cache.caffeine.CaffeineCacheManager;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.web.servlet.ViewResolver;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-import javax.inject.Inject;
-import java.util.Collections;
-
-/**
- * Created by aalexeev on 11/22/16.
- */
-@Configuration
-@EnableCaching
-@Import({ BaseWebConfiguration.class, WebSecurityConfig.class, SapeConfiguration.class,
-        StorageConfiguration.class})
-public class WwwAppConfiguration implements WebMvcConfigurer {
-    @Inject
-    private UserService userService;
-    @Inject
-    private TagService tagService;
-    @Bean
-    public CaffeineCacheManager cacheManager() {
-        return new CaffeineCacheManager("help");
-    }
-
-    @Bean
-    public HelpService helpService() {
-        return new HelpService("help");
-    }
-
-    @Bean
-    public Parser cmParser() {
-        return Parser.builder().extensions(Collections.singletonList(AutolinkExtension.create())).build();
-    }
-    @Bean
-    public HtmlRenderer helpRenderer() {
-        return HtmlRenderer.builder()
-                .attributeProviderFactory(context -> (node, tagName, attributes) -> {
-                    if (node instanceof Link) {
-                        Link link = (Link) node;
-                        if (link.getDestination().startsWith("/")) {
-                            String destination = "/" + helpService().getHelpPath() + link.getDestination();
-                            link.setDestination(destination);
-                            attributes.put("href", destination);
-                        }
-                    }
-                })
-                .build();
-    }
-    @Bean
-    public CloudflareCache cloudflareCache() {
-        return new CloudflareCache();
-    }
-    @Bean
-    public Loader templateLoader() {
-        return new ClasspathLoader();
-    }
-
-    @Bean
-    public SpringExtension springExtension() {
-        return new SpringExtension();
-    }
-
-    @Bean
-    public PebbleEngine pebbleEngine() {
-        return new PebbleEngine.Builder()
-                .loader(this.templateLoader())
-                .extension(springExtension())
-                .extension(new FormatterExtension())
-                .strictVariables(true)
-                .build();
-    }
-
-    @Bean
-    public ViewResolver viewResolver() {
-        PebbleViewResolver viewResolver = new PebbleViewResolver();
-        viewResolver.setPrefix("templates");
-        viewResolver.setSuffix(".html");
-        viewResolver.setPebbleEngine(pebbleEngine());
-        viewResolver.setCharacterEncoding(CharEncoding.UTF_8);
-        return viewResolver;
-    }
-
-}
diff --git a/juick-www/src/main/java/com/juick/www/controllers/AnythingFilter.java b/juick-www/src/main/java/com/juick/www/controllers/AnythingFilter.java
deleted file mode 100644
index d4519539d..000000000
--- a/juick-www/src/main/java/com/juick/www/controllers/AnythingFilter.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.juick.www.controllers;
-
-import com.juick.server.util.WebUtils;
-import com.juick.service.MessagesService;
-import com.juick.service.UserService;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.springframework.stereotype.Component;
-import org.springframework.web.filter.OncePerRequestFilter;
-import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-import org.springframework.web.util.UriComponents;
-
-import javax.annotation.Nonnull;
-import javax.inject.Inject;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-@Component
-public class AnythingFilter extends OncePerRequestFilter {
-    @Inject
-    private MessagesService messagesService;
-    @Inject
-    private UserService userService;
-
-    @Override
-    public void doFilterInternal(@Nonnull HttpServletRequest servletRequest,
-                                 @Nonnull HttpServletResponse servletResponse,
-                                 @Nonnull FilterChain filterChain) throws IOException, ServletException {
-        UriComponents components = ServletUriComponentsBuilder.fromCurrentRequestUri().build();
-        String anything = components.getPath().substring(1);
-        int before = NumberUtils.toInt(components.getQueryParams().getFirst("before"), 0);
-        if (before == 0) {
-            boolean isPostNumber = WebUtils.isPostNumber(anything);
-            int messageId = isPostNumber ?
-                    NumberUtils.toInt(anything) : 0;
-
-            if (isPostNumber && anything.equals(Integer.toString(messageId))) {
-                if (messageId > 0) {
-                    com.juick.User author = messagesService.getMessageAuthor(messageId);
-
-                    if (author != null) {
-                        servletResponse.setStatus(HttpServletResponse.SC_MOVED_PERMANENTLY);
-                        servletResponse.setHeader("Location", "/" + author.getName() + "/" + anything);
-                        return;
-                    }
-                }
-            }
-            com.juick.User user = userService.getUserByName(anything);
-            if (user.getUid() > 0) {
-                ((HttpServletResponse)servletResponse).sendRedirect("/" + user.getName() + "/");
-            } else {
-                filterChain.doFilter(servletRequest, servletResponse);
-            }
-        } else {
-            com.juick.User user = userService.getUserByName(anything);
-            if (!user.isAnonymous()) {
-                ((HttpServletResponse) servletResponse).sendRedirect("/" + user.getName() + "/?before=" + before);
-            } else {
-                filterChain.doFilter(servletRequest, servletResponse);
-            }
-        }
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/controllers/AppSiteAssociation.java b/juick-www/src/main/java/com/juick/www/controllers/AppSiteAssociation.java
deleted file mode 100644
index dcf6c400a..000000000
--- a/juick-www/src/main/java/com/juick/www/controllers/AppSiteAssociation.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.juick.www.controllers;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Collections;
-import java.util.List;
-
-@RestController
-public class AppSiteAssociation {
-    @Value("${ios_app_id:}")
-    private String appId;
-
-    @GetMapping("/.well-known/apple-app-site-association")
-    @ResponseBody
-    public SiteAssociations appSiteAssociations() {
-        WebCredentials webCredentials = new WebCredentials();
-        webCredentials.setApps(Collections.singletonList(appId));
-        SiteAssociations siteAssociations = new SiteAssociations();
-        siteAssociations.setWebcredentials(webCredentials);
-        return siteAssociations;
-    }
-
-    private class SiteAssociations {
-        private WebCredentials webcredentials;
-
-        public WebCredentials getWebcredentials() {
-            return webcredentials;
-        }
-
-        public void setWebcredentials(WebCredentials webcredentials) {
-            this.webcredentials = webcredentials;
-        }
-    }
-
-    private class WebCredentials {
-        private List<String> apps;
-
-        public List<String> getApps() {
-            return apps;
-        }
-
-        public void setApps(List<String> apps) {
-            this.apps = apps;
-        }
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Help.java b/juick-www/src/main/java/com/juick/www/controllers/Help.java
deleted file mode 100644
index 834cf1c16..000000000
--- a/juick-www/src/main/java/com/juick/www/controllers/Help.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.www.controllers;
-
-import com.juick.server.util.HttpNotFoundException;
-import com.juick.server.util.UserUtils;
-import com.juick.service.MessagesService;
-import com.juick.www.HelpService;
-import org.commonmark.parser.Parser;
-import org.commonmark.renderer.html.HtmlRenderer;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import javax.inject.Inject;
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.util.Locale;
-import java.util.Objects;
-
-/**
- * Created by aalexeev on 11/21/16.
- */
-@Controller
-public class Help {
-    @Inject
-    private HelpService helpService;
-    @Inject
-    private MessagesService messagesService;
-    @Inject
-    private Parser cmParser;
-    @Inject
-    private HtmlRenderer helpRenderer;
-
-    @GetMapping({"/help/", "/help", "/help/{langOrPage}", "/help/{lang}/{page}"})
-    public String showHelp(
-            Locale locale,
-            @PathVariable(required = false, name = "lang") String lang,
-            @PathVariable(required = false, name = "page") String page,
-            @PathVariable(required = false, name = "langOrPage") String langOrPage,
-            Model model) throws IOException, URISyntaxException {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-
-        String navigation = null;
-
-        if (langOrPage != null) {
-            if (helpService.canBeLang(langOrPage)) {
-                navigation = helpService.getHelp("navigation", langOrPage);
-                if (navigation != null)
-                    lang = langOrPage;
-            }
-
-            if (navigation == null && helpService.canBePage(langOrPage))
-                page = langOrPage;
-        }
-
-        if (lang == null) {
-            lang = locale.getLanguage();
-        }
-
-        String content = helpService.getHelp(page, lang);
-        if (content == null && !Objects.equals("tos", page))
-            content = helpService.getHelp("tos", lang);
-
-        if (navigation == null)
-            navigation = helpService.getHelp("navigation", lang);
-
-        if (content == null || navigation == null)
-            throw new HttpNotFoundException();
-
-        model.addAttribute("navigation", helpRenderer.render(cmParser.parse(navigation)));
-        model.addAttribute("content", helpRenderer.render(cmParser.parse(content)));
-        model.addAttribute("visitor", visitor);
-
-        return "views/help";
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Login.java b/juick-www/src/main/java/com/juick/www/controllers/Login.java
deleted file mode 100644
index cb7df833a..000000000
--- a/juick-www/src/main/java/com/juick/www/controllers/Login.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.www.controllers;
-
-import com.juick.server.util.UserUtils;
-import com.juick.service.UserService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.inject.Inject;
-
-/**
- * @author Ugnich Anton
- */
-@Controller
-public class Login {
-    @Inject
-    private UserService userService;
-
-    @GetMapping("/login")
-    public String getloginForm(@RequestParam(required = false, defaultValue = "true") boolean redirect) {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-
-        if (!visitor.isAnonymous()) {
-            return redirect ? "redirect:/" : "redirect:/login/success";
-        }
-        return "views/login";
-    }
-    @GetMapping("/login/success")
-    public String getSuccessLogin(ModelMap model) {
-        model.addAttribute("hash", userService.getHashByUID(UserUtils.getCurrentUser().getUid()));
-        return "views/login_success";
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java b/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java
deleted file mode 100644
index f416cb867..000000000
--- a/juick-www/src/main/java/com/juick/www/controllers/MessagesWWW.java
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * 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.www.controllers;
-
-import com.juick.Message;
-import com.juick.Tag;
-import com.juick.formatters.PlainTextFormatter;
-import com.juick.server.component.MessageReadEvent;
-import com.juick.server.util.HttpForbiddenException;
-import com.juick.server.util.HttpNotFoundException;
-import com.juick.server.util.UserUtils;
-import com.juick.server.util.WebUtils;
-import com.juick.service.*;
-import com.juick.util.MessageUtils;
-import com.juick.www.Utils;
-import org.apache.commons.codec.CharEncoding;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
-import org.springframework.web.util.UriComponents;
-import ru.sape.Sape;
-
-import javax.inject.Inject;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- *
- * @author Ugnich Anton
- */
-@Controller
-public class MessagesWWW {
-    @Inject
-    private UserService userService;
-    @Inject
-    private TagService tagService;
-    @Inject
-    private MessagesService messagesService;
-    @Inject
-    private Sape sape;
-    @Inject
-    private PMQueriesService pmQueriesService;
-    @Inject
-    private CrosspostService crosspostService;
-    @Inject
-    private ApplicationEventPublisher applicationEventPublisher;
-
-    void fillUserModel(ModelMap model, com.juick.User user, com.juick.User visitor) {
-        model.addAttribute("user", user);
-        model.addAttribute("isSubscribed", userService.isSubscribed(visitor.getUid(), user.getUid()));
-        model.addAttribute("isInBL", userService.isInBL(visitor.getUid(), user.getUid()));
-        model.addAttribute("isInBLAny", userService.isInBLAny(user.getUid(), visitor.getUid()));
-        model.addAttribute("statsIRead", userService.getStatsIRead(user.getUid()));
-        model.addAttribute("statsMyReaders", userService.getStatsMyReaders(user.getUid()));
-        model.addAttribute("statsMyBL", userService.getUserBLUsers(user.getUid()).size());
-        model.addAttribute("statsMessages", userService.getStatsMessages(user.getUid()));
-        model.addAttribute("statsReplies", userService.getStatsReplies(user.getUid()));
-        model.addAttribute("iread", userService.getUserReadLeastPopular(user.getUid(), 8));
-        model.addAttribute("tagStats", tagService.getUserTagStats(user.getUid())
-                .stream().sorted((e1, e2) -> Integer.compare(e2.getUsageCount(), e1.getUsageCount())).limit(20).map(t -> t.getTag().getName()).collect(Collectors.toList()));
-    }
-
-    @GetMapping("/")
-    protected String doGet(
-            @RequestParam(required = false) String tag,
-            @RequestParam(name = "show", required = false) String paramShow,
-            @RequestParam(name = "search", required = false) String paramSearch,
-            @RequestParam(name = "before", required = false, defaultValue = "0") Integer paramBefore,
-            @RequestParam(name = "to", required = false, defaultValue = "0") Long paramTo,
-            @CookieValue(name = "sape_cookie", required = false, defaultValue = StringUtils.EMPTY) String sapeCookie,
-            ModelMap model) throws IOException {
-        if (tag != null) {
-            return "redirect:/tag/" + URLEncoder.encode(tag, CharEncoding.UTF_8);
-        }
-        com.juick.User visitor = UserUtils.getCurrentUser();
-
-        if (paramSearch != null && paramSearch.length() > 64) {
-            paramSearch = null;
-        }
-
-        model.addAttribute("discover", false);
-
-        String title;
-        List<Integer> mids;
-
-        if (paramSearch != null) {
-            title = "Поиск: " + StringEscapeUtils.escapeHtml4(paramSearch);
-            mids = messagesService.getSearch(Utils.encodeSphinx(paramSearch), paramBefore);
-        } else if (paramShow == null) {
-            if (!visitor.isAnonymous()) {
-                title = "Популярные";
-                mids = messagesService.getPopular(visitor.getUid(), paramBefore);
-                model.addAttribute("discover", true);
-            } else {
-                title = "Микроблоги Juick: популярные записи";
-                mids = messagesService.getPopular(0, paramBefore);
-            }
-
-        } else if (paramShow.equals("top")) {
-            return "redirect:/";
-        } else if (paramShow.equals("my") && !visitor.isAnonymous()) {
-            title = "Моя лента";
-            mids = messagesService.getMyFeed(visitor.getUid(), paramBefore, true);
-        } else if (paramShow.equals("private") && !visitor.isAnonymous()) {
-            title = "Приватные";
-            mids = messagesService.getPrivate(visitor.getUid(), paramBefore);
-        } else if (paramShow.equals("discuss") && !visitor.isAnonymous()) {
-            title = "Обсуждения";
-            mids = messagesService.getDiscussions(visitor.getUid(), paramTo);
-        } else if (paramShow.equals("recommended") && !visitor.isAnonymous()) {
-            title = "Рекомендации";
-            mids = messagesService.getRecommended(visitor.getUid(), paramBefore);
-        } else if (paramShow.equals("photos")) {
-            title = "Фотографии";
-            mids = messagesService.getPhotos(visitor.getUid(), paramBefore);
-            model.addAttribute("discover", true);
-        } else if (paramShow.equals("all")) {
-            title = "Все сообщения";
-            mids = messagesService.getAll(visitor.getUid(), paramBefore);
-            model.addAttribute("discover", true);
-        } else {
-            throw new HttpNotFoundException();
-        }
-
-        String head = StringUtils.EMPTY;
-        if (paramBefore > 0 || paramShow != null) {
-            head = "<meta name=\"robots\" content=\"noindex\"/>";
-        }
-        model.addAttribute("title", title);
-        model.addAttribute("headers", head);
-        model.addAttribute("visitor", visitor);
-        model.addAttribute("noindex", !(paramShow == null && paramBefore == 0));
-        List<com.juick.Message> msgs = messagesService.getMessages(mids);
-
-        if (!visitor.isAnonymous()) {
-            fillUserModel(model, visitor, visitor);
-            List<Integer> unread = messagesService.getUnread(visitor);
-            visitor.setUnreadCount(unread.size());
-            List<Integer> blUIDs = userService.checkBL(visitor.getUid(),
-                    msgs.stream().map(m -> m.getUser().getUid()).collect(Collectors.toList()));
-            msgs.forEach(m -> {
-                m.ReadOnly |= blUIDs.contains(m.getUser().getUid());
-                m.setUnread(unread.contains(m.getMid()));
-            });
-        }
-        model.addAttribute("msgs", msgs);
-        model.addAttribute("tags", tagService.getPopularTags());
-        model.addAttribute("headers", head);
-        model.addAttribute("showAdv",
-                paramShow == null && paramBefore == 0 && paramSearch == null && visitor.isAnonymous());
-        if (mids.size() >= 20) {
-            String nextpage = (paramShow != null && paramShow.equals("discuss")) ? "?to=" + msgs.get(msgs.size() - 1).getUpdated().toEpochMilli() : "?before=" + mids.get(mids.size() - 1);
-            if (paramShow != null) {
-                nextpage += "&amp;show=" + paramShow;
-            }
-            if (paramSearch != null) {
-                nextpage += "&amp;search=" + URLEncoder.encode(paramSearch, CharEncoding.UTF_8);
-            }
-            model.addAttribute("nextpage", nextpage);
-        }
-        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build();
-        String queryString = builder.getQuery();
-        String requestURI = builder.toUri().getPath();
-        if (sape != null && visitor.isAnonymous() && queryString == null) {
-            String links = sape.getPageLinks(requestURI, sapeCookie).render();
-            model.addAttribute("links", links);
-        }
-        return "views/index";
-    }
-
-    @GetMapping("/{uname}/")
-    protected String doGetBlog(
-            @RequestParam(required = false, name = "show") String paramShow,
-            @RequestParam(required = false, name = "tag") String paramTagStr,
-            @RequestParam(required = false, name = "search") String paramSearch,
-            @PathVariable String uname,
-            @RequestParam(required = false, defaultValue = "0") Integer before,
-            @CookieValue(name = "sape_cookie", required = false, defaultValue = StringUtils.EMPTY) String sapeCookie,
-            ModelMap model) throws IOException {
-        com.juick.User user = userService.getUserByName(uname);
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (user.isBanned() || user.isAnonymous()) {
-            throw new HttpNotFoundException();
-        }
-
-        List<Integer> mids;
-
-        com.juick.Tag paramTag = null;
-        if (paramTagStr != null) {
-            if (paramTagStr.length() < 64) {
-                paramTag = tagService.getTag(paramTagStr, false);
-            }
-            if (paramTag == null) {
-                throw new HttpNotFoundException();
-            } else if (!paramTag.getName().equals(paramTagStr)) {
-                String url = user.getName() + "/?tag=" + URLEncoder.encode(paramTag.getName(), CharEncoding.UTF_8);
-                return "redirect:/" + url;
-            }
-        }
-        if (paramSearch != null && paramSearch.length() > 64) {
-            paramSearch = null;
-        }
-
-        int privacy = 0;
-        if (!visitor.isAnonymous()) {
-            if (user.getUid() == visitor.getUid() || visitor.getUid() == 1) {
-                privacy = -3;
-            } else if (userService.isInWL(user.getUid(), visitor.getUid())) {
-                privacy = -2;
-            }
-        }
-
-        String title;
-        if (paramShow == null) {
-            if (paramTag != null) {
-                title = "Блог " + user.getName() + ": *" + StringEscapeUtils.escapeHtml4(paramTag.getName());
-                mids = messagesService.getUserTag(user.getUid(), paramTag.TID, privacy, before);
-            } else if (paramSearch != null) {
-                title = "Блог " + user.getName() + ": " + StringEscapeUtils.escapeHtml4(paramSearch);
-                mids = messagesService.getUserSearch(user.getUid(), Utils.encodeSphinx(paramSearch), privacy, before);
-            } else {
-                title = "Блог " + user.getName();
-                mids = messagesService.getUserBlog(user.getUid(), privacy, before);
-            }
-        } else if (paramShow.equals("recomm")) {
-            title = "Рекомендации " + user.getName();
-            mids = messagesService.getUserRecommendations(user.getUid(), before);
-        } else if (paramShow.equals("photos")) {
-            title = "Фотографии " + user.getName();
-            mids = messagesService.getUserPhotos(user.getUid(), privacy, before);
-        } else {
-            throw new HttpNotFoundException();
-        }
-
-        String head = "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" +
-                user.getName() + "\" href=\"//rss.juick.com/" + user.getName() + "/blog\"/>";
-        if (paramTag != null && tagService.getTagNoIndex(paramTag.TID)) {
-            head += "<meta name=\"robots\" content=\"noindex,nofollow\"/>";
-        } else if (before > 0 || paramShow != null) {
-            head += "<meta name=\"robots\" content=\"noindex\"/>";
-        }
-        model.addAttribute("pageUrl", "http://juick.com/" + user.getName());
-        model.addAttribute("title", title);
-        model.addAttribute("headers", head);
-        model.addAttribute("visitor", visitor);
-        model.addAttribute("noindex", paramShow == null && before == 0);
-        fillUserModel(model, user, visitor);
-        model.addAttribute("paramTag", paramTag);
-        List<com.juick.Message> msgs = messagesService.getMessages(mids);
-
-        if (!visitor.isAnonymous()) {
-            List<Integer> unread = messagesService.getUnread(visitor);
-            visitor.setUnreadCount(unread.size());
-            List<Integer> blUIDs = userService.checkBL(visitor.getUid(),
-                    msgs.stream().map(m -> m.getUser().getUid()).collect(Collectors.toList()));
-            msgs.forEach(m -> {
-                m.ReadOnly |= blUIDs.contains(m.getUser().getUid());
-                m.setUnread(unread.contains(m.getMid()));
-            });
-        }
-        model.addAttribute("msgs", msgs);
-        model.addAttribute("headers", head);
-        model.addAttribute("showAdv",
-                paramShow == null && before == 0 && paramSearch == null && visitor.getUid() == 0);
-        if (mids.size() >= 20) {
-            String nextpage = "?before=" + mids.get(mids.size() - 1);
-            if (paramShow != null) {
-                nextpage += "&amp;show=" + paramShow;
-            }
-            if (paramSearch != null) {
-                nextpage += "&amp;search=" + URLEncoder.encode(paramSearch, CharEncoding.UTF_8);
-            }
-            if (paramTag != null) {
-                nextpage += "&amp;tag=" + URLEncoder.encode(paramTag.getName(), CharEncoding.UTF_8);
-            }
-            model.addAttribute("nextpage", nextpage);
-        }
-        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build();
-        String queryString = builder.getQuery();
-        String requestURI = builder.toUri().getPath();
-        if (sape != null && visitor.isAnonymous() && queryString == null) {
-            String links = sape.getPageLinks(requestURI, sapeCookie).render();
-            model.addAttribute("links", links);
-        }
-        return "views/blog";
-    }
-
-    @GetMapping("/{uname}/tags")
-    protected String doGetTags(@PathVariable String uname, ModelMap model) throws IOException {
-        com.juick.User user = userService.getUserByName(uname);
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isBanned()) {
-            throw new HttpNotFoundException();
-        }
-
-        model.addAttribute("title", "Теги " + user.getName());
-        model.addAttribute("headers", "<meta name=\"robots\" content=\"noindex,nofollow\"/>");
-        model.addAttribute("visitor", visitor);
-        fillUserModel(model, user, visitor);
-        model.addAttribute("tags", tagService.getUserTagStats(user.getUid()).stream()
-                .sorted((e1, e2) -> Integer.compare(e2.getUsageCount(), e1.getUsageCount())).map(t -> t.getTag().getName()).collect(Collectors.toList()));
-
-        return "views/blog_tags";
-    }
-
-    @GetMapping("/{uname}/friends")
-    protected String doGetFriends(@PathVariable String uname, ModelMap model) throws IOException {
-        com.juick.User user = userService.getUserByName(uname);
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isBanned()) {
-            throw new HttpNotFoundException();
-        }
-        model.addAttribute("title", "Подписки " + user.getName());
-        model.addAttribute("headers", "<meta name=\"robots\" content=\"noindex\"/>");
-        model.addAttribute("visitor", visitor);
-        fillUserModel(model, user, visitor);
-        model.addAttribute("users", userService.getUserFriends(user.getUid()));
-
-        return "views/users";
-    }
-
-    @GetMapping("/{uname}/readers")
-    protected String doGetReaders(@PathVariable String uname, ModelMap model) throws IOException {
-        com.juick.User user = userService.getUserByName(uname);
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isBanned()) {
-            throw new HttpForbiddenException();
-        }
-        model.addAttribute("title", "Читатели " + user.getName());
-        model.addAttribute("headers", "<meta name=\"robots\" content=\"noindex\"/>");
-        model.addAttribute("visitor", visitor);
-        fillUserModel(model, user, visitor);
-        model.addAttribute("users", userService.getUserReaders(user.getUid()));
-
-        return "views/users";
-    }
-
-    @GetMapping("/{uname}/bl")
-    protected String doGetBL(@PathVariable String uname, ModelMap model) throws IOException {
-        com.juick.User user = userService.getUserByName(uname);
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isBanned() || visitor.getUid() != user.getUid()) {
-            throw new HttpForbiddenException();
-        }
-        model.addAttribute("title", "Черный список " + user.getName());
-        model.addAttribute("headers", "<meta name=\"robots\" content=\"noindex\"/>");
-        model.addAttribute("visitor", visitor);
-        fillUserModel(model, user, visitor);
-        model.addAttribute("users", userService.getUserBLUsers(user.getUid()));
-
-        return "views/users";
-    }
-    @GetMapping("/tag/{tagName}")
-    protected String tagAction(HttpServletRequest request,
-                               @PathVariable String tagName,
-                               @CookieValue(name = "sape_cookie", required = false, defaultValue = StringUtils.EMPTY) String sapeCookie,
-                               @RequestParam(required = false, defaultValue = "0") int before,
-                               ModelMap model) throws IOException {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-
-        String paramTagStr = StringEscapeUtils.unescapeHtml4(tagName);
-        com.juick.Tag paramTag = tagService.getTag(paramTagStr, false);
-        if (paramTag == null) {
-            throw new HttpNotFoundException();
-        } else if (paramTag.SynonymID > 0 && paramTag.TID != paramTag.SynonymID) {
-            com.juick.Tag synTag = tagService.getTag(paramTag.SynonymID);
-            String url = "/tag/" + URLEncoder.encode(StringEscapeUtils.escapeHtml4(synTag.getName()), CharEncoding.UTF_8);
-            if (request.getQueryString() != null) {
-                url += "?" + request.getQueryString();
-            }
-            return "redirect:" + url;
-        } else if (!paramTag.getName().equals(paramTagStr)) {
-            String url = "/tag/" + URLEncoder.encode(StringEscapeUtils.escapeHtml4(paramTag.getName()), CharEncoding.UTF_8);
-            if (request.getQueryString() != null) {
-                url += "?" + request.getQueryString();
-            }
-            return "redirect:" + url;
-        }
-
-        String title = "*" + StringEscapeUtils.escapeHtml4(paramTag.getName());
-        model.addAttribute("title", title);
-        List<Integer> mids = messagesService.getTag(paramTag.TID, visitor.getUid(), before, (visitor.isAnonymous()) ? 40 : 20);
-        List<com.juick.Message> msgs = messagesService.getMessages(mids);
-        if (!visitor.isAnonymous()) {
-            List<Integer> unread = messagesService.getUnread(visitor);
-            visitor.setUnreadCount(unread.size());
-            List<Integer> blUIDs = userService.checkBL(
-                    visitor.getUid(),
-                    msgs.stream().map(m -> m.getUser().getUid()).collect(Collectors.toList())
-                    );
-            msgs.forEach(m -> {
-                m.ReadOnly |= blUIDs.contains(m.getUser().getUid());
-                m.setUnread(unread.contains(m.getMid()));
-            });
-            fillUserModel(model, visitor, visitor);
-        }
-
-        String head = StringUtils.EMPTY;
-        if (tagService.getTagNoIndex(paramTag.TID)) {
-            head = "<meta name=\"robots\" content=\"noindex,nofollow\"/>";
-        } else if (before > 0 || mids.size() < 5) {
-            head = "<meta name=\"robots\" content=\"noindex\"/>";
-        }
-        model.addAttribute("headers", head);
-        model.addAttribute("visitor", visitor);
-        model.addAttribute("tag", paramTag);
-        model.addAttribute("title", title);
-        model.addAttribute("msgs", msgs);
-        model.addAttribute("tags", tagService.getPopularTags());
-        model.addAttribute("noindex", before > 0);
-        model.addAttribute("showAdv", before == 0 && visitor.isAnonymous());
-        model.addAttribute("isSubscribed", tagService.isSubscribed(visitor, paramTag));
-        model.addAttribute("isInBL", tagService.isInBL(visitor, paramTag));
-        if (mids.size() >= 20) {
-            String nextpage = "/tag/" + URLEncoder.encode(paramTag.getName(), CharEncoding.UTF_8) + "?before=" + mids.get(mids.size() - 1);
-            model.addAttribute("nextpage", nextpage);
-        }
-        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build();
-        String queryString = builder.getQuery();
-        String requestURI = builder.toUri().getPath();
-        if (sape != null && visitor.isAnonymous() && queryString == null) {
-            String links = sape.getPageLinks(requestURI, sapeCookie).render();
-            model.addAttribute("links", links);
-        }
-        return "views/index";
-    }
-    @GetMapping("/pm/inbox")
-    protected String doGetInbox(ModelMap model) {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isAnonymous()) {
-            return "redirect:/login";
-        }
-        String title = "PM: Inbox";
-        List<com.juick.Message> msgs = pmQueriesService.getLastPMInbox(visitor.getUid());
-        fillUserModel(model, visitor, visitor);
-        model.addAttribute("title", title);
-        model.addAttribute("visitor", visitor);
-        model.addAttribute("msgs", msgs);
-        model.addAttribute("tags", tagService.getPopularTags());
-        return "views/pm_inbox";
-    }
-
-    @GetMapping("/pm/sent")
-    protected String doGetSent(@RequestParam(required = false) String uname,
-                               ModelMap model) {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isAnonymous()) {
-            return "redirect:/login";
-        }
-        String title = "PM: Sent";
-        List<com.juick.Message> msgs = pmQueriesService.getLastPMSent(visitor.getUid());
-
-        if (WebUtils.isNotUserName(uname)) {
-            uname = StringUtils.EMPTY;
-        }
-        fillUserModel(model, visitor, visitor);
-        model.addAttribute("title", title);
-        model.addAttribute("visitor", visitor);
-        model.addAttribute("msgs", msgs);
-        model.addAttribute("tags", tagService.getPopularTags());
-        model.addAttribute("uname", uname);
-        return "views/pm_sent";
-    }
-    @GetMapping("/{uname}/{mid}")
-    protected String threadAction(ModelMap model,
-                                  @PathVariable String uname,
-                                  @PathVariable int mid,
-                                  @CookieValue(name = "sape_cookie",
-                                          required = false, defaultValue = StringUtils.EMPTY) String sapeCookie) {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-
-        if (!messagesService.canViewThread(mid, visitor.getUid())) {
-            throw new HttpForbiddenException();
-        }
-
-        com.juick.Message msg = messagesService.getMessage(mid);
-
-        if (msg == null || msg.getUser().isBanned()) {
-            throw new HttpNotFoundException();
-        }
-
-        com.juick.User user = userService.getUserByName(uname);
-        if (user.isAnonymous() || !msg.getUser().equals(user)) {
-            return String.format("redirect:/%s/%d", msg.getUser().getName(), mid);
-        }
-        msg.VisitorCanComment = !visitor.isAnonymous();
-        List<com.juick.Message> replies = messagesService.getReplies(visitor, msg.getMid());
-        // this should be after getReplies to mark thread as read
-        fillUserModel(model, user, visitor);
-        if (!visitor.isAnonymous()) {
-            List<Integer> unread = messagesService.getUnread(visitor);
-            visitor.setUnreadCount(unread.size());
-            boolean isMsgAuthor = visitor.getUid() == msg.getUser().getUid();
-            boolean isInBL = userService.isInBLAny(msg.getUser().getUid(), visitor.getUid());
-            msg.VisitorCanComment = isMsgAuthor || !(msg.ReadOnly || isInBL);
-        }
-        model.addAttribute("msg", msg);
-
-        String title = msg.getUser().getName() + ": " + MessageUtils.getTagsString(msg);
-
-        model.addAttribute("title", title);
-        model.addAttribute("visitor", visitor);
-        String headers = "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"@" + msg.getUser().getName() + "\" href=\"//rss.juick.com/" + msg.getUser().getName() + "/blog\"/>";
-        String pageUrl = "https://juick.com/" + msg.getUser().getName() + "/" + msg.getMid();
-        if (msg.Hidden) {
-            headers += "<meta name=\"robots\" content=\"noindex\"/>";
-        }
-        String cardType = StringUtils.isNotEmpty(msg.getAttachmentType()) ? "summary_large_image" : "summary";
-        if (StringUtils.isNotEmpty(msg.getAttachmentType()))  {
-            // additional check in case of broken images
-            if (msg.getAttachment() != null) {
-                String msgImage = msg.getAttachment().getMedium().getUrl();
-                headers += "<meta property=\"og:image\" content=\"" + msgImage + "\" />";
-            }
-        } else {
-            String msgImage ="https://i.juick.com/a/" + msg.getUser().getUid() + ".png";
-            headers += "<meta property=\"og:image\" content=\"" + msgImage + "\" />";
-        }
-        model.addAttribute("ogtype", "article");
-        String cardDescription = StringEscapeUtils.escapeHtml4(PlainTextFormatter.formatTwitterCard(msg));
-        headers += "<meta name=\"twitter:card\" content=\"" + cardType + "\" />\n" +
-                "<meta name=\"twitter:site\" content=\"@juick\" />\n" +
-                "<meta property=\"og:url\" content=\"" + pageUrl + "\" />\n" +
-                "<meta property=\"og:title\" content=\"" + msg.getUser().getName() + " at Juick\" />\n" +
-                "<meta property=\"og:description\" content=\"" + cardDescription + "\" />\n" +
-                "<meta name=\"Description\" content=\"" + cardDescription + "\" />\n";
-        String twitterName = crosspostService.getTwitterName(msg.getUser().getUid());
-        if (StringUtils.isNotEmpty(twitterName)) {
-            headers += "<meta name=\"twitter:creator\" content=\"@" + twitterName + "\" />\n";
-        }
-        if (msg.getTags().size() > 0) {
-            headers += "<meta name=\"Keywords\" content=\"" + msg.getTags().stream().map(Tag::getName)
-                    .collect(Collectors.joining(", ")) + "\" />\n";
-        }
-        model.addAttribute("headers", headers);
-        model.addAttribute("visitorSubscribed", messagesService.isSubscribed(visitor.getUid(), msg.getMid()));
-        model.addAttribute("visitorInBL",  userService.isInBL(msg.getUser().getUid(), visitor.getUid()));
-        model.addAttribute("recomm", messagesService.getMessageRecommendations(msg.getMid()));
-        List<Integer> blUIDs = new ArrayList<>();
-        for (Message reply : replies) {
-            if (reply.getUser().getUid() != msg.getUser().getUid()
-                    && !blUIDs.contains(reply.getUser().getUid())) {
-                blUIDs.add(reply.getUser().getUid());
-            }
-            reply.VisitorCanComment = !visitor.isAnonymous();
-            if (!visitor.isAnonymous()) {
-                boolean isMsgAuthor = visitor.getUid() == msg.getUser().getUid();
-                boolean isReplyAuthor = visitor.getUid() == reply.getUser().getUid();
-                reply.VisitorCanComment = isMsgAuthor || (!msg.ReadOnly
-                        && msg.VisitorCanComment && (isReplyAuthor || !userService.isInBLAny(visitor.getUid(), reply.getUser().getUid())));
-            }
-        }
-        model.addAttribute("replies", replies);
-        model.addAttribute("showAdv", visitor.isAnonymous());
-        UriComponents builder = ServletUriComponentsBuilder.fromCurrentRequestUri().build();
-        String queryString = builder.getQuery();
-        String requestURI = builder.toUri().getPath();
-        if (sape != null && visitor.isAnonymous() && queryString == null) {
-            String links = sape.getPageLinks(requestURI, sapeCookie).render();
-            model.addAttribute("links", links);
-        }
-        return "views/thread";
-    }
-
-    // when message id is not fit to int
-    @ExceptionHandler(NumberFormatException.class)
-    public ResponseEntity<String> notFoundAction() {
-        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
deleted file mode 100644
index a464add22..000000000
--- a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*
- * 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.www.controllers;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.juick.Message;
-import com.juick.User;
-import com.juick.server.helpers.AnonymousUser;
-import com.juick.server.helpers.CommandResult;
-import com.juick.server.util.*;
-import com.juick.service.*;
-import com.juick.www.WebApp;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import javax.inject.Inject;
-import java.io.IOException;
-import java.net.URI;
-import java.net.URL;
-import java.util.stream.Collectors;
-
-/**
- * @author Ugnich Anton
- */
-@Controller
-public class NewMessage {
-
-    @Inject
-    private TagService tagService;
-    @Inject
-    private MessagesService messagesService;
-    @Inject
-    private UserService userService;
-    @Inject
-    private SubscriptionService subscriptionService;
-    @Inject
-    private CrosspostService crosspostService;
-    @Inject
-    private PMQueriesService pmQueriesService;
-    @Inject
-    private WebApp webApp;
-    @Inject
-    private ObjectMapper jsonMapper;
-    @Inject
-    private ImagesService imagesService;
-    @Value("${img_path:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
-    private String imgDir;
-    @Value("${upload_tmp_dir:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
-    private String tmpDir;
-    @Value("${api_url:http://localhost:8081}")
-    private String apiUrl;
-    private RestTemplate rest = new RestTemplate();
-
-    private static final Logger logger = LoggerFactory.getLogger(NewMessage.class);
-
-    @GetMapping("/post")
-    protected String postAction(@RequestParam(required = false) String body, ModelMap model) {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        model.addAttribute("title", "Написать");
-        model.addAttribute("headers", "");
-        model.addAttribute("visitor", visitor);
-        if (body == null) {
-            body = StringUtils.EMPTY;
-        } else {
-            if (body.length() > 4096) {
-                body = body.substring(0, 4096);
-            }
-            body = StringEscapeUtils.escapeHtml4(body);
-        }
-        model.addAttribute("body", body);
-        model.addAttribute("visitor", visitor);
-        model.addAttribute("tags", tagService.getUserTagStats(visitor.getUid()).stream()
-                .sorted((e1, e2) -> Integer.compare(e2.getUsageCount(), e1.getUsageCount())).map(t -> t.getTag().getName()).collect(Collectors.toList()));
-        return "views/post";
-    }
-
-    @PostMapping("/comment")
-    public String doPostComment(
-            @RequestParam Integer mid,
-            @RequestParam(required = false, defaultValue = "0") Integer rid,
-            @RequestParam(required = false, defaultValue = StringUtils.EMPTY) String body,
-            @RequestParam(required = false, defaultValue = StringUtils.EMPTY) String img,
-            @RequestParam(required = false) MultipartFile attach) throws IOException {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isAnonymous() || visitor.isBanned()) {
-            throw new HttpForbiddenException();
-        }
-        com.juick.Message msg = messagesService.getMessage(mid);
-        if (msg == null) {
-            throw new HttpNotFoundException();
-        }
-
-        com.juick.Message reply = null;
-        if (rid > 0) {
-            reply = messagesService.getReply(mid, rid);
-            if (reply == null) {
-                throw new HttpNotFoundException();
-            }
-        }
-
-        if ((StringUtils.isEmpty(body) || body.length() > 4096) && StringUtils.isEmpty(img) && attach == null) {
-            throw new HttpBadRequestException();
-        }
-        body = body.replace("\r", StringUtils.EMPTY);
-
-        if ((msg.ReadOnly && msg.getUser().getUid() != visitor.getUid())
-                || userService.isInBLAny(msg.getUser().getUid(), visitor.getUid())
-                || (reply != null && userService.isInBLAny(reply.getUser().getUid(), visitor.getUid()))) {
-            throw new HttpForbiddenException();
-        }
-
-        URI attachmentFName = HttpUtils.receiveMultiPartFile(attach, tmpDir);
-
-        if (StringUtils.isBlank(attachmentFName.toString()) && img != null && img.length() > 10) {
-            try {
-                URL imgUrl = new URL(img);
-                attachmentFName = HttpUtils.downloadImage(imgUrl, tmpDir);
-            } catch (Exception e) {
-                logger.error("DOWNLOAD ERROR", e);
-                throw new HttpBadRequestException();
-            }
-        }
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-        HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(params, headers);
-
-
-        params.add("body", rid == 0 ? String.format("#%d %s", mid, body) : String.format("#%d/%d %s", mid, rid, body));
-        params.add("hash", userService.getHashByUID(visitor.getUid()));
-        if (StringUtils.isNotEmpty(attachmentFName.toString())) {
-            params.add("img", attachmentFName.toASCIIString());
-        }
-        URI postUri = UriComponentsBuilder.fromUriString(apiUrl).path("/post").build().toUri();
-        ResponseEntity<CommandResult> result = rest.postForEntity(
-                postUri,
-                request, CommandResult.class);
-        logger.info("/comment: {}", jsonMapper.writeValueAsString(result.getBody()));
-        return "redirect:/" + msg.getUser().getName() + "/" + mid + "#" + result.getBody().getNewMessage().get().getRid();
-    }
-
-    @PostMapping("/pm/send")
-    public String doPostPM(@RequestParam(name = "uname", required = false) String unameParam,
-                           @RequestParam String body) throws IOException {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isAnonymous() || visitor.isBanned()) {
-            throw new HttpForbiddenException();
-        }
-        String uname = unameParam;
-        if (uname.startsWith("@")) {
-            uname = uname.substring(1);
-        }
-        User userTo = AnonymousUser.INSTANCE;
-        if (WebUtils.isUserName(uname)) {
-            userTo = userService.getUserByName(uname);
-        }
-
-        if (userTo.isAnonymous() || body.length() > 10240) {
-            throw new HttpBadRequestException();
-        }
-
-        if (userService.isInBLAny(userTo.getUid(), visitor.getUid())) {
-            throw new HttpForbiddenException();
-        }
-
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-        HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(params, headers);
-
-        params.add("body", String.format("@%s %s", userTo.getName(), body));
-        params.add("hash", userService.getHashByUID(visitor.getUid()));
-        URI postUri = UriComponentsBuilder.fromUriString(apiUrl).path("/post").build().toUri();
-        ResponseEntity<CommandResult> result = rest.postForEntity(
-                postUri,
-                request, CommandResult.class);
-        logger.info("/pm: {}", jsonMapper.writeValueAsString(result.getBody()));
-        return "redirect:/pm/sent";
-
-    }
-    @PostMapping("/post2")
-    public String doPostMessage(@RequestParam(name = "body", required = false) String bodyParam,
-                                @RequestParam(required = false) String img,
-                                @RequestParam(required = false) MultipartFile attach) throws JsonProcessingException {
-
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isAnonymous() || visitor.isBanned()) {
-            throw new HttpForbiddenException();
-        }
-        String body = StringUtils.isNotEmpty(bodyParam) ? bodyParam.replace("\r", StringUtils.EMPTY) : StringUtils.EMPTY;
-
-        URI attachmentFName = HttpUtils.receiveMultiPartFile(attach, tmpDir);
-
-        if (StringUtils.isBlank(attachmentFName.toString()) && StringUtils.isNotBlank(img)) {
-            try {
-                URL imgUrl = new URL(img);
-                attachmentFName = HttpUtils.downloadImage(imgUrl, tmpDir);
-            } catch (Exception e) {
-                logger.error("DOWNLOAD ERROR", e);
-                throw new HttpBadRequestException();
-            }
-        }
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
-        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
-        HttpEntity<MultiValueMap<String, String>> request = new HttpEntity<>(params, headers);
-
-        params.add("body", body);
-        params.add("hash", userService.getHashByUID(visitor.getUid()));
-        if (StringUtils.isNotEmpty(attachmentFName.toString())) {
-            params.add("img", attachmentFName.toASCIIString());
-        }
-        URI postUri = UriComponentsBuilder.fromUriString(apiUrl).path("/post").build().toUri();
-        try {
-            ResponseEntity<CommandResult> result = rest.postForEntity(postUri,
-                    request, CommandResult.class);
-            Message newMessage = result.getBody().getNewMessage().orElse(new Message());
-            if (newMessage.getMid() > 0) {
-                logger.info("/post: {}", jsonMapper.writeValueAsString(result.getBody()));
-                return String.format("redirect:/%d", newMessage.getMid());
-            } else {
-                logger.info("{} : {}", body, result.getBody().getText());
-            }
-        } catch (HttpClientErrorException e) {
-            logger.error("post error", e);
-        }
-        return "redirect:/?show=my";
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Settings.java b/juick-www/src/main/java/com/juick/www/controllers/Settings.java
deleted file mode 100644
index f95274238..000000000
--- a/juick-www/src/main/java/com/juick/www/controllers/Settings.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
- * 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.www.controllers;
-
-import com.juick.server.component.UserUpdatedEvent;
-import com.juick.server.helpers.NotifyOpts;
-import com.juick.server.helpers.UserInfo;
-import com.juick.server.util.*;
-import com.juick.service.*;
-import org.apache.commons.lang3.RandomStringUtils;
-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.ApplicationEventPublisher;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.inject.Inject;
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.Session;
-import javax.mail.Transport;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-
-/**
- *
- * @author Ugnich Anton
- */
-@Controller
-public class Settings {
-    private static final Logger logger = LoggerFactory.getLogger(Settings.class);
-
-    @Value("${img_path:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
-    private String imgDir;
-    @Value("${upload_tmp_dir:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
-    private String tmpDir;
-    @Inject
-    private TagService tagService;
-    @Inject
-    private UserService userService;
-    @Inject
-    private CrosspostService crosspostService;
-    @Inject
-    private SubscriptionService subscriptionService;
-    @Inject
-    private EmailService emailService;
-    @Inject
-    private TelegramService telegramService;
-    @Inject
-    private ApplicationEventPublisher applicationEventPublisher;
-    @Inject
-    private ImagesService imagesService;
-
-    @GetMapping("/settings")
-    protected String doGet(HttpServletRequest request, HttpServletResponse response, ModelMap model) throws IOException {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isAnonymous()) {
-            response.sendRedirect("/login");
-        }
-        List<String> pages = Arrays.asList("main", "password", "about", "auth-email", "privacy");
-        String page = request.getParameter("page");
-        if (StringUtils.isEmpty(page) || !pages.contains(page)) {
-            page = "main";
-        }
-
-        model.addAttribute("title", "Настройки");
-        model.addAttribute("visitor", visitor);
-        model.addAttribute("tags", tagService.getPopularTags());
-        model.addAttribute("auths", userService.getAuthCodes(visitor));
-        model.addAttribute("email_active", emailService.getNotificationsEmail(visitor.getUid()));
-        model.addAttribute("ehash", userService.getEmailHash(visitor));
-        model.addAttribute("emails", userService.getEmails(visitor));
-        model.addAttribute("jids", userService.getAllJIDs(visitor));
-        List<String> hours = IntStream.rangeClosed(0, 23).boxed()
-                .map(i -> StringUtils.leftPad(String.format("%d", i), 2, "0")).collect(Collectors.toList());
-        model.addAttribute("hours", hours);
-        model.addAttribute("fbstatus", crosspostService.getFbCrossPostStatus(visitor.getUid()));
-        model.addAttribute("twitter_name", crosspostService.getTwitterName(visitor.getUid()));
-        model.addAttribute("telegram_name", crosspostService.getTelegramName(visitor.getUid()));
-        model.addAttribute("notify_options", subscriptionService.getNotifyOptions(visitor));
-        model.addAttribute("userinfo", userService.getUserInfo(visitor));
-        if (page.equals("auth-email")) {
-            if (emailService.verifyAddressByCode(visitor.getUid(), request.getParameter("code"))) {
-                ;
-                model.addAttribute("result", "OK!");
-            } else {
-                model.addAttribute("result", "Sorry, code unknown.");
-            }
-        }
-        return String.format("views/settings_%s", page);
-    }
-
-    @PostMapping("/settings")
-    protected String doPost(HttpServletRequest request, HttpServletResponse response,
-                            @RequestParam(required = false) MultipartFile avatar,
-                            ModelMap model)
-            throws IOException {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        if (visitor.isAnonymous()) {
-            throw new HttpBadRequestException();
-        }
-        List<String> pages = Arrays.asList("main", "password", "about", "email", "email-add", "email-del",
-                "email-subscr", "auth-email", "privacy", "jid-del", "twitter-del", "telegram-del", "facebook-disable",
-                "facebook-enable", "vk-del");
-        String page = request.getParameter("page");
-        if (StringUtils.isEmpty(page) || !pages.contains(page)) {
-            throw new HttpBadRequestException();
-        }
-        String result = StringUtils.EMPTY;
-        switch (page) {
-            case "password":
-                if (userService.updatePassword(visitor, request.getParameter("password"))) {
-                    result = "<p>Password has been changed.</p>";
-                    String hash = userService.getHashByUID(visitor.getUid());
-                    Cookie c = new Cookie("hash", hash);
-                    c.setMaxAge(365 * 24 * 60 * 60);
-                    response.addCookie(c);
-                }
-                break;
-            case "main":
-                NotifyOpts opts = new NotifyOpts();
-                opts.setRepliesEnabled(StringUtils.isNotEmpty(request.getParameter("jnotify")));
-                opts.setSubscriptionsEnabled(StringUtils.isNotEmpty(request.getParameter("subscr_notify")));
-                opts.setRecommendationsEnabled(StringUtils.isNotEmpty(request.getParameter("recomm")));
-                if (subscriptionService.setNotifyOptions(visitor, opts)) {
-                    result = "<p>Notification options has been updated</p>";
-                }
-                break;
-            case "about":
-                UserInfo info = new UserInfo();
-                info.setFullName(request.getParameter("fullname"));
-                info.setCountry(request.getParameter("country"));
-                info.setUrl(request.getParameter("url"));
-                info.setDescription(request.getParameter("descr"));
-                String avatarTmpPath = HttpUtils.receiveMultiPartFile(avatar, tmpDir).getHost();
-                if (StringUtils.isNotEmpty(avatarTmpPath)) {
-                    imagesService.saveAvatar(avatarTmpPath, visitor.getUid());
-                }
-                if (userService.updateUserInfo(visitor, info)) {
-                    applicationEventPublisher.publishEvent(new UserUpdatedEvent(this, visitor));
-                    result = String.format("<p>Your info is updated.</p><p><a href='/%s/'>Back to blog</a>.</p>", visitor.getName());
-                }
-                break;
-            case "jid-del":
-                // FIXME: stop using ugnich-csv in parameters
-                String[] params = request.getParameter("delete").split(";", 2);
-                boolean res = false;
-                if (params[0].equals("xmpp")) {
-                    res = userService.deleteJID(visitor.getUid(), params[1]);
-                } else if (params[0].equals("xmpp-unauth")) {
-                    res = userService.unauthJID(visitor.getUid(), params[1]);
-                }
-                if (res) {
-                    result = "<p>Deleted. <a href=\"/settings\">Back</a>.</p>";
-                } else {
-                    result = "<p>Error</p>";
-                }
-                break;
-            case "email-add":
-                if (!emailService.verifyAddressByCode(visitor.getUid(), request.getParameter("account"))) {
-                    String authCode = RandomStringUtils.randomAlphanumeric(8).toUpperCase();
-                    if (emailService.addVerificationCode(visitor.getUid(), request.getParameter("account"), authCode)) {
-                        Session session = Session.getDefaultInstance(System.getProperties());
-                        try {
-                            MimeMessage message = new MimeMessage(session);
-                            message.setFrom(new InternetAddress("noreply@mail.juick.com"));
-                            message.addRecipient(Message.RecipientType.TO, new InternetAddress(request.getParameter("account")));
-                            message.setSubject("Juick authorization link");
-                            message.setText(String.format("Follow link to attach this email to Juick account:\n" +
-                                    "http://juick.com/settings?page=auth-email&code=%s\n\n" +
-                                    "If you don't know, what this mean - just ignore this mail.\n", authCode));
-                            Transport.send(message);
-                            result = "<p>Authorization link has been sent to your email. Follow it to proceed.</p>" +
-                                    "<p><a href=\"/settings\">Back</a></p>";
-
-                        } catch (MessagingException ex) {
-                            logger.error("mail exception", ex);
-                            throw new HttpBadRequestException();
-                        }
-                    }
-                }
-                break;
-            case "email-del":
-                if (emailService.deleteEmail(visitor.getUid(), request.getParameter("account"))) {
-                    result = "<p>Deleted. <a href=\"/settings\">Back</a>.</p>";
-                } else {
-                    result = "<p>An error occured while deleting.</p>";
-                }
-                break;
-            case "email-subscr":
-                if (emailService.setNotificationsEmail(visitor.getUid(), request.getParameter("account"))) {
-                    result = String.format("<p>Saved! Will send notifications to <strong>%s</strong>." +
-                            "</p><p><a href=\"/settings\">Back</a></p>", request.getParameter("account"));
-                } else {
-                    result = "<p>Disabled.</p><p><a href=\"/settings\">Back</a></p>";
-                }
-                break;
-            case "twitter-del":
-                crosspostService.deleteTwitterToken(visitor.getUid());
-                for (Cookie cookie : request.getCookies()) {
-                    if (cookie.getName().equals("request_token")) {
-                        cookie.setMaxAge(0);
-                        response.addCookie(cookie);
-                    }
-                    if (cookie.getName().equals("request_token_secret")) {
-                        cookie.setMaxAge(0);
-                        response.addCookie(cookie);
-                    }
-                }
-                result = "<p><a href=\"/settings\">Back</a></p>";
-                break;
-            case "telegram-del":
-                telegramService.deleteTelegramUser(visitor.getUid());
-                telegramService.getTelegramIdentifiers(Collections.singletonList(visitor)).forEach(t -> {
-                    telegramService.deleteChat(t);
-                });
-                result = "<p><a href=\"/settings\">Back</a></p>";
-                break;
-            case "facebook-disable":
-                crosspostService.disableFBCrosspost(visitor.getUid());
-                result = "<p><a href=\"/settings\">Back</a></p>";
-                break;
-            case "facebook-enable":
-                crosspostService.enableFBCrosspost(visitor.getUid());
-                result = "<p><a href=\"/settings\">Back</a></p>";
-                break;
-            case "vk-del":
-                crosspostService.deleteVKUser(visitor.getUid());
-                result = "<p><a href=\"/settings\">Back</a></p>";
-                break;
-            default:
-                throw new HttpBadRequestException();
-        }
-
-        model.addAttribute("title", "Настройки");
-        model.addAttribute("visitor", visitor);
-        model.addAttribute("result", result);
-        return "views/settings_result";
-    }
-}
diff --git a/juick-www/src/main/java/com/juick/www/controllers/SignUp.java b/juick-www/src/main/java/com/juick/www/controllers/SignUp.java
deleted file mode 100644
index 02a8006b8..000000000
--- a/juick-www/src/main/java/com/juick/www/controllers/SignUp.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * 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.www.controllers;
-
-import com.juick.server.util.HttpBadRequestException;
-import com.juick.server.util.HttpForbiddenException;
-import com.juick.server.util.UserUtils;
-import com.juick.service.CrosspostService;
-import com.juick.service.MessengerService;
-import com.juick.service.UserService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.inject.Inject;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- *
- * @author Ugnich Anton
- */
-@Controller
-public class SignUp {
-
-    @Inject
-    private UserService userService;
-    @Inject
-    private CrosspostService crosspostService;
-    @Inject
-    private MessengerService messengerService;
-
-
-    @GetMapping("/signup")
-    protected String doGet(@RequestParam String type, @RequestParam String hash, ModelMap model) {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-
-        if (hash.length() > 36 || !type.matches("^[a-zA-Z0-9\\-]+$")
-                || !hash.matches("^[a-zA-Z0-9\\-]+$")) {
-            throw new HttpBadRequestException();
-        }
-
-        String account = null;
-        switch (type) {
-            case "fb":
-                account = crosspostService.getFacebookNameByHash(hash);
-                break;
-            case "vk":
-                account = crosspostService.getVKNameByHash(hash);
-                break;
-            case "xmpp":
-                account = crosspostService.getJIDByHash(hash);
-                break;
-            case "durov":
-                account = crosspostService.getTelegramNameByHash(hash);
-                break;
-            case "messenger":
-                account = messengerService.getDisplayName(hash);
-                break;
-        }
-        if (account == null) {
-            throw new HttpBadRequestException();
-        }
-
-        model.addAttribute("title", "Новый пользователь");
-        model.addAttribute("visitor", visitor);
-        model.addAttribute("account", account);
-        model.addAttribute("type", type);
-        model.addAttribute("hash", hash);
-        return "views/signup";
-    }
-
-    @PostMapping("/signup")
-    protected String doPost(
-            HttpServletResponse response,
-            @RequestParam String type,
-            @RequestParam String hash,
-            @RequestParam String action,
-            @RequestParam(required = false) String username,
-            @RequestParam(required = false) String password) {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        int uid = 0;
-
-        if (hash.length() > 36 || !type.matches("^[a-zA-Z0-9\\-]+$") || !hash.matches("^[a-zA-Z0-9\\-]+$")) {
-            throw new HttpBadRequestException();
-        }
-
-        if (action.charAt(0) == 'l') {
-
-            if (visitor.isAnonymous()) {
-                if (username.length() > 32) {
-                    throw new HttpBadRequestException();
-                }
-                uid = userService.checkPassword(username, password);
-            } else {
-                uid = visitor.getUid();
-            }
-
-            if (uid <= 0) {
-                throw new HttpForbiddenException();
-            }
-
-            if (!(type.charAt(0) == 'f' && crosspostService.setFacebookUser(hash, uid))
-                    && !(type.charAt(0) == 'v' && crosspostService.setVKUser(hash, uid))
-                    && !(type.charAt(0) == 'd' && crosspostService.setTelegramUser(hash, uid))
-                    && !(type.charAt(0) == 'x' && crosspostService.setJIDUser(hash, uid))
-                    && !(type.charAt(0) == 'm' && messengerService.linkMessengerUser(hash, uid))) {
-                throw new HttpBadRequestException();
-            }
-
-        } else { // Create new account
-            if (username.length() < 2 || username.length() > 16 || !username.matches("^[a-zA-Z0-9\\-]+$") || password.length() < 6 || password.length() > 32) {
-                throw new HttpBadRequestException();
-            }
-
-            // CHECK USERNAME
-
-            uid = userService.createUser(username, password);
-            if (uid <= 0) {
-                throw new HttpBadRequestException();
-            }
-
-            if (!(type.charAt(0) == 'f' && crosspostService.setFacebookUser(hash, uid))
-                    && !(type.charAt(0) == 'v' && crosspostService.setVKUser(hash, uid))
-                    && !(type.charAt(0) == 'd' && crosspostService.setTelegramUser(hash, uid))
-                    && !(type.charAt(0) == 'x' && crosspostService.setJIDUser(hash, uid))
-                    && !(type.charAt(0) == 'm' && messengerService.linkMessengerUser(hash, uid))) {
-                throw new HttpBadRequestException();
-            }
-        }
-
-        if (visitor.isAnonymous()) {
-            hash = userService.getHashByUID(uid);
-            Cookie c = new Cookie("hash", hash);
-            c.setMaxAge(365 * 24 * 60 * 60);
-            response.addCookie(c);
-        }
-        return "redirect:/";
-    }
-}