Prevent insert and request URIs from being overwritten once set, make edition updatin...

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index ff50c84..ab98316 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -56,6 +56,16 @@ import freenet.keys.FreenetURI;
  */
 public class Core extends AbstractService {
 
+       /** The default Sones. */
+       private static final Set<String> defaultSones = new HashSet<String>();
+
+       static {
+               /* Sone of Sone. */
+               defaultSones.add("USK@eRHt0ceFsHjRZ11j6dd68RSdIvfd8f9YjJLZ9lnhEyo,iJWjIWh6TkMZm1NY8qBranKTIuwsCPkVPG6T6c6ft-I,AQACAAE/Sone/3");
+               /* Sone of Bombe. */
+               defaultSones.add("USK@RuW~uAO35Ipne896-1OmaVJNPuYE4ZIB5oZ5ziaU57A,7rV3uiyztXBDt03DCoRiNwiGjgFCJuznM9Okc1opURU,AQACAAE/Sone/24");
+       }
+
        /**
         * Enumeration for the possible states of a {@link Sone}.
         *
@@ -505,6 +515,7 @@ public class Core extends AbstractService {
                                                } else {
                                                        addSone(parsedSone);
                                                }
+                                               setSoneStatus(parsedSone, SoneStatus.idle);
                                        }
                                } catch (MalformedURLException mue1) {
                                        logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1);
@@ -642,8 +653,8 @@ public class Core extends AbstractService {
         *            The post to check for
         * @return All Sones that like the post
         */
-       public Set<Sone> getLikes(final Post post) {
-               return Filters.filteredSet(getSones(), new Filter<Sone>() {
+       public Collection<Sone> getLikes(final Post post) {
+               return Filters.filteredCollection(getKnownSones(), new Filter<Sone>() {
 
                        @Override
                        public boolean filterObject(Sone sone) {
@@ -659,8 +670,8 @@ public class Core extends AbstractService {
         *            The reply to check for
         * @return All Sones that like the reply
         */
-       public Set<Sone> getLikes(final Reply reply) {
-               return Filters.filteredSet(getSones(), new Filter<Sone>() {
+       public Collection<Sone> getLikes(final Reply reply) {
+               return Filters.filteredCollection(getKnownSones(), new Filter<Sone>() {
 
                        @Override
                        public boolean filterObject(Sone sone) {
@@ -711,6 +722,15 @@ public class Core extends AbstractService {
        //
 
        /**
+        * Adds some default Sones.
+        */
+       private void addDefaultSones() {
+               for (String soneUri : defaultSones) {
+                       loadSone(soneUri);
+               }
+       }
+
+       /**
         * Loads the configuration.
         */
        @SuppressWarnings("unchecked")
@@ -720,10 +740,7 @@ public class Core extends AbstractService {
                boolean firstStart = configuration.getBooleanValue("FirstStart").getValue(true);
                if (firstStart) {
                        logger.log(Level.INFO, "First start of Sone, adding a couple of default Sones…");
-                       /* Sone’s Sone. */
-                       loadSone("USK@eRHt0ceFsHjRZ11j6dd68RSdIvfd8f9YjJLZ9lnhEyo,iJWjIWh6TkMZm1NY8qBranKTIuwsCPkVPG6T6c6ft-I,AQACAAE/Sone/0");
-                       /* Bombe’s Sone. */
-                       loadSone("USK@RuW~uAO35Ipne896-1OmaVJNPuYE4ZIB5oZ5ziaU57A,7rV3uiyztXBDt03DCoRiNwiGjgFCJuznM9Okc1opURU,AQACAAE/Sone/15");
+                       addDefaultSones();
                        try {
                                configuration.getBooleanValue("FirstStart").setValue(false);
                        } catch (ConfigurationException ce1) {
@@ -754,6 +771,7 @@ public class Core extends AbstractService {
                options.getBooleanOption("ReallyClearOnNextRestart").set(null);
                if (clearConfiguration) {
                        /* stop loading the configuration. */
+                       addDefaultSones();
                        return;
                }