X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.kt;h=e943b38b1ecabfae5928e7e18cdce69cfb570fa2;hb=f049280a40ddf05f02400e7f0d93a24dea4545c2;hp=8722873aa0e7a4740a017fb1ad073ed17c7d26d1;hpb=90993f1fc13288b83996066e726653b4dd011479;p=Sone.git

diff --git a/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt b/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt
index 8722873..e943b38 100644
--- a/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt
@@ -28,12 +28,12 @@ import net.pterodactylus.sone.data.Album
 import net.pterodactylus.sone.data.Image
 import net.pterodactylus.sone.data.Post
 import net.pterodactylus.sone.data.PostReply
-import net.pterodactylus.sone.data.Reply.TIME_COMPARATOR
 import net.pterodactylus.sone.data.Sone
-import net.pterodactylus.sone.data.Sone.toAllAlbums
-import net.pterodactylus.sone.data.Sone.toAllImages
+import net.pterodactylus.sone.data.allAlbums
+import net.pterodactylus.sone.data.allImages
 import net.pterodactylus.sone.data.impl.AlbumBuilderImpl
 import net.pterodactylus.sone.data.impl.ImageBuilderImpl
+import net.pterodactylus.sone.data.newestReplyFirst
 import net.pterodactylus.sone.database.AlbumBuilder
 import net.pterodactylus.sone.database.Database
 import net.pterodactylus.sone.database.DatabaseException
@@ -62,7 +62,7 @@ class MemoryDatabase @Inject constructor(private val configuration: Configuratio
 	private val sonePosts: Multimap<String, Post> = HashMultimap.create<String, Post>()
 	private val knownPosts = mutableSetOf<String>()
 	private val allPostReplies = mutableMapOf<String, PostReply>()
-	private val sonePostReplies: Multimap<String, PostReply> = TreeMultimap.create<String, PostReply>(Comparator { leftString, rightString -> leftString.compareTo(rightString) }, TIME_COMPARATOR)
+	private val sonePostReplies: Multimap<String, PostReply> = TreeMultimap.create<String, PostReply>(Comparator { leftString, rightString -> leftString.compareTo(rightString) }, newestReplyFirst)
 	private val knownPostReplies = mutableSetOf<String>()
 	private val allAlbums = mutableMapOf<String, Album>()
 	private val soneAlbums: Multimap<String, Album> = HashMultimap.create<String, Album>()
@@ -123,13 +123,13 @@ class MemoryDatabase @Inject constructor(private val configuration: Configuratio
 			for (postReply in sone.replies) {
 				allPostReplies[postReply.id] = postReply
 			}
-			soneAlbums.putAll(sone.id, toAllAlbums.apply(sone)!!)
-			for (album in toAllAlbums.apply(sone)!!) {
-				allAlbums[album.id] = album
+			sone.allAlbums.let { albums ->
+				soneAlbums.putAll(sone.id, albums)
+				albums.forEach { album -> allAlbums[album.id] = album }
 			}
-			soneImages.putAll(sone.id, toAllImages.apply(sone)!!)
-			for (image in toAllImages.apply(sone)!!) {
-				allImages[image.id] = image
+			sone.rootAlbum.allImages.let { images ->
+				soneImages.putAll(sone.id, images)
+				images.forEach { image -> allImages[image.id] = image }
 			}
 		}
 	}
@@ -227,7 +227,7 @@ class MemoryDatabase @Inject constructor(private val configuration: Configuratio
 			readLock.withLock {
 				allPostReplies.values
 						.filter { it.postId == postId }
-						.sortedWith(TIME_COMPARATOR)
+						.sortedWith(newestReplyFirst.reversed())
 			}
 
 	override fun newPostReplyBuilder(): PostReplyBuilder =