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
*/
@MenuName("New")
@TemplatePath("/templates/new.html")
-class NewPage @Inject constructor(template: Template, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer):
- SoneTemplatePage("new.html", webInterface, loaders, template, templateRenderer, pageTitleKey = "Page.New.Title") {
+@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() + newElements.newReplies().mapPresent { it.post })
.distinct()
.sortedByDescending { it.time }
.let { posts ->