🔀 Merge changes from other next branch

[Sone.git] / src / main / java / net / pterodactylus / sone / web / WebInterface.java

diff --git a/src/main/java/net/pterodactylus/sone/web/WebInterface.java b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
index d247993..cf67c0b 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/WebInterface.java
+++ b/src/main/java/net/pterodactylus/sone/web/WebInterface.java
@@ -609,82 +609,56 @@ public class WebInterface implements SessionProvider {
         * Register all toadlets.
         */
        private void registerToadlets() {
-               Template emptyTemplate = parse(new StringReader(""));
-               Template loginTemplate = loaders.loadTemplate("/templates/login.html");
-               Template indexTemplate = loaders.loadTemplate("/templates/index.html");
-               Template newTemplate = loaders.loadTemplate("/templates/new.html");
-               Template knownSonesTemplate = loaders.loadTemplate("/templates/knownSones.html");
-               Template createSoneTemplate = loaders.loadTemplate("/templates/createSone.html");
-               Template createPostTemplate = loaders.loadTemplate("/templates/createPost.html");
-               Template createReplyTemplate = loaders.loadTemplate("/templates/createReply.html");
-               Template bookmarksTemplate = loaders.loadTemplate("/templates/bookmarks.html");
-               Template searchTemplate = loaders.loadTemplate("/templates/search.html");
-               Template editProfileTemplate = loaders.loadTemplate("/templates/editProfile.html");
-               Template editProfileFieldTemplate = loaders.loadTemplate("/templates/editProfileField.html");
-               Template deleteProfileFieldTemplate = loaders.loadTemplate("/templates/deleteProfileField.html");
-               Template viewSoneTemplate = loaders.loadTemplate("/templates/viewSone.html");
-               Template viewPostTemplate = loaders.loadTemplate("/templates/viewPost.html");
-               Template deletePostTemplate = loaders.loadTemplate("/templates/deletePost.html");
-               Template deleteReplyTemplate = loaders.loadTemplate("/templates/deleteReply.html");
-               Template deleteSoneTemplate = loaders.loadTemplate("/templates/deleteSone.html");
-               Template imageBrowserTemplate = loaders.loadTemplate("/templates/imageBrowser.html");
-               Template createAlbumTemplate = loaders.loadTemplate("/templates/createAlbum.html");
-               Template deleteAlbumTemplate = loaders.loadTemplate("/templates/deleteAlbum.html");
-               Template deleteImageTemplate = loaders.loadTemplate("/templates/deleteImage.html");
-               Template optionsTemplate = loaders.loadTemplate("/templates/options.html");
-               Template rescueTemplate = loaders.loadTemplate("/templates/rescue.html");
-               Template aboutTemplate = loaders.loadTemplate("/templates/about.html");
-               Template invalidTemplate = loaders.loadTemplate("/templates/invalid.html");
                Template postTemplate = loaders.loadTemplate("/templates/include/viewPost.html");
                Template replyTemplate = loaders.loadTemplate("/templates/include/viewReply.html");
                Template openSearchTemplate = loaders.loadTemplate("/templates/xml/OpenSearch.xml");
 
                pageToadletRegistry.addPage(new RedirectPage<FreenetRequest>("", "index.html"));
-               pageToadletRegistry.addPage(new IndexPage(indexTemplate, this, loaders, templateRenderer, postVisibilityFilter));
-               pageToadletRegistry.addPage(new NewPage(newTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new CreateSonePage(createSoneTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new KnownSonesPage(knownSonesTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new EditProfilePage(editProfileTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new EditProfileFieldPage(editProfileFieldTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new DeleteProfileFieldPage(deleteProfileFieldTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new CreatePostPage(createPostTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new CreateReplyPage(createReplyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new ViewSonePage(viewSoneTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new ViewPostPage(viewPostTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new LikePage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new UnlikePage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new DeletePostPage(deletePostTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new DeleteReplyPage(deleteReplyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new LockSonePage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new UnlockSonePage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new FollowSonePage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new UnfollowSonePage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new ImageBrowserPage(imageBrowserTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new CreateAlbumPage(createAlbumTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new EditAlbumPage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new DeleteAlbumPage(deleteAlbumTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new UploadImagePage(invalidTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new EditImagePage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new DeleteImagePage(deleteImageTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new TrustPage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new DistrustPage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new UntrustPage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new MarkAsKnownPage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new BookmarkPage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new UnbookmarkPage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new BookmarksPage(bookmarksTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new SearchPage(searchTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new DeleteSonePage(deleteSoneTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new LoginPage(loginTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new LogoutPage(emptyTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new OptionsPage(optionsTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new RescuePage(rescueTemplate, this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new AboutPage(aboutTemplate, this, loaders, templateRenderer, new PluginVersion(SonePlugin.getPluginVersion()), new PluginYear(sonePlugin.getYear()), new PluginHomepage(sonePlugin.getHomepage())));
+               pageToadletRegistry.addPage(new IndexPage(this, loaders, templateRenderer, postVisibilityFilter));
+               pageToadletRegistry.addPage(new NewPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new CreateSonePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new KnownSonesPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new EditProfilePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new EditProfileFieldPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new DeleteProfileFieldPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new CreatePostPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new CreateReplyPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new ViewSonePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new ViewPostPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new LikePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new UnlikePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new DeletePostPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new DeleteReplyPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new LockSonePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new UnlockSonePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new FollowSonePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new UnfollowSonePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new ImageBrowserPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new CreateAlbumPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new EditAlbumPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new DeleteAlbumPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new UploadImagePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new EditImagePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new DeleteImagePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new TrustPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new DistrustPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new UntrustPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new MarkAsKnownPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new BookmarkPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new UnbookmarkPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new BookmarksPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new SearchPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new DeleteSonePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new LoginPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new LogoutPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new OptionsPage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new RescuePage(this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new AboutPage(this, loaders, templateRenderer, new PluginVersion(SonePlugin.getPluginVersion()), new PluginYear(sonePlugin.getYear()), new PluginHomepage(sonePlugin.getHomepage())));
                pageToadletRegistry.addPage(new InvalidPage(this, loaders, templateRenderer));
                pageToadletRegistry.addPage(new NoPermissionPage(this, loaders, templateRenderer));
                pageToadletRegistry.addPage(new EmptyImageTitlePage(this, loaders, templateRenderer));
                pageToadletRegistry.addPage(new EmptyAlbumTitlePage(this, loaders, templateRenderer));
-               pageToadletRegistry.addPage(new DismissNotificationPage(emptyTemplate, this, loaders, templateRenderer));
+               pageToadletRegistry.addPage(new DismissNotificationPage(this, loaders, templateRenderer));
                pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("css/", "/static/css/", "text/css"));
                pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("javascript/", "/static/javascript/", "text/javascript"));
                pageToadletRegistry.addPage(loaders.<FreenetRequest>loadStaticPage("images/", "/static/images/", "image/png"));
@@ -794,7 +768,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void newSoneFound(NewSoneFoundEvent newSoneFoundEvent) {
-               newSoneNotification.add(newSoneFoundEvent.sone());
+               newSoneNotification.add(newSoneFoundEvent.getSone());
                if (!hasFirstStartNotification()) {
                        notificationManager.addNotification(newSoneNotification);
                }
@@ -808,7 +782,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void newPostFound(NewPostFoundEvent newPostFoundEvent) {
-               Post post = newPostFoundEvent.post();
+               Post post = newPostFoundEvent.getPost();
                boolean isLocal = post.getSone().isLocal();
                if (isLocal) {
                        localPostNotification.add(post);
@@ -834,7 +808,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void newReplyFound(NewPostReplyFoundEvent newPostReplyFoundEvent) {
-               PostReply reply = newPostReplyFoundEvent.postReply();
+               PostReply reply = newPostReplyFoundEvent.getPostReply();
                boolean isLocal = reply.getSone().isLocal();
                if (isLocal) {
                        localReplyNotification.add(reply);
@@ -860,27 +834,27 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void markSoneKnown(MarkSoneKnownEvent markSoneKnownEvent) {
-               newSoneNotification.remove(markSoneKnownEvent.sone());
+               newSoneNotification.remove(markSoneKnownEvent.getSone());
        }
 
        @Subscribe
        public void markPostKnown(MarkPostKnownEvent markPostKnownEvent) {
-               removePost(markPostKnownEvent.post());
+               removePost(markPostKnownEvent.getPost());
        }
 
        @Subscribe
        public void markReplyKnown(MarkPostReplyKnownEvent markPostReplyKnownEvent) {
-               removeReply(markPostReplyKnownEvent.postReply());
+               removeReply(markPostReplyKnownEvent.getPostReply());
        }
 
        @Subscribe
        public void soneRemoved(SoneRemovedEvent soneRemovedEvent) {
-               newSoneNotification.remove(soneRemovedEvent.sone());
+               newSoneNotification.remove(soneRemovedEvent.getSone());
        }
 
        @Subscribe
        public void postRemoved(PostRemovedEvent postRemovedEvent) {
-               removePost(postRemovedEvent.post());
+               removePost(postRemovedEvent.getPost());
        }
 
        private void removePost(Post post) {
@@ -893,7 +867,7 @@ public class WebInterface implements SessionProvider {
 
        @Subscribe
        public void replyRemoved(PostReplyRemovedEvent postReplyRemovedEvent) {
-               removeReply(postReplyRemovedEvent.postReply());
+               removeReply(postReplyRemovedEvent.getPostReply());
        }
 
        private void removeReply(PostReply reply) {
@@ -912,7 +886,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void soneLocked(SoneLockedEvent soneLockedEvent) {
-               final Sone sone = soneLockedEvent.sone();
+               final Sone sone = soneLockedEvent.getSone();
                ScheduledFuture<?> tickerObject = ticker.schedule(new Runnable() {
 
                        @Override
@@ -933,8 +907,8 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void soneUnlocked(SoneUnlockedEvent soneUnlockedEvent) {
-               lockedSonesNotification.remove(soneUnlockedEvent.sone());
-               lockedSonesTickerObjects.remove(soneUnlockedEvent.sone()).cancel(false);
+               lockedSonesNotification.remove(soneUnlockedEvent.getSone());
+               lockedSonesTickerObjects.remove(soneUnlockedEvent.getSone()).cancel(false);
        }
 
        /**
@@ -945,9 +919,9 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void soneInserting(SoneInsertingEvent soneInsertingEvent) {
-               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertingEvent.sone());
+               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertingEvent.getSone());
                soneInsertNotification.set("soneStatus", "inserting");
-               if (soneInsertingEvent.sone().getOptions().isSoneInsertNotificationEnabled()) {
+               if (soneInsertingEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
                        notificationManager.addNotification(soneInsertNotification);
                }
        }
@@ -960,10 +934,10 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void soneInserted(SoneInsertedEvent soneInsertedEvent) {
-               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertedEvent.sone());
+               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertedEvent.getSone());
                soneInsertNotification.set("soneStatus", "inserted");
-               soneInsertNotification.set("insertDuration", soneInsertedEvent.insertDuration() / 1000);
-               if (soneInsertedEvent.sone().getOptions().isSoneInsertNotificationEnabled()) {
+               soneInsertNotification.set("insertDuration", soneInsertedEvent.getInsertDuration() / 1000);
+               if (soneInsertedEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
                        notificationManager.addNotification(soneInsertNotification);
                }
        }
@@ -976,10 +950,10 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void soneInsertAborted(SoneInsertAbortedEvent soneInsertAbortedEvent) {
-               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertAbortedEvent.sone());
+               TemplateNotification soneInsertNotification = getSoneInsertNotification(soneInsertAbortedEvent.getSone());
                soneInsertNotification.set("soneStatus", "insert-aborted");
-               soneInsertNotification.set("insert-error", soneInsertAbortedEvent.cause());
-               if (soneInsertAbortedEvent.sone().getOptions().isSoneInsertNotificationEnabled()) {
+               soneInsertNotification.set("insert-error", soneInsertAbortedEvent.getCause());
+               if (soneInsertAbortedEvent.getSone().getOptions().isSoneInsertNotificationEnabled()) {
                        notificationManager.addNotification(soneInsertNotification);
                }
        }
@@ -992,10 +966,10 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void updateFound(UpdateFoundEvent updateFoundEvent) {
-               newVersionNotification.set("latestVersion", updateFoundEvent.version());
-               newVersionNotification.set("latestEdition", updateFoundEvent.latestEdition());
-               newVersionNotification.set("releaseTime", updateFoundEvent.releaseTime());
-               newVersionNotification.set("disruptive", updateFoundEvent.disruptive());
+               newVersionNotification.set("latestVersion", updateFoundEvent.getVersion());
+               newVersionNotification.set("latestEdition", updateFoundEvent.getLatestEdition());
+               newVersionNotification.set("releaseTime", updateFoundEvent.getReleaseTime());
+               newVersionNotification.set("disruptive", updateFoundEvent.isDisruptive());
                notificationManager.addNotification(newVersionNotification);
        }
 
@@ -1007,7 +981,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void imageInsertStarted(ImageInsertStartedEvent imageInsertStartedEvent) {
-               insertingImagesNotification.add(imageInsertStartedEvent.image());
+               insertingImagesNotification.add(imageInsertStartedEvent.getImage());
                notificationManager.addNotification(insertingImagesNotification);
        }
 
@@ -1019,7 +993,7 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void imageInsertAborted(ImageInsertAbortedEvent imageInsertAbortedEvent) {
-               insertingImagesNotification.remove(imageInsertAbortedEvent.image());
+               insertingImagesNotification.remove(imageInsertAbortedEvent.getImage());
        }
 
        /**
@@ -1030,8 +1004,8 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
-               insertingImagesNotification.remove(imageInsertFinishedEvent.image());
-               insertedImagesNotification.add(imageInsertFinishedEvent.image());
+               insertingImagesNotification.remove(imageInsertFinishedEvent.getImage());
+               insertedImagesNotification.add(imageInsertFinishedEvent.getImage());
                notificationManager.addNotification(insertedImagesNotification);
        }
 
@@ -1043,8 +1017,8 @@ public class WebInterface implements SessionProvider {
         */
        @Subscribe
        public void imageInsertFailed(ImageInsertFailedEvent imageInsertFailedEvent) {
-               insertingImagesNotification.remove(imageInsertFailedEvent.image());
-               imageInsertFailedNotification.add(imageInsertFailedEvent.image());
+               insertingImagesNotification.remove(imageInsertFailedEvent.getImage());
+               imageInsertFailedNotification.add(imageInsertFailedEvent.getImage());
                notificationManager.addNotification(imageInsertFailedNotification);
        }