refactor: simplify argument passing

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt

@@ -205,8 +205,6 @@ fun LobstersApp(
           setWebUri("https://lobste.rs/s/$postId")
           CommentsPage(
             postId = postId,
-            getDetails = viewModel::getPostComments,
-            getLinkMetadata = viewModel::getLinkMetadata,
             postActions = postActions,
             htmlConverter = htmlConverter,
           )

android/src/main/kotlin/dev/msfjarvis/claw/android/ui/ext.kt

@@ -11,6 +11,8 @@ import dev.msfjarvis.claw.android.viewmodel.ClawViewModel
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.urllauncher.UrlLauncher
 import dev.msfjarvis.claw.database.local.SavedPost
+import dev.msfjarvis.claw.model.LinkMetadata
+import dev.msfjarvis.claw.model.LobstersPostDetails
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
@@ -61,6 +63,14 @@ fun rememberPostActions(
       override fun toggleSave(post: SavedPost) {
         viewModel.toggleSave(post)
       }
+
+      override suspend fun getComments(postId: String): LobstersPostDetails {
+        return viewModel.getPostComments(postId)
+      }
+
+      override suspend fun getLinkMetadata(url: String): LinkMetadata {
+        return viewModel.getLinkMetadata(url)
+      }
     }
   }
 }

common/src/main/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt

@@ -49,7 +49,6 @@ import java.time.temporal.TemporalAccessor
 @Composable
 fun CommentsHeader(
   postDetails: LobstersPostDetails,
-  getLinkMetadata: suspend (String) -> LinkMetadata,
   postActions: PostActions,
   htmlConverter: HTMLConverter,
   modifier: Modifier = Modifier,
@@ -59,7 +58,7 @@ fun CommentsHeader(
     produceState(
       initialValue = LinkMetadata(postDetails.url, null, null),
     ) {
-      value = getLinkMetadata(postDetails.url)
+      value = postActions.getLinkMetadata(postDetails.url)
     }
 
   Surface(color = MaterialTheme.colorScheme.background, modifier = modifier) {

common/src/main/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt

@@ -24,13 +24,11 @@ import dev.msfjarvis.claw.common.NetworkState.Success
 import dev.msfjarvis.claw.common.posts.PostActions
 import dev.msfjarvis.claw.common.ui.NetworkError
 import dev.msfjarvis.claw.common.ui.ProgressBar
-import dev.msfjarvis.claw.model.LinkMetadata
 import dev.msfjarvis.claw.model.LobstersPostDetails
 
 @Composable
 private fun CommentsPageInternal(
   details: LobstersPostDetails,
-  getLinkMetadata: suspend (String) -> LinkMetadata,
   postActions: PostActions,
   htmlConverter: HTMLConverter,
   modifier: Modifier = Modifier,
@@ -40,7 +38,6 @@ private fun CommentsPageInternal(
       item {
         CommentsHeader(
           postDetails = details,
-          getLinkMetadata = getLinkMetadata,
           postActions = postActions,
           htmlConverter = htmlConverter,
         )
@@ -76,19 +73,17 @@ private fun CommentsPageInternal(
   }
 }
 
-@Suppress("UNCHECKED_CAST", "LongParameterList")
+@Suppress("UNCHECKED_CAST")
 @Composable
 fun CommentsPage(
   postId: String,
-  getDetails: suspend (String) -> LobstersPostDetails,
-  getLinkMetadata: suspend (String) -> LinkMetadata,
   postActions: PostActions,
   htmlConverter: HTMLConverter,
   modifier: Modifier = Modifier,
 ) {
   val postDetails by
     produceState<NetworkState>(Loading) {
-      runCatching { getDetails(postId) }
+      runCatching { postActions.getComments(postId) }
         .fold(
           onSuccess = { details -> value = Success(details) },
           onFailure = { value = Error(error = it, description = "Failed to load comments") }
@@ -99,7 +94,6 @@ fun CommentsPage(
     is Success<*> -> {
       CommentsPageInternal(
         details = (postDetails as Success<LobstersPostDetails>).data,
-        getLinkMetadata = getLinkMetadata,
         postActions = postActions,
         htmlConverter = htmlConverter,
         modifier = modifier.fillMaxSize(),

common/src/main/kotlin/dev/msfjarvis/claw/common/posts/PostActions.kt

@@ -1,10 +1,14 @@
 package dev.msfjarvis.claw.common.posts
 
 import dev.msfjarvis.claw.database.local.SavedPost
+import dev.msfjarvis.claw.model.LinkMetadata
+import dev.msfjarvis.claw.model.LobstersPostDetails
 
 interface PostActions {
   fun viewPost(postUrl: String, commentsUrl: String)
   fun viewComments(postId: String)
   fun viewCommentsPage(commentsUrl: String)
   fun toggleSave(post: SavedPost)
+  suspend fun getComments(postId: String): LobstersPostDetails
+  suspend fun getLinkMetadata(url: String): LinkMetadata
 }