Pisg formatter: switch to peer ids, include 'to' and 'action' users i…

…n usermap

Solves a problem where some user ids do not appear in the usermap in certain situations.

formatters/pisg.rb

@@ -38,10 +38,21 @@ def end_dialog(dialog)
   end
 
   def format_message(dialog, message, output_stream)
+    involved_users = []
+    involved_users << message['from'] if message['from']
+    if message['to'] && message['to']['peer_type'] == 'user'
+      involved_users << message['to']
+    end
+    if message['action'] && message['action']['user']
+      involved_users << message['action']['user']
+    end
+    involved_users.each do |user|
+      @users[user['peer_id']] = user if user['peer_id']
+    end
+
     return unless message['date'] and message['from']
     return if message['from']['print_name'].to_s == ''
     @oldest_message_date ||= Time.at(message['date'])
-    @users[message['from']['id']] = message['from']
     lines = message['text'].to_s.split("\n")
     lines.push('') if lines.empty?
     lines.reverse_each do |message_line|
@@ -51,7 +62,7 @@ def format_message(dialog, message, output_stream)
 
   def dump_message_line(message, message_line, output_stream)
     date_str = Time.at(message['date']).strftime('[%H:%M:%S] ')
-    user_ref = 'u' + message['from']['id'].to_s
+    user_ref = 'u' + message['from']['peer_id'].to_s
 
     line = case message['event'].downcase
       when 'message'
@@ -60,7 +71,7 @@ def dump_message_line(message, message_line, output_stream)
         else nil end
       when 'service'
         target = message['action']['user']
-        target_ref = target ? 'u' + target['id'].to_s : ''
+        target_ref = target ? 'u' + target['peer_id'].to_s : ''
         case message['action']['type'].downcase
           when 'chat_add_user'
             "*** Joins: #{target_ref} (tg@#{target_ref}.users.telegram)"