X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fmain%2FSonePlugin.java;h=b79df7c6754f0fa984a1859991a454af4d59c1a1;hb=b2952fda6d34528489d7fa4e26e09133099c978f;hp=f2cf128f22beabcf531da6a7362a33433c0c129d;hpb=18ada47554280f444bb829dafc4d40926312066e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index f2cf128..b79df7c 100644
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -26,6 +26,8 @@ import net.pterodactylus.sone.core.*;
 import net.pterodactylus.sone.fcp.*;
 import net.pterodactylus.sone.freenet.wot.*;
 import net.pterodactylus.sone.web.*;
+import net.pterodactylus.sone.web.notification.NotificationHandler;
+import net.pterodactylus.sone.web.notification.NotificationHandlerModule;
 
 import freenet.l10n.BaseL10n.*;
 import freenet.l10n.*;
@@ -34,8 +36,10 @@ import freenet.support.*;
 import freenet.support.api.*;
 
 import com.google.common.annotations.*;
+import com.google.common.eventbus.*;
 import com.google.common.cache.*;
 import com.google.inject.*;
+import com.google.inject.Module;
 import com.google.inject.name.*;
 import kotlin.jvm.functions.*;
 
@@ -50,12 +54,13 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	static {
 		/* initialize logging. */
 		soneLogger.setUseParentHandlers(false);
+		soneLogger.setLevel(Level.ALL);
 		soneLogger.addHandler(new Handler() {
 			private final LoadingCache<String, Class<?>> classCache = CacheBuilder.newBuilder()
 					.build(new CacheLoader<String, Class<?>>() {
 						@Override
 						public Class<?> load(String key) throws Exception {
-							return Class.forName(key);
+							return SonePlugin.class.getClassLoader().loadClass(key);
 						}
 					});
 
@@ -194,8 +199,13 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 		/* create the web interface. */
 		webInterface = injector.getInstance(WebInterface.class);
 
+		/* we need to request this to install all notification handlers. */
+		injector.getInstance(NotificationHandler.class);
+
 		/* start core! */
 		core.start();
+
+		/* start the web interface! */
 		webInterface.start();
 		webInterface.setFirstStart(injector.getInstance(Key.get(Boolean.class, Names.named("FirstStart"))));
 		webInterface.setNewConfig(injector.getInstance(Key.get(Boolean.class, Names.named("NewConfig"))));
@@ -204,10 +214,11 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
 	@VisibleForTesting
 	protected Injector createInjector() {
 		FreenetModule freenetModule = new FreenetModule(pluginRespirator);
-		AbstractModule soneModule = new SoneModule(this);
+		AbstractModule soneModule = new SoneModule(this, new EventBus());
 		Module webInterfaceModule = new WebInterfaceModule();
+		Module notificationHandlerModule = new NotificationHandlerModule();
 
-		return createInjector(freenetModule, soneModule, webInterfaceModule);
+		return createInjector(freenetModule, soneModule, webInterfaceModule, notificationHandlerModule);
 	}
 
 	@VisibleForTesting