projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove updated time setter from Sone, store update time in database.
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
database
/
memory
/
MemoryDatabase.java
diff --git
a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
index
7a548b9
..
d5d5396
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
+++ b/
src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java
@@
-275,7
+275,7
@@
public class MemoryDatabase extends AbstractService implements Database {
/* if we’re still here, Sone was loaded successfully. */
lock.writeLock().lock();
try {
/* if we’re still here, Sone was loaded successfully. */
lock.writeLock().lock();
try {
-
sone.setTime(
soneTime);
+
updateSoneTime(sone,
soneTime);
sone.setProfile(profile);
sone.setLikePostIds(likedPostIds);
sone.setLikeReplyIds(likedReplyIds);
sone.setProfile(profile);
sone.setLikePostIds(likedPostIds);
sone.setLikeReplyIds(likedReplyIds);
@@
-464,6
+464,7
@@
public class MemoryDatabase extends AbstractService implements Database {
@Override
protected void doStart() {
soneDatabase.start();
@Override
protected void doStart() {
soneDatabase.start();
+ memoryFriendDatabase.start();
postDatabase.start();
memoryBookmarkDatabase.start();
loadKnownPostReplies();
postDatabase.start();
memoryBookmarkDatabase.start();
loadKnownPostReplies();
@@
-475,6
+476,7
@@
public class MemoryDatabase extends AbstractService implements Database {
protected void doStop() {
try {
soneDatabase.stop();
protected void doStop() {
try {
soneDatabase.stop();
+ memoryFriendDatabase.stop();
postDatabase.stop();
memoryBookmarkDatabase.stop();
save();
postDatabase.stop();
memoryBookmarkDatabase.stop();
save();
@@
-515,6
+517,11
@@
public class MemoryDatabase extends AbstractService implements Database {
soneDatabase.setSoneKnown(sone.getId());
}
soneDatabase.setSoneKnown(sone.getId());
}
+ @Override
+ public void updateSoneTime(Sone sone, long soneTime) {
+ soneDatabase.updateSoneTime(sone.getId(), soneTime);
+ }
+
private void storePosts(String soneId, Collection<Post> posts) {
postDatabase.storePosts(soneId, posts);
}
private void storePosts(String soneId, Collection<Post> posts) {
postDatabase.storePosts(soneId, posts);
}
@@
-624,7
+631,7
@@
public class MemoryDatabase extends AbstractService implements Database {
}
@Override
}
@Override
- public Collection<String> getFriends(Sone localSone) {
+ public Collection<String> getFriends(
Local
Sone localSone) {
if (!localSone.isLocal()) {
return Collections.emptySet();
}
if (!localSone.isLocal()) {
return Collections.emptySet();
}
@@
-632,7
+639,12
@@
public class MemoryDatabase extends AbstractService implements Database {
}
@Override
}
@Override
- public boolean isFriend(Sone localSone, String friendSoneId) {
+ public Optional<Long> getSoneFollowingTime(String remoteSoneId) {
+ return memoryFriendDatabase.getSoneFollowingTime(remoteSoneId);
+ }
+
+ @Override
+ public boolean isFriend(LocalSone localSone, String friendSoneId) {
if (!localSone.isLocal()) {
return false;
}
if (!localSone.isLocal()) {
return false;
}
@@
-640,18
+652,12
@@
public class MemoryDatabase extends AbstractService implements Database {
}
@Override
}
@Override
- public void addFriend(Sone localSone, String friendSoneId) {
- if (!localSone.isLocal()) {
- return;
- }
+ public void addFriend(LocalSone localSone, String friendSoneId) {
memoryFriendDatabase.addFriend(localSone.getId(), friendSoneId);
}
@Override
memoryFriendDatabase.addFriend(localSone.getId(), friendSoneId);
}
@Override
- public void removeFriend(Sone localSone, String friendSoneId) {
- if (!localSone.isLocal()) {
- return;
- }
+ public void removeFriend(LocalSone localSone, String friendSoneId) {
memoryFriendDatabase.removeFriend(localSone.getId(), friendSoneId);
}
memoryFriendDatabase.removeFriend(localSone.getId(), friendSoneId);
}