X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryFriendDatabase.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryFriendDatabase.java;h=6661be04e050b85f664107366d62d57a5af90239;hp=0be87389428b21f0774e7f7ca28f47bce0ab018f;hb=03cec6a6772c2d836d94864adddaf544cbe9d72f;hpb=6f1f26e3998cfef155b0cf59152827accea70d30 diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryFriendDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryFriendDatabase.java index 0be8738..6661be0 100644 --- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryFriendDatabase.java +++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryFriendDatabase.java @@ -4,13 +4,14 @@ import java.util.Collection; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; /** * In-memory implementation of friend-related functionality. - * - * @author David ‘Bombe’ Roden */ class MemoryFriendDatabase { @@ -48,6 +49,9 @@ class MemoryFriendDatabase { try { if (soneFriends.put(localSoneId, friendSoneId)) { configurationLoader.saveFriends(localSoneId, soneFriends.get(localSoneId)); + if (configurationLoader.getSoneFollowingTime(friendSoneId) == null) { + configurationLoader.setSoneFollowingTime(friendSoneId, System.currentTimeMillis()); + } } } finally { lock.writeLock().unlock(); @@ -60,12 +64,24 @@ class MemoryFriendDatabase { try { if (soneFriends.remove(localSoneId, friendSoneId)) { configurationLoader.saveFriends(localSoneId, soneFriends.get(localSoneId)); + boolean unfollowedSoneStillFollowed = false; + for (String soneId : soneFriends.keys()) { + unfollowedSoneStillFollowed |= getFriends(soneId).contains(friendSoneId); + } + if (!unfollowedSoneStillFollowed) { + configurationLoader.removeSoneFollowingTime(friendSoneId); + } } } finally { lock.writeLock().unlock(); } } + @Nullable + Long getFollowingTime(@Nonnull String soneId) { + return configurationLoader.getSoneFollowingTime(soneId); + } + private void loadFriends(String localSoneId) { lock.writeLock().lock(); try {