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=2d2571594666d910ff4fbbc5f89e734503fe38f3;hb=b798049da3b4d4a58d5ff12314bc1022808171bc;hpb=6e9a43ccd93ae125720547c0fe421dc81a54ba90 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..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,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; @@ -28,8 +28,6 @@ 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 David ‘Bombe’ Roden */ public class PostImpl implements Post { @@ -37,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; @@ -72,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; @@ -88,7 +86,12 @@ public class PostImpl implements Post { */ @Override public String getId() { - return id.toString(); + return id; + } + + @Override + public boolean isLoaded() { + return true; } /** @@ -96,7 +99,7 @@ public class PostImpl implements Post { */ @Override public Sone getSone() { - return soneProvider.getSone(soneId).get(); + return soneProvider.getSone(soneId); } /** @@ -104,7 +107,7 @@ public class PostImpl implements Post { */ @Override public Optional getRecipientId() { - return Optional.fromNullable(recipientId); + return fromNullable(recipientId); } /** @@ -112,7 +115,7 @@ public class PostImpl implements Post { */ @Override public Optional getRecipient() { - return soneProvider.getSone(recipientId); + return fromNullable(soneProvider.getSone(recipientId)); } /**