Fix: show the correct article extracts for the featured article in (#4933)

zhwiki

Co-authored-by: Dmitry Brant <[email protected]>

Author: cooltey

app/src/main/java/org/wikipedia/dataclient/page/PageSummary.kt

@@ -24,7 +24,7 @@ open class PageSummary(
     var description: String? = null,
     @SerialName("originalimage") private val originalImage: Thumbnail? = null,
     @SerialName("wikibase_item") val wikiBaseItem: String? = null,
-    @SerialName("extract_html") val extractHtml: String? = null,
+    @SerialName("extract_html") var extractHtml: String? = null,
     @SerialName("description_source") val descriptionSource: String = "",
     @Serializable(with = LocationSerializer::class) var coordinates: Location? = null,
     val type: String = TYPE_STANDARD,

app/src/main/java/org/wikipedia/feed/aggregated/AggregatedFeedContentClient.kt

@@ -154,7 +154,7 @@ class AggregatedFeedContentClient {
                     if (hasParentLanguageCode) {
                         // TODO: Needs to update tfa and most read
                         feedContentResponse.tfa?.let {
-                            val tfaResponse = L10nUtil.getPagesForLanguageVariant(listOf(it), wikiSite).first()
+                            val tfaResponse = L10nUtil.getPagesForLanguageVariant(listOf(it), wikiSite, shouldUpdateExtracts = true).first()
                             feedContentResponse = AggregatedFeedContent(
                                 tfa = tfaResponse,
                                 news = feedContentResponse.news,

app/src/main/java/org/wikipedia/util/L10nUtil.kt

@@ -7,8 +7,10 @@ import android.util.SparseArray
 import android.view.View
 import androidx.annotation.StringRes
 import androidx.core.os.ConfigurationCompat
+import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
 import kotlinx.coroutines.withContext
 import org.wikipedia.Constants
 import org.wikipedia.WikipediaApp
@@ -137,7 +139,7 @@ object L10nUtil {
         }
     }
 
-    suspend fun getPagesForLanguageVariant(list: List<PageSummary>, wikiSite: WikiSite): List<PageSummary> {
+    suspend fun getPagesForLanguageVariant(list: List<PageSummary>, wikiSite: WikiSite, shouldUpdateExtracts: Boolean = false): List<PageSummary> {
         return withContext(Dispatchers.IO) {
             val newList = mutableListOf<PageSummary>()
             val titles = list.joinToString(separator = "|") { it.apiTitle }
@@ -151,6 +153,20 @@ object L10nUtil {
                 ServiceFactory.get(wikiSite).getVariantTitlesByTitles(titles)
             }
 
+            // Third, update the extracts from the page/summary endpoint if needed.
+            val summaryForExtractsDeferred = mutableListOf<Deferred<PageSummary>>()
+            if (shouldUpdateExtracts) {
+                summaryForExtractsDeferred.addAll(list.map { pageSummary ->
+                    async {
+                        ServiceFactory.getRest(wikiSite).getPageSummary(null, pageSummary.apiTitle)
+                    }
+                })
+                summaryForExtractsDeferred.awaitAll().forEachIndexed { index, pageSummary ->
+                    list[index].extract = pageSummary.extract
+                    list[index].extractHtml = pageSummary.extractHtml
+                }
+            }
+
             list.forEach { pageSummary ->
                 // Find the correct display title from the varianttitles map, and insert the new page summary to the list.
                 val displayTitle = mwQueryResponse.await().query?.pages?.find { StringUtil.addUnderscores(it.title) == pageSummary.apiTitle }?.varianttitles?.get(wikiSite.languageCode)