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
$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) = @_;
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);
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};