X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FNewPage.kt;h=a3a8461b72b07119470840f219038204ffcb04f6;hb=e12cdcb23b4549e1daf9fe498b01029cc289f75d;hp=d464db7a123f2d55055878f26cd661c989746f5d;hpb=6a3f1fede0cda5cd6ed56204aa1dd37a19813cb9;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt
index d464db7..a3a8461 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt
@@ -1,12 +1,16 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.main.*
+import net.pterodactylus.sone.main.Loaders
 import net.pterodactylus.sone.utils.mapPresent
 import net.pterodactylus.sone.utils.paginate
 import net.pterodactylus.sone.utils.parameters
+import net.pterodactylus.sone.web.NewElements
 import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.*
-import net.pterodactylus.util.template.Template
+import net.pterodactylus.sone.web.page.MenuName
+import net.pterodactylus.sone.web.page.SoneRequest
+import net.pterodactylus.sone.web.page.TemplatePath
+import net.pterodactylus.sone.web.page.TemplateRenderer
+import net.pterodactylus.sone.web.page.ToadletPath
 import net.pterodactylus.util.template.TemplateContext
 import javax.inject.Inject
 
@@ -15,12 +19,14 @@ import javax.inject.Inject
  * [PostVisibilityFilter.isPostVisible(Sone, Post)] and sorted by time.
  */
 @MenuName("New")
-class NewPage @Inject constructor(  template: Template, webInterface: WebInterface, loaders: Loaders):
-		SoneTemplatePage("new.html", webInterface, loaders, template = template, pageTitleKey = "Page.New.Title") {
+@TemplatePath("/templates/new.html")
+@ToadletPath("new.html")
+class NewPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer, private val newElements: NewElements) :
+		SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.New.Title") {
 
 	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) =
 			getCurrentSone(soneRequest.toadletContext).let { currentSone ->
-				(soneRequest.webInterface.getNewPosts(currentSone) + soneRequest.webInterface.getNewReplies(currentSone).mapPresent { it.post })
+				(newElements.newPosts(currentSone) + newElements.newReplies(currentSone).mapPresent { it.post })
 						.distinct()
 						.sortedByDescending { it.time }
 						.let { posts ->