refactor: simplify dearrow requests by only accepting a single video id

Simplifies the code to request the dearrow content, by only accepting a single
video id, instead of multiple. While the PipedBackend does support retrieving
multiple videos at once (as opposed to the official API), we do not take
advantage of it.

Author: FineFindus

app/src/main/java/com/github/libretube/api/MediaServiceRepository.kt

@@ -25,7 +25,7 @@ interface MediaServiceRepository {
         actionType: List<String>? = null
     ): SegmentData
 
-    suspend fun getDeArrowContent(videoIds: String): Map<String, DeArrowContent>
+    suspend fun getDeArrowContent(videoId: String): DeArrowContent?
     suspend fun getCommentsNextPage(videoId: String, nextPage: String): CommentsPage
     suspend fun getSearchResults(searchQuery: String, filter: String): SearchResult
     suspend fun getSearchResultsNextPage(

app/src/main/java/com/github/libretube/api/NewPipeMediaServiceRepository.kt

@@ -360,18 +360,14 @@ class NewPipeMediaServiceRepository : MediaServiceRepository {
         videoId.sha256Sum().substring(0, 4), category, actionType
     ).first { it.videoID == videoId }
 
-    override suspend fun getDeArrowContent(videoIds: String): Map<String, DeArrowContent> =
-        videoIds.split(',').chunked(25).flatMap {
-            it.parallelMap { videoId ->
-                runCatching {
-                    RetrofitInstance.externalApi.getDeArrowContent(
-                        // use hashed video id for privacy
-                        // https://wiki.sponsor.ajay.app/w/API_Docs/DeArrow#GET_/api/branding/:sha256HashPrefix
-                        videoId.sha256Sum().substring(0, 4)
-                    )
-                }.getOrNull()
-            }
-        }.filterNotNull().reduce { acc, map -> acc + map }.mapValues { (videoId, value) ->
+    override suspend fun getDeArrowContent(videoId: String): DeArrowContent? =
+        runCatching {
+            RetrofitInstance.externalApi.getDeArrowContent(
+                // use hashed video id for privacy
+                // https://wiki.sponsor.ajay.app/w/API_Docs/DeArrow#GET_/api/branding/:sha256HashPrefix
+                videoId.sha256Sum().substring(0, 4)
+            )
+        }.getOrDefault(emptyMap())[videoId]?.let { value ->
             value.copy(
                 thumbnails = value.thumbnails.map { thumbnail ->
                     thumbnail.takeIf { it.original } ?: thumbnail.copy(

app/src/main/java/com/github/libretube/api/PipedMediaServiceRepository.kt

@@ -47,8 +47,8 @@ open class PipedMediaServiceRepository : MediaServiceRepository {
         JsonHelper.json.encodeToString(actionType)
     )
 
-    override suspend fun getDeArrowContent(videoIds: String): Map<String, DeArrowContent> =
-        api.getDeArrowContent(videoIds)
+    override suspend fun getDeArrowContent(videoId: String): DeArrowContent? =
+        api.getDeArrowContent(videoId)[videoId]
 
     override suspend fun getCommentsNextPage(videoId: String, nextPage: String): CommentsPage =
         api.getCommentsNextPage(videoId, nextPage)

app/src/main/java/com/github/libretube/ui/dialogs/SubmitDeArrowDialog.kt

@@ -73,7 +73,7 @@ class SubmitDeArrowDialog: DialogFragment() {
         val data = try {
             withContext(Dispatchers.IO) {
                 MediaServiceRepository.instance.getDeArrowContent(videoId)
-            }.getOrElse(videoId) { return }
+            } ?: return
         } catch (e: Exception) {
             return
         }

app/src/main/java/com/github/libretube/util/DeArrowUtil.kt

@@ -18,9 +18,10 @@ object DeArrowUtil {
     }
 
 
-    private suspend fun fetchDeArrowContent(videoId: String): Map<String, DeArrowContent>? {
+    private suspend fun fetchDeArrowContent(videoId: String): DeArrowContent? {
         return try {
             MediaServiceRepository.instance.getDeArrowContent(videoId)
+                .also { memoryCache.put(videoId, CacheObject(it)) }
         } catch (e: Exception) {
             Log.e(this::class.java.name, "Failed to fetch DeArrow content: ${e.message}")
             null
@@ -33,13 +34,11 @@ object DeArrowUtil {
     suspend fun deArrowStreams(streams: Streams, vidId: String): Streams {
         if (!PreferenceHelper.getBoolean(PreferenceKeys.DEARROW, false)) return streams
 
-        val response = fetchDeArrowContent(vidId) ?: return streams
+        val data = fetchDeArrowContent(vidId) ?: return streams
+        val (newTitle, newThumbnail) = extractTitleAndThumbnail(data)
 
-        response[vidId]?.let { data ->
-            val (newTitle, newThumbnail) = extractTitleAndThumbnail(data)
-            if (newTitle != null) streams.title = newTitle
-            if (newThumbnail != null) streams.thumbnailUrl = newThumbnail
-        }
+        if (newTitle != null) streams.title = newTitle
+        if (newThumbnail != null) streams.thumbnailUrl = newThumbnail
 
         return streams
     }
@@ -50,11 +49,7 @@ object DeArrowUtil {
     suspend fun deArrowVideoId(videoId: String): Pair<String?, String?>? {
         if (!PreferenceHelper.getBoolean(PreferenceKeys.DEARROW, false)) return null
 
-        val response = fetchDeArrowContent(videoId) ?: return null
-        response[videoId]?.let { data ->
-            return extractTitleAndThumbnail(data)
-        }
-
-        return null
+        val data = fetchDeArrowContent(videoId) ?: return null
+        return extractTitleAndThumbnail(data)
     }
 }