fuck_facebook 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acfe1137400e4f4cc8fc79f7d0222eb8617eb72032fade8f975da0c638967a7a
-  data.tar.gz: ef0b084adbf6017d96b008792efc158bde131df714bbc9382738394bcbf01462
+  metadata.gz: 328dfd9c415343629b2aeb3f83e6252fa2ee0c882be23f441442e0170781a0e0
+  data.tar.gz: 13369d4a2a3bb32d672385cb47776cdfd37ecb8159c2314d78cefb52ae0376fd
 SHA512:
-  metadata.gz: bf839aa8b6b7b0803588021a3d444e6ef641240569a0ed72a98eed6a66f9a123498a8891c1c25218ea47bb005110d64861acb1a277b553f096ced32d40b50c1c
-  data.tar.gz: ad427fa1ae23c9abf1c2d78db1b547c7f4cc73ce0b12dbefc57c443a5ac2fd7812924c543fb60d1159fe5e421dc0442d6c0ef7fc8e846c6863c4687d3e36fe29
+  metadata.gz: 111cd999cfa8dddbfbb72c36ace0dbed922b57a0ed653c3726541bba8f2a17f1bdfc4188e832a07cb6e0cf46938e52218e1973a9ab4b2dce92453d018e2fefee
+  data.tar.gz: 44d2fa65bb1b48e4f2294cb314cdd63609135fd4b028e929937f4141064563acba59ec1db3552459d22c92e151d9c42b85941ebd1e423235e67d510880522283

data/Gemfile.lock

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

data/lib/fuck_facebook/version.rb

@@ -1,3 +1,3 @@
 module FuckFacebook
-  VERSION = '0.5.2'.freeze
+  VERSION = '0.5.3'.freeze
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fuck_facebook
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  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