Refactor account, WIP cache fetchers

ihateblueb · ihateblueb · commit 1134d0a8520e · 2026-06-25T22:31:50.000-04:00
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/App.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/App.kt
@@ -55,7 +55,7 @@ import site.remlit.snowdrop.util.safe
 import site.remlit.snowdrop.util.scrollingUpward
 import site.remlit.snowdrop.util.settings
 import site.remlit.snowdrop.util.setupAppSettings
-import site.remlit.snowdrop.util.setupCache
+import site.remlit.snowdrop.util.cache.setupCache
 import site.remlit.snowdrop.view.*
 import site.remlit.snowdrop.view.settings.*
 import snowdrop.shared.generated.resources.Res
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/api/accounts/getAccount.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/api/accounts/getAccount.kt
@@ -4,7 +4,7 @@ import com.russhwolf.settings.ExperimentalSettingsApi
 import io.ktor.client.request.get
 import io.ktor.client.request.header
 import site.remlit.snowdrop.model.ApiResponse
-import site.remlit.snowdrop.model.User
+import site.remlit.snowdrop.model.Account
 import site.remlit.snowdrop.util.config.endOfRequest
 import site.remlit.snowdrop.util.getCurrentAccountHost
 import site.remlit.snowdrop.util.getCurrentAccountId
@@ -13,7 +13,7 @@ import site.remlit.snowdrop.util.safeApiRequest
 import site.remlit.snowdrop.util.settings
 
 @OptIn(ExperimentalSettingsApi::class)
