From 2efaf52caa8c42ec30ba9967c5f5841e874e22f4 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Mon, 20 Nov 2017 15:04:38 +0300
Subject: fix api and www tests

---
 .../java/com/juick/www/controllers/NewMessage.java  | 21 +++++++++++++--------
 1 file changed, 13 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 8f7c8059..d188dfbe 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
@@ -25,6 +25,7 @@ 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.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -65,6 +66,10 @@ public class NewMessage {
     private PMQueriesService pmQueriesService;
     @Inject
     private WebApp webApp;
+    @Value("${img_path:/var/www/juick.com/i/}")
+    private String imgDir;
+    @Value("${upload_tmp_dir:/var/www/juick.com/i/tmp/}")
+    private String tmpDir;
 
     private static final Logger logger = LoggerFactory.getLogger(NewMessage.class);
 
@@ -102,12 +107,12 @@ public class NewMessage {
 
         List<Tag> tags = webApp.parseTags(tagsStr);
 
-        String attachmentFName = HttpUtils.receiveMultiPartFile(attach, webApp.getTmpDir());
+        String attachmentFName = HttpUtils.receiveMultiPartFile(attach, tmpDir);
 
         if (StringUtils.isBlank(attachmentFName) && StringUtils.isNotBlank(img)) {
             try {
                 URL imgUrl = new URL(img);
-                attachmentFName = HttpUtils.downloadImage(imgUrl, webApp.getTmpDir());
+                attachmentFName = HttpUtils.downloadImage(imgUrl, tmpDir);
             } catch (Exception e) {
                 logger.error("DOWNLOAD ERROR", e);
                 throw new HttpBadRequestException();
@@ -130,7 +135,7 @@ public class NewMessage {
             String fname = mid + "." + attachmentType;
             String attachmentURL = "http://i.juick.com/photos-1024/" + fname;
 
-            ImageUtils.saveImageWithPreviews(attachmentFName, fname, webApp.getTmpDir(), webApp.getImgDir());
+            ImageUtils.saveImageWithPreviews(attachmentFName, fname, tmpDir, imgDir);
 
             body = attachmentURL + "\n" + body;
             try {
@@ -225,12 +230,12 @@ public class NewMessage {
             throw new HttpForbiddenException();
         }
 
-        String attachmentFName = HttpUtils.receiveMultiPartFile(attach, webApp.getTmpDir());
+        String attachmentFName = HttpUtils.receiveMultiPartFile(attach, tmpDir);
 
         if (StringUtils.isBlank(attachmentFName) && img != null && img.length() > 10) {
             try {
                 URL imgUrl = new URL(img);
-                attachmentFName = HttpUtils.downloadImage(imgUrl, webApp.getTmpDir());
+                attachmentFName = HttpUtils.downloadImage(imgUrl, tmpDir);
             } catch (Exception e) {
                 logger.error("DOWNLOAD ERROR", e);
                 throw new HttpBadRequestException();
@@ -259,7 +264,7 @@ public class NewMessage {
             String fname = mid + "-" + ridnew + "." + attachmentType;
             String attachmentURL = "http://i.juick.com/photos-1024/" + fname;
 
-            ImageUtils.saveImageWithPreviews(attachmentFName, fname, webApp.getTmpDir(), webApp.getImgDir());
+            ImageUtils.saveImageWithPreviews(attachmentFName, fname, tmpDir, imgDir);
 
             body = attachmentURL + "\n" + body;
             try {
@@ -397,12 +402,12 @@ public class NewMessage {
         }
         String body = bodyParam.replace("\r", StringUtils.EMPTY);
 
-        String attachmentFName = HttpUtils.receiveMultiPartFile(attach, webApp.getTmpDir());
+        String attachmentFName = HttpUtils.receiveMultiPartFile(attach, tmpDir);
 
         if (StringUtils.isBlank(attachmentFName) && img != null && img.length() > 10) {
             try {
                 URL imgUrl = new URL(img);
-                attachmentFName = HttpUtils.downloadImage(imgUrl, webApp.getTmpDir());
+                attachmentFName = HttpUtils.downloadImage(imgUrl, tmpDir);
             } catch (Exception e) {
                 logger.error("DOWNLOAD ERROR", e);
                 throw new HttpBadRequestException();
-- 
cgit v1.2.3