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=2b785f9d98d970c381c0cabb78784b95a6e3e71f;hp=2d2571594666d910ff4fbbc5f89e734503fe38f3;hb=8e313509a42a8c638fcac018dd73dd975bf9cb68;hpb=6bdcd41b92f9a6acd014612d35a54e54e41a9dd0

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 2d25715..2b785f9 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–2016 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,7 +17,7 @@
 
 package net.pterodactylus.sone.data.impl;
 
-import java.util.UUID;
+import static com.google.common.base.Optional.fromNullable;
 
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Sone;
@@ -37,7 +37,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;
@@ -72,7 +72,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;
@@ -88,7 +88,12 @@ public class PostImpl implements Post {
 	 */
 	@Override
 	public String getId() {
-		return id.toString();
+		return id;
+	}
+
+	@Override
+	public boolean isLoaded() {
+		return true;
 	}
 
 	/**
@@ -96,7 +101,7 @@ public class PostImpl implements Post {
 	 */
 	@Override
 	public Sone getSone() {
-		return soneProvider.getSone(soneId).get();
+		return soneProvider.getSone(soneId);
 	}
 
 	/**
@@ -104,7 +109,7 @@ public class PostImpl implements Post {
 	 */
 	@Override
 	public Optional<String> getRecipientId() {
-		return Optional.fromNullable(recipientId);
+		return fromNullable(recipientId);
 	}
 
 	/**
@@ -112,7 +117,7 @@ public class PostImpl implements Post {
 	 */
 	@Override
 	public Optional<Sone> getRecipient() {
-		return soneProvider.getSone(recipientId);
+		return fromNullable(soneProvider.getSone(recipientId));
 	}
 
 	/**