diff options
author | Vitaly Takmazov | 2017-04-07 11:01:29 +0300 |
---|---|---|
committer | Vitaly Takmazov | 2017-04-07 11:01:29 +0300 |
commit | 47d7e0e533687b204e6c781f0dce57ca54e01348 (patch) | |
tree | 9fa81730de771be5695a544a24d63d0ae1992cfc /juick-www/src/main/java/com/juick/www/controllers/Home.java | |
parent | 9820abe11c0c037f50bb2f7ddbb0bd19646264dc (diff) |
juick-www: refactoring, drop userref shit
Diffstat (limited to 'juick-www/src/main/java/com/juick/www/controllers/Home.java')
-rw-r--r-- | juick-www/src/main/java/com/juick/www/controllers/Home.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/juick-www/src/main/java/com/juick/www/controllers/Home.java b/juick-www/src/main/java/com/juick/www/controllers/Home.java index a362901c..4e6330a8 100644 --- a/juick-www/src/main/java/com/juick/www/controllers/Home.java +++ b/juick-www/src/main/java/com/juick/www/controllers/Home.java @@ -17,6 +17,7 @@ */ package com.juick.www.controllers; +import com.juick.server.util.HttpNotFoundException; import com.juick.service.AdsService; import com.juick.service.MessagesService; import com.juick.service.UserService; @@ -57,7 +58,7 @@ public class Home { WebApp webApp; @GetMapping("/{anything}/**") - protected void parseAnyThing(HttpServletResponse response, @PathVariable String anything, + protected String parseAnyThing(@PathVariable String anything, @RequestParam(required = false, defaultValue = "0") int before) throws IOException { if (before == 0) { boolean isPostNumber = WebUtils.isPostNumber(anything); @@ -69,24 +70,21 @@ public class Home { com.juick.User author = messagesService.getMessageAuthor(messageId); if (author != null) { - Utils.sendPermanentRedirect(response, "/" + author.getName() + "/" + anything); - return; + return "redirect:/" + author.getName() + "/" + anything; } } } com.juick.User user = userService.getUserByName(anything); if (user.getUid() > 0) { - Utils.sendPermanentRedirect(response, "/" + user.getName() + "/"); - return; + return "redirect:/" + user.getName() + "/"; } - response.sendError(HttpServletResponse.SC_NOT_FOUND); - return; + throw new HttpNotFoundException(); } com.juick.User user = userService.getUserByName(anything); if (user.getUid() > 0) { - Utils.sendPermanentRedirect(response, "/" + user.getName() + "/?before=" + before); + return "redirect:/" + user.getName() + "/?before=" + before; } else { - response.sendError(HttpServletResponse.SC_NOT_FOUND); + throw new HttpNotFoundException(); } } |