From 8b245d2df742321b575cb8295518f6e22790ba87 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Fri, 12 Jan 2018 10:20:16 +0300 Subject: api: merge crosspost application --- .../configuration/CrosspostAppConfiguration.java | 73 ---------- .../configuration/CrosspostInitializer.java | 60 -------- .../components/controllers/StatusController.java | 41 ------ .../src/main/java/com/juick/service/Crosspost.java | 161 --------------------- .../juick/service/rest/CrosspostRestService.java | 143 ------------------ 5 files changed, 478 deletions(-) delete mode 100644 juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostAppConfiguration.java delete mode 100644 juick-crosspost/src/main/java/com/juick/components/configuration/CrosspostInitializer.java delete mode 100644 juick-crosspost/src/main/java/com/juick/components/controllers/StatusController.java delete mode 100644 juick-crosspost/src/main/java/com/juick/service/Crosspost.java delete mode 100644 juick-crosspost/src/main/java/com/juick/service/rest/CrosspostRestService.java (limited to 'juick-crosspost/src/main/java') 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 . - */ - -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 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 . - */ - -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 . - */ - -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/Crosspost.java b/juick-crosspost/src/main/java/com/juick/service/Crosspost.java deleted file mode 100644 index 7fcb9a52..00000000 --- a/juick-crosspost/src/main/java/com/juick/service/Crosspost.java +++ /dev/null @@ -1,161 +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 . - */ -package com.juick.service; - -import com.juick.Message; -import com.juick.server.component.MessageEvent; -import com.juick.util.MessageUtils; -import org.apache.commons.codec.CharEncoding; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.tuple.Pair; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -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 javax.inject.Inject; -import javax.net.ssl.HttpsURLConnection; -import java.io.OutputStreamWriter; -import java.net.URL; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; - -/** - * @author Ugnich Anton - */ -public class Crosspost implements ApplicationListener { - final static String FBURL = "https://graph.facebook.com/me/feed"; - final static String VKURL = "https://api.vk.com/method/wall.post"; - - private static Logger logger = LoggerFactory.getLogger(Crosspost.class); - - @Inject - private CrosspostService crosspostService; - - @Value("${twitter_consumer_key:}") - private String twitter_consumer_key; - @Value("${twitter_consumer_secret:}") - private String twitter_consumer_secret; - - @Override - public void onApplicationEvent(MessageEvent event) { - Message msg = event.getMessage(); - if (msg.getMid() > 0 && msg.getRid() == 0) { - if (StringUtils.isNotEmpty(crosspostService.getTwitterName(msg.getUser().getUid()))) { - if (msg.getTags().stream().noneMatch(t -> t.getName().equals("notwitter"))) { - twitterPost(msg); - } - } - // TODO: approve application for facebook crosspost - } - } - - public 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()) { - return false; - } - - logger.info("FB: #{}", jmsg.getMid()); - - String status = MessageUtils.getMessageHashTags(jmsg) + "\n" + jmsg.getText(); - - boolean ret = false; - try { - String body = "access_token=" - + URLEncoder.encode(token, CharEncoding.UTF_8) - + "&message=" - + URLEncoder.encode(status, CharEncoding.UTF_8) - + "&link=http%3A%2F%2Fjuick.com%2F" - + jmsg.getMid(); - - HttpsURLConnection conn = (HttpsURLConnection) new URL(FBURL).openConnection(); - conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - conn.setRequestProperty("User-Agent", "Juick"); - conn.setRequestProperty("Content-Length", Integer.toString(body.length())); - conn.setUseCaches(false); - conn.setDoInput(true); - conn.setDoOutput(true); - conn.setRequestMethod("POST"); - conn.connect(); - - OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream()); - wr.write(body); - wr.close(); - - ret = StringUtils.isNotEmpty(IOUtils.toString(conn.getInputStream(), StandardCharsets.UTF_8)); - - conn.disconnect(); - } catch (Exception e) { - logger.error("fbPost exception", e); - } - return ret; - } - - public boolean vkontaktePost(final com.juick.Message jmsg) { - Pair tokens = crosspostService.getVkTokens(jmsg.getUser().getUid()).orElse(Pair.of(StringUtils.EMPTY, StringUtils.EMPTY)); - if (tokens.getLeft().isEmpty() || tokens.getRight().isEmpty()) { - return false; - } - - logger.info("VK: #", jmsg.getMid()); - - String status = MessageUtils.getMessageHashTags(jmsg) + "\n" + jmsg.getText() + "\nhttp://juick.com/" + jmsg.getMid(); - - boolean ret = false; - try { - String body = "owner_id=" + tokens.getLeft() + "&access_token=" + URLEncoder.encode(tokens.getRight(), CharEncoding.UTF_8) + "&from_group=1&message=" + URLEncoder.encode(status, CharEncoding.UTF_8); - - HttpsURLConnection conn = (HttpsURLConnection) new URL(VKURL).openConnection(); - conn.setRequestProperty("Content-Type", "application/x-www-form-urlencoded"); - conn.setRequestProperty("User-Agent", "Juick"); - conn.setRequestProperty("Content-Length", Integer.toString(body.length())); - conn.setUseCaches(false); - conn.setDoInput(true); - conn.setDoOutput(true); - conn.setRequestMethod("POST"); - conn.connect(); - - OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream()); - wr.write(body); - wr.close(); - - ret = StringUtils.isNotEmpty(IOUtils.toString(conn.getInputStream(), StandardCharsets.UTF_8)); - - conn.disconnect(); - } catch (Exception e) { - logger.error("vkPost exception", e); - } - return ret; - } - - public 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) { - status = status.substring(0, 254) + "…"; - } - status += " http://juick.com/" + jmsg.getMid(); - Twitter twitter = new TwitterTemplate(twitter_consumer_key, twitter_consumer_secret, t.getToken(), t.getSecret()); - twitter.timelineOperations().updateStatus(status); - }); - } -} 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 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> 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> 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; - } -} -- cgit v1.2.3