fuck_facebook 0.4.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58036357e5b5129b1f1d3395335e519c5fe361b888367f39b0aa22868ccafea2
-  data.tar.gz: 75b470be6a7b43fb1b2f1169c76b94c0f36fa7dd16e7f407fd0c604b74e740ad
+  metadata.gz: 328dfd9c415343629b2aeb3f83e6252fa2ee0c882be23f441442e0170781a0e0
+  data.tar.gz: 13369d4a2a3bb32d672385cb47776cdfd37ecb8159c2314d78cefb52ae0376fd
 SHA512:
-  metadata.gz: 9a0b4111c0c2df0dc5fca7d154152b593e42a7f7bcf98eace36d4a85422a8786168c1b668b910b1e0187e9edbf683ae772f04aa1b471594702a7b6134d975b88
-  data.tar.gz: 6fb6a161adbfc38a33af6a36f1c56dfa98fc8d0cc5b311b0783ded7cd9b7d9d5eec0badf12076bccec281f03e4e7a474031073cd24d3a6fd89c40596798ca32d
+  metadata.gz: 111cd999cfa8dddbfbb72c36ace0dbed922b57a0ed653c3726541bba8f2a17f1bdfc4188e832a07cb6e0cf46938e52218e1973a9ab4b2dce92453d018e2fefee
+  data.tar.gz: 44d2fa65bb1b48e4f2294cb314cdd63609135fd4b028e929937f4141064563acba59ec1db3552459d22c92e151d9c42b85941ebd1e423235e67d510880522283

data/.gitignore

@@ -11,3 +11,5 @@
 .rspec_status
 
 *.gem
+
+fuck_facebook_error*.png

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fuck_facebook (0.4.0)
+    fuck_facebook (0.5.2)
       activesupport (~> 6.1)
       highline (~> 2.0)
       mail (~> 2.7)

data/README.md