-suspend fun getAccount(id: String): ApiResponse<User> = safeApiRequest {
+suspend fun getAccount(id: String): ApiResponse<Account> = safeApiRequest {
 	val accountId = getCurrentAccountId()
 	val host = getCurrentAccountHost()
 	val token = settings.getString("account_${accountId}_token", "")
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/api/verifyCredentials.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/api/verifyCredentials.kt
@@ -4,7 +4,7 @@ import com.russhwolf.settings.ExperimentalSettingsApi
 import io.ktor.client.request.get
 import io.ktor.client.request.header
 import site.remlit.snowdrop.model.ApiResponse
-import site.remlit.snowdrop.model.User
+import site.remlit.snowdrop.model.Account
 import site.remlit.snowdrop.util.config.endOfRequest
 import site.remlit.snowdrop.util.getCurrentAccountHost
 import site.remlit.snowdrop.util.getCurrentAccountId
@@ -13,7 +13,7 @@ import site.remlit.snowdrop.util.safeApiRequest
 import site.remlit.snowdrop.util.settings
 
 @OptIn(ExperimentalSettingsApi::class)
-suspend fun verifyCredentials(): ApiResponse<User> = safeApiRequest {
+suspend fun verifyCredentials(): ApiResponse<Account> = safeApiRequest {
 	val host = getCurrentAccountHost()
 	val accountId = getCurrentAccountId()
 	val token = settings.getString("account_${accountId}_token", "")
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/component/Avatar.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/component/Avatar.kt
@@ -13,7 +13,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import io.kamel.image.KamelImage
 import io.kamel.image.asyncPainterResource
-import site.remlit.snowdrop.model.User
+import site.remlit.snowdrop.model.Account
 
 const val bigAvatarSize = 84
 const val smallAvatarSize = 24
@@ -25,7 +25,7 @@ const val avatarRadius = 15
 
 @Composable
 fun Avatar(
-	user: User,
+	account: Account,
 	big: Boolean = false,
 	small: Boolean = false
 ) {
@@ -42,15 +42,15 @@ fun Avatar(
 		)
 	}
 
-	if (user.avatar != null) {
+	if (account.avatar != null) {
 		KamelImage(
-			{ asyncPainterResource(user.avatarStatic!!) },
-			user.avatarDescription,
+			{ asyncPainterResource(account.avatarStatic!!) },
+			account.avatarDescription,
 			onLoading = { fallback() },
 			modifier = Modifier.clip(RoundedCornerShape(radius))
 				.height(size)
 				.width(size),
 			contentScale = ContentScale.Crop
 		)
 	} else fallback()
-}
+}
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/component/Status.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/component/Status.kt
@@ -40,7 +40,7 @@ import site.remlit.snowdrop.ProfileRoute
 import site.remlit.snowdrop.ThreadRoute
 import site.remlit.snowdrop.component.dropdown.DangerDropdownItem
 import site.remlit.snowdrop.model.Status
-import site.remlit.snowdrop.model.User
+import site.remlit.snowdrop.model.Account
 import site.remlit.snowdrop.util.LocalNavController
 import site.remlit.snowdrop.util.WarningColor25
 import site.remlit.snowdrop.util.atRoute
@@ -86,7 +86,7 @@ fun Status(status: Status) {
 
 	var realStatus by remember { mutableStateOf(status) }
 	var isReblog by remember { mutableStateOf(false) }
-	var rebloggingAccount by remember { mutableStateOf<User?>(null) }
+	var rebloggingAccount by remember { mutableStateOf<Account?>(null) }
 	var isMine by remember { mutableStateOf(realStatus.account?.id == currentAccount?.id) }
 	//todo: or is admin? figure out how to do that
 
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/model/Account.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/model/Account.kt
@@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class User(
+data class Account(
 	val id: String,
 	val username: String,
 	val acct: String,
@@ -37,7 +37,7 @@ data class User(
 	val headerDescription: String? = null,
 
 	// todo: why is this a string? what is this?
-	val moved: User? = null,
+	val moved: Account? = null,
 
 	val locked: Boolean,
 	val bot: Boolean,
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/model/Notification.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/model/Notification.kt
@@ -10,7 +10,7 @@ data class Notification(
 	val id: String,
 	val type: String,
 
-	val account: User,
+	val account: Account,
 	val status: Status? = null,
 
 	val emoji: String? = null,
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/model/Status.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/model/Status.kt
@@ -8,7 +8,7 @@ import kotlin.time.Instant
 @Serializable
 data class Status(
 	val id: String? = null,
-	val account: User? = null,
+	val account: Account? = null,
 
 	@SerialName("spoiler_text")
 	val spoilerText: String? = null,
@@ -191,7 +191,7 @@ data class Status(
 		val url: String? = null,
 		@SerialName("static_url")
 		val staticUrl: String? = null,
-		val accounts: List<User>? = emptyList(),
+		val accounts: List<Account>? = emptyList(),
 		@SerialName("account_ids")
 		val accountIds: List<String> = emptyList()
 	)
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/model/response/SearchResponse.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/model/response/SearchResponse.kt
@@ -1,11 +1,11 @@
 package site.remlit.snowdrop.model.response
 
 import kotlinx.serialization.Serializable
-import site.remlit.snowdrop.model.User
+import site.remlit.snowdrop.model.Account
 
 @Serializable
 data class SearchResponse(
-	val accounts: List<User> = emptyList(),
+	val accounts: List<Account> = emptyList(),
 	val statuses: List<String> = emptyList(),
 	val hashtags: List<Hashtag> = emptyList()
 ) {
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/util/Settings.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/util/Settings.kt
@@ -9,8 +9,9 @@ import com.russhwolf.settings.coroutines.toBlockingSettings
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.FlowCollector
 import site.remlit.snowdrop.api.verifyCredentials
-import site.remlit.snowdrop.model.User
-import site.remlit.snowdrop.util.config.json
+import site.remlit.snowdrop.model.Account
+import site.remlit.snowdrop.util.cache.getCacheEntry
+import site.remlit.snowdrop.util.cache.putCacheEntry
 
 @OptIn(ExperimentalSettingsApi::class)
 expect val settings: FlowSettings
@@ -50,8 +51,8 @@ fun setupAppSettings() {
  * @return User
  * */
 @OptIn(ExperimentalSettingsApi::class)
-fun getCurrentAccountObjectFlow(): Flow<User> = object : Flow<User> {
-	override suspend fun collect(collector: FlowCollector<User>) = safe {
+fun getCurrentAccountObjectFlow(): Flow<Account> = object : Flow<Account> {
+	override suspend fun collect(collector: FlowCollector<Account>) = safe {
 		if (getCurrentAccountId() == "")
 			return@safe
 
@@ -60,15 +61,15 @@ fun getCurrentAccountObjectFlow(): Flow<User> = object : Flow<User> {
 
 		collector.emit(
 			getCacheEntry("account_${getCurrentAccountId()}")!!
-				.getContent<User>()
+				.getContent<Account>()
 		)
 	}
 }
 
 suspend fun updateCurrentAccountObject() {
 	val verifyRes = verifyCredentials()
 	if (verifyRes.error) return
-	if (verifyRes.response !is User) return
+	if (verifyRes.response !is Account) return
 
 	putCacheEntry(
 		"account_${getCurrentAccountId()}",
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/util/cache/Cache.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/util/cache/Cache.kt
@@ -1,4 +1,4 @@
-package site.remlit.snowdrop.util
+package site.remlit.snowdrop.util.cache
 
 import com.russhwolf.settings.ExperimentalSettingsApi
 import com.russhwolf.settings.coroutines.FlowSettings
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/util/cache/Fetchers.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/util/cache/Fetchers.kt
@@ -0,0 +1,24 @@
+package site.remlit.snowdrop.util.cache
+
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.FlowCollector
+import site.remlit.snowdrop.api.accounts.getAccount
+import site.remlit.snowdrop.model.Account
+import site.remlit.snowdrop.util.safe
+
+/**
+ * Gets the cached representation of an account (if available) before
+ * the request to get a fresh version finishes.
+ * */
+fun fetchAccount(id: String): Flow<Account> = object : Flow<Account> {
+	override suspend fun collect(collector: FlowCollector<Account>) = safe {
+		val cached = getCacheEntry("account_$id")
+		if (cached != null) safe {
+			collector.emit(cached.getContent<Account>())
+		}
+
+		val req = getAccount(id)
+		if (!req.error && req.response != null)
+			collector.emit(req.response)
+	}
+}
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/view/ProfileView.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/view/ProfileView.kt
@@ -50,7 +50,7 @@ import site.remlit.snowdrop.component.HtmlContent
 import site.remlit.snowdrop.component.ViewSurface
 import site.remlit.snowdrop.component.bigAvatarRadius
 import site.remlit.snowdrop.component.bigAvatarSize
-import site.remlit.snowdrop.model.User
+import site.remlit.snowdrop.model.Account
 import site.remlit.snowdrop.util.LocalNavController
 import site.remlit.snowdrop.util.atRoute
 import site.remlit.snowdrop.util.extension.formatNumber
@@ -75,7 +75,7 @@ fun ProfileView(id: String) = ViewSurface {
 	val currentAccount by getCurrentAccountObjectFlow()
 		.collectAsStateWithLifecycle(null)
 
-	var account by remember { mutableStateOf<User?>(null) }
+	var account by remember { mutableStateOf<Account?>(null) }
 	var ready by remember { mutableStateOf(false) }
 
 	var isMe by remember { mutableStateOf(false) }
@@ -193,7 +193,7 @@ fun ProfileView(id: String) = ViewSurface {
 									).height((bigAvatarSize + 6).dp)
 										.width((bigAvatarSize + 6).dp)
 								)
-								Avatar(user = account!!, big = true)
+								Avatar(account = account!!, big = true)
 							}
 
 							Row(
diff --git a/shared/src/commonMain/kotlin/site/remlit/snowdrop/view/settings/SettingsDebugStorageView.kt b/shared/src/commonMain/kotlin/site/remlit/snowdrop/view/settings/SettingsDebugStorageView.kt
@@ -20,10 +20,10 @@ import com.russhwolf.settings.ExperimentalSettingsApi
 import org.jetbrains.compose.resources.painterResource
 import site.remlit.snowdrop.component.ViewSurface
 import site.remlit.snowdrop.util.LocalNavController
-import site.remlit.snowdrop.util.blockingCache
+import site.remlit.snowdrop.util.cache.blockingCache
 import site.remlit.snowdrop.util.blockingSettings
-import site.remlit.snowdrop.util.getCacheEntry
-import site.remlit.snowdrop.util.getCacheManifest
+import site.remlit.snowdrop.util.cache.getCacheEntry
+import site.remlit.snowdrop.util.cache.getCacheManifest
 import site.remlit.snowdrop.util.settings
 import snowdrop.shared.generated.resources.Res
 import snowdrop.shared.generated.resources.icon_arrow_back_24
