fuck_facebook 0.1.2 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f671ef4b3c5a7c3f2e6588e97c23047de204f309c06b0d563e239ad4f654ca8
-  data.tar.gz: 94d1962dbc7d824bca10f51fb08f3388cd33f482f41f49afeed09fd80b77a325
+  metadata.gz: fd816f264c73ea38c4349c8110cade9787ae11f92de9b37ad8a1f6fbef9b2059
+  data.tar.gz: e2862a3aee723788f459ab7b84acf84ca2b3bda8ef6176e51a1018915cb350d7
 SHA512:
-  metadata.gz: f2c7745e2ed0559bce742015e66e4203e254404badf0402a57deef1289496f6775e2c73766968779630a3c3a08a19ba270a8fd34c7c4b5846c1227d29074fcf6
-  data.tar.gz: ae7dcdd2c32cac29858da002a0a13c16eaeff59bbe2e1734732aeee7022128d461ac12f8aa564e23f67ce4501c9d722a8dc324869b44d14ee62f100e80a711aa
+  metadata.gz: aa5dfc850834b1ab4efd759eb853ac2bdc25c6a9cb739ee704b2e2182fc917fc43b85c504c75ad7394074f0549abd8e372906911a68da64ea0a4c78766d0d39b
+  data.tar.gz: 8ebea4e69e013d5c2f7f7345755c5ed39768bdbcd231587ae06c64e196e718d2f57293ea9714c84cf61008bc104d05c1dfd90df7548c8eade979d76a5391f129

data/lib/fuck_facebook/version.rb

@@ -1,3 +1,3 @@
 module FuckFacebook
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.1'.freeze
 end

data/src/authenticator.rb

@@ -19,7 +19,7 @@ class Authenticator
 
     accept_cookies
     submit_credentials
-    submit_2fa
+    submit_otp
     click_remember_password
   end
 
@@ -32,7 +32,7 @@ class Authenticator
 
   def click_remember_password
     driver.navigate.to('https://www.facebook.com/settings?tab=security')
-    driver.switch_to.frame(xpaths.element(:settings, :security_iframe))
+    driver.switch_to.frame(xpaths.wait_for_element(:settings, :security_iframe))
     xpaths.element(:settings, :save_login_information_edit_button).click
     xpaths.element(:settings, :save_login_information_button).click
   end
@@ -43,15 +43,20 @@ class Authenticator
     xpaths.element(:login_button).click
   end
 
-  def submit_2fa
-    return unless xpaths.element(:checkpoint, :prompt).text == 'Two-factor authentication required'
+  def submit_otp
+    return unless xpaths.element_exists?(:checkpoint, :otp_prompt)
 
     xpaths.element(:checkpoint, :otp_input).send_keys(user_input.get(:otp))
-    xpaths.element(:checkpoint, :otp_continue_button).click
-    xpaths.element(:checkpoint, :save_browser_continue_button).click
+    otp_button = xpaths.element(:checkpoint, :submit_button)
+    otp_button.click
+
+    save_browser_button = xpaths.element(:checkpoint, :submit_button)
+    save_browser_button.click
   end
 
   def accept_cookies
+    return unless xpaths.element_exists?(:accept_cookies_button)
+
     accept_cookies_button = xpaths.element(:accept_cookies_button)
     accept_cookies_button.click
   end

data/src/config.rb

@@ -1,10 +1,24 @@
 require 'yaml'
 
 class Config
-  CONFIG = YAML.load_file("#{ENV['HOME']}/.config/fuck-facebook/config.yaml")
+  CONFIG_FILE_PATH = "#{ENV['HOME']}/.local/share/fuck-facebook/config.yaml".freeze
 
   def self.option(*path)
     path_strings = path.map(&:to_s)
-    CONFIG.dig(*path_strings)
+    config.dig(*path_strings)
+  end
+
+  private
+
+  def self.config
+    create_config_file_if_not_exists!
+
+    YAML.load_file(CONFIG_FILE_PATH)
+  end
+
+  def self.create_config_file_if_not_exists!
+    dirname = File.dirname(CONFIG_FILE_PATH)
+    FileUtils.mkdir_p(dirname) unless File.directory?(dirname)
+    File.write(CONFIG_FILE_PATH, '{}') unless File.exist?(CONFIG_FILE_PATH)
   end
 end

data/src/cookie_handler.rb

@@ -41,7 +41,7 @@ class CookieHandler
     saved_cookies = JSON.parse(File.read(cookies_filename), symbolize_names: true)
 
     saved_cookies.each do |saved_cookie|
-      saved_cookie[:expires] = Time.parse(saved_cookie[:expires])
+      saved_cookie[:expires] = Time.parse(saved_cookie[:expires]) unless saved_cookie[:expires].nil?
     end
 
     saved_cookies

data/src/message_handler.rb

@@ -18,10 +18,7 @@ class MessageHandler
   def messages
     visit_messages_page
 
-    xpaths.wait_for_element(:messages, :chats)
-
-    chats = xpaths.elements(:messages, :chats)
-
+    chats = xpaths.wait_for_elements(:messages, :chats)
     messages = messages_for_chats(chats)
 
     messages_after_last_message_time(messages)

data/src/xpaths.rb

@@ -63,6 +63,12 @@ class Xpaths
     found_element
   end
 
+  def wait_for_elements(*path_elements)
+    wait_for_element(*path_elements)
+
+    elements(*path_elements)
+  end
+
   def for(*path_elements)
     path_elements_strings = path_elements.map(&:to_s)
     result = XPATHS.dig(*path_elements_strings)

data/xpaths.yaml

@@ -8,13 +8,12 @@ settings:
   save_login_information_button: '//div[text() = "Save your login information"]'
 link_to_profile: '//a[@href="/me/"]'
 checkpoint:
-  otp_input: '/html/body/div[1]/div[3]/div[1]/div/form/div/div[2]/div[3]/span/input'
-  otp_continue_button: '/html/body/div[1]/div[3]/div[1]/div/form/div/div[3]/div[1]/button'
+  otp_prompt: '//strong[text() = "Two-factor authentication required"]'
+  otp_input: '//*[@id="approvals_code"]'
   save_browser_radio_input: '/html/body/div[1]/div[3]/div[1]/div/form/div/div[2]/div[2]/div[1]/input'
-  save_browser_continue_button: '/html/body/div[1]/div[3]/div[1]/div/form/div/div[3]/div[1]/button'
-  prompt: '/html/body/div[1]/div[3]/div[1]/div/form/div/div[1]'
+  submit_button: '//*[@id="checkpointSubmitButton"]'
 messages:
-  chats: '/html/body/div[1]/div/div[1]/div/div[3]/div/div/div[1]/div[1]/div[1]/div/div/div/div[3]/div[1]/div[2]/div/child::*[@role = "row"]'
+  chats: './/*[@aria-label="Chats"]/child::*'
   title_relative: 'div[1]/div/a/div/div[2]/div[1]/div/div/div[1]/span/span/span/span'
   text_relative: 'div[1]/div/a/div/div[2]/div[1]/div/div/div[2]/span/span/div/span[1]/span'
   time_sent_ago_relative: 'div[1]/div/a/div/div[2]/div[1]/div/div/div[2]/span/span/div/span[3]'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuck_facebook
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.1
 platform: ruby
 authors:
 - Keeyan Nejad
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport