X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=e3fd103d73495c230eaa7fa0314617ef673c1310;hb=df37c71a5b53af746f2c0c8b7ce8c1d4ae33486f;hp=68cf4b2ae731817131f50ee43d435bc457dd0f30;hpb=2ef163831826acdb2113f04278d90fa0a60d3f8e;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 68cf4b2..e3fd103 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -73,6 +73,7 @@ import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
 import net.pterodactylus.sone.data.Sone.SoneStatus;
 import net.pterodactylus.sone.data.TemporaryImage;
 import net.pterodactylus.sone.database.AlbumBuilder;
+import net.pterodactylus.sone.database.AlbumProvider;
 import net.pterodactylus.sone.database.Database;
 import net.pterodactylus.sone.database.DatabaseException;
 import net.pterodactylus.sone.database.ImageBuilder;
@@ -102,8 +103,11 @@ import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableList.Builder;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
+import com.google.common.collect.Ordering;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
 import com.google.inject.Inject;
@@ -115,7 +119,7 @@ import com.google.inject.Singleton;
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 @Singleton
-public class Core extends AbstractService implements SoneProvider, PostProvider, PostReplyProvider {
+public class Core extends AbstractService implements SoneProvider, PostProvider, PostReplyProvider, AlbumProvider {
 
 	/** The logger. */
 	private static final Logger logger = getLogger(Core.class.getName());
@@ -488,7 +492,14 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Override
 	public List<PostReply> getReplies(final String postId) {
-		return database.getReplies(postId);
+		Builder<PostReply> postReplies = ImmutableList.<PostReply>builder().addAll(database.getReplies(postId));
+		if (isCompatibilityMode(CompatibilityMode.oldElementIds)) {
+			Optional<Post> post = getPost(postId);
+			if (post.isPresent()) {
+				postReplies.addAll(database.getReplies(post.get().getInternalId()));
+			}
+		}
+		return Ordering.from(Reply.TIME_COMPARATOR).sortedCopy(postReplies.build());
 	}
 
 	/**
@@ -504,6 +515,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			if (sone.getLikedPostIds().contains(post.getId())) {
 				sones.add(sone);
 			}
+			if (isCompatibilityMode(CompatibilityMode.oldElementIds)) {
+				if (sone.getLikedPostIds().contains(post.getInternalId())) {
+					sones.add(sone);
+				}
+			}
 		}
 		return sones;
 	}
@@ -521,6 +537,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			if (sone.getLikedReplyIds().contains(reply.getId())) {
 				sones.add(sone);
 			}
+			if (isCompatibilityMode(CompatibilityMode.oldElementIds)) {
+				if (sone.getLikedReplyIds().contains(reply.getInternalId())) {
+					sones.add(sone);
+				}
+			}
 		}
 		return sones;
 	}
@@ -559,8 +580,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * @return The album with the given ID, or {@code null} if no album with the
 	 *         given ID exists
 	 */
-	public Album getAlbum(String albumId) {
-		return database.getAlbum(albumId).orNull();
+	public Optional<Album> getAlbum(String albumId) {
+		return database.getAlbum(albumId);
 	}
 
 	public ImageBuilder imageBuilder() {
@@ -1621,6 +1642,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(null);
 			}
 
+			/* save compatibility modes. */
+			configuration.getBooleanValue("CompatibilityModes/OldElementIds").setValue(compatibilityModes.contains(CompatibilityMode.oldElementIds));
+
 			/* save known posts. */
 			database.save();
 
@@ -1669,6 +1693,11 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			}
 			++soneCounter;
 		}
+
+		/* load compatibility modes. */
+		if (configuration.getBooleanValue("CompatibilityModes/OldElementIds").getValue(false)) {
+			setCompatibilityMode(CompatibilityMode.oldElementIds);
+		}
 	}
 
 	/**