Make cache account specific and fix oauth parsing

Author: ihateblueb

shared/src/commonMain/kotlin/site/remlit/snowdrop/App.kt

@@ -42,6 +42,7 @@ import com.russhwolf.settings.ExperimentalSettingsApi
 import io.kamel.image.KamelImage
 import io.kamel.image.asyncPainterResource
 import io.kamel.image.config.LocalKamelConfig
+import io.ktor.http.Url
 import kotlinx.serialization.Serializable
 import org.jetbrains.compose.resources.painterResource
 import site.remlit.snowdrop.component.AppTheme
@@ -57,6 +58,7 @@ import site.remlit.snowdrop.util.scrollingUpward
 import site.remlit.snowdrop.util.settings
 import site.remlit.snowdrop.util.setupAppSettings
 import site.remlit.snowdrop.util.cache.setupCache
+import site.remlit.snowdrop.util.safeReturnable
 import site.remlit.snowdrop.view.*
 import site.remlit.snowdrop.view.settings.*
 import snowdrop.shared.generated.resources.Res
@@ -122,13 +124,11 @@ fun App() = safe {
 
 	DisposableEffect(Unit) {
 		ExternalUriHandler.listener = { uri ->
-			Logger.d { "URI received: $uri" }
+			val parsed = safeReturnable { Url(uri) }
+			Logger.d { "URI received & parsed: $parsed" }
 
-			if (uri.startsWith("snowdrop://oauth-callback?code="))
-				blockingSettings.putString(
-					"oauth_callback",
-					uri.replace("snowdrop://oauth-callback?code=", "")
-				)
+			if (parsed?.host == "oauth-callback" && parsed.parameters.contains("code"))
+				blockingSettings.putString("oauth_callback", parsed.parameters["code"]!!)
 
 			// if any other URIs need to be configured, they can be added here
 		}

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

@@ -0,0 +1,5 @@
+package site.remlit.snowdrop.api
+
+fun getInstance(auth: Boolean = false) {
+
+}

shared/src/commonMain/kotlin/site/remlit/snowdrop/model/InstanceV1.kt

@@ -84,10 +84,15 @@ data class InstanceV1(
 		data class MediaAttachments(
 			@SerialName("supported_mine_types")
 			val supportedMimeTypes: List<String> = emptyList(),
+			@SerialName("image_size_limit")
 			val imageSizeLimit: Int = 0,
+			@SerialName("image_matrix_limit")
 			val imageMatrixLimit: Int = 0,
+			@SerialName("video_size_limit")
 			val videoSizeLimit: Int = 0,
+			@SerialName("video_frame_limit")
 			val videoFrameLimit: Int = 0,
+			@SerialName("video_matrix_limit")
 			val videoMatrixLimit: Int = 0,
 		)
 

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

@@ -55,7 +55,7 @@ fun setupAppSettings() {
  * */
 @OptIn(ExperimentalSettingsApi::class)
 fun getCurrentAccountObjectFlow(): Flow<Account> = flow {
-	if (getCurrentAccountId() == "")
+	if (!settings.getBoolean("logged_in", false))
 		return@flow
 
 	if (getCacheEntry("account_${getCurrentAccountId()}") == null)

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

@@ -10,6 +10,7 @@ import site.remlit.snowdrop.model.cache.CacheEntry
 import site.remlit.snowdrop.model.cache.CacheManifest
 import site.remlit.snowdrop.util.config.cbor
 import site.remlit.snowdrop.util.config.json
+import site.remlit.snowdrop.util.getCurrentAccountId
 
 /* I don't think this will be used, but i'm keeping it just in case */
 @OptIn(ExperimentalSettingsApi::class)
@@ -21,23 +22,23 @@ val blockingCache = cache.toBlockingSettings()
 
 @OptIn(ExperimentalSerializationApi::class)
 fun setupCache() {
-	if (blockingCache.hasKey("manifest")) return
+	if (blockingCache.hasKey("${getCurrentAccountId()}_manifest")) return
 	blockingCache.putString(
-		"manifest",
+		"${getCurrentAccountId()}_manifest",
 		cbor.encodeToHexString(CacheManifest())
 	)
 }
 
 @OptIn(ExperimentalSerializationApi::class)
 fun getCacheManifest(): CacheManifest {
-	val raw = blockingCache.getStringOrNull("manifest")
+	val raw = blockingCache.getStringOrNull("${getCurrentAccountId()}_manifest")
 		?: return CacheManifest()
 	return cbor.decodeFromHexString(raw)
 }
 
 @OptIn(ExperimentalSerializationApi::class)
 fun getCacheEntry(id: String): CacheEntry? {
-	val raw = blockingCache.getStringOrNull("entry_$id")
+	val raw = blockingCache.getStringOrNull("${getCurrentAccountId()}_entry_$id")
 		?: return null
 	return cbor.decodeFromHexString(raw)
 }
@@ -54,14 +55,14 @@ inline fun <reified T> putCacheEntry(
 
 	val manifest = getCacheManifest()
 	blockingCache.putString(
-		"manifest",
+		"${getCurrentAccountId()}_manifest",
 		cbor.encodeToHexString(
 			manifest.copy(ids = manifest.ids.plus(id).distinct())
 		)
 	)
 
 	blockingCache.putString(
-		"entry_$id",
+		"${getCurrentAccountId()}_entry_$id",
 		cbor.encodeToHexString(entry)
 	)
 }

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

@@ -128,10 +128,8 @@ fun LoginView(
 		navigateToTimeline()
 	}
 
-	if (!oauthCallbackCode.isNullOrBlank()) {
-		Logger.e("MEOW! CONTENT IS $oauthCallbackCode")
+	if (!oauthCallbackCode.isNullOrBlank())
 		finishButtonPressed()
-	}
 
 	if (!continued) {
 		Column(