Guard more thoroughly against empty message ids [#72]

tvdstaaij · Feb 25, 2017 · 650580f · 650580f
1 parent cd260ea
commit 650580f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/dumpers/lib/dumper_interface.rb b/dumpers/lib/dumper_interface.rb
@@ -30,7 +30,7 @@ def start_dialog(dialog, progress)
   # This default makes sense in simple cases, override for advanced custom logic
   def msg_fresh?(msg, progress)
     # msg: Hash, progress: DumpProgress
-    return false unless msg['id']
+    return false if msg['id'].to_s.empty?
     !progress.newest_id || MsgId.new(msg['id']) > progress.newest_id
   end
 

diff --git a/lib/dump_progress.rb b/lib/dump_progress.rb
@@ -9,7 +9,7 @@ class DumpProgress
   attr_writer :dumper_state
 
   def initialize(newest_id = nil, newest_date = nil, dumper_state = {})
-    @newest_id = newest_id ? MsgId.new(newest_id) : nil
+    @newest_id = (newest_id.to_s.empty?) ? nil : MsgId.new(newest_id)
     @newest_date = newest_date
     @dumper_state = dumper_state
   end
@@ -35,7 +35,7 @@ def to_json(*a)
   end
 
   def update(msg)
-    msg_id = msg['id'] ? MsgId.new(msg['id']) : nil
+    msg_id = (msg['id'].to_s.empty?) ? nil : MsgId.new(msg['id'])
     if msg_id && (!@newest_id || msg_id > @newest_id)
       @newest_id = msg_id
       @newest_date = msg['date'] || @newest_date

diff --git a/telegram-history-dump.rb b/telegram-history-dump.rb
@@ -102,12 +102,14 @@ def dump_dialog(dialog)
 
     msg_chunk.reverse_each do |msg|
       dump_msg = true
-      unless msg['id']
+      if msg['id'].to_s.empty?
         $log.warn('Dropping message without id: %s' % msg)
         dump_msg = false
+        msg_id = nil
+      else
+        msg_id = MsgId.new(msg['id'])
       end
-      msg_id = msg['id'] ? MsgId.new(msg['id']) : nil
-      unless !msg_id || !prev_msg_id || msg_id < prev_msg_id
+      if msg_id && prev_msg_id && msg_id >= prev_msg_id
         $log.warn('Message ids are not sequential (%s[%s] -> %s[%s])' % [
           prev_msg_id.raw_hex, prev_msg_id.sequence_hex,
           msg_id.raw_hex, msg_id.sequence_hex,
@@ -118,7 +120,7 @@ def dump_dialog(dialog)
         dump_msg = false
       end
 
-      prev_msg_id = MsgId.new(msg['id']) if msg['id']
+      prev_msg_id = msg_id
       cur_progress.update(msg)
 
       if msg['text'] && filter_regex && filter_regex =~ msg['text']