2 files changed, 24 insertions, 64 deletions
diff --git a/src/main/java/com/juick/server/www/controllers/MessagesWWW.java b/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
index ad988bcb..1c69db32 100644
--- a/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
+++ b/src/main/java/com/juick/server/www/controllers/MessagesWWW.java
@@ -601,6 +601,30 @@ public class MessagesWWW {
         return "views/thread";
     }
 
+    @GetMapping("/post")
+    protected String postAction(@RequestParam(required = false) String body, ModelMap model) {
+        com.juick.User visitor = UserUtils.getCurrentUser();
+        fillUserModel(model, visitor, visitor);
+        visitor.setAvatar(webApp.getAvatarWebPath(visitor));
+        model.addAttribute("title", "Написать");
+        model.addAttribute("headers", "");
+        model.addAttribute("visitor", visitor);
+        if (body == null) {
+            body = StringUtils.EMPTY;
+        } else {
+            if (body.length() > 4096) {
+                body = body.substring(0, 4096);
+            }
+            body = StringEscapeUtils.escapeHtml4(body);
+        }
+        model.addAttribute("body", body);
+        model.addAttribute("visitor", visitor);
+        model.addAttribute("user", visitor);
+        model.addAttribute("tags", tagService.getUserTagStats(visitor.getUid()).stream()
+                .sorted((e1, e2) -> Integer.compare(e2.getUsageCount(), e1.getUsageCount())).map(t -> t.getTag().getName()).collect(Collectors.toList()));
+        return "views/post";
+    }
+
     // when message id is not fit to int
     @ExceptionHandler(NumberFormatException.class)
     public ResponseEntity<String> notFoundAction() {
diff --git a/src/main/java/com/juick/server/www/controllers/NewMessage.java b/src/main/java/com/juick/server/www/controllers/NewMessage.java
deleted file mode 100644
index dfe629b5..00000000
--- a/src/main/java/com/juick/server/www/controllers/NewMessage.java
+++ /dev/null
@@ -1,64 +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.server.www.controllers;
-
-import com.juick.server.util.UserUtils;
-import com.juick.server.www.WebApp;
-import com.juick.service.TagService;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.StringEscapeUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import javax.inject.Inject;
-import java.util.stream.Collectors;
-
-/**
- * @author Ugnich Anton
- */
-@Controller
-public class NewMessage {
-
-    @Inject
-    private TagService tagService;
-    @Inject
-    private WebApp webApp;
-    @GetMapping("/post")
-    protected String postAction(@RequestParam(required = false) String body, ModelMap model) {
-        com.juick.User visitor = UserUtils.getCurrentUser();
-        visitor.setAvatar(webApp.getAvatarWebPath(visitor));
-        model.addAttribute("title", "Написать");
-        model.addAttribute("headers", "");
-        model.addAttribute("visitor", visitor);
-        if (body == null) {
-            body = StringUtils.EMPTY;
-        } else {
-            if (body.length() > 4096) {
-                body = body.substring(0, 4096);
-            }
-            body = StringEscapeUtils.escapeHtml4(body);
-        }
-        model.addAttribute("body", body);
-        model.addAttribute("visitor", visitor);
-        model.addAttribute("user", visitor);
-        model.addAttribute("tags", tagService.getUserTagStats(visitor.getUid()).stream()
-                .sorted((e1, e2) -> Integer.compare(e2.getUsageCount(), e1.getUsageCount())).map(t -> t.getTag().getName()).collect(Collectors.toList()));
-        return "views/post";
-    }
-}