1 files changed, 7 insertions, 7 deletions

diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index b69de856..38eba2a0 100644
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -7,11 +7,11 @@ use strict;
 use warnings;
 
 use POSIX qw(strftime);
-use Date::Parse qw(str2time);
 use Digest::SHA qw(sha1_hex);
 use PublicInbox::Address;
 use PublicInbox::Hval qw(ascii_html);
 use PublicInbox::MID qw/mid_clean mid_escape/;
+use PublicInbox::MsgTime qw(msg_timestamp);
 
 # called by PSGI server after getline:
 sub close {}
@@ -33,8 +33,8 @@ sub response {
 sub getline {
         my ($self) = @_;
         if (my $middle = $self->{cb}) {
-                my $mime = $middle->();
-                return feed_entry($self, $mime) if $mime;
+                my $smsg = $middle->();
+                return feed_entry($self, $smsg) if $smsg;
         }
         delete $self->{cb} ? '</feed>' : undef;
 }
@@ -92,10 +92,11 @@ sub mid2uuid ($) {
 
 # returns undef or string
 sub feed_entry {
-        my ($self, $mime) = @_;
+        my ($self, $smsg) = @_;
         my $ctx = $self->{ctx};
+        my $mime = $smsg->{mime};
         my $hdr = $mime->header_obj;
-        my $mid = mid_clean($hdr->header_raw('Message-ID'));
+        my $mid = $smsg->mid;
         my $irt = PublicInbox::View::in_reply_to($hdr);
         my $uuid = mid2uuid($mid);
         my $base = $ctx->{feed_base_url};
@@ -108,8 +109,7 @@ sub feed_entry {
                 $irt = '';
         }
         my $href = $base . mid_escape($mid) . '/';
-        my $date = $hdr->header('Date');
-        my $t = eval { str2time($date) } if defined $date;
+        my $t = msg_timestamp($hdr);
         my @t = gmtime(defined $t ? $t : time);
         my $updated = feed_updated(@t);