From 751b2a9b0fc523d17c9f7a410fadcc82eaaa1fb7 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Wed, 27 Sep 2017 15:19:06 +0300
Subject: api: Telegram posting

---
 .../main/java/com/juick/api/controllers/Post.java  | 79 ++++++++--------------
 1 file changed, 30 insertions(+), 49 deletions(-)

(limited to 'juick-api/src/main/java/com/juick/api/controllers/Post.java')

diff --git a/juick-api/src/main/java/com/juick/api/controllers/Post.java b/juick-api/src/main/java/com/juick/api/controllers/Post.java
index 5a32ade0..33d83d2c 100644
--- a/juick-api/src/main/java/com/juick/api/controllers/Post.java
+++ b/juick-api/src/main/java/com/juick/api/controllers/Post.java
@@ -101,22 +101,7 @@ public class Post {
                 throw new HttpBadRequestException();
             }
         }
-
-        if (apiServer.getXmpp() != null) {
-            Message xmsg = new Message();
-            xmsg.setFrom(Jid.of(String.valueOf(visitor.getUid()), "uid.juick.com", "perl"));
-            xmsg.setTo(Jid.of("juick@juick.com/Juick"));
-            xmsg.setBody(body);
-            try {
-                if (StringUtils.isNotEmpty(attachmentFName)) {
-                    String attachmentUrl = String.format("juick://%s", attachmentFName);
-                    xmsg.addExtension(new OobX(new URI(attachmentUrl), "!!!!Juick!!"));
-                }
-                apiServer.getXmpp().sendMessage(xmsg);
-            } catch (URISyntaxException e1) {
-                logger.warn("attachment error", e1);
-            }
-        }
+        apiServer.processMessage(visitor, body, attachmentFName);
     }
 
     @RequestMapping(value = "/comment", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@@ -175,48 +160,44 @@ public class Post {
 
         com.juick.Message jmsg = messagesService.getReply(mid, ridnew);
 
-        if (apiServer.getXmpp() != null) {
-            Message xmsg = new Message();
-            xmsg.setFrom(Jid.of("juick@juick.com"));
-            xmsg.setType(Message.Type.CHAT);
-            xmsg.setThread("juick-" + mid);
-            xmsg.addExtension(jmsg);
+        Message xmsg = new Message();
+        xmsg.setFrom(Jid.of("juick@juick.com"));
+        xmsg.setType(Message.Type.CHAT);
+        xmsg.setThread("juick-" + mid);
+        xmsg.addExtension(jmsg);
 
-            String quote = reply != null ? reply.getText() : msg.getText();
-            if (quote.length() >= 50) {
-                quote = quote.substring(0, 47) + "...";
-            }
+        String quote = reply != null ? reply.getText() : msg.getText();
+        if (quote.length() >= 50) {
+            quote = quote.substring(0, 47) + "...";
+        }
 
-            xmsg.addExtension(new Nickname("@" + jmsg.getUser().getName()));
+        xmsg.addExtension(new Nickname("@" + jmsg.getUser().getName()));
 
-            if (StringUtils.isNotEmpty(attachmentFName)) {
-                String fname = mid + "-" + ridnew + "." + attachmentType;
-                String attachmentURL = "http://i.juick.com/photos-1024/" + fname;
+        if (StringUtils.isNotEmpty(attachmentFName)) {
+            String fname = mid + "-" + ridnew + "." + attachmentType;
+            String attachmentURL = "http://i.juick.com/photos-1024/" + fname;
 
-                ImageUtils.saveImageWithPreviews(attachmentFName, fname, tmpDir, imgDir);
+            ImageUtils.saveImageWithPreviews(attachmentFName, fname, tmpDir, imgDir);
 
-                body = attachmentURL + "\n" + body;
-                try {
-                    xmsg.addExtension(new OobX(new URI(attachmentURL)));
-                } catch (URISyntaxException e) {
-                    logger.error("invalid uri: {}, exception {}", attachmentURL, e);
-                }
+            body = attachmentURL + "\n" + body;
+            try {
+                xmsg.addExtension(new OobX(new URI(attachmentURL)));
+            } catch (URISyntaxException e) {
+                logger.error("invalid uri: {}, exception {}", attachmentURL, e);
             }
+        }
 
-            xmsg.setBody("Reply by @" + jmsg.getUser().getName() + ":\n>" + quote + "\n" + body + "\n\n#" +
-                    mid + "/" + ridnew + " http://juick.com/" + mid + "#" + ridnew);
+        xmsg.setBody("Reply by @" + jmsg.getUser().getName() + ":\n>" + quote + "\n" + body + "\n\n#" +
+                mid + "/" + ridnew + " http://juick.com/" + mid + "#" + ridnew);
 
-            xmsg.setTo(Jid.of("juick@s2s.juick.com"));
-            apiServer.getXmpp().send(xmsg);
+        xmsg.setTo(Jid.of("juick@s2s.juick.com"));
+        apiServer.sendMessage(xmsg);
 
-            xmsg.setTo(Jid.of("juick@ws.juick.com"));
-            apiServer.getXmpp().send(xmsg);
+        xmsg.setTo(Jid.of("juick@ws.juick.com"));
+        apiServer.sendMessage(xmsg);
 
-            xmsg.setTo(Jid.of("juick@push.juick.com"));
-            apiServer.getXmpp().send(xmsg);
-        } else {
-            logger.error("XMPP unavailable");
-        }
+        xmsg.setTo(Jid.of("juick@push.juick.com"));
+        apiServer.sendMessage(xmsg);
         return jmsg;
     }
 
@@ -277,7 +258,7 @@ public class Post {
                     String attachmentUrl = String.format("juick://%s", attachmentFName[0]);
                     xmsg.addExtension(new OobX(new URI(attachmentUrl), "!!!!Juick!!"));
                 }
-                apiServer.getXmpp().sendMessage(xmsg);
+                apiServer.sendMessage(xmsg);
             } catch (URISyntaxException e1) {
                 logger.warn("attachment error", e1);
             }
-- 
cgit v1.2.3