about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2021-02-24 17:31:54 +0600
committerEric Wong <e@80x24.org>2021-02-24 23:27:07 +0000
commitab32ba9e13b0fe83314b76a481439a39a88a3359 (patch)
tree6b2cfc0c24c98c1248a75cbd257f9e1e61b3a675
parent48bae7dc634583b58fd747bd557392cac60123b3 (diff)
downloadpublic-inbox-ab32ba9e13b0fe83314b76a481439a39a88a3359.tar.gz
More network things for -watch are isolated in NetReader, now,
so fewer exports are necessary.
-rw-r--r--lib/PublicInbox/NetReader.pm15
-rw-r--r--lib/PublicInbox/Watch.pm4
2 files changed, 3 insertions, 16 deletions
diff --git a/lib/PublicInbox/NetReader.pm b/lib/PublicInbox/NetReader.pm
index 785211bf..96d3b2ed 100644
--- a/lib/PublicInbox/NetReader.pm
+++ b/lib/PublicInbox/NetReader.pm
@@ -10,11 +10,7 @@ use PublicInbox::Eml;
 
 our %IMAPflags2kw = map {; "\\\u$_" => $_ } qw(seen answered flagged draft);
 
-# TODO: trim this down, this is huge
-our @EXPORT = qw(uri_new uri_section
-                nn_new imap_uri nntp_uri
-                cfg_bool cfg_intvl imap_common_init nntp_common_init
-                );
+our @EXPORT = qw(uri_section imap_uri nntp_uri);
 
 # returns the git config section name, e.g [imap "imaps://user@example.com"]
 # without the mailbox, so we can share connections between different inboxes
@@ -94,15 +90,6 @@ sub mic_for { # mic = Mail::IMAPClient
         $mic;
 }
 
-sub uri_new {
-        my ($url) = @_;
-        require URI;
-
-        # URI::snews exists, URI::nntps does not, so use URI::snews
-        $url =~ s!\Anntps://!snews://!i;
-        URI->new($url);
-}
-
 # Net::NNTP doesn't support CAPABILITIES, yet
 sub try_starttls ($) {
         my ($host) = @_;
diff --git a/lib/PublicInbox/Watch.pm b/lib/PublicInbox/Watch.pm
index 0b72bd16..dd245935 100644
--- a/lib/PublicInbox/Watch.pm
+++ b/lib/PublicInbox/Watch.pm
@@ -544,7 +544,7 @@ sub poll_fetch_reap {
 
 sub watch_imap_init ($$) {
         my ($self, $poll) = @_;
-        my $mics = imap_common_init($self); # read args from config
+        my $mics = PublicInbox::NetReader::imap_common_init($self);
         my $idle = []; # [ [ uri1, intvl1 ], [uri2, intvl2] ]
         for my $uri (@{$self->{imap_order}}) {
                 my $sec = uri_section($uri);
@@ -565,7 +565,7 @@ sub watch_imap_init ($$) {
 
 sub watch_nntp_init ($$) {
         my ($self, $poll) = @_;
-        nntp_common_init($self); # read args from config
+        PublicInbox::NetReader::nntp_common_init($self);
         for my $uri (@{$self->{nntp_order}}) {
                 my $sec = uri_section($uri);
                 my $intvl = $self->{nntp_opt}->{$sec}->{pollInterval};