Switch currentAccount to use cache over settings, fix useless passing of token

Author: ihateblueb

shared/src/commonMain/kotlin/site/remlit/snowdrop/api/verifyCredentials.kt

@@ -13,11 +13,10 @@ import site.remlit.snowdrop.util.safeApiRequest
 import site.remlit.snowdrop.util.settings
 
 @OptIn(ExperimentalSettingsApi::class)
-suspend fun verifyCredentials(token: String? = null): ApiResponse<User> = safeApiRequest {
+suspend fun verifyCredentials(): ApiResponse<User> = safeApiRequest {
 	val host = getCurrentAccountHost()
 	val accountId = getCurrentAccountId()
-	val token = token
-		?: settings.getString("account_${accountId}_token", "")
+	val token = settings.getString("account_${accountId}_token", "")
 
 	val req = httpClient.get("https://$host/api/v1/accounts/verify_credentials") {
 		header("Authorization", "Bearer $token")

shared/src/commonMain/kotlin/site/remlit/snowdrop/model/cache/CacheEntry.kt

@@ -4,13 +4,14 @@ import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.decodeFromHexString
 import site.remlit.snowdrop.util.config.cbor
+import kotlin.time.Clock
 import kotlin.time.Instant
 
 @Serializable
 data class CacheEntry(
 	val id: String,
 	val content: String,
-	val expiresAt: Instant
+	val createdAt: Instant = Clock.System.now()
 ) {
 	@OptIn(ExperimentalSerializationApi::class)
 	inline fun <reified T> getContent(): T {

shared/src/commonMain/kotlin/site/remlit/snowdrop/util/Cache.kt

@@ -41,6 +41,30 @@ fun getCacheEntry(id: String): CacheEntry? {
 	return cbor.decodeFromHexString(raw)
 }
 
+@OptIn(ExperimentalSerializationApi::class)
+inline fun <reified T> putCacheEntry(
+	id: String,
+	content: T
+) {
+	val entry = CacheEntry(
+		id,
+		cbor.encodeToHexString<T>(content)
+	)
+
+	val manifest = getCacheManifest()
+	blockingCache.putString(
+		"manifest",
+		cbor.encodeToHexString(
+			manifest.copy(ids = manifest.ids.plus(id).distinct())
+		)
+	)
+
+	blockingCache.putString(
+		"entry_$id",
+		cbor.encodeToHexString(entry)
+	)
+}
+
 fun cleanExpiredCacheEntries() {
 
 }

shared/src/commonMain/kotlin/site/remlit/snowdrop/util/Settings.kt

@@ -55,27 +55,25 @@ fun getCurrentAccountObjectFlow(): Flow<User> = object : Flow<User> {
 		if (getCurrentAccountId() == "")
 			return@safe
 
-		if (settings.getStringOrNull("account_${getCurrentAccountId()}_user") == null)
+		if (getCacheEntry("account_${getCurrentAccountId()}") == null)
 			updateCurrentAccountObject()
 
-		val user = json.decodeFromString<User>(
-			settings.getString("account_${getCurrentAccountId()}_user", "")
+		collector.emit(
+			getCacheEntry("account_${getCurrentAccountId()}")!!
+				.getContent<User>()
 		)
-
-		collector.emit(user)
 	}
 }
 
-suspend fun updateCurrentAccountObject(token: String? = null) {
-	val verifyRes = verifyCredentials(token)
+suspend fun updateCurrentAccountObject() {
+	val verifyRes = verifyCredentials()
 	if (verifyRes.error) return
 	if (verifyRes.response !is User) return
 
-	blockingSettings.putString(
-		"account_${getCurrentAccountId()}_user",
-		json.encodeToString(verifyRes.response)
+	putCacheEntry(
+		"account_${getCurrentAccountId()}",
+		verifyRes.response
 	)
-	blockingSettings.putString("account_${getCurrentAccountId()}_token", token!!)
 }
 
 /** Used for compose post FAB */

shared/src/commonMain/kotlin/site/remlit/snowdrop/view/LoginView.kt

@@ -119,7 +119,7 @@ fun LoginView(
 			blockingSettings.putString("account_${currentAccountId}_token", res.response.accessToken)
 			blockingSettings.putBoolean("logged_in", true)
 
-			updateCurrentAccountObject(res.response.accessToken)
+			updateCurrentAccountObject()
 		}
 
 		navigateToTimeline()

shared/src/commonMain/kotlin/site/remlit/snowdrop/view/settings/SettingsDebugStorageView.kt

@@ -102,8 +102,12 @@ fun SettingsDebugStorageView(
 				HorizontalDivider()
 
 				blockingCache.keys.forEach {
-					if (!it.startsWith("e_")) return@forEach
-					renderKeyVal(it, getCacheEntry(it).toString())
+					if (!it.startsWith("entry_")) return@forEach
+					renderKeyVal(
+						it,
+						getCacheEntry(it.replace("entry_", ""))
+							.toString()
+					)
 				}
 			}
 		}