X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.kt;fp=src%2Fmain%2Fkotlin%2Fnet%2Fpterodactylus%2Fsone%2Fdatabase%2Fmemory%2FMemoryDatabase.kt;h=df65a5a35921401f448eead451200a0b36723875;hp=e62d968d10d33c0cf3b759d9c7ca983d212b68ed;hb=2b7b9baa754ba9d4a41b0abfaf946bd9146a10c9;hpb=d98bd42433b94ba26460ca99495805dca3b06481

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 e62d968..df65a5a 100644
--- a/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt
+++ b/src/main/kotlin/net/pterodactylus/sone/database/memory/MemoryDatabase.kt
@@ -30,7 +30,7 @@ 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.allAlbums
 import net.pterodactylus.sone.data.allImages
 import net.pterodactylus.sone.data.impl.AlbumBuilderImpl
 import net.pterodactylus.sone.data.impl.ImageBuilderImpl
@@ -123,9 +123,9 @@ 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.rootAlbum.allAlbums.let { albums ->
+				soneAlbums.putAll(sone.id, albums)
+				albums.forEach { album -> allAlbums[album.id] = album }
 			}
 			sone.rootAlbum.allImages.let { images ->
 				soneImages.putAll(sone.id, images)