Added ability to reply to posts

Author: ihateblueb

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

@@ -130,7 +130,8 @@ data class StatusInteractionDetailRoute(
 data class ComposeRoute(
 	val inReplyToId: String? = null,
 	val cw: String = "",
-	val content: String = ""
+	val content: String = "",
+	val visibility: String? = null
 )
 
 @Serializable
@@ -426,7 +427,8 @@ fun App() = safe {
 									ComposeView(
 										args.inReplyToId,
 										args.cw,
-										args.content
+										args.content,
+										args.visibility
 									)
 								}
 

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

@@ -28,7 +28,10 @@ import snowdrop.shared.generated.resources.Res
 import snowdrop.shared.generated.resources.icon_warning_20px
 
 @Composable
-fun MiniStatus(status: Status) {
+fun MiniStatus(
+	status: Status,
+	showContentEvenIfCw: Boolean = false
+) {
 	val navHandler = LocalNavController.current
 
 	Column(
@@ -65,6 +68,15 @@ fun MiniStatus(status: Status) {
 				}
 			}
 
+			@Composable
+			fun Content() {
+				Row(
+					modifier = Modifier.padding(top = 5.dp)
+				) {
+					HtmlContent(status.content ?: "", status.mentions, maxLines = 3)
+				}
+			}
+
 			if (!status.spoilerText.isNullOrBlank()) {
 				Row(
 					modifier = Modifier.padding(top = 5.dp),
@@ -77,15 +89,9 @@ fun MiniStatus(status: Status) {
 						fontWeight = FontWeight.Medium
 					)
 				}
-			} else {
-				if (status.content != null) {
-					Row(
-						modifier = Modifier.padding(top = 5.dp)
-					) {
-						HtmlContent(status.content, status.mentions, maxLines = 3)
-					}
-				}
-			}
+
+				if (showContentEvenIfCw && status.content != null) Content()
+			} else if (status.content != null) Content()
 		}
 	}
 }

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

@@ -45,6 +45,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.toRoute
 import com.russhwolf.settings.ExperimentalSettingsApi
 import org.jetbrains.compose.resources.painterResource
+import site.remlit.snowdrop.ComposeRoute
 import site.remlit.snowdrop.ProfileRoute
 import site.remlit.snowdrop.StatusInteractionDetailRoute
 import site.remlit.snowdrop.ThreadRoute
