Sones may be known before but must not have a request URI to be new.

[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 132e4a6..15a7b0e 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -323,6 +323,21 @@ public class Core implements IdentityListener {
        }
 
        /**
+        * Returns whether the given Sone is a new Sone. After this check, the Sone
+        * is marked as known, i.e. a second call with the same parameters will
+        * always yield {@code false}.
+        *
+        * @param sone
+        *            The sone to check for
+        * @return {@code true} if the given Sone is new, false otherwise
+        */
+       public boolean isNewSone(Sone sone) {
+               synchronized (newSones) {
+                       return newSones.remove(sone);
+               }
+       }
+
+       /**
         * Returns the post with the given ID.
         *
         * @param postId
@@ -511,8 +526,8 @@ public class Core implements IdentityListener {
                        return null;
                }
                synchronized (remoteSones) {
-                       boolean newSone = !isRemoteSone(identity.getId());
                        final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
+                       boolean newSone = sone.getRequestUri() == null;
                        sone.setRequestUri(getSoneUri(identity.getRequestUri()));
                        sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
                        if (newSone) {