From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Fri, 25 Jan 2013 18:07:55 +0000 (+0100)
Subject: Merge commit '173eb2df26ebc15a6aa5565ec15dfad37bfa61a1' into run
X-Git-Tag: 0.8.5^2~3^2~55
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=6d8f11098552fcb40a87d3e35690b3ba760fb947

Merge commit '173eb2df26ebc15a6aa5565ec15dfad37bfa61a1' into run

Conflicts:
	src/main/java/net/pterodactylus/sone/core/Core.java
---

6d8f11098552fcb40a87d3e35690b3ba760fb947
diff --cc src/main/java/net/pterodactylus/sone/core/Core.java
index 7d4441b,c3276a3..ab49612
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@@ -1313,9 -1307,9 +1313,9 @@@ public class Core extends AbstractServi
  				logger.log(Level.WARNING, "Invalid post found, aborting load!");
  				return;
  			}
- 			PostBuilder postBuilder = postBuilder().withId(postId).from(sone).withTime(postTime).withText(postText);
 -			PostBuilder postBuilder = postBuilderFactory.newPostBuilder().withId(postId).from(sone.getId()).withTime(postTime).withText(postText);
++			PostBuilder postBuilder = postBuilder().withId(postId).from(sone.getId()).withTime(postTime).withText(postText);
  			if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
- 				postBuilder.to(getSone(postRecipientId));
+ 				postBuilder.to(postRecipientId);
  			}
  			posts.add(postBuilder.build());
  		}
diff --cc src/main/java/net/pterodactylus/sone/data/PostReply.java
index 1dc5f44,3dd0a14..1e870b9
--- a/src/main/java/net/pterodactylus/sone/data/PostReply.java
+++ b/src/main/java/net/pterodactylus/sone/data/PostReply.java
@@@ -52,15 -30,6 +52,6 @@@ public interface PostReply extends Repl
  	 *
  	 * @return The post this reply refers to
  	 */
 -	public Post getPost();
 +	public Optional<Post> getPost();
  
- 	/**
- 	 * Sets the post this reply refers to.
- 	 *
- 	 * @param postId
- 	 *            The ID of the post to reply to
- 	 * @return This reply
- 	 */
- 	public PostReply setPost(String postId);
- 
  }