@@ -358,14 +359,26 @@ fun Status(status: Status) {
 			}
 
 			/*
+			*
+			*
 			* Footer
+			*
+			*
 			*/
 			Row(
 				modifier = Modifier.padding(start = 5.dp, end = 5.dp),
 				horizontalArrangement = Arrangement.spacedBy(5.dp),
 				verticalAlignment = Alignment.CenterVertically
 			) {
-				FooterButton(onClick = { }) {
+				FooterButton(onClick = {
+					navHandler.navigate(ComposeRoute(
+						inReplyToId = realStatus.id,
+						cw = if (!realStatus.spoilerText.isNullOrBlank()) "RE: ${realStatus.spoilerText}" else "",
+						// what a block
+						content = (if (!isMine) "@${realStatus.account!!.acct} " else "") +
+							realStatus.mentions.joinToString(separator = "") { "@${it.acct} " }
+					))
+				}) {
 					if (realStatus.inReplyToId != null) Icon(
 						painterResource(Res.drawable.icon_reply_all_24px),
 						null

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

@@ -26,6 +26,14 @@ fun fetchAccount(id: String): Flow<Account> = flow {
 	}
 }
 
+/**
+ * Gets the cached representation of an account (if available) before
+ * the request to get a fresh version finishes. Returns null if ID is
+ * null.
+ * */
+fun fetchAccountOrNull(id: String?): Flow<Account?> =
+	if (id != null) fetchAccount(id) else flow { emit(null) }
+
 /**
  * Gets the cached representation of a status (if available) before
  * the request to get a fresh version finishes.
@@ -42,3 +50,11 @@ fun fetchStatus(id: String): Flow<Status> = flow {
 		putCacheEntry("status_$id", req.response)
 	}
 }
+
+/**
+ * Gets the cached representation of a status (if available) before
+ * the request to get a fresh version finishes. Returns null if ID is
+ * null.
+ * */
+fun fetchStatusOrNull(id: String?): Flow<Status?> =
+	if (id != null) fetchStatus(id) else flow { emit(null) }

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

@@ -51,13 +51,16 @@ import kotlinx.coroutines.runBlocking
 import org.jetbrains.compose.resources.painterResource
 import site.remlit.snowdrop.api.statuses.createStatus
 import site.remlit.snowdrop.component.Avatar
+import site.remlit.snowdrop.component.MiniStatus
 import site.remlit.snowdrop.component.ViewSurface
 import site.remlit.snowdrop.component.Visibility
 import site.remlit.snowdrop.model.request.CreateStatusRequest
 import site.remlit.snowdrop.util.LocalNavController
 import site.remlit.snowdrop.util.WarningColor25
 import site.remlit.snowdrop.util.bgIO
 import site.remlit.snowdrop.util.blockingSettings
+import site.remlit.snowdrop.util.cache.fetchStatus
+import site.remlit.snowdrop.util.cache.fetchStatusOrNull
 import site.remlit.snowdrop.util.getCurrentAccountObjectFlow
 import site.remlit.snowdrop.util.settings
 import snowdrop.shared.generated.resources.Res
@@ -74,7 +77,8 @@ import snowdrop.shared.generated.resources.icon_warning_24px
 fun ComposeView(
 	inReplyToId: String? = null,
 	initialCw: String = "",
-	initialContent: String = ""
+	initialContent: String = "",
+	visibility: String? = null
 ) = ViewSurface {
 	val navHandler = LocalNavController.current
 
@@ -90,13 +94,20 @@ fun ComposeView(
 
 	var cw by remember { mutableStateOf(initialCw) }
 	var content by remember { mutableStateOf(initialContent) }
-	var visibility by remember { mutableStateOf(blockingSettings.getString("default_visibility", "public")) }
+	var visibility by remember {
+		mutableStateOf(visibility
+			?: blockingSettings.getString("default_visibility", "public"))
+	}
+
+	val replyTarget by fetchStatusOrNull(inReplyToId)
+		.collectAsStateWithLifecycle(null)
 
 	// can submit stuff
 	canSubmit = !content.isBlank()
 
 	suspend fun sendPost() {
 		val res = createStatus(CreateStatusRequest(
+			inReplyToId = inReplyToId,
 			status = content,
 			spoilerText = cw,
 			visibility = visibility
@@ -112,7 +123,8 @@ fun ComposeView(
 			}
 		},
 		title = {
-			Text("Compose")
+			if (inReplyToId != null) Text("Reply")
+			else Text("Compose")
 		}
 	)
 
@@ -159,6 +171,7 @@ fun ComposeView(
 							expanded = visibilityDropdownOpen,
 							onDismissRequest = { visibilityDropdownOpen = !visibilityDropdownOpen }
 						) {
+							// todo: do minimum visibility based on the view's visibility parameter
 							DropdownMenuItem(
 								leadingIcon = {
 									Icon(painterResource(Res.drawable.icon_globe_20px) ,null)
@@ -248,6 +261,14 @@ fun ComposeView(
 				}
 			}
 
+			if (replyTarget != null)
+				Column(
+					modifier = Modifier.padding(horizontal = 10.dp)
+				) {
+					MiniStatus(replyTarget!!, showContentEvenIfCw = true)
+				}
+
+
 			Column(
 				modifier = Modifier.fillMaxHeight().weight(1f),
 				verticalArrangement = Arrangement.spacedBy(5.dp)