api: merge crosspost application

9 files changed, 15 insertions, 355 deletions

diff --git a/juick-api/build.gradle b/juick-api/build.gradle
index 39475d94..bba2be89 100644
--- a/juick-api/build.gradle
+++ b/juick-api/build.gradle
@@ -17,6 +17,7 @@ dependencies {
 
     compile 'com.github.pengrad:java-telegram-bot-api:3.5.2'
     compile 'com.github.messenger4j:messenger4j:1.0.0-M2'
+    compile "org.springframework.social:spring-social-twitter:1.1.2.RELEASE"
     compile 'org.apache.commons:commons-email:1.5'
     compile 'org.imgscalr:imgscalr-lib:4.2'
 
diff --git a/juick-crosspost/src/main/java/com/juick/service/Crosspost.java b/juick-api/src/main/java/com/juick/api/CrosspostManager.java
index 7fcb9a52..13f21074 100644
--- a/juick-crosspost/src/main/java/com/juick/service/Crosspost.java
+++ b/juick-api/src/main/java/com/juick/api/CrosspostManager.java
@@ -14,10 +14,11 @@
  * 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.service;
+package com.juick.api;
 
 import com.juick.Message;
 import com.juick.server.component.MessageEvent;
+import com.juick.service.CrosspostService;
 import com.juick.util.MessageUtils;
 import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.io.IOUtils;
@@ -29,7 +30,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationListener;
 import org.springframework.social.twitter.api.Twitter;
 import org.springframework.social.twitter.api.impl.TwitterTemplate;
+import org.springframework.stereotype.Component;
 
+import javax.annotation.Nonnull;
 import javax.inject.Inject;
 import javax.net.ssl.HttpsURLConnection;
 import java.io.OutputStreamWriter;
@@ -40,11 +43,12 @@ import java.nio.charset.StandardCharsets;
 /**
  * @author Ugnich Anton
  */
-public class Crosspost implements ApplicationListener<MessageEvent> {
-    final static String FBURL = "https://graph.facebook.com/me/feed";
-    final static String VKURL = "https://api.vk.com/method/wall.post";
+@Component
+public class CrosspostManager implements ApplicationListener<MessageEvent> {
+    private final static String FBURL = "https://graph.facebook.com/me/feed";
+    private final static String VKURL = "https://api.vk.com/method/wall.post";
 
-    private static Logger logger = LoggerFactory.getLogger(Crosspost.class);
+    private static Logger logger = LoggerFactory.getLogger(CrosspostManager.class);
 
     @Inject
     private CrosspostService crosspostService;
@@ -55,7 +59,7 @@ public class Crosspost implements ApplicationListener<MessageEvent> {
     private String twitter_consumer_secret;
 
     @Override
-    public void onApplicationEvent(MessageEvent event) {
+    public void onApplicationEvent(@Nonnull MessageEvent event) {
         Message msg = event.getMessage();
         if (msg.getMid() > 0 && msg.getRid() == 0) {
             if (StringUtils.isNotEmpty(crosspostService.getTwitterName(msg.getUser().getUid()))) {
@@ -67,7 +71,7 @@ public class Crosspost implements ApplicationListener<MessageEvent> {
         }
     }
 
-    public boolean facebookPost(final com.juick.Message jmsg) {
+    private boolean facebookPost(final com.juick.Message jmsg) {
         String token = crosspostService.getFacebookTokens(jmsg.getUser().getUid())
                 .orElse(Pair.of(StringUtils.EMPTY, StringUtils.EMPTY)).getRight();
         if (token.isEmpty()) {
@@ -110,7 +114,7 @@ public class Crosspost implements ApplicationListener<MessageEvent> {
         return ret;
     }
 
-    public boolean vkontaktePost(final com.juick.Message jmsg) {
+    private boolean vkontaktePost(final com.juick.Message jmsg) {
         Pair<String, String> tokens = crosspostService.getVkTokens(jmsg.getUser().getUid()).orElse(Pair.of(StringUtils.EMPTY, StringUtils.EMPTY));
         if (tokens.getLeft().isEmpty() || tokens.getRight().isEmpty()) {
             return false;
@@ -147,7 +151,7 @@ public class Crosspost implements ApplicationListener<MessageEvent> {
         return ret;
     }
 
-    public void twitterPost(final com.juick.Message jmsg) {
+    private void twitterPost(final com.juick.Message jmsg) {
         crosspostService.getTwitterToken(jmsg.getUser().getUid()).ifPresent(t -> {
             String status = MessageUtils.getMessageHashTags(jmsg) + jmsg.getText();
             if (status.length() > 255) {
diff --git a/juick-crosspost/build.gradle b/juick-crosspost/build.gradle
deleted file mode 100644
index 1c0dc931..00000000
--- a/juick-crosspost/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply plugin: 'java'
-apply plugin: 'war'
-apply plugin: 'org.akhikhl.gretty'
-
-dependencies {
-    compile project(':juick-server-web')
-    compile "org.springframework:spring-websocket:${rootProject.springFrameworkVersion}"
-    compile "org.springframework.social:spring-social-twitter:1.1.2.RELEASE"
-}
-
-compileJava.options.encoding = 'UTF-8'
-
-gretty {
-    httpPort = 8080
-    contextPath = ''
-    servletContainer = 'tomcat8'
-}
-
-configurations {
-    all*.exclude module: 'commons-logging'
-}
\ No newline at end of file
diff --git a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java
deleted file mode 100644
index 76a909ad..00000000
--- a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java
+++ /dev/null
@@ -1,73 +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.components.configuration;
-
-import com.juick.server.component.JuickServerComponent;
-import com.juick.server.component.JuickServerReconnectManager;
-import com.juick.server.configuration.BaseWebConfiguration;
-import com.juick.service.Crosspost;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.PropertySource;
-import org.springframework.http.client.ClientHttpRequestInterceptor;
-import org.springframework.http.client.InterceptingClientHttpRequestFactory;
-import org.springframework.http.client.support.BasicAuthorizationInterceptor;
-import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-
-import java.util.Collections;
-import java.util.List;
-
-/**
- * Created by aalexeev on 11/12/16.
- */
-@Configuration
-@ComponentScan(basePackages = "com.juick.service")
-@EnableWebMvc
-@PropertySource("classpath:juick.conf")
-public class CrosspostAppConfiguration extends BaseWebConfiguration {
-    @Value("${api_user:juick}")
-    private String apiUser;
-    @Value("${api_password:secret}")
-    private String apiSecret;
-    @Bean
-    public JuickServerComponent juickServerComponent() {
-        return new JuickServerComponent();
-    }
-    @Bean
-    public JuickServerReconnectManager juickServerReconnectManager() {
-        return new JuickServerReconnectManager();
-    }
-    @Bean
-    public RestTemplate rest() {
-        RestTemplate rest = new RestTemplate();
-        List<ClientHttpRequestInterceptor> interceptors = Collections.singletonList(
-                new BasicAuthorizationInterceptor(apiUser, apiSecret));
-
-        rest.setRequestFactory(new InterceptingClientHttpRequestFactory(rest.getRequestFactory(), interceptors));
-        return rest;
-    }
-
-    @Bean
-    public Crosspost crosspost() {
-        return new Crosspost();
-    }
-
-}
diff --git a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java b/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java
deleted file mode 100644
index 88280480..00000000
--- a/juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java
+++ /dev/null
@@ -1,60 +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.components.configuration;
-
-import com.juick.server.configuration.JuickServerComponentConfiguration;
-import org.apache.commons.codec.CharEncoding;
-import org.springframework.web.filter.CharacterEncodingFilter;
-import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
-
-import javax.servlet.Filter;
-
-/**
- * Created by vt on 09/02/16.
- */
-public class CrosspostInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
-
-    @Override
-    protected Class<?>[] getRootConfigClasses() {
-        return new Class<?>[]{
-                CrosspostAppConfiguration.class,
-                JuickServerComponentConfiguration.class
-        };
-    }
-
-    @Override
-    protected Class<?>[] getServletConfigClasses() {
-        return null;
-    }
-
-    @Override
-    protected String[] getServletMappings() {
-        return new String[]{"/"};
-    }
-
-    @Override
-    protected Filter[] getServletFilters() {
-        CharacterEncodingFilter characterEncodingFilter = new CharacterEncodingFilter(CharEncoding.UTF_8);
-        return new Filter[]{characterEncodingFilter};
-    }
-
-    @Override
-    protected String getServletName() {
-        return "Crosspost dispatcher servlet";
-    }
-}
diff --git a/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java b/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java
deleted file mode 100644
index 3bcd84e2..00000000
--- a/juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java
+++ /dev/null
@@ -1,41 +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.components.controllers;
-
-import com.juick.service.Crosspost;
-import com.juick.Status;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.inject.Inject;
-
-/**
- * Created by vitalyster on 24.10.2016.
- */
-@RestController
-public class StatusController {
-    @Inject
-    private Crosspost crosspost;
-
-    @RequestMapping(method = RequestMethod.GET, value = "/", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public Status status() {
-        return crosspost != null ? Status.OK : Status.FAIL;
-    }
-}
diff --git a/juick-crosspost/src/main/java/com/juick/service/rest/CrosspostRestService.java b/juick-crosspost/src/main/java/com/juick/service/rest/CrosspostRestService.java
deleted file mode 100644
index dbc0bdc9..00000000
--- a/juick-crosspost/src/main/java/com/juick/service/rest/CrosspostRestService.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package com.juick.service.rest;
-
-import com.juick.ExternalToken;
-import com.juick.User;
-import com.juick.server.helpers.ApplicationStatus;
-import com.juick.service.CrosspostService;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import org.springframework.stereotype.Component;
-import org.springframework.web.client.RestTemplate;
-
-import javax.inject.Inject;
-import java.util.Optional;
-
-@Component
-public class CrosspostRestService implements CrosspostService {
-    @Inject
-    private RestTemplate rest;
-
-    @Override
-    public Optional<ExternalToken> getTwitterToken(int uid) {
-        User user = rest.getForObject("https://api.juick.com/tokens?uid={uid}", User.class, uid);
-        if (user != null) {
-            return user.getTokens().stream()
-                    .filter(t -> t.getType().equals("twitter")).findFirst();
-        }
-        return Optional.empty();
-    }
-
-    @Override
-    public boolean deleteTwitterToken(Integer uid) {
-        return false;
-    }
-
-    @Override
-    public Optional<Pair<String, String>> getFacebookTokens(int uid) {
-        return Optional.empty();
-    }
-
-    @Override
-    public ApplicationStatus getFbCrossPostStatus(int uid) {
-        return null;
-    }
-
-    @Override
-    public boolean enableFBCrosspost(Integer uid) {
-        return false;
-    }
-
-    @Override
-    public void disableFBCrosspost(Integer uid) {
-
-    }
-
-    @Override
-    public String getTwitterName(int uid) {
-        ExternalToken token = getTwitterToken(uid).orElse(null);
-        if (token != null) {
-            return token.getName();
-        }
-        return StringUtils.EMPTY;
-    }
-
-    @Override
-    public String getTelegramName(int uid) {
-        return null;
-    }
-
-    @Override
-    public Optional<Pair<String, String>> getVkTokens(int uid) {
-        return null;
-    }
-
-    @Override
-    public void deleteVKUser(Integer uid) {
-
-    }
-
-    @Override
-    public int getUIDbyFBID(long fbID) {
-        return 0;
-    }
-
-    @Override
-    public boolean createFacebookUser(long fbID, String loginhash, String token, String fbName, String fbLink) {
-        return false;
-    }
-
-    @Override
-    public boolean updateFacebookUser(long fbID, String token, String fbName, String fbLink) {
-        return false;
-    }
-
-    @Override
-    public int getUIDbyVKID(long vkID) {
-        return 0;
-    }
-
-    @Override
-    public boolean createVKUser(long vkID, String loginhash, String token, String vkName, String vkLink) {
-        return false;
-    }
-
-    @Override
-    public String getFacebookNameByHash(String hash) {
-        return null;
-    }
-
-    @Override
-    public String getTelegramNameByHash(String hash) {
-        return null;
-    }
-
-    @Override
-    public boolean setFacebookUser(String hash, int uid) {
-        return false;
-    }
-
-    @Override
-    public String getVKNameByHash(String hash) {
-        return null;
-    }
-
-    @Override
-    public boolean setVKUser(String hash, int uid) {
-        return false;
-    }
-
-    @Override
-    public boolean setTelegramUser(String hash, int uid) {
-        return false;
-    }
-
-    @Override
-    public String getJIDByHash(String hash) {
-        return null;
-    }
-
-    @Override
-    public boolean setJIDUser(String hash, int uid) {
-        return false;
-    }
-}
diff --git a/juick-crosspost/src/main/webapp/WEB-INF/web.xml b/juick-crosspost/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index a57cceb9..00000000
--- a/juick-crosspost/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-         version="3.0">
-
-</web-app>
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 09b3c7ed..3b78e42e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
 rootProject.name = "Juick"
 
-include ':juick-core', ':juick-server-core', ':juick-server-jdbc', ':juick-server-web', ':juick-api', ':juick-www', ':juick-rss', ':juick-ws', ':juick-notifications', ':juick-crosspost', ':juick-xmpp', ':juick-xmpp-wip'
+include ':juick-core', ':juick-server-core', ':juick-server-jdbc', ':juick-server-web', ':juick-api', ':juick-www', ':juick-rss', ':juick-ws', ':juick-notifications', ':juick-xmpp', ':juick-xmpp-wip'