diff options
author | 2019-04-29 14:06:24 +0300 | |
---|---|---|
committer | 2019-04-29 14:06:24 +0300 | |
commit | c3a9365645ec94d5b7c9778ab32c93e5eb4be5f6 (patch) | |
tree | d853fc7df61fdc18a20a52c93291853796e9a60f /src/main/java/com/juick/server/www/controllers/Help.java | |
parent | 409ef92da23f4b650340197e7383ba8b528999e4 (diff) |
UserUtils -> @Visitor
Diffstat (limited to 'src/main/java/com/juick/server/www/controllers/Help.java')
-rw-r--r-- | src/main/java/com/juick/server/www/controllers/Help.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/com/juick/server/www/controllers/Help.java b/src/main/java/com/juick/server/www/controllers/Help.java index 12abee80..909e8acb 100644 --- a/src/main/java/com/juick/server/www/controllers/Help.java +++ b/src/main/java/com/juick/server/www/controllers/Help.java @@ -17,11 +17,12 @@ package com.juick.server.www.controllers; +import com.juick.User; import com.juick.server.util.HttpNotFoundException; -import com.juick.server.util.UserUtils; +import com.juick.server.www.HelpService; import com.juick.server.www.WebApp; import com.juick.service.MessagesService; -import com.juick.server.www.HelpService; +import com.juick.service.security.annotation.Visitor; import org.commonmark.parser.Parser; import org.commonmark.renderer.html.HtmlRenderer; import org.springframework.stereotype.Controller; @@ -30,8 +31,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import javax.inject.Inject; -import java.io.IOException; -import java.net.URISyntaxException; import java.util.Locale; import java.util.Objects; @@ -53,12 +52,12 @@ public class Help { @GetMapping({"/help/", "/help", "/help/{langOrPage}", "/help/{lang}/{page}"}) public String showHelp( + @Visitor User visitor, Locale locale, @PathVariable(required = false, name = "lang") String lang, @PathVariable(required = false, name = "page") String page, @PathVariable(required = false, name = "langOrPage") String langOrPage, - Model model) throws IOException, URISyntaxException { - com.juick.User visitor = UserUtils.getCurrentUser(); + Model model) { visitor.setAvatar(webApp.getAvatarWebPath(visitor)); String navigation = null; |