X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=17905f3495e8546c2f8ffed0f6da8e30d41d49f8;hp=dfe8074f5fd28d14c90b49081fcc391c5b1103b0;hb=2524f4d47c56874a263f9e53ec5c4035f2baa7e0;hpb=b9281ba712aac6ea70b7dc217607608ae80b594d

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index dfe8074..17905f3 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -726,7 +726,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	public void followSone(Sone sone, String soneId) {
 		checkNotNull(sone, "sone must not be null");
 		checkNotNull(soneId, "soneId must not be null");
-		sone.addFriend(soneId);
+		database.addFriend(sone, soneId);
 		synchronized (soneFollowingTimes) {
 			if (!soneFollowingTimes.containsKey(soneId)) {
 				long now = System.currentTimeMillis();
@@ -761,7 +761,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	public void unfollowSone(Sone sone, String soneId) {
 		checkNotNull(sone, "sone must not be null");
 		checkNotNull(soneId, "soneId must not be null");
-		sone.removeFriend(soneId);
+		database.removeFriend(sone, soneId);
 		boolean unfollowedSoneStillFollowed = false;
 		for (Sone localSone : getLocalSones()) {
 			unfollowedSoneStillFollowed |= localSone.hasFriend(soneId);
@@ -1027,9 +1027,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		Set<String> likedReplyIds =
 				configurationSoneParser.parseLikedPostReplyIds();
 
-		/* load friends. */
-		Set<String> friends = configurationSoneParser.parseFriends();
-
 		/* load albums. */
 		List<Album> topLevelAlbums;
 		try {
@@ -1081,9 +1078,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			sone.setReplies(replies);
 			sone.setLikePostIds(likedPostIds);
 			sone.setLikeReplyIds(likedReplyIds);
-			for (String friendId : friends) {
-				followSone(sone, friendId);
-			}
 			for (Album album : sone.getRootAlbum().getAlbums()) {
 				sone.getRootAlbum().removeAlbum(album);
 			}
@@ -1095,11 +1089,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 				soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
 			}
 		}
-		synchronized (knownSones) {
-			for (String friend : friends) {
-				knownSones.add(friend);
-			}
-		}
 		for (Post post : posts) {
 			post.setKnown(true);
 		}
@@ -1513,13 +1502,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			}
 			configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter + "/ID").setValue(null);
 
-			/* save friends. */
-			int friendCounter = 0;
-			for (String friendId : sone.getFriends()) {
-				configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter++ + "/ID").setValue(friendId);
-			}
-			configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
-
 			/* save albums. first, collect in a flat structure, top-level first. */
 			List<Album> albums = FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).toList();