X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FNewPage.kt;h=027aa8602817d64c11e8ad4d32aeb6b21971790d;hb=608f680bc5ce54d7efa8787d7910fec8a9567fa0;hp=c774cebb30c69a3f98208873bc4c6022e52cbe23;hpb=d63b7445567b65ffdbd50fa8f7ffbfea1304dff9;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 c774ceb..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,32 +1,41 @@
 package net.pterodactylus.sone.web.pages
 
-import net.pterodactylus.sone.utils.Pagination
+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.FreenetRequest
-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
 
 /**
  * Page that displays all new posts and replies. The posts are filtered using
  * [PostVisibilityFilter.isPostVisible(Sone, Post)] and sorted by time.
  */
-class NewPage(template: Template, webInterface: WebInterface):
-		SoneTemplatePage("new.html", webInterface, template, "Page.New.Title") {
+@MenuName("New")
+@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(freenetRequest: FreenetRequest, templateContext: TemplateContext) =
-			getCurrentSone(freenetRequest.toadletContext).let { currentSone ->
-				(webInterface.getNewPosts(currentSone) + webInterface.getNewReplies(currentSone).mapPresent { it.post })
+	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) =
+			getCurrentSone(soneRequest.toadletContext).let { currentSone ->
+				(newElements.newPosts + newElements.newReplies.mapPresent { it.post })
 						.distinct()
 						.sortedByDescending { it.time }
 						.let { posts ->
-							Pagination(posts, webInterface.core.preferences.postsPerPage).apply {
-								page = freenetRequest.parameters["page"]?.toIntOrNull() ?: 0
-							}.let { pagination ->
-								templateContext["pagination"] = pagination
-								templateContext["posts"] = pagination.items
-							}
+							posts.paginate(soneRequest.core.preferences.postsPerPage)
+									.turnTo(soneRequest.parameters["page"]?.toIntOrNull() ?: 0)
+									.let { pagination ->
+										templateContext["pagination"] = pagination
+										templateContext["posts"] = pagination.items
+									}
 						}
 			}