0.4.3

sokomishalov · May 28, 2020 · 0bd6c35 · 0bd6c35
1 parent 8c27da1
commit 0bd6c35
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -123,7 +123,7 @@ Maven:
     <dependency>
         <groupId>com.github.sokomishalov.skraper</groupId>
         <artifactId>skrapers</artifactId>
-        <version>0.4.2</version>
+        <version>0.4.3</version>
     </dependency>
 </dependencies>
 ```
@@ -134,7 +134,7 @@ repositories {
     maven { url = uri("http://jitpack.io") }
 }
 dependencies {
-    implementation("com.github.sokomishalov.skraper:skrapers:0.4.2")
+    implementation("com.github.sokomishalov.skraper:skrapers:0.4.3")
 }
 ```
 

diff --git a/cli/pom.xml b/cli/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>ru.sokomishalov.skraper</groupId>
         <artifactId>skraper-parent</artifactId>
-        <version>0.4.2</version>
+        <version>0.4.3</version>
     </parent>
 
     <artifactId>cli</artifactId>
-    <version>0.4.2</version>
+    <version>0.4.3</version>
 
     <properties>
         <maven.skip.deploy>true</maven.skip.deploy>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>ru.sokomishalov.skraper</groupId>
             <artifactId>skrapers</artifactId>
-            <version>0.4.2</version>
+            <version>0.4.3</version>
         </dependency>
         <dependency>
             <groupId>com.xenomachina</groupId>

diff --git a/cli/src/main/kotlin/ru/sokomishalov/skraper/cli/Main.kt b/cli/src/main/kotlin/ru/sokomishalov/skraper/cli/Main.kt
@@ -42,7 +42,7 @@ import kotlin.text.Charsets.UTF_8
 fun main(args: Array<String>) = mainBody(columns = 100) {
     val parsedArgs = ArgParser(args = args.ifEmpty { arrayOf("--help") }).parseInto(::Args)
 
-    println("${"Skraper".green()} ${"v.0.4.2".magenta()} started")
+    println("${"Skraper".green()} ${"v.0.4.3".magenta()} started")
 
     val posts = runBlocking {
         parsedArgs.skraper.getPosts(

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -37,7 +37,7 @@ repositories {
 }
 
 dependencies {
-    def skraper_version = "0.4.2"
+    def skraper_version = "0.4.3"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>ru.sokomishalov.skraper</groupId>
     <artifactId>skraper-parent</artifactId>
-    <version>0.4.2</version>
+    <version>0.4.3</version>
     <packaging>pom</packaging>
 
     <properties>

diff --git a/skrapers/pom.xml b/skrapers/pom.xml
@@ -7,11 +7,11 @@
     <parent>
         <groupId>ru.sokomishalov.skraper</groupId>
         <artifactId>skraper-parent</artifactId>
-        <version>0.4.2</version>
+        <version>0.4.3</version>
     </parent>
 
     <artifactId>skrapers</artifactId>
-    <version>0.4.2</version>
+    <version>0.4.3</version>
 
     <dependencies>
 

diff --git a/skrapers/src/main/kotlin/ru/sokomishalov/skraper/provider/facebook/FacebookSkraper.kt b/skrapers/src/main/kotlin/ru/sokomishalov/skraper/provider/facebook/FacebookSkraper.kt
@@ -233,12 +233,24 @@ class FacebookSkraper @JvmOverloads constructor(
                                         ?.attr("data-original-aspect-ratio")
                                         ?.toDoubleOrNull()
                         )
-                        imgNode != null -> Image(
-                                url = imgNode.attr("data-src"),
-                                aspectRatio = imgNode.attr("width").toDoubleOrNull() / imgNode.attr("height").toDoubleOrNull()
-                        )
+                        imgNode != null -> with(imgNode) {
+                            Image(
+                                    url = attr("data-src"),
+                                    aspectRatio = attr("width").toDoubleOrNull() / attr("height").toDoubleOrNull()
+                            )
+                        }
                         else -> null
                     }
+                }.ifEmpty {
+                    getFirstElementByClass("uiScaledImageContainer")
+                            ?.getFirstElementByTag("img")
+                            ?.run {
+                                listOf(Image(
+                                        url = attr("data-src"),
+                                        aspectRatio = attr("width").toDoubleOrNull() / attr("height").toDoubleOrNull()
+                                ))
+                            }
+                            .orEmpty()
                 }
     }
 }
diff --git a/skrapers/src/test/kotlin/ru/sokomishalov/skraper/provider/facebook/FacebookSkraperTest.kt b/skrapers/src/test/kotlin/ru/sokomishalov/skraper/provider/facebook/FacebookSkraperTest.kt
@@ -26,7 +26,7 @@ import ru.sokomishalov.skraper.provider.SkraperTck
 class FacebookSkraperTest : SkraperTck() {
     override val skraper: FacebookSkraper = FacebookSkraper(client = client)
     override val path: String = "/memes/posts"
-    private val community: String = "memes"
+    private val community: String = "dracibrno"
     private val username: String = "DonaldTrump"
 
     @Test