Merge pull request #743 from tunjid/bugfix/1.1.3

Bugfix/1.1.3

Author: tunjid

.github/workflows/publish.yml

@@ -2,9 +2,6 @@ name: Publish
 
 on:
   workflow_dispatch:
-  push:
-    tags:
-      - '*'
 
 jobs:
   publish-android-app:

data/core/src/commonMain/kotlin/com/tunjid/heron/data/network/VideoUploadService.kt

@@ -109,21 +109,23 @@ internal class SuspendingVideoUploadService @Inject constructor(
                 ),
             )
         }.mapCatchingUnlessCancelled { tokenResponse ->
-            videoUploadClient.post(UploadVideoEndpoint) {
-                url {
-                    parameters.append(
-                        name = DidQueryParam,
-                        value = authToken.authProfileId.id,
-                    )
-                    parameters.append(
-                        name = NameQueryParam,
-                        value = Clock.System.now().toEpochMilliseconds().toString(),
-                    )
+            fileManager.source(file).use { source ->
+                videoUploadClient.post(UploadVideoEndpoint) {
+                    url {
+                        parameters.append(
+                            name = DidQueryParam,
+                            value = authToken.authProfileId.id,
+                        )
+                        parameters.append(
+                            name = NameQueryParam,
+                            value = Clock.System.now().toEpochMilliseconds().toString(),
+                        )
+                    }
+                    bearerAuth(tokenResponse.token)
+                    contentType(ContentType.Video.MP4)
+                    setBody(ByteReadChannel(source))
+                    headers[ContentLengthHeaderKey] = fileManager.size(file).toString()
                 }
-                bearerAuth(tokenResponse.token)
-                contentType(ContentType.Video.MP4)
-                setBody(ByteReadChannel(fileManager.source(file)))
-                headers[ContentLengthHeaderKey] = fileManager.size(file).toString()
             }
                 .let {
                     if (it.status.isSuccess()) it.body<VideoUploadResponse>()

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/NotificationsRepository.kt

@@ -54,7 +54,13 @@ import sh.christian.ozone.api.response.AtpResponse
 @Serializable
 data class NotificationsQuery(
     override val data: CursorQuery.Data,
-) : CursorQuery
+) : CursorQuery {
+    init {
+        require(data.limit < 20) {
+            "Notification query limit must be less than 20 items"
+        }
+    }
+}
 
 interface NotificationsRepository {
     val unreadCount: Flow<Long>

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/PostRepository.kt

@@ -92,6 +92,7 @@ import com.tunjid.heron.data.utilities.toOutcome
 import com.tunjid.heron.data.utilities.with
 import com.tunjid.heron.data.utilities.withRefresh
 import dev.zacsweers.metro.Inject
+import io.ktor.utils.io.ByteReadChannel
 import kotlin.time.Clock
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.async
@@ -107,6 +108,7 @@ import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
+import kotlinx.io.Source
 import kotlinx.serialization.Serializable
 import sh.christian.ozone.api.AtUri
 import sh.christian.ozone.api.Cid
@@ -441,9 +443,9 @@ internal class OfflinePostRepository @Inject constructor(
                     request.metadata.embeddedMedia.map { file ->
                         async {
                             when (file) {
-                                is File.Media.Photo -> networkService.uploadImageBlob(
-                                    data = fileManager.readBytes(file),
-                                )
+                                is File.Media.Photo -> fileManager.source(file).use {
+                                    networkService.uploadImageBlob(data = it)
+                                }
                                 is File.Media.Video -> videoUploadService.uploadVideo(
                                     file = file,
                                 )
@@ -759,9 +761,9 @@ private fun CreateRecordResponse.successWithUri(): Pair<Boolean, String> =
     Pair(validationStatus is CreateRecordValidationStatus.Valid, uri.atUri)
 
 private suspend fun NetworkService.uploadImageBlob(
-    data: ByteArray,
+    data: Source,
 ): Result<Blob> = runCatchingWithMonitoredNetworkRetry {
-    api.uploadBlob(data)
+    api.uploadBlob(ByteReadChannel(data))
         .map(UploadBlobResponse::blob)
 }
 

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/ProfileRepository.kt

@@ -81,6 +81,7 @@ import com.tunjid.heron.data.utilities.toOutcome
 import com.tunjid.heron.data.utilities.toProfileWithViewerStates
 import com.tunjid.heron.data.utilities.withRefresh
 import dev.zacsweers.metro.Inject
+import io.ktor.utils.io.ByteReadChannel
 import kotlin.time.Clock
 import kotlinx.coroutines.async
 import kotlinx.coroutines.awaitAll
@@ -614,8 +615,9 @@ internal class OfflineProfileRepository @Inject constructor(
                 async {
                     if (file == null) return@async null
                     networkService.runCatchingWithMonitoredNetworkRetry {
-                        val bytes = fileManager.readBytes(file)
-                        uploadBlob(bytes)
+                        fileManager.source(file).use { source ->
+                            uploadBlob(ByteReadChannel(source))
+                        }
                     }
                         .onSuccess { fileManager.delete(file) }
                         .getOrNull()
@@ -629,7 +631,7 @@ internal class OfflineProfileRepository @Inject constructor(
                 async {
                     if (file == null) null
                     else networkService.runCatchingWithMonitoredNetworkRetry {
-                        uploadBlob(file.data)
+                        uploadBlob(ByteReadChannel(file.data))
                     }
                         .getOrNull()
                         ?.blob

data/core/src/commonMain/kotlin/com/tunjid/heron/data/repository/TimelineRepository.kt

@@ -1162,7 +1162,8 @@ internal class OfflineTimelineRepository(
                 else Unit
 
             // New reply to the OP, start its own thread
-            lastItem is TimelineItem.Thread && lastItem.posts.first().uri != thread.rootPostUri -> list += TimelineItem.Thread(
+            lastItem is TimelineItem.Thread &&
+                lastItem.posts.first().uri != thread.rootPostUri -> list += TimelineItem.Thread(
                 id = thread.entity.uri.uri,
                 generation = thread.generation,
                 anchorPostIndex = 0,
@@ -1172,17 +1173,23 @@ internal class OfflineTimelineRepository(
                 signedInProfileId = signedInProfileId,
                 postUrisToThreadGates = mapOf(post.uri to threadGate(post.uri)),
             )
-
             // Just tack the post to the current thread
-            lastItem is TimelineItem.Thread -> list[list.lastIndex] = lastItem.copy(
-                posts = lastItem.posts + post,
-                postUrisToThreadGates = lastItem.postUrisToThreadGates + (post.uri to threadGate(post.uri)),
-            )
+            lastItem is TimelineItem.Thread ->
+                // Make sure only consecutive generations are added to the thread.
+                // Nonconsecutive generations are dropped. Users can see these replies by
+                // diving into the thread.
+                if (lastItem.nextGeneration == thread.generation) list[list.lastIndex] = lastItem.copy(
+                    posts = lastItem.posts + post,
+                    postUrisToThreadGates = lastItem.postUrisToThreadGates + (post.uri to threadGate(post.uri)),
+                )
             else -> Unit
         }
     }
 }
 
+private val TimelineItem.Thread.nextGeneration
+    get() = generation?.let { it + posts.size }
+
 private fun TimelinePreferencesEntity?.preferredPresentation(): Timeline.Presentation =
     when (this?.preferredPresentation) {
         Timeline.Presentation.Media.Expanded.key -> Timeline.Presentation.Media.Expanded

data/database/src/commonMain/kotlin/com/tunjid/heron/data/database/daos/PostDao.kt

@@ -318,12 +318,13 @@ interface PostDao {
             WITH RECURSIVE
               -- 1. ParentHierarchy CTE: Recursively finds all parent URIs for the given post
               -- and calculates their generation (negative).
-              ParentHierarchy(uri, rootPostUri, generation, sort) AS (
+              ParentHierarchy(uri, rootPostUri, generation, ancestorCreated, postCreated) AS (
                 SELECT
                   pt.parentPostUri, -- each parent is its own root
                   pt.postUri AS rootPostUri,
                   -1 AS generation,
-                  -1 AS sort -- sort parents of the OP strictly by their generation
+                  -1 AS ancestorCreated, -- Always a negative constant for ancestors
+                  -1 AS postCreated -- Always a negative constant for ancestors
                 FROM
                   postThreads pt
                 WHERE postUri = :postUri
@@ -332,7 +333,8 @@ interface PostDao {
                   pt.parentPostUri,
                   ph.rootPostUri,
                   ph.generation - 1,
-                  ph.sort -1
+                  ph.ancestorCreated - 1,
+                  ph.postCreated - 1
                 FROM
                   postThreads pt
                 INNER JOIN
@@ -341,12 +343,13 @@ interface PostDao {
 
               -- 2. ChildHierarchy CTE: Recursively finds all child URIs for the given post
               -- and calculates their generation (positive).
-              ChildHierarchy(uri, rootPostUri, generation, sort) AS (
+              ChildHierarchy(uri, rootPostUri, generation, ancestorCreated, postCreated) AS (
                 SELECT
                   pt.postUri,
                   pt.postUri AS rootPostUri, -- add the very first reply to the OP as the root
                   1 AS generation,
-                  p.createdAt as sort -- sort all replies by the very first reply to the OP
+                  p.createdAt as ancestorCreated, -- sort all replies by the very first reply to the OP
+                  p.createdAt as postCreated -- second sort is the actual post's createdAt
                 FROM
                   postThreads pt
                 JOIN posts p ON pt.postUri = p.uri
@@ -357,21 +360,23 @@ interface PostDao {
                   pt.postUri,
                   ch.rootPostUri,
                   ch.generation + 1,
-                  ch.sort
+                  ch.ancestorCreated, -- preserve the ancestorCreatedDate in the thread
+                  p.createdAt -- pull in the actual post's createdAt date
                 FROM
                   postThreads pt
+                INNER JOIN posts p ON pt.postUri = p.uri
                 INNER JOIN
                   ChildHierarchy ch ON pt.parentPostUri = ch.uri
               ),
 
               -- 3. FullThread CTE: Combines the URIs and generations from parents, children,
               -- and the post itself (generation 0).
-              FullThread(uri, rootPostUri, generation, sort) AS (
-                SELECT uri, rootPostUri, generation, sort FROM ParentHierarchy
+              FullThread(uri, rootPostUri, generation, ancestorCreated, postCreated) AS (
+                SELECT uri, rootPostUri, generation, ancestorCreated, postCreated FROM ParentHierarchy
                 UNION
-                SELECT uri, rootPostUri, generation, sort FROM ChildHierarchy
+                SELECT uri, rootPostUri, generation, ancestorCreated, postCreated FROM ChildHierarchy
                 UNION
-                SELECT :postUri, NULL, 0, 0
+                SELECT :postUri, NULL, 0, 0, 0
               )
 
             -- 4. Final SELECT: Fetches all columns from the `posts` table for every URI
@@ -380,13 +385,14 @@ interface PostDao {
               p.*,
               ft.rootPostUri AS rootPostUri,
               ft.generation AS generation,
-              ft.sort AS sort
+              ft.ancestorCreated AS ancestorCreated,
+              ft.postCreated AS postCreated
             FROM
               posts p
             JOIN
               FullThread ft ON p.uri = ft.uri
             ORDER BY
-              ft.sort, ft.generation; -- sort by the first reply to the op, then the generation
+              ft.ancestorCreated, ft.generation, ft.postCreated; -- sort by the first reply to the op, then the generation, then the post itself
         """,
     )
     fun postThread(

data/files/src/commonMain/kotlin/com/tunjid/heron/data/files/FileKitFileManager.kt

@@ -29,12 +29,10 @@ import io.github.vinceglb.filekit.extension
 import io.github.vinceglb.filekit.name
 import io.github.vinceglb.filekit.nameWithoutExtension
 import io.github.vinceglb.filekit.path
-import io.github.vinceglb.filekit.readBytes
 import io.github.vinceglb.filekit.size
 import io.github.vinceglb.filekit.source
 import io.github.vinceglb.filekit.write
 import kotlin.time.Clock
-import kotlinx.io.IOException
 import kotlinx.io.Source
 import kotlinx.io.buffered
 
@@ -87,14 +85,6 @@ internal class FileKitFileManager : FileManager {
         }
     }
 
-    override suspend fun readBytes(
-        file: File,
-    ): ByteArray {
-        val cachedFile = file.toPlatformFile()
-        return if (cachedFile.exists()) cachedFile.readBytes()
-        else throw IOException("File does not exist")
-    }
-
     override suspend fun source(
         file: File,
     ): Source =

data/files/src/commonMain/kotlin/com/tunjid/heron/data/files/FileManager.kt

@@ -24,10 +24,6 @@ interface FileManager {
         restrictedFile: RestrictedFile,
     ): File?
 
-    suspend fun readBytes(
-        file: File,
-    ): ByteArray
-
     suspend fun source(
         file: File,
     ): Source

data/lexicons/build.gradle.kts

@@ -1,4 +1,5 @@
 import sh.christian.ozone.api.generator.ApiReturnType
+import sh.christian.ozone.api.generator.BinaryDataType
 
 plugins {
     id("android-library-convention")
@@ -49,6 +50,12 @@ lexicons {
     defaults {
         generateUnknownsForSealedTypes.set(true)
         generateUnknownsForEnums.set(true)
+        binaryDataType.set(
+            BinaryDataType.Custom(
+                packageName = "io.ktor.utils.io",
+                simpleNames = listOf("ByteReadChannel"),
+            ),
+        )
     }
 
     generateApi("BlueskyApi") {