@@ -26,6 +26,9 @@ This way if you have emails going out for new messages, you won't get notified f
 Here's a complete config file along with an explanation of each option:
 
 ```yaml
+errors:
+  min_minutes_between_reports: 0 # Only report error if one has not occured in the past X minutes
+  include_screenshot: false # Generates a screenshot with the error report
 smtp:
   from_email: sender@example.com
   to_email: receiver@example.com

data/bin/fuck-facebook

@@ -12,11 +12,12 @@ require_relative '../src/message_sender'
 require_relative '../src/error_reporter'
 
 options = ArgsParser.parse_args
+facebook_connection = nil
 
 begin
+  facebook_connection = FacebookConnection.new(headless: options[:headless])
   raise 'Error triggered by --simulate-error flag' if options[:simulate_error]
 
-  facebook_connection = FacebookConnection.new(headless: options[:headless])
   facebook_connection.cookie_handler.clear! if options[:clear_cookies]
   facebook_connection.login if options[:login]
   message_sender = MessageSender.new(options[:sender], facebook_connection)
@@ -24,5 +25,5 @@ begin
   message_sender.send_messages if options[:messages]
   facebook_connection.close
 rescue StandardError => e
-  ErrorReporter.report_error(options[:sender], e)
+  ErrorReporter.report_error(options[:sender], e, facebook_connection: facebook_connection)
 end

data/lib/fuck_facebook/version.rb

@@ -1,3 +1,3 @@
 module FuckFacebook
-  VERSION = '0.4.1'.freeze
+  VERSION = '0.5.3'.freeze
 end

data/src/config.rb

@@ -3,15 +3,16 @@ require 'yaml'
 class Config
   CONFIG_FILE_PATH = "#{ENV['HOME']}/.local/share/fuck-facebook/config.yaml".freeze
 
-  def self.option(*path)
+  def self.option(*path, default: nil, type: nil)
     env_var = "FF_#{path.join('_').upcase}"
-    return ENV[env_var] if ENV[env_var]
-
     path_strings = path.map(&:to_s)
-    config.dig(*path_strings)
-  end
 
-  private
+    value = config.dig(*path_strings)
+    value = ENV[env_var] if ENV[env_var]
+    value = default if value.nil?
+
+    cast_value_to_type(value, type)
+  end
 
   def self.config
     create_config_file_if_not_exists!
@@ -19,9 +20,28 @@ class Config
     YAML.load_file(CONFIG_FILE_PATH)
   end
 
-  def self.create_config_file_if_not_exists!
+  private_class_method 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
+
+  private_class_method def self.cast_value_to_type(value, type)
+    case type
+    when nil
+      value
+    when :boolean
+      cast_value_to_boolean(value)
+    when :float
+      value.to_f
+    end
+  end
+
+  private_class_method def self.cast_value_to_boolean(value)
+    if [true, false].include?(value)
+      value
+    elsif value.is_a?(String)
+      value == 'true'
+    end
+  end
 end

data/src/error_reporter.rb

@@ -1,6 +1,44 @@
 class ErrorReporter
-  def self.report_error(sender_name, error)
-    Senders.by_name(sender_name).send_error(error)
+  def self.report_error(sender_name, error, facebook_connection: nil)
+    raise error unless report_error?
+
+    screenshot = include_screenshot?(facebook_connection) ? create_screenshot(facebook_connection) : nil
+
+    Senders.by_name(sender_name).send_error(error, screenshot: screenshot)
+
+    Storage.set(:last_error_reported_time, Time.now)
     raise error
   end
+
+  private_class_method def self.include_screenshot?(facebook_connection)
+    include_screenshot_config = Config.option(
+      :errors,
+      :include_screenshot,
+      default: false,
+      type: :boolean
+    )
+
+    include_screenshot_config && facebook_connection.present?
+  end
+
+  private_class_method def self.create_screenshot(facebook_connection)
+    facebook_connection.driver.screenshot_as(:png)
+  rescue StandardError
+    nil
+  end
+
+  private_class_method def self.report_error?
+    min_minutes_between_reports = Config.option(
+      :errors,
+      :min_minutes_between_reports,
+      default: 0,
+      type: :float
+    )
+
+    last_error_reported_time = Storage.get(:last_error_reported_time, default: Time.new(2000))
+
+    next_report_time = last_error_reported_time + min_minutes_between_reports.minutes
+
+    Time.now > next_report_time
+  end
 end

data/src/fb_duration.rb

@@ -3,29 +3,40 @@ require 'active_support/core_ext/numeric/time'
 class FbDuration
   DURATION_LETTER_TO_METHOD = {
     'm' => :minutes,
-    'd' => :days,
     'h' => :hours,
+    'd' => :days,
     'w' => :weeks,
     'y' => :years
   }.freeze
 
   DURATION_LETTER_TO_BEGINNING_OF_METHOD = {
     'm' => :beginning_of_minute,
-    'd' => :beginning_of_day,
     'h' => :beginning_of_hour,
+    'd' => :beginning_of_day,
     'w' => :beginning_of_week,
     'y' => :beginning_of_year
   }.freeze
 
+  # TODO: Fill in d w y extra time to add
+  EXTRA_TIME_TO_ADD_TO_FIX_ROUNDING = {
+    'm' => 0,
+    'h' => 5.minutes,
+    'd' => 0,
+    'w' => 0,
+    'y' => 0
+  }
+
   def self.parse_to_time(facebook_format_duration)
     duration = parse(facebook_format_duration)
     time_to_beginning_of_duration_letter(Time.now - duration, facebook_format_duration)
   end
 
   def self.parse(facebook_format_duration)
-    segments = facebook_format_duration.split
+    number, duration_letter = facebook_format_duration.split
+
+    extra_rounding_time = EXTRA_TIME_TO_ADD_TO_FIX_ROUNDING[duration_letter]
 
-    segments[0].to_i.send(DURATION_LETTER_TO_METHOD[segments[1]])
+    number.to_i.send(DURATION_LETTER_TO_METHOD[duration_letter]) + extra_rounding_time
   end
 
   def self.time_to_beginning_of_duration_letter(time, facebook_format_duration)

data/src/message_handler.rb

@@ -53,12 +53,13 @@ class MessageHandler
   end
 
   def messages_after_last_message_time(messages)
-    last_message_check_time = Storage.get(:last_message_check_time, default: Time.new(2004, 2, 4))
-    last_check_time_with_buffer = last_message_check_time - 5.minutes
+    last_message_time = Storage.get(:last_message_time, default: Time.new(2004, 2, 4))
 
-    messages_to_return = messages.select { _1.timestamp > last_check_time_with_buffer }
+    messages_to_return = messages.select { _1.timestamp > last_message_time }
 
-    Storage.set(:last_message_check_time, Time.now)
+    last_message_time = messages.map(&:timestamp).max
+
+    Storage.set(:last_message_time, last_message_time)
 
     messages_to_return
   end

data/src/senders/email.rb

@@ -11,12 +11,13 @@ module Senders
       end
     end
 
-    def self.send_error(error)
+    def self.send_error(error, screenshot: nil)
       Mail.deliver do
         from Config.option(:smtp, :from_email)
         to Config.option(:smtp, :to_email)
         subject 'Error occurred during Fuck Facebook command'
         body error.full_message(highlight: false)
+        add_file filename: 'error_screenshot.png', content: screenshot if screenshot
       end
     end
   end

data/src/senders/stdout.rb

@@ -6,8 +6,13 @@ module Senders
       end
     end
 
-    def self.send_error(error)
+    def self.send_error(error, screenshot: nil)
       puts error
+      return if screenshot.nil?
+
+      filename = "fuck_facebook_error_#{Time.now.iso8601}.png"
+      File.write(filename, screenshot)
+      puts "Screenshot of error page saved as #{filename}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuck_facebook
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Keeyan Nejad
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-25 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport