1 files changed, 15 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
index b9abb4e40..dd76a52c0 100644
--- a/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
+++ b/perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm
@@ -156,6 +156,20 @@ sub compare_photo {
     return FixMyStreet::Template::SafeString->new($s);
 }
 
+# This is a list of extra keys that could be set on a report after a moderation
+# has occurred. This can confuse the display of the last moderation entry, as
+# the comparison with the problem's extra will be wrong.
+my @keys_to_ignore = (
+    'sent_to', # SendReport::Email adds this arrayref when sent
+    'closed_updates', # Marked to close a report to updates
+    'closure_alert_sent_at', # Set by alert sending if update closes a report
+    # Can be set/changed by an Open311 update
+    'external_status_code', 'customer_reference',
+    # Can be set by inspectors
+    'traffic_information', 'detailed_information', 'duplicates', 'duplicate_of', 'order',
+);
+my %keys_to_ignore = map { $_ => 1 } @keys_to_ignore;
+
 sub compare_extra {
     my ($self, $other) = @_;
 
@@ -163,7 +177,7 @@ sub compare_extra {
     my $new = $other->get_extra_metadata;
 
     my $both = { %$old, %$new };
-    my @all_keys = grep { $_ ne 'sent_to' } sort keys %$both;
+    my @all_keys = grep { !$keys_to_ignore{$_} } sort keys %$both;
     my @s;
     foreach (@all_keys) {
         $old->{$_} = join(', ', @{$old->{$_}}) if ref $old->{$_} eq 'ARRAY';