X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FNewPage.kt;h=027aa8602817d64c11e8ad4d32aeb6b21971790d;hb=05d126a69fbd464bea6aa974cff52dc4e5d5b2a6;hp=940e6e80d3ac75bc63b82d8b0dc7d91e79eb51f8;hpb=3ef366568695ff12fd945a506e53d6279b2337c5;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 940e6e8..027aa86 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt
@@ -1,11 +1,18 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.main.*
-import net.pterodactylus.sone.utils.*
-import net.pterodactylus.sone.web.*
-import net.pterodactylus.sone.web.page.*
-import net.pterodactylus.util.template.*
-import javax.inject.*
+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.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
 
 /**
  * Page that displays all new posts and replies. The posts are filtered using
@@ -14,12 +21,12 @@ import javax.inject.*
 @MenuName("New")
 @TemplatePath("/templates/new.html")
 @ToadletPath("new.html")
-class NewPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+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 + newElements.newReplies.mapPresent { it.post })
 						.distinct()
 						.sortedByDescending { it.time }
 						.let { posts ->