about summary refs log tree commit homepage
path: root/lib/PublicInbox/LeiDedupe.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-04-13 10:54:43 +0000
committerEric Wong <e@80x24.org>2021-04-13 15:04:42 -0400
commitc2216fcd14454c937e50e89711c6955ddd4101a7 (patch)
treeac6985668611373e1ac82ff03a60f8bb30037d8e /lib/PublicInbox/LeiDedupe.pm
parenta1a309418475aaa99d63cda8191ef3ce534343cd (diff)
downloadpublic-inbox-c2216fcd14454c937e50e89711c6955ddd4101a7.tar.gz
LeiSavedSearch will use a LeiDedupe-like internal API,
so we won't have to make as many changes to callsites
between saved and unsaved searches.
Diffstat (limited to 'lib/PublicInbox/LeiDedupe.pm')
-rw-r--r--lib/PublicInbox/LeiDedupe.pm16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/PublicInbox/LeiDedupe.pm b/lib/PublicInbox/LeiDedupe.pm
index a62b3a7c..378f748e 100644
--- a/lib/PublicInbox/LeiDedupe.pm
+++ b/lib/PublicInbox/LeiDedupe.pm
@@ -41,8 +41,8 @@ sub smsg_hash ($) {
 sub dedupe_oid ($) {
         my ($skv) = @_;
         (sub { # may be called in a child process
-                my ($eml, $oid) = @_;
-                $skv->set_maybe(_oidbin($oid) // _regen_oid($eml), '');
+                my ($eml, $oidhex) = @_;
+                $skv->set_maybe(_oidbin($oidhex) // _regen_oid($eml), '');
         }, sub {
                 my ($smsg) = @_;
                 $skv->set_maybe(_oidbin($smsg->{blob}), '');
@@ -53,9 +53,9 @@ sub dedupe_oid ($) {
 sub dedupe_mid ($) {
         my ($skv) = @_;
         (sub { # may be called in a child process
-                my ($eml, $oid) = @_;
-                # TODO: lei will support non-public messages w/o Message-ID
-                my $mid = $eml->header_raw('Message-ID') // _oidbin($oid) //
+                my ($eml, $oidhex) = @_;
+                # lei supports non-public drafts w/o Message-ID
+                my $mid = $eml->header_raw('Message-ID') // _oidbin($oidhex) //
                         content_hash($eml);
                 $skv->set_maybe($mid, '');
         }, sub {
@@ -71,7 +71,7 @@ sub dedupe_mid ($) {
 sub dedupe_content ($) {
         my ($skv) = @_;
         (sub { # may be called in a child process
-                my ($eml) = @_; # oid = $_[1], ignored
+                my ($eml) = @_; # $oidhex = $_[1], ignored
                 $skv->set_maybe(content_hash($eml), '');
         }, sub {
                 my ($smsg) = @_;
@@ -104,8 +104,8 @@ sub new {
 # returns true on seen messages according to the deduplication strategy,
 # returns false if unseen
 sub is_dup {
-        my ($self, $eml, $oid) = @_;
-        !$self->[1]->($eml, $oid);
+        my ($self, $eml, $smsg) = @_;
+        !$self->[1]->($eml, $smsg ? $smsg->{blob} : undef);
 }
 
 sub is_smsg_dup {