fuck_facebook 0.5.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4444d134e1ae1d10b948ae6432691f99c1c22498aea2f0530359b0c93a1df967
-  data.tar.gz: b276c6b4a680c546b2b34366b5e28cd1af620ef7800ae7f2964bbded6235eff8
+  metadata.gz: f39f95c1ab04f9becec05ea79cb6f07c90d93628ef94c121394a6cdffe195098
+  data.tar.gz: 80c4db15e83c546edac23505e9d277c3b92219aae9ba731cf4bcc2132681e8d6
 SHA512:
-  metadata.gz: 2e9a2254136c1886d20e7f164bbf1cf9d06d1a6191ed7522df717db580b6eea1b48f9ab5c9caebb9b84c75bc24f8467e0c92b30d5bae5f1131a99b7a6bb93b94
-  data.tar.gz: 5b930019d90be80fb751a487c2b71b0021278dc1952fd2a61baac57b7e88a4bcfc33be612699193bd6caeeb1c43a5fb0b7a231fce555d41c32e6d69a6cb93185
+  metadata.gz: a9a9e910c17f7d70698e77a9c690168d52fc42898034a778673d823ec1e36a8d15e2d9c7106f59c6f525495ac850877af34810b9d1024a3f77f7cd6e95e4d3c3
+  data.tar.gz: 3100461e7973a50441f53145df781f6d8555cbe57f078cdd1991a48d25c2ca5af29d6bd3892581ccb2748000bc9b382fbfa164978bfa6e41b434945b75cba40f

data/Gemfile.lock

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

data/lib/fuck_facebook/version.rb

@@ -1,3 +1,3 @@
 module FuckFacebook
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.5.4'.freeze
 end

data/src/config.rb

@@ -3,16 +3,15 @@ require 'yaml'
 class Config
   CONFIG_FILE_PATH = "#{ENV['HOME']}/.local/share/fuck-facebook/config.yaml".freeze
 
-  def self.option(*path, default: nil)
+  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)
-    value = config.dig(*path_strings)
 
-    return value if value
+    value = config.dig(*path_strings)
+    value = ENV[env_var] if ENV[env_var]
+    value = default if value.nil?
 
-    default
+    cast_value_to_type(value, type)
   end
 
   def self.config
@@ -26,4 +25,23 @@ class Config
     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

@@ -2,16 +2,23 @@ class ErrorReporter
   def self.report_error(sender_name, error, facebook_connection: nil)
     raise error unless report_error?
 
-    Storage.set(:last_error_reported_time, Time.now)
-
     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)
-    Config.option(:errors, :include_screenshot) && facebook_connection.present?
+    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)
@@ -21,7 +28,12 @@ class ErrorReporter
   end
 
   private_class_method def self.report_error?
-    min_minutes_between_reports = Config.option(:errors, :min_minutes_between_reports, default: 0)
+    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))
 

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
+  ROUNDING_CORRECTION_TIMES = {
+    '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
+
+    rounding_correction_times = ROUNDING_CORRECTION_TIMES[duration_letter]
 
-    segments[0].to_i.send(DURATION_LETTER_TO_METHOD[segments[1]])
+    number.to_i.send(DURATION_LETTER_TO_METHOD[duration_letter]) + rounding_correction_times
   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

metadata

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