From bda2d764a9c187da5aa8cd74fb8c4a9574d3996e Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Fri, 30 Mar 2018 17:52:53 +0300
Subject: xmpp integration tests

---
 .../src/main/java/com/juick/www/controllers/NewMessage.java | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'juick-www/src/main/java/com/juick/www/controllers/NewMessage.java')

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
index f8a11d82..6e16ae50 100644
--- a/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
+++ b/juick-www/src/main/java/com/juick/www/controllers/NewMessage.java
@@ -16,13 +16,10 @@
  */
 package com.juick.www.controllers;
 
-import com.juick.Status;
-import com.juick.Tag;
 import com.juick.User;
 import com.juick.server.helpers.AnonymousUser;
 import com.juick.server.util.*;
 import com.juick.service.*;
-import com.juick.util.MessageUtils;
 import com.juick.www.WebApp;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.text.StringEscapeUtils;
@@ -34,7 +31,6 @@ 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.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import rocks.xmpp.addr.Jid;
 import rocks.xmpp.core.stanza.model.Message;
@@ -47,7 +43,6 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -76,6 +71,8 @@ public class NewMessage {
     private String imgDir;
     @Value("${upload_tmp_dir:#{systemEnvironment['TEMP'] ?: '/tmp'}}")
     private String tmpDir;
+    @Value("${xmppbot_jid:juick@localhost}")
+    private Jid botJid;
 
     private static final Logger logger = LoggerFactory.getLogger(NewMessage.class);
 
@@ -247,11 +244,11 @@ public class NewMessage {
         if (visitor.getUid() == 0 || visitor.isBanned()) {
             throw new HttpForbiddenException();
         }
-        String body = bodyParam.replace("\r", StringUtils.EMPTY);
+        String body = StringUtils.isNotEmpty(bodyParam) ? bodyParam.replace("\r", StringUtils.EMPTY) : StringUtils.EMPTY;
 
         String attachmentFName = HttpUtils.receiveMultiPartFile(attach, tmpDir);
 
-        if (StringUtils.isBlank(attachmentFName) && img != null && img.length() > 10) {
+        if (StringUtils.isBlank(attachmentFName) && StringUtils.isNotBlank(img)) {
             try {
                 URL imgUrl = new URL(img);
                 attachmentFName = HttpUtils.downloadImage(imgUrl, tmpDir);
@@ -263,7 +260,7 @@ public class NewMessage {
         Message msg = new Message();
         msg.setType(Message.Type.CHAT);
         msg.setFrom(Jid.of(String.valueOf(visitor.getUid()), "uid.juick.com", "perl"));
-        msg.setTo(Jid.of("juick@juick.com/Juick"));
+        msg.setTo(botJid);
         msg.setBody(body);
         try {
             if (StringUtils.isNotEmpty(attachmentFName)) {
-- 
cgit v1.2.3