X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2Fimpl%2FPostImpl.java;h=d8d5086a27b8e067d4e034e356aab84720243476;hp=bb8a4df1e36c6d8a8dd3b0acd555508873e229fb;hb=b798049da3b4d4a58d5ff12314bc1022808171bc;hpb=6d8f11098552fcb40a87d3e35690b3ba760fb947

diff --git a/src/main/java/net/pterodactylus/sone/data/impl/PostImpl.java b/src/main/java/net/pterodactylus/sone/data/impl/PostImpl.java
index bb8a4df..d8d5086 100644
--- a/src/main/java/net/pterodactylus/sone/data/impl/PostImpl.java
+++ b/src/main/java/net/pterodactylus/sone/data/impl/PostImpl.java
@@ -1,5 +1,5 @@
 /*
- * Sone - PostImpl.java - Copyright © 2010–2013 David Roden
+ * Sone - PostImpl.java - Copyright © 2010–2019 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,17 +17,17 @@
 
 package net.pterodactylus.sone.data.impl;
 
-import java.util.UUID;
+import static com.google.common.base.Optional.fromNullable;
 
-import net.pterodactylus.sone.core.SoneProvider;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.database.SoneProvider;
+
+import com.google.common.base.Optional;
 
 /**
  * A post is a short message that a user writes in his Sone to let other users
  * know what is going on.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 public class PostImpl implements Post {
 
@@ -35,7 +35,7 @@ public class PostImpl implements Post {
 	private final SoneProvider soneProvider;
 
 	/** The GUID of the post. */
-	private final UUID id;
+	private final String id;
 
 	/** The ID of the owning Sone. */
 	private final String soneId;
@@ -70,7 +70,7 @@ public class PostImpl implements Post {
 	 */
 	public PostImpl(SoneProvider soneProvider, String id, String soneId, String recipientId, long time, String text) {
 		this.soneProvider = soneProvider;
-		this.id = UUID.fromString(id);
+		this.id = id;
 		this.soneId = soneId;
 		this.recipientId = recipientId;
 		this.time = time;
@@ -86,7 +86,12 @@ public class PostImpl implements Post {
 	 */
 	@Override
 	public String getId() {
-		return id.toString();
+		return id;
+	}
+
+	@Override
+	public boolean isLoaded() {
+		return true;
 	}
 
 	/**
@@ -94,15 +99,23 @@ public class PostImpl implements Post {
 	 */
 	@Override
 	public Sone getSone() {
-		return soneProvider.getSone(soneId, false);
+		return soneProvider.getSone(soneId);
+	}
+
+	/**
+	 * {@inheritDocs}
+	 */
+	@Override
+	public Optional<String> getRecipientId() {
+		return fromNullable(recipientId);
 	}
 
 	/**
 	 * {@inheritDoc}
 	 */
 	@Override
-	public Sone getRecipient() {
-		return soneProvider.getSone(recipientId, false);
+	public Optional<Sone> getRecipient() {
+		return fromNullable(soneProvider.getSone(recipientId));
 	}
 
 	/**