forki 0.2.16 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a81f3f14449d4d0abdb3300bbdffbc4d34b8c5db400c8a4d7beb9bb2958fcc7
-  data.tar.gz: d4b9ade188b782c02da0b53ef64fb39a6d66aaed3eac2354dd968e87c58f1e51
+  metadata.gz: 828be4f10ea4ff3496585984d78878a1492bfb13691e6772e754e31a8e0654e9
+  data.tar.gz: 35b0d1cba36a195e95e4d649a3808455cd2f51917a619c536b55b3413395b719
 SHA512:
-  metadata.gz: d9516edea544bd8eefaee678e60f957f9f659a32daa46bbb8157a06da38e4e513ea3eca85108c59714b4d9d70b536ef853a7f6741e1e956c2bdb7c89a908308d
-  data.tar.gz: eb6126c73693e2d13d335d517573736343869b94e3e17e8775d65f2c496e90b55c6baed06797e140ca76539ba5434d2ad2dc603de415d758db76337ee74224c6
+  metadata.gz: e34ae0dd4d57660c075bf1c6d8a690ca8a65adb771739556ba2c8031918ee32e2829ce7aa419ff5533640f602a92b2f7f1dc00d852768ff30cfdab42a48f9732
+  data.tar.gz: 8de5a58ece6ae090ebd1a638cbbe4cff3168a0f439476dfb7490d53b982e1cf4e12bf97d5a1f453134867a64f1442c95c4569ad2bde4be49f88fdde68da0b6b1

data/lib/forki/scrapers/post_scraper.rb

@@ -33,12 +33,12 @@ module Forki
 
       if post_is_text_only
         extract_text_post_data(graphql_objects)
+      elsif post_has_image && !post_has_video && !post_has_video_in_comment_stream
+        extract_image_post_data(graphql_objects)
       elsif post_has_video
         extract_video_post_data(graphql_strings)
       elsif post_has_video_in_comment_stream
         extract_video_comment_post_data(graphql_objects)
-      elsif post_has_image
-        extract_image_post_data(graphql_objects)
       else
         extract_image_post_data(graphql_objects)
       end
@@ -64,7 +64,17 @@ module Forki
     end
 
     def check_if_post_is_video(graphql_objects)
-      graphql_objects.any? { |graphql_object| graphql_object.key?("is_live_streaming") || graphql_object.key?("video") || check_if_post_is_reel(graphql_object) }
+      result = graphql_objects.any? do |graphql_object|
+        next unless graphql_object.dig("viewer", "news_feed").nil?
+
+        result = graphql_object.to_s.include?("videoDeliveryLegacyFields")
+        result = graphql_object.key?("is_live_streaming") && graphql_object["is_live_streaming"] == true if result == false
+        result = graphql_object.key?("video") if result == false
+        result = check_if_post_is_reel(graphql_object) if result == false
+        result
+      end
+
+      result
     end
 
     def check_if_post_is_reel(graphql_object)
@@ -84,6 +94,7 @@ module Forki
         return true unless graphql_object.fetch("image", nil).nil? # so long as the associated values are not nil
         return true unless graphql_object.fetch("currMedia", nil).nil?
         return true unless graphql_object.fetch("photo_image", nil).nil?
+        return true unless graphql_object.fetch("large_share_image", nil).nil?
 
         # This is a complicated form for `web.facebook.com` posts
         if !graphql_object.dig("node", "comet_sections", "content", "story", "attachments").nil?
@@ -298,7 +309,7 @@ module Forki
 
       share_count_object = feedback_object.fetch("share_count", {})
 
-      if story_node_object["comet_sections"]["content"]["story"]["comet_sections"].key? "message"
+      if story_node_object["comet_sections"]["content"]["story"]["comet_sections"].key?("message") && !story_node_object["comet_sections"]["content"]["story"]["comet_sections"]["message"].nil?
         text = story_node_object["comet_sections"]["content"]["story"]["comet_sections"]["message"]["story"]["message"]["text"]
       else
         text = ""
@@ -329,11 +340,10 @@ module Forki
         reshare_warning = feedback_object["comet_ufi_summary_and_actions_renderer"]["feedback"]["should_show_reshare_warning"]
       end
 
-      if !video_object.key?("browser_native_hd_url") && !video_object.key?("browser_native_sd_url") && video_object.key?("videoDeliveryLegacyFields")
-        video_url = video_object["videoDeliveryLegacyFields"]["browser_native_hd_url"] || video_object["videoDeliveryLegacyFields"]["browser_native_sd_url"]
-      else
-        video_url = video_object["browser_native_hd_url"] || video_object["browser_native_sd_url"]
-      end
+      video_object_url_subsearch = video_object
+      video_object_url_subsearch = video_object_url_subsearch["videoDeliveryLegacyFields"] if video_object_url_subsearch.has_key?("videoDeliveryLegacyFields")
+      # if video_object.key?("browser_native_hd_url") || video_object.key?("browser_native_sd_url")
+      video_url = video_object_url_subsearch["browser_native_hd_url"] || video_object_url_subsearch["browser_native_sd_url"]
 
       post_details = {
         id: video_object["id"],
@@ -442,6 +452,10 @@ module Forki
           if image_url.nil?
             image_url = attachments.first&.dig("styles", "attachment", "media", "large_share_image", "uri")
           end
+
+          if image_url.nil?
+            image_url = attachments.first&.dig("styles", "attachment", "media", "image", "uri")
+          end
         end
 
         text = graphql_object["node"]["comet_sections"]["content"]["story"].dig("message", "text")

data/lib/forki/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Forki
-  VERSION = "0.2.16"
+  VERSION = "0.2.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forki
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.18
 platform: ruby
 authors:
 - ''
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara