X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fweb%2Fpages%2FBookmarksPage.kt;h=f6cdd0b9c5f66b089fd98b705a19b452ce9585ab;hp=fbfc7d3f7f31219665cbe6d23752004f6c00a562;hb=c28013c8a4bcb9776a1e2d82ffd6c4c8297ffb62;hpb=ffd92ca2374c0b2218e583d02e0bdd24b8c110ae

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt
index fbfc7d3..f6cdd0b 100644
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt
@@ -1,20 +1,22 @@
 package net.pterodactylus.sone.web.pages
 
 import net.pterodactylus.sone.data.Post
-import net.pterodactylus.sone.utils.Pagination
+import net.pterodactylus.sone.utils.paginate
 import net.pterodactylus.sone.web.WebInterface
-import net.pterodactylus.sone.web.page.FreenetRequest
+import net.pterodactylus.sone.web.page.*
 import net.pterodactylus.util.template.Template
 import net.pterodactylus.util.template.TemplateContext
+import javax.inject.Inject
 
 /**
  * Page that lets the user browse all his bookmarked posts.
  */
-class BookmarksPage(template: Template, webInterface: WebInterface): SoneTemplatePage("bookmarks.html", template, "Page.Bookmarks.Title", webInterface) {
+class BookmarksPage @Inject constructor(template: Template, webInterface: WebInterface) :
+		SoneTemplatePage("bookmarks.html", webInterface, template, "Page.Bookmarks.Title") {
 
-	override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
-		webInterface.core.bookmarkedPosts.let { posts ->
-			val pagination = Pagination<Post>(posts.filter { it.isLoaded }.sortedByDescending { it.time }, webInterface.core.preferences.postsPerPage)
+	override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
+		soneRequest.core.bookmarkedPosts.let { posts ->
+			val pagination = posts.filter(Post::isLoaded).sortedByDescending { it.time }.paginate(soneRequest.core.preferences.postsPerPage)
 			templateContext["pagination"] = pagination
 			templateContext["posts"] = pagination.items
 			templateContext["postsNotLoaded"] = posts.any { !it.isLoaded }