lib/imap/backup/cli/local.rb in imap-backup-7.0.0.rc1 vs lib/imap/backup/cli/local.rb in imap-backup-7.0.2

@@ -37,12 +37,12 @@
       )
       Kernel.puts "-" * (12 + MAX_SUBJECT + 28)
 
       uids = folder_serializer.uids
 
-      folder_serializer.each_message(uids).map do |uid, message|
-        list_message uid, message
+      folder_serializer.each_message(uids).map do |message|
+        list_message message
       end
     end
 
     desc "show EMAIL FOLDER UID[,UID]", "Show one or more emails"
     long_desc <<~DESC
@@ -57,25 +57,25 @@
         f.name == folder_name
       end
       raise "Folder '#{folder_name}' not found" if !folder_serializer
 
       uid_list = uids.split(",")
-      folder_serializer.each_message(uid_list).each do |uid, message|
+      folder_serializer.each_message(uid_list).each do |message|
         if uid_list.count > 1
           Kernel.puts <<~HEADER
             #{'-' * 80}
-            #{format('| UID: %-71s |', uid)}
+            #{format('| UID: %-71s |', message.uid)}
             #{'-' * 80}
           HEADER
         end
-        Kernel.puts message.supplied_body
+        Kernel.puts message.body
       end
     end
 
     no_commands do
-      def list_message(uid, message)
+      def list_message(message)
         m = {
-          uid: uid,
+          uid: message.uid,
           date: message.date.to_s,
           subject: message.subject || ""
         }
         if m[:subject].length > MAX_SUBJECT
           Kernel.puts format("% 10<uid>u: %.#{MAX_SUBJECT - 3}<subject>s... - %<date>s", m)