diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Extractor.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Extractor.kt index 09bdb006..2f028f6e 100644 --- a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Extractor.kt +++ b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Extractor.kt @@ -105,7 +105,6 @@ abstract class Extractor( HttpRequestService.create(storage = str) } - /** * If media is private just pass valid cookies to * extract list of [Formats] @@ -272,22 +271,22 @@ abstract class Extractor( private fun getRandomInstagramUserAgent(): String { val userAgents = listOf( "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.80 " + - "Safari/537.36", + "Safari/537.36", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/75.0.3770.100 " + - "Safari/537.36", + "Safari/537.36", "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/537.36 (KHTML, like Gecko) " + - "Chrome/74.0.3729.169 Safari/537.36", + "Chrome/74.0.3729.169 Safari/537.36", "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 " + - "Safari/537.36", + "Safari/537.36", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.131 " + - "Safari/537.36", + "Safari/537.36", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 " + - "Safari/537.36", + "Safari/537.36", "Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.157 " + - "Safari/537.36", + "Safari/537.36", "Mozilla/5.0 (iPhone; CPU iPhone OS 12_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) " + - "Mobile/15E148 Instagram 105.0.0.11.118 (iPhone11,8; iOS 12_3_1; en_US; en-US; scale=2.00; " + - "828x1792; 165586599)" + "Mobile/15E148 Instagram 105.0.0.11.118 (iPhone11,8; iOS 12_3_1; en_US; en-US; scale=2.00; " + + "828x1792; 165586599)" ) return userAgents.random() } diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Facebook.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Facebook.kt index 2cc16594..442475e5 100644 --- a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Facebook.kt +++ b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Facebook.kt @@ -561,7 +561,7 @@ class Facebook internal constructor(url: String) : Extractor(url) { videoData.get("original_width") .toString() + "x" + videoData.get("original_height") + "(" + s.uppercase() + ")", - ) + ) ) } return SUCCESS diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Instagram.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Instagram.kt index 04677526..913e60c7 100644 --- a/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Instagram.kt +++ b/src/commonMain/kotlin/com/mugames/vidsnapkit/extractor/Instagram.kt @@ -178,10 +178,10 @@ class Instagram internal constructor(url: String) : Extractor(url) { private suspend fun extractMusicAssetInfo(assetInfo: JSONObject) { formats.title = assetInfo.getNullableString("title")?.ifEmpty { null } ?: assetInfo.getNullableString("subtitle") - ?.ifEmpty { null } ?: "Reels_audio ${assetInfo.getNullableString("display_artist")}" + ?.ifEmpty { null } ?: "Reels_audio ${assetInfo.getNullableString("display_artist")}" val imageUrl = assetInfo.run { getNullableString("cover_artwork_uri")?.ifEmpty { null } ?: getNullableString("cover_artwork_thumbnail_uri") - ?: getJSONObject("music_composition_info").getString("placeholder_profile_pic_url") + ?: getJSONObject("music_composition_info").getString("placeholder_profile_pic_url") } formats.imageData.add(ImageResource(imageUrl, Util.getResolutionFromUrl(imageUrl))) diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/network/HttpRequestService.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/network/HttpRequestService.kt index db9df0c2..21c7e1fa 100644 --- a/src/commonMain/kotlin/com/mugames/vidsnapkit/network/HttpRequestService.kt +++ b/src/commonMain/kotlin/com/mugames/vidsnapkit/network/HttpRequestService.kt @@ -32,7 +32,7 @@ interface HttpRequestService { suspend fun getResponse( url: String, headers: - Hashtable? = null, + Hashtable? = null, ): String? /** diff --git a/src/commonMain/kotlin/com/mugames/vidsnapkit/network/HttpRequestServiceImpl.kt b/src/commonMain/kotlin/com/mugames/vidsnapkit/network/HttpRequestServiceImpl.kt index 73ec4fea..d436c9ab 100644 --- a/src/commonMain/kotlin/com/mugames/vidsnapkit/network/HttpRequestServiceImpl.kt +++ b/src/commonMain/kotlin/com/mugames/vidsnapkit/network/HttpRequestServiceImpl.kt @@ -78,9 +78,9 @@ class HttpRequestServiceImpl(private val client: HttpClient) : HttpRequestServic val body = bodyAsText() logger.warn( "Unhandled in getData() status code=$status for url=$url with headers=$headers &\n response=${ - body.substring( - min(body.length, 2000) - ) + body.substring( + min(body.length, 2000) + ) }" ) null