/*
- * Sone - SonePlugin.java - Copyright © 2010–2016 David Roden
+ * Sone - SonePlugin.java - Copyright © 2010–2019 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.database.Database;
+import net.pterodactylus.sone.database.PostProvider;
+import net.pterodactylus.sone.database.SoneProvider;
import net.pterodactylus.sone.database.memory.MemoryDatabase;
import net.pterodactylus.sone.fcp.FcpInterface;
import net.pterodactylus.sone.freenet.PluginStoreConfigurationBackend;
import net.pterodactylus.sone.freenet.wot.Context;
import net.pterodactylus.sone.freenet.wot.WebOfTrustConnector;
import net.pterodactylus.sone.web.WebInterface;
+import net.pterodactylus.sone.web.WebInterfaceModule;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
import net.pterodactylus.util.config.MapConfigurationBackend;
import com.google.inject.AbstractModule;
import com.google.inject.Guice;
import com.google.inject.Injector;
+import com.google.inject.Module;
import com.google.inject.TypeLiteral;
import com.google.inject.matcher.Matchers;
import com.google.inject.spi.InjectionListener;
import com.google.inject.spi.TypeListener;
import freenet.client.async.PersistenceDisabledException;
+import freenet.l10n.BaseL10n;
import freenet.l10n.BaseL10n.LANGUAGE;
import freenet.l10n.PluginL10n;
import freenet.pluginmanager.FredPlugin;
}
/** The current year at time of release. */
- private static final int YEAR = 2017;
+ private static final int YEAR = 2019;
private static final String SONE_HOMEPAGE = "USK@nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI,DuQSUZiI~agF8c-6tjsFFGuZ8eICrzWCILB60nT8KKo,AQACAAE/sone/";
- private static final int LATEST_EDITION = 77;
+ private static final int LATEST_EDITION = 79;
/** The logger. */
private static final Logger logger = getLogger(SonePlugin.class.getName());
return (version == null) ? "unknown" : version.getNice();
}
- public static int getYear() {
+ public int getYear() {
return YEAR;
}
- public static String getHomepage() {
+ public String getHomepage() {
return SONE_HOMEPAGE + LATEST_EDITION;
}
bind(Context.class).toInstance(context);
bind(getOptionalContextTypeLiteral()).toInstance(of(context));
bind(SonePlugin.class).toInstance(SonePlugin.this);
- bind(Version.class).toInstance(Version.parse(getVersion()));
+ bind(Version.class).toInstance(Version.parse(getVersion().substring(1)));
bind(PluginVersion.class).toInstance(new PluginVersion(getVersion()));
bind(PluginYear.class).toInstance(new PluginYear(getYear()));
bind(PluginHomepage.class).toInstance(new PluginHomepage(getHomepage()));
bind(Database.class).to(MemoryDatabase.class).in(Singleton.class);
+ bind(BaseL10n.class).toInstance(l10n.getBase());
+ bind(SoneProvider.class).to(Core.class).in(Singleton.class);
+ bind(PostProvider.class).to(Core.class).in(Singleton.class);
if (startConfiguration.getBooleanValue("Developer.LoadFromFilesystem").getValue(false)) {
String path = startConfiguration.getStringValue("Developer.FilesystemPath").getValue(null);
if (path != null) {
}
};
- Injector injector = Guice.createInjector(freenetModule, soneModule);
+ Module webInterfaceModule = new WebInterfaceModule();
+ Injector injector = Guice.createInjector(freenetModule, soneModule, webInterfaceModule);
core = injector.getInstance(Core.class);
/* create web of trust connector. */
return getPluginVersion();
}
- public static class PluginVersion {
-
- private final String version;
-
- public PluginVersion(String version) {
- this.version = version;
- }
-
- public String getVersion() {
- return version;
- }
-
- }
-
- public static class PluginYear {
-
- private final int year;
-
- public PluginYear(int year) {
- this.year = year;
- }
-
- public int getYear() {
- return year;
- }
-
- }
-
- public static class PluginHomepage {
-
- private final String homepage;
-
- public PluginHomepage(String homepage) {
- this.homepage = homepage;
- }
-
- public String getHomepage() {
- return homepage;
- }
-
- }
-
}