cgi: update feed/view and tests for shorter URLs

Code should be consistent with the design docs
(and we will need better tests).

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index da4cc04a940ef9794a1ad88ad428eda543977764..75e5d9532de3e7f0a21ec9344487b3c35b18e2aa 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -127,8 +127,8 @@ sub get_feedopts {
                $rv{atomurl} = "$url_base/index.atom.xml";
        }
        $rv{url} ||= "$url_base/";
-       $rv{midurl} = "$url_base/mid/";
-       $rv{fullurl} = "$url_base/full/";
+       $rv{midurl} = "$url_base/m/";
+       $rv{fullurl} = "$url_base/f/";
 
        \%rv;
 }
@@ -162,8 +162,8 @@ sub add_to_feed {
                return 0;
        }
 
-       my $midurl = $feed_opts->{midurl} || 'http://example.com/mid/';
-       my $fullurl = $feed_opts->{fullurl} || 'http://example.com/full/';
+       my $midurl = $feed_opts->{midurl} || 'http://example.com/m/';
+       my $fullurl = $feed_opts->{fullurl} || 'http://example.com/f/';
 
        my $content = PublicInbox::View->as_feed_entry($mime, $fullurl);
        defined($content) or return 0;

diff --git a/t/cgi.t b/t/cgi.t
index 93a48d0079e431d0c1e8ff2b0cf09901f962ec78..2c4c824c500543827f05b461452497ea3564aa16 100644 (file)
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -106,7 +106,7 @@ EOF
        like($res->{body}, qr/<title>test for public-inbox/,
                "set title in XML feed");
        like($res->{body},
-               qr!http://test\.example\.com/test/mid/blah%40example\.com!,
+               qr!http://test\.example\.com/test/m/blah%40example\.com!,
                "link id set");
        like($res->{body}, qr/what\?/, "reply included");
 

diff --git a/t/view.t b/t/view.t
index fbdbd88433fa48d1716043c51f7edac8fbb7721e..ad79c413084f9d97726769ea19a3bc4f60fd2e68 100644 (file)
--- a/t/view.t
+++ b/t/view.t
@@ -40,7 +40,7 @@ EOF
                "long quoted text is anchored");
 
        # short page
-       my $pfx = "http://example.com/test/full";
+       my $pfx = "http://example.com/test/f";
        my $short = PublicInbox::View->as_html($s, $pfx);
        like($short, qr/\n> keep this inline/,
                "short quoted text is inline");