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=140d80ce354353c38e9cfd0078640648ea4a8846;hpb=00a434a23c9ea1e57c63d8a3c0fc4b09277af431;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 140d80c..e3fd103 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -103,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;
@@ -489,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());
 	}
 
 	/**
@@ -505,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;
 	}
@@ -522,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;
 	}