🔥 Remove path from FreenetTemplatePage

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt
index 780f2b1..8cf5f61 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePage.kt
@@ -31,7 +31,6 @@ import java.util.logging.Logger.*
  * fit into Freenet’s web interface.
  */
 open class FreenetTemplatePage(
-               path: String,
                private val templateRenderer: TemplateRenderer,
                loaders: Loaders,
                private val invalidFormPasswordRedirectTarget: String

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt
index 121f736..f622319 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt
@@ -15,7 +15,7 @@ import javax.inject.*
 class AboutPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer,
                private val pluginVersion: PluginVersion,
                private val pluginYear: PluginYear,
-               private val pluginHomepage: PluginHomepage) : SoneTemplatePage("about.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.About.Title") {
+               private val pluginHomepage: PluginHomepage) : SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.About.Title") {
 
        override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
                templateContext["version"] = pluginVersion.version

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt
index 7985947..1dc12e4 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt
@@ -12,7 +12,7 @@ import javax.inject.*
  */
 @ToadletPath("bookmark.html")
 class BookmarkPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer)
-       : SoneTemplatePage("bookmark.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.Bookmark.Title") {
+       : SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.Bookmark.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

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 0ed3662..b892263 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt
@@ -15,7 +15,7 @@ import javax.inject.*
 @TemplatePath("/templates/bookmarks.html")
 @ToadletPath("bookmarks.html")
 class BookmarksPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("bookmarks.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.Bookmarks.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.Bookmarks.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                soneRequest.core.bookmarkedPosts.let { posts ->

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
index 706f10b..a00b4bf 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
@@ -16,7 +16,7 @@ import javax.inject.*
 @TemplatePath("/templates/createAlbum.html")
 @ToadletPath("createAlbum.html")
 class CreateAlbumPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("createAlbum.html", "Page.CreateAlbum.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.CreateAlbum.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt
index f03b198..b47c2b1 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt
@@ -15,7 +15,7 @@ import javax.inject.*
 @TemplatePath("/templates/createPost.html")
 @ToadletPath("createPost.html")
 class CreatePostPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("createPost.html", "Page.CreatePost.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.CreatePost.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                val returnPage = soneRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256)

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt
index c368ed8..562e647 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt
@@ -15,7 +15,7 @@ import javax.inject.*
 @TemplatePath("/templates/createReply.html")
 @ToadletPath("createReply.html")
 class CreateReplyPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("createReply.html", "Page.CreateReply.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.CreateReply.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                val postId = soneRequest.httpRequest.getPartAsStringFailsafe("post", 36).apply { templateContext["postId"] = this }

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
index 9f11e40..b2056c2 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
@@ -16,7 +16,7 @@ import javax.inject.*
 @TemplatePath("/templates/createSone.html")
 @ToadletPath("createSone.html")
 class CreateSonePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("createSone.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.CreateSone.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.CreateSone.Title") {
 
        private val logger = Logger.getLogger(CreateSonePage::class.java.name)
 

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
index c4bcb72..d55c7cb 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
@@ -14,7 +14,7 @@ import javax.inject.*
 @TemplatePath("/templates/deleteAlbum.html")
 @ToadletPath("deleteAlbum.html")
 class DeleteAlbumPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("deleteAlbum.html", "Page.DeleteAlbum.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.DeleteAlbum.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt
index 58f5f51..a9d601c 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt
@@ -14,7 +14,7 @@ import javax.inject.*
 @TemplatePath("/templates/deleteImage.html")
 @ToadletPath("deleteImage.html")
 class DeleteImagePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("deleteImage.html", "Page.DeleteImage.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.DeleteImage.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt
index 6114b76..b3749b3 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt
@@ -14,7 +14,7 @@ import javax.inject.*
 @TemplatePath("/templates/deletePost.html")
 @ToadletPath("deletePost.html")
 class DeletePostPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("deletePost.html", "Page.DeletePost.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.DeletePost.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
index c705947..0fabad9 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
@@ -14,7 +14,7 @@ import javax.inject.*
 @TemplatePath("/templates/deleteProfileField.html")
 @ToadletPath("deleteProfileField.html")
 class DeleteProfileFieldPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("deleteProfileField.html", "Page.DeleteProfileField.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.DeleteProfileField.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
index adf9b6d..e3f30ce 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
@@ -14,7 +14,7 @@ import javax.inject.*
 @TemplatePath("/templates/deleteReply.html")
 @ToadletPath("deleteReply.html")
 class DeleteReplyPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("deleteReply.html", "Page.DeleteReply.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.DeleteReply.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt
index 61b4750..f65e378 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt
@@ -17,7 +17,7 @@ import javax.inject.*
 @TemplatePath("/templates/deleteSone.html")
 @ToadletPath("deleteSone.html")
 class DeleteSonePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("deleteSone.html", "Page.DeleteSone.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.DeleteSone.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt
index 47c2df6..862db67 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt
@@ -11,7 +11,7 @@ import javax.inject.*
  */
 @ToadletPath("dismissNotification.html")
 class DismissNotificationPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("dismissNotification.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.DismissNotification.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.DismissNotification.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                val returnPage = soneRequest.httpRequest.getPartAsStringFailsafe("returnPage", 256)

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/DistrustPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/DistrustPage.kt
index 2821b39..f2115e5 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/DistrustPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/DistrustPage.kt
@@ -16,7 +16,7 @@ import javax.inject.*
  */
 @ToadletPath("distrust.html")
 class DistrustPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("distrust.html", "Page.Distrust.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.Distrust.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
index d75cb19..aeaf14e 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
@@ -14,7 +14,7 @@ import javax.inject.*
  */
 @ToadletPath("editAlbum.html")
 class EditAlbumPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("editAlbum.html", "Page.EditAlbum.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.EditAlbum.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt
index 710bd55..76f6e23 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditImagePage.kt
@@ -15,7 +15,7 @@ import javax.inject.*
  */
 @ToadletPath("editImage.html")
 class EditImagePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("editImage.html", "Page.EditImage.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.EditImage.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPage.kt
index 7cdad30..386f66b 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPage.kt
@@ -14,7 +14,7 @@ import javax.inject.*
 @TemplatePath("/templates/editProfileField.html")
 @ToadletPath("editProfileField.html")
 class EditProfileFieldPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("editProfileField.html", "Page.EditProfileField.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.EditProfileField.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                currentSone.profile.let { profile ->

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt
index f4baadc..54b7efd 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditProfilePage.kt
@@ -17,7 +17,7 @@ import javax.inject.*
 @TemplatePath("/templates/editProfile.html")
 @ToadletPath("editProfile.html")
 class EditProfilePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("editProfile.html", "Page.EditProfile.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.EditProfile.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                currentSone.profile.let { profile ->

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ErrorPages.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ErrorPages.kt
index 85c7f69..8d52c87 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ErrorPages.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ErrorPages.kt
@@ -6,16 +6,16 @@ import net.pterodactylus.sone.web.page.*
 
 @TemplatePath("/templates/invalid.html")
 @ToadletPath("invalid.html")
-class InvalidPage(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) : SoneTemplatePage("invalid.html", webInterface, loaders, templateRenderer, "Page.Invalid.Title")
+class InvalidPage(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) : SoneTemplatePage(webInterface, loaders, templateRenderer, "Page.Invalid.Title")
 
 @TemplatePath("/templates/noPermission.html")
 @ToadletPath("noPermission.html")
-class NoPermissionPage(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) : SoneTemplatePage("noPermission.html", webInterface, loaders, templateRenderer, "Page.NoPermission.Title")
+class NoPermissionPage(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) : SoneTemplatePage(webInterface, loaders, templateRenderer, "Page.NoPermission.Title")
 
 @TemplatePath("/templates/emptyImageTitle.html")
 @ToadletPath("emptyImageTitle.html")
-class EmptyImageTitlePage(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) : SoneTemplatePage("emptyImageTitle.html", webInterface, loaders, templateRenderer, "Page.EmptyImageTitle.Title")
+class EmptyImageTitlePage(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) : SoneTemplatePage(webInterface, loaders, templateRenderer, "Page.EmptyImageTitle.Title")
 
 @TemplatePath("/templates/emptyAlbumTitle.html")
 @ToadletPath("emptyAlbumTitle.html")
-class EmptyAlbumTitlePage(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) : SoneTemplatePage("emptyAlbumTitle.html", webInterface, loaders, templateRenderer, "Page.EmptyAlbumTitle.Title")
+class EmptyAlbumTitlePage(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) : SoneTemplatePage(webInterface, loaders, templateRenderer, "Page.EmptyAlbumTitle.Title")

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt
index 4cba65a..244cb52 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/FollowSonePage.kt
@@ -13,7 +13,7 @@ import javax.inject.*
  */
 @ToadletPath("followSone.html")
 class FollowSonePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("followSone.html", "Page.FollowSone.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.FollowSone.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
index 802bdaf..20219d7 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ImageBrowserPage.kt
@@ -16,7 +16,7 @@ import javax.inject.*
 @TemplatePath("/templates/imageBrowser.html")
 @ToadletPath("imageBrowser.html")
 class ImageBrowserPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("imageBrowser.html", "Page.ImageBrowser.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.ImageBrowser.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if ("album" in soneRequest.parameters) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt
index 52004ab..069ef9f 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/IndexPage.kt
@@ -17,7 +17,7 @@ import javax.inject.*
 @TemplatePath("/templates/index.html")
 @ToadletPath("index.html")
 class IndexPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer, private val postVisibilityFilter: PostVisibilityFilter) :
-               LoggedInPage("index.html", "Page.Index.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.Index.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                (currentSone.posts +

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
index c0d691f..ae0d7d1 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/KnownSonesPage.kt
@@ -15,7 +15,7 @@ import javax.inject.*
 @TemplatePath("/templates/knownSones.html")
 @ToadletPath("knownSones.html")
 class KnownSonesPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("knownSones.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.KnownSones.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.KnownSones.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                getCurrentSone(soneRequest.toadletContext).let { currentSone ->

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LikePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LikePage.kt
index a1831b0..cc5043f 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LikePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LikePage.kt
@@ -13,7 +13,7 @@ import javax.inject.*
  */
 @ToadletPath("like.html")
 class LikePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("like.html", "Page.Like.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.Like.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt
index 72abb0e..2a62a7d 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LockSonePage.kt
@@ -12,7 +12,7 @@ import javax.inject.*
  */
 @ToadletPath("lockSone.html")
 class LockSonePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("lockSone.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.LockSone.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.LockSone.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                soneRequest.parameters["returnPage", 256]!!.let { returnPage ->

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoggedInPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoggedInPage.kt
index 910a768..5d389b9 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoggedInPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoggedInPage.kt
@@ -9,8 +9,8 @@ import net.pterodactylus.util.template.*
 /**
  * Base class for [SoneTemplatePage] implementations that require a logged in user.
  */
-abstract class LoggedInPage(path: String, pageTitleKey: String, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage(path, webInterface, loaders, templateRenderer, pageTitleKey = pageTitleKey, requiresLogin = true) {
+abstract class LoggedInPage(pageTitleKey: String, webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = pageTitleKey, requiresLogin = true) {
 
        final override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                handleRequest(soneRequest, getCurrentSone(soneRequest.toadletContext, false)!!, templateContext)

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
index 5d6915d..9e47049 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
@@ -15,7 +15,7 @@ import javax.inject.*
 @TemplatePath("/templates/login.html")
 @ToadletPath("login.html")
 class LoginPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("login.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.Login.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.Login.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt
index 72def85..325d876 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/LogoutPage.kt
@@ -13,7 +13,7 @@ import javax.inject.*
 @MenuName("Logout")
 @ToadletPath("logout.html")
 class LogoutPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("logout.html", "Page.Logout.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.Logout.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                setCurrentSone(soneRequest.toadletContext, null)

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/MarkAsKnownPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/MarkAsKnownPage.kt
index c06ded2..652881d 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/MarkAsKnownPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/MarkAsKnownPage.kt
@@ -14,7 +14,7 @@ import javax.inject.*
  */
 @ToadletPath("markAsKnown.html")
 class MarkAsKnownPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("markAsKnown.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.MarkAsKnown.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.MarkAsKnown.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                val ids = soneRequest.parameters["id", 65536]!!.split(" ")

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 2fd29e8..940e6e8 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/NewPage.kt
@@ -15,7 +15,7 @@ import javax.inject.*
 @TemplatePath("/templates/new.html")
 @ToadletPath("new.html")
 class NewPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("new.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.New.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.New.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) =
                        getCurrentSone(soneRequest.toadletContext).let { currentSone ->

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
index b9bc57c..8829030 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/OptionsPage.kt
@@ -16,7 +16,7 @@ import javax.inject.*
 @TemplatePath("/templates/options.html")
 @ToadletPath("options.html")
 class OptionsPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("options.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.Options.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.Options.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
index 933e2c5..2ed4940 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/RescuePage.kt
@@ -15,7 +15,7 @@ import javax.inject.*
 @TemplatePath("/templates/rescue.html")
 @ToadletPath("rescue.html")
 class RescuePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("rescue.html", "Page.Rescue.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.Rescue.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                val soneRescuer = soneRequest.core.getSoneRescuer(currentSone)

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt
index 3b987d8..3c14604 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SearchPage.kt
@@ -21,7 +21,7 @@ import javax.inject.*
 @TemplatePath("/templates/search.html")
 @ToadletPath("search.html")
 class SearchPage(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer, ticker: Ticker = Ticker.systemTicker()) :
-               SoneTemplatePage("search.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.Search.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.Search.Title") {
 
        @Inject
        constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
index a018ae7..b288a4c 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePage.kt
@@ -15,14 +15,13 @@ import java.net.*
  * Base page for the Sone web interface.
  */
 open class SoneTemplatePage @JvmOverloads constructor(
-               path: String,
                private val webInterface: WebInterface,
                loaders: Loaders,
                templateRenderer: TemplateRenderer,
                private val pageTitleKey: String? = null,
                private val requiresLogin: Boolean = false,
                private val pageTitle: (FreenetRequest) -> String = { pageTitleKey?.let(webInterface.l10n::getString) ?: "" }
-) : FreenetTemplatePage(path, templateRenderer, loaders, "noPermission.html") {
+) : FreenetTemplatePage(templateRenderer, loaders, "noPermission.html") {
 
        private val core = webInterface.core
        private val sessionProvider: SessionProvider = webInterface

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/TrustPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/TrustPage.kt
index 9fc8c41..9a4c02f 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/TrustPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/TrustPage.kt
@@ -14,7 +14,7 @@ import javax.inject.*
  */
 @ToadletPath("trust.html")
 class TrustPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("trust.html", "Page.Trust.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.Trust.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt
index 7759fb7..9c226d4 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPage.kt
@@ -13,7 +13,7 @@ import javax.inject.*
  */
 @ToadletPath("unbookmark.html")
 class UnbookmarkPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("unbookmark.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.Unbookmark.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.Unbookmark.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                when {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt
index 2e14016..79fdef5 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePage.kt
@@ -13,7 +13,7 @@ import javax.inject.*
  */
 @ToadletPath("unfollowSone.html")
 class UnfollowSonePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("unfollowSone.html", "Page.UnfollowSone.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.UnfollowSone.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlikePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlikePage.kt
index 4a46bce..82147a9 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlikePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlikePage.kt
@@ -13,7 +13,7 @@ import javax.inject.*
  */
 @ToadletPath("unlike.html")
 class UnlikePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("unlike.html", "Page.Unlike.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.Unlike.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePage.kt
index 247415e..2c5735b 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePage.kt
@@ -12,7 +12,7 @@ import javax.inject.*
  */
 @ToadletPath("unlockSone.html")
 class UnlockSonePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("unlockSone.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.UnlockSone.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.UnlockSone.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt
index f90adcf..7dd342e 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UntrustPage.kt
@@ -14,7 +14,7 @@ import javax.inject.*
  */
 @ToadletPath("untrust.html")
 class UntrustPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("untrust.html", "Page.Untrust.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.Untrust.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
index 00a8cc9..de61835 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/UploadImagePage.kt
@@ -19,7 +19,7 @@ import javax.inject.*
 @TemplatePath("/templates/invalid.html")
 @ToadletPath("uploadImage.html")
 class UploadImagePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               LoggedInPage("uploadImage.html", "Page.UploadImage.Title", webInterface, loaders, templateRenderer) {
+               LoggedInPage("Page.UploadImage.Title", webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, currentSone: Sone, templateContext: TemplateContext) {
                if (soneRequest.isPOST) {

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt
index 2032a16..7e4d6a5 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewPostPage.kt
@@ -15,7 +15,7 @@ import javax.inject.*
 @TemplatePath("/templates/viewPost.html")
 @ToadletPath("viewPost.html")
 class ViewPostPage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("viewPost.html", webInterface, loaders, templateRenderer, pageTitleKey = "Page.ViewPost.Title") {
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "Page.ViewPost.Title") {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                templateContext["post"] = soneRequest.parameters["post"]?.let(soneRequest.core::getPost)

diff --git a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt
index b0fcda2..a498d24 100644 (file)
--- a/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/web/pages/ViewSonePage.kt
@@ -16,7 +16,7 @@ import javax.inject.*
 @TemplatePath("/templates/viewSone.html")
 @ToadletPath("viewSone.html")
 class ViewSonePage @Inject constructor(webInterface: WebInterface, loaders: Loaders, templateRenderer: TemplateRenderer) :
-               SoneTemplatePage("viewSone.html", webInterface, loaders, templateRenderer) {
+               SoneTemplatePage(webInterface, loaders, templateRenderer) {
 
        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                templateContext["soneId"] = soneRequest.parameters["sone"]

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePageTest.kt
index d50d3b8..d8c7562 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/page/FreenetTemplatePageTest.kt
@@ -130,6 +130,6 @@ class FreenetTemplatePageTest {
 
        @TemplatePath("template-path")
        @ToadletPath("/test/path")
-       private open class TestPage(templateRenderer: TemplateRenderer, loaders: Loaders) : FreenetTemplatePage("/", templateRenderer, loaders, "invalid-form-password")
+       private open class TestPage(templateRenderer: TemplateRenderer, loaders: Loaders) : FreenetTemplatePage(templateRenderer, loaders, "invalid-form-password")
 
 }

diff --git a/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt b/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
index ffb8997..8e29df1 100644 (file)
--- a/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
+++ b/src/test/kotlin/net/pterodactylus/sone/web/pages/SoneTemplatePageTest.kt
@@ -15,7 +15,7 @@ import org.junit.*
 /**
  * Unit test for [SoneTemplatePage].
  */
-class SoneTemplatePageTest : WebPageTest({ webInterface, loaders, templateRenderer -> object : SoneTemplatePage("path.html", webInterface, loaders, templateRenderer, requiresLogin = true) {} }) {
+class SoneTemplatePageTest : WebPageTest({ webInterface, loaders, templateRenderer -> object : SoneTemplatePage(webInterface, loaders, templateRenderer, requiresLogin = true) {} }) {
 
        init {
                request("index.html")
@@ -23,14 +23,14 @@ class SoneTemplatePageTest : WebPageTest({ webInterface, loaders, templateRender
 
        @Test
        fun `page title is empty string if no page title key was given`() {
-               SoneTemplatePage("path.html", webInterface, loaders, templateRenderer, requiresLogin = false).let { page ->
+               SoneTemplatePage(webInterface, loaders, templateRenderer, requiresLogin = false).let { page ->
                        assertThat(page.getPageTitle(soneRequest), equalTo(""))
                }
        }
 
        @Test
        fun `page title is retrieved from l10n if page title key is given`() {
-               SoneTemplatePage("path.html", webInterface, loaders, templateRenderer, pageTitleKey = "page.title", requiresLogin = false).let { page ->
+               SoneTemplatePage(webInterface, loaders, templateRenderer, pageTitleKey = "page.title", requiresLogin = false).let { page ->
                        whenever(l10n.getString("page.title")).thenReturn("Page Title")
                        assertThat(page.getPageTitle(soneRequest), equalTo("Page Title"))
                }
@@ -143,7 +143,7 @@ class SoneTemplatePageTest : WebPageTest({ webInterface, loaders, templateRender
        @Test
        fun `handleRequest method is called`() {
                var called = false
-               val page = object : SoneTemplatePage("path.html", webInterface, loaders, templateRenderer, requiresLogin = true) {
+               val page = object : SoneTemplatePage(webInterface, loaders, templateRenderer, requiresLogin = true) {
                        override fun handleRequest(freenetRequest: FreenetRequest, templateContext: TemplateContext) {
                                called = true
                        }
@@ -154,7 +154,7 @@ class SoneTemplatePageTest : WebPageTest({ webInterface, loaders, templateRender
 
        @Test
        fun `redirect does not happen if login is not required`() {
-               val page = SoneTemplatePage("page.html", webInterface, loaders, templateRenderer, requiresLogin = false)
+               val page = SoneTemplatePage(webInterface, loaders, templateRenderer, requiresLogin = false)
                assertThat(page.getRedirectTarget(freenetRequest), nullValue())
        }
 
@@ -206,7 +206,7 @@ class SoneTemplatePageTest : WebPageTest({ webInterface, loaders, templateRender
 
        @Test
        fun `page is enabled if no full access is required and login is not required`() {
-               SoneTemplatePage("path.html", webInterface, loaders, templateRenderer, requiresLogin = false).let { page ->
+               SoneTemplatePage(webInterface, loaders, templateRenderer, requiresLogin = false).let { page ->
                        assertThat(page.isEnabled(toadletContext), equalTo(true))
                }
        }
@@ -214,7 +214,7 @@ class SoneTemplatePageTest : WebPageTest({ webInterface, loaders, templateRender
        @Test
        fun `handle request with sone request is called`() {
                var called = false
-               val page = object : SoneTemplatePage("path.html", webInterface, loaders, templateRenderer) {
+               val page = object : SoneTemplatePage(webInterface, loaders, templateRenderer) {
                        override fun handleRequest(soneRequest: SoneRequest, templateContext: TemplateContext) {
                                called = true
                        }