www_stream: fix search for new.html endpoint

[public-inbox.git] / lib / PublicInbox / Inbox.pm

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 5d9fdb36b1fc66af10f4ecfc6e564f5d4d8d1f4f..ada713c741657ef16522d4b118cffebcbd95c4be 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -5,17 +5,23 @@
 package PublicInbox::Inbox;
 use strict;
 use warnings;
-use Scalar::Util qw(weaken);
+use Scalar::Util qw(weaken isweak);
 use PublicInbox::Git;
+use PublicInbox::MID qw(mid2path);
 
 sub new {
        my ($class, $opts) = @_;
+       my $v = $opts->{address} ||= 'public-inbox@example.com';
+       my $p = $opts->{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
+       $opts->{domain} = ($p =~ /\@(\S+)\z/) ? $1 : 'localhost';
        bless $opts, $class;
 }
 
 sub weaken_all {
        my ($self) = @_;
-       weaken($self->{$_}) foreach qw(git mm search);
+       foreach my $f (qw(git mm search)) {
+               isweak($self->{$f}) or weaken($self->{$f});
+       }
 }
 
 sub git {
@@ -64,13 +70,43 @@ sub cloneurl {
        $self->{cloneurl} = \@url;
 }
 
-sub footer_html {
+sub base_url {
+       my ($self, $prq) = @_; # Plack::Request
+       if (defined $prq) {
+               my $url = $prq->base->as_string;
+               $url .= '/' if $url !~ m!/\z!; # for mount in Plack::Builder
+               $url .= $self->{name} . '/';
+       } else {
+               # either called from a non-PSGI environment (e.g. NNTP/POP3)
+               $self->{-base_url} ||= do {
+                       my $url = $self->{url} or return undef;
+                       # expand protocol-relative URLs to HTTPS if we're
+                       # not inside a web server
+                       $url = "https:$url" if $url =~ m!\A//!;
+                       $url .= '/' if $url !~ m!/\z!;
+                       $url;
+               };
+       }
+}
+
+sub nntp_usable {
        my ($self) = @_;
-       my $footer = $self->{footer};
-       return $footer if defined $footer;
-       $footer = try_cat("$self->{mainrepo}/public-inbox/footer.html");
-       chomp $footer;
-       $self->{footer} = $footer;
+       my $ret = $self->mm && $self->search;
+       $self->{mm} = $self->{search} = undef;
+       $ret;
+}
+
+sub msg_by_path ($$;$) {
+       my ($self, $path, $ref) = @_;
+       # TODO: allow other refs:
+       my $str = git($self)->cat_file('HEAD:'.$path, $ref);
+       $$str =~ s/\A[\r\n]*From [^\r\n]*\r?\n//s if $str;
+       $str;
+}
+
+sub msg_by_mid ($$;$) {
+       my ($self, $mid, $ref) = @_;
+       msg_by_path($self, mid2path($mid), $ref);
 }
 
 1;