From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-3.3 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id B5B981F910 for ; Sat, 26 Nov 2022 07:24:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=80x24.org; s=selector1; t=1669447442; bh=dR+ZqAFZxOQ++AItROxIt8FZkJVfFv+AK15id90aTZE=; h=From:To:Subject:Date:From; b=499ag4lau8cee/nf0csYGsQqOaULgji8/8POqTxXE+rNJjxJnCDLS6JYiuXuU2tks rcU/j+XnrvlcoVgS+nbRDuUTFJxwY4gCviwFx1RGDemEuW9d/9gvb8K8pMCiAcFl1p 6JRAk0JOSwpG64rXMG0jGXK9F5wk2wiTdzzL9qR4= From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] filter/rubylang: adjust filter for new list software Date: Sat, 26 Nov 2022 07:24:02 +0000 Message-Id: <20221126072402.23807-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: The host serving ruby-core and ruby-dev no longer set X-Mail-Count, but the serial number remains active in the Subject. --- lib/PublicInbox/Filter/RubyLang.pm | 29 +++++++++++++++++------------ t/filter_rubylang.t | 16 ++++++++++++---- 2 files changed, 29 insertions(+), 16 deletions(-) diff --git a/lib/PublicInbox/Filter/RubyLang.pm b/lib/PublicInbox/Filter/RubyLang.pm index 09aa6aa8..57ebbe78 100644 --- a/lib/PublicInbox/Filter/RubyLang.pm +++ b/lib/PublicInbox/Filter/RubyLang.pm @@ -1,11 +1,10 @@ -# Copyright (C) 2017-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ # Filter for lists.ruby-lang.org trailers package PublicInbox::Filter::RubyLang; -use base qw(PublicInbox::Filter::Base); -use strict; -use warnings; +use v5.10.1; +use parent qw(PublicInbox::Filter::Base); use PublicInbox::MID qw(mids); my $l1 = qr/Unsubscribe:\s @@ -56,16 +55,22 @@ sub scrub { my $hdr = $mime->header_obj; my $mids = mids($hdr); return $self->REJECT('Message-ID missing') unless (@$mids); - my @v = $hdr->header_raw('X-Mail-Count'); my $n; - foreach (@v) { - /\A\s*([0-9]+)\s*\z/ or next; - $n = $1; - last; - } - unless (defined $n) { - return $self->REJECT('X-Mail-Count not numeric'); + my @v = $hdr->header_raw('X-Mail-Count'); # old host only + if (@v) { + for (@v) { + /\A\s*([0-9]+)\s*\z/ or next; + $n = $1; + last; + } + } else { # new host: nue.mailmanlists.eu + for ($hdr->header_str('Subject')) { + /\A\[ruby-[^:]+:([0-9]+)\]/ or next; + $n = $1; + last; + } } + $n // return $self->REJECT('could not get count not numeric'); foreach my $mid (@$mids) { my $r = $altid->mm_alt->mid_set($n, $mid); next if $r == 0; diff --git a/t/filter_rubylang.t b/t/filter_rubylang.t index 4e9695e1..490a2154 100644 --- a/t/filter_rubylang.t +++ b/t/filter_rubylang.t @@ -1,8 +1,7 @@ -# Copyright (C) 2017-2021 all contributors +#!perl -w +# Copyright (C) all contributors # License: AGPL-3.0+ -use strict; -use warnings; -use Test::More; +use v5.12; use PublicInbox::Eml; use PublicInbox::TestCommon; use_ok 'PublicInbox::Filter::RubyLang'; @@ -56,6 +55,15 @@ EOF $mime = PublicInbox::Eml->new($msg); $ret = $f->delivery($mime); is($ret, 100, "delivery rejected without X-Mail-Count"); + + $mime = PublicInbox::Eml->new(<<'EOM'); +Message-ID: +Subject: [ruby-core:13] times + +EOM + $ret = $f->delivery($mime); + is($ret, $mime, "delivery successful"); + is($mm->num_for('new@host'), 13, 'MM entry created based on Subject'); } done_testing();