X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=0415ecd4993a53a6d9512e08f70829b8f6a06cd1;hb=59987c0cdf71bb2b58e0b97abe60e5d77e3cd8be;hp=22dc593d3215deb12ffbf812c7fc854dbf275be9;hpb=c2e868714435ac7c75d77d1911d0dfb00393d051;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 22dc593..0415ecd 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -54,7 +54,7 @@ import com.google.common.primitives.Ints;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Sone implements Fingerprintable, Comparable<Sone> {
+public class Sone implements Identified, Fingerprintable, Comparable<Sone> {
 
 	/**
 	 * Enumeration for the possible states of a {@link Sone}.
@@ -155,7 +155,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 
 		@Override
 		public boolean apply(Sone sone) {
-			return sone.getTime() != 0;
+			return (sone == null) ? false : sone.getTime() != 0;
 		}
 	};
 
@@ -164,7 +164,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 
 		@Override
 		public boolean apply(Sone sone) {
-			return sone.getIdentity() instanceof OwnIdentity;
+			return (sone == null) ? false : sone.getIdentity() instanceof OwnIdentity;
 		}
 
 	};
@@ -174,7 +174,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 
 		@Override
 		public boolean apply(Sone sone) {
-			return !sone.getRootAlbum().getAlbums().isEmpty();
+			return (sone == null) ? false : !sone.getRootAlbum().getAlbums().isEmpty();
 		}
 	};
 
@@ -832,7 +832,10 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 		hash.putString(")");
 
 		hash.putString("Albums(");
-		for (Album album : albums) {
+		for (Album album : rootAlbum.getAlbums()) {
+			if (!Album.NOT_EMPTY.apply(album)) {
+				continue;
+			}
 			hash.putString(album.getFingerprint());
 		}
 		hash.putString(")");
@@ -872,7 +875,7 @@ public class Sone implements Fingerprintable, Comparable<Sone> {
 	/** {@inheritDoc} */
 	@Override
 	public String toString() {
-		return getClass().getName() + "[identity=" + identity + ",requestUri=" + requestUri + ",insertUri(" + String.valueOf(insertUri).length() + "),friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + ")]";
+		return getClass().getName() + "[identity=" + identity + ",requestUri=" + requestUri + ",insertUri(" + String.valueOf(insertUri).length() + "),friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + "),albums(" + getRootAlbum().getAlbums().size() + ")]";
 	}
 
 }