X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=68cf4b2ae731817131f50ee43d435bc457dd0f30;hb=2ef163831826acdb2113f04278d90fa0a60d3f8e;hp=d442e691241a40662d8b0632a17c2aeb6fd3c378;hpb=d72167e26461a77ad3b916cabf44df416ebb2a72;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 d442e69..68cf4b2 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -27,6 +27,7 @@ import static java.util.logging.Logger.getLogger;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -98,6 +99,7 @@ import net.pterodactylus.util.thread.NamedThreadFactory;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Function;
 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.Multimap;
@@ -154,6 +156,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/** The trust updater. */
 	private final WebOfTrustUpdater webOfTrustUpdater;
 
+	private final Set<CompatibilityMode> compatibilityModes = EnumSet.noneOf(CompatibilityMode.class);
+
 	/** The times Sones were followed. */
 	private final Map<String, Long> soneFollowingTimes = new HashMap<String, Long>();
 
@@ -273,6 +277,18 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		return updateChecker;
 	}
 
+	public boolean isCompatibilityMode(CompatibilityMode compatibilityMode) {
+		return compatibilityModes.contains(compatibilityMode);
+	}
+
+	public void setCompatibilityMode(CompatibilityMode compatibilityMode) {
+		compatibilityModes.add(compatibilityMode);
+	}
+
+	public void clearCompatibilityMod(CompatibilityMode compatibilityMode) {
+		compatibilityModes.remove(compatibilityMode);
+	}
+
 	/**
 	 * Returns the Sone rescuer for the given local Sone.
 	 *
@@ -420,8 +436,17 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Optional<Post> getPost(String postId) {
-		return database.getPost(postId);
+	public Optional<Post> getPost(final String postId) {
+		Optional<Post> post = database.getPost(postId);
+		if (post.isPresent() || !isCompatibilityMode(CompatibilityMode.oldElementIds)) {
+			return post;
+		}
+		return FluentIterable.from(getSones()).transformAndConcat(Sone.toAllPosts).filter(new Predicate<Post>() {
+			@Override
+			public boolean apply(Post input) {
+				return (input != null) && input.getInternalId().equals(postId);
+			}
+		}).first();
 	}
 
 	/**
@@ -1487,7 +1512,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			int replyCounter = 0;
 			for (PostReply reply : sone.getReplies()) {
 				String replyPrefix = sonePrefix + "/Replies/" + replyCounter++;
-				configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
+				configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getInternalId());
 				configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPostId());
 				configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
 				configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());