Merge remote-tracking branch 'origin/master'

# Conflicts:
#	shared/src/commonMain/kotlin/site/remlit/snowdrop/App.kt

Author: ihateblueb

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

@@ -86,7 +86,7 @@ object MyProfileRoute : Destination(5)
 @Serializable
 data class ProfileRoute(val id: String) : Destination(6)
 @Serializable
-data class StatusRoute(val id: String) : Destination(7)
+data class ThreadRoute(val id: String) : Destination(7)
 @Serializable
 object ComposeRoute : Destination(8)
 
@@ -279,9 +279,9 @@ fun App() = safe {
 								else Text("Error")
 							}
 
-							composable<StatusRoute> {
-								val args = it.toRoute<StatusRoute>()
-								StatusView(args.id)
+							composable<ThreadRoute> {
+								val args = it.toRoute<ThreadRoute>()
+								ThreadView(args.id)
 							}
 							composable<ProfileRoute> {
 								val args = it.toRoute<ProfileRoute>()

shared/src/commonMain/kotlin/site/remlit/snowdrop/api/statuses/getStatusContext.kt

@@ -0,0 +1,25 @@
+package site.remlit.snowdrop.api.statuses
+
+import com.russhwolf.settings.ExperimentalSettingsApi
+import io.ktor.client.request.*
+import site.remlit.snowdrop.model.ApiResponse
+import site.remlit.snowdrop.model.StatusContext
+import site.remlit.snowdrop.util.config.endOfRequest
+import site.remlit.snowdrop.util.getCurrentAccountHost
+import site.remlit.snowdrop.util.getCurrentAccountId
+import site.remlit.snowdrop.util.config.httpClient
+import site.remlit.snowdrop.util.safeApiRequest
+import site.remlit.snowdrop.util.settings
+
+@OptIn(ExperimentalSettingsApi::class)
+suspend fun getStatusContext(id: String): ApiResponse<StatusContext> = safeApiRequest {
+	val accountId = getCurrentAccountId()
+	val host = getCurrentAccountHost()
+	val token = settings.getString("account_${accountId}_token", "")
+
+	val req = httpClient.get("https://$host/api/v1/statuses/$id/context") {
+		header("Authorization", "Bearer $token")
+	}
+
+	endOfRequest(req)
+}

shared/src/commonMain/kotlin/site/remlit/snowdrop/component/MiniStatus.kt

@@ -20,7 +20,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.jetbrains.compose.resources.painterResource
-import site.remlit.snowdrop.StatusRoute
+import site.remlit.snowdrop.ThreadRoute
 import site.remlit.snowdrop.model.Status
 import site.remlit.snowdrop.util.LocalNavController
 import site.remlit.snowdrop.util.extension.toRelativeString
@@ -36,15 +36,15 @@ fun MiniStatus(status: Status) {
 			.clip(RoundedCornerShape(10.dp))
 			.border(1.dp, MaterialTheme.colorScheme.surfaceContainerHigh, RoundedCornerShape(10.dp))
 			.clickable(onClick = {
-				navHandler.navigate(StatusRoute(status.id))
+				navHandler.navigate(ThreadRoute(status.id!!))
 			})
 	) {
 		Column(modifier = Modifier.padding(10.dp)) {
 			Row(
 				horizontalArrangement = Arrangement.spacedBy(5.dp),
 				verticalAlignment = Alignment.CenterVertically
 			) {
-				Avatar(status.account, small = true)
+				Avatar(status.account!!, small = true)
 				Text(
 					status.account.displayName ?: status.account.username,
 					fontWeight = FontWeight.Bold,
@@ -61,7 +61,7 @@ fun MiniStatus(status: Status) {
 						"${status.getCreatedAtTimestamp()?.toRelativeString()}",
 						fontSize = 13.sp
 					)
-					Visibility(status.visibility)
+					Visibility(status.visibility!!)
 				}
 			}
 

shared/src/commonMain/kotlin/site/remlit/snowdrop/component/Status.kt

@@ -37,7 +37,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.russhwolf.settings.ExperimentalSettingsApi
 import org.jetbrains.compose.resources.painterResource
 import site.remlit.snowdrop.ProfileRoute
-import site.remlit.snowdrop.StatusRoute
+import site.remlit.snowdrop.ThreadRoute
 import site.remlit.snowdrop.component.dropdown.DangerDropdownItem
 import site.remlit.snowdrop.model.Status
 import site.remlit.snowdrop.model.User
@@ -87,7 +87,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 isMine by remember { mutableStateOf(realStatus.account.id == currentAccount?.id) }
+	var isMine by remember { mutableStateOf(realStatus.account?.id == currentAccount?.id) }
 	//todo: or is admin? figure out how to do that
 
 	if (status.reblog != null) {
@@ -119,9 +119,9 @@ fun Status(status: Status) {
 	Column(
 		modifier = Modifier.clickable(
 				// todo: fix this when we add ascendants/descendants (idk how to get the id of the current view)
-				enabled = !atRoute<StatusRoute>(currentDest),
+				enabled = !atRoute<ThreadRoute>(currentDest),
 				onClick = {
-					navHandler.navigate(StatusRoute(realStatus.id))
+					navHandler.navigate(ThreadRoute(realStatus.id!!))
 				}
 			)
 	) {
@@ -175,26 +175,26 @@ fun Status(status: Status) {
 				Column(
 					modifier = Modifier.padding(end = 10.dp)
 						.clickable(onClick = {
-							navHandler.navigate(ProfileRoute(realStatus.account.id))
+							navHandler.navigate(ProfileRoute(realStatus.account?.id!!))
 						})
 				) {
-					Avatar(realStatus.account)
+					Avatar(realStatus.account!!)
 				}
 
 				Column(
 					modifier = Modifier.weight(1f)
 						.clickable(onClick = {
-							navHandler.navigate(ProfileRoute(realStatus.account.id))
+							navHandler.navigate(ProfileRoute(realStatus.account?.id!!))
 						})
 				) {
 					Text(
-						realStatus.account.displayName ?: realStatus.account.username,
+						realStatus.account?.displayName ?: realStatus.account?.username!!,
 						fontWeight = FontWeight.Medium,
 						overflow = TextOverflow.Ellipsis,
 						maxLines = 1
 					)
 					Text(
-						"@${realStatus.account.acct}",
+						"@${realStatus.account?.acct}",
 						overflow = TextOverflow.Ellipsis,
 						color = MaterialTheme.colorScheme.onSurfaceVariant,
 						fontSize = 13.sp,
@@ -208,7 +208,7 @@ fun Status(status: Status) {
 					Column(
 						horizontalAlignment = Alignment.CenterHorizontally
 					) {
-						Visibility(status.visibility)
+						Visibility(status.visibility!!)
 						Text(
 							"${realStatus.getCreatedAtTimestamp()?.toRelativeString()}",
 							fontSize = 13.sp
@@ -381,7 +381,7 @@ fun Status(status: Status) {
 									Icon(painterResource(Res.drawable.icon_link_24px), null)
 								},
 								onClick = {
-									clipboardManager.setText(AnnotatedString(status.url))
+									clipboardManager.setText(AnnotatedString(realStatus.url!!))
 									showDropdown = !showDropdown
 								}
 							)
@@ -392,7 +392,7 @@ fun Status(status: Status) {
 									Icon(painterResource(Res.drawable.icon_open_in_new_24px), null)
 								},
 								onClick = {
-									uriHandler.openUri(status.url)
+									uriHandler.openUri(realStatus.url!!)
 									showDropdown = !showDropdown
 								}
 							)

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

@@ -7,8 +7,8 @@ import kotlin.time.Instant
 
 @Serializable
 data class Status(
-	val id: String,
-	val account: User,
+	val id: String? = null,
+	val account: User? = null,
 
 	@SerialName("spoiler_text")
 	val spoilerText: String? = null,
@@ -50,7 +50,7 @@ data class Status(
 	val sensitive: Boolean = false,
 	val pinned: Boolean = false,
 
-	val visibility: String,
+	val visibility: String? = null,
 
 	val poll: Poll? = null,
 	val filtered: List<Filtered>? = null,
@@ -61,7 +61,7 @@ data class Status(
 	val reactions: List<Reaction> = listOf(),
 	val tags: List<Tag> = listOf(),
 
-	val card: String? = null,
+	val card: Unit? = null,
 	val application: Unit? = null,
 	val language: String? = null,
 
@@ -70,7 +70,7 @@ data class Status(
 	val quotedStatus: Status? = null,
 
 	@SerialName("created_at")
-	val createdAt: String,
+	val createdAt: String? = null,
 	@SerialName("edited_at")
 	val editedAt: String? = null,
 ) {
@@ -177,7 +177,7 @@ data class Status(
 			data class Original(
 				val width: Long = 0,
 				val height: Long = 0,
-				val size: String,
+				val size: String? = null,
 				val aspect: Double = 0.0,
 			)
 		}
@@ -204,6 +204,6 @@ data class Status(
 
 	// Instants
 	fun getCreatedAtTimestamp(): Instant? = safeReturnable {
-		Instant.parse(this.createdAt)
+		Instant.parse(this.createdAt!!)
 	}
 }

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

@@ -0,0 +1,10 @@
+package site.remlit.snowdrop.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class StatusContext(
+	val ancestors: List<Status>,
+	val descendants: List<Status>
+)

…/site/remlit/snowdrop/view/StatusView.kt …/site/remlit/snowdrop/view/ThreadView.ktshared/src/commonMain/kotlin/site/remlit/snowdrop/view/StatusView.kt renamed to shared/src/commonMain/kotlin/site/remlit/snowdrop/view/ThreadView.kt shared/src/commonMain/kotlin/site/remlit/snowdrop/view/StatusView.kt renamed to shared/src/commonMain/kotlin/site/remlit/snowdrop/view/ThreadView.kt

@@ -4,13 +4,17 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -20,17 +24,27 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import kotlinx.coroutines.Dispatchers
 import site.remlit.snowdrop.api.statuses.getStatus
+import site.remlit.snowdrop.api.statuses.getStatusContext
+import site.remlit.snowdrop.api.timeline.getHomeTimeline
+import site.remlit.snowdrop.component.Status
 import site.remlit.snowdrop.component.ViewSurface
 import site.remlit.snowdrop.model.Status
+import site.remlit.snowdrop.model.StatusContext
 import site.remlit.snowdrop.util.getCurrentAccountObjectFlow
 import site.remlit.snowdrop.component.Status as StatusComponent
 
 @Composable
-fun StatusView(id: String) = ViewSurface {
+fun ThreadView(id: String, status: Status? = null) = ViewSurface {
 	val currentAccount by getCurrentAccountObjectFlow()
 		.collectAsStateWithLifecycle(null)
 
-	var status by remember { mutableStateOf<Status?>(null) }
+	var status by remember { mutableStateOf(status) }
+
+	val threadStatuses = remember { mutableStateListOf<Status>() }
+	val context = remember { mutableStateOf<StatusContext?>(null) }
+
+	val listState = rememberLazyListState()
+
 	var ready by remember { mutableStateOf(false) }
 
 	val scrollState = rememberScrollState()
@@ -41,7 +55,18 @@ fun StatusView(id: String) = ViewSurface {
 		if (req.error) return@LaunchedEffect
 		status = req.response
 
+		threadStatuses.clear()
+		threadStatuses.add(status!!)
+		val res = getStatusContext(status!!.id!!)
+		if (res.error) return@LaunchedEffect
+		if (res.response == null) return@LaunchedEffect
+		context.value = res.response
+		threadStatuses.addAll(0, res.response.ancestors)
+		threadStatuses.addAll(res.response.descendants)
+
 		ready = true
+
+		listState.scrollToItem(threadStatuses.indexOf(threadStatuses.find { sts -> status!!.id == sts.id }))
 	}
 
 	TopAppBar(
@@ -51,7 +76,7 @@ fun StatusView(id: String) = ViewSurface {
 			}
 			else Column {
 				Text(
-					"Post by " + (status!!.account.displayName ?: status!!.account.username),
+					"Post by " + (status!!.account?.displayName ?: status!!.account?.username),
 					maxLines = 1,
 					overflow = TextOverflow.Ellipsis
 				)
@@ -68,6 +93,17 @@ fun StatusView(id: String) = ViewSurface {
 			CircularProgressIndicator()
 		}
 	} else {
-		StatusComponent(status!!)
+		LazyColumn(
+			state = listState,
+		) {
+			items(
+				items = threadStatuses,
+				key = { status ->
+					status.id!!
+				}
+			) { status ->
+				StatusComponent(status)
+			}
+		}
 	}
 }

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

@@ -148,12 +148,12 @@ fun TimelineView() = ViewSurface {
 				items(
 					items = timeline,
 					key = { status ->
-						status.id
+						status.id!!
 					}
 				) { status ->
 					Status(status)
 				}
 			}
 		}
 	}
-}
+}