thread: prevent hidden threads in /$INBOX/ landing page

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

diff --git a/lib/PublicInbox/Over.pm b/lib/PublicInbox/Over.pm
index 0bd6008ba4adbfc706f742cdfbba08265616436b..30f2603f7d2a4324d02c1900593c4a80253ba790 100644 (file)
--- a/lib/PublicInbox/Over.pm
+++ b/lib/PublicInbox/Over.pm
@@ -15,7 +15,11 @@ use Compress::Zlib qw(uncompress);
 sub dbh_new {
        my ($self) = @_;
        my $ro = ref($self) eq 'PublicInbox::Over';
-       my $dbh = DBI->connect("dbi:SQLite:dbname=$self->{filename}",'','', {
+       my $f = $self->{filename};
+       if (!$ro && !-f $f) { # SQLite defaults mode to 0644, we want 0666
+               open my $fh, '+>>', $f or die "failed to open $f: $!";
+       }
+       my $dbh = DBI->connect("dbi:SQLite:dbname=$f",'','', {
                AutoCommit => 1,
                RaiseError => 1,
                PrintError => 0,
@@ -59,7 +63,7 @@ sub do_get {
 sub query_xover {
        my ($self, $beg, $end) = @_;
        do_get($self, <<'', {}, $beg, $end);
-SELECT * FROM over WHERE num >= ? AND num <= ?
+SELECT num,ts,ds,ddd FROM over WHERE num >= ? AND num <= ?
 ORDER BY num ASC
 
 }
@@ -93,16 +97,20 @@ ORDER BY num ASC LIMIT 1
 SELECT tid,sid FROM over WHERE num = ? LIMIT 1
 
        defined $tid or return nothing; # $sid may be undef
-
-       $prev ||= 0;
-       my $cond = 'FROM over WHERE (tid = ? OR sid = ?) AND num > ?';
-       my $msgs = do_get($self, <<"", {}, $tid, $sid, $prev);
-SELECT * $cond ORDER BY num ASC
+       my $sort_col = 'ds';
+       $num = 0;
+       if ($prev) {
+               $num = $prev->{num} || 0;
+               $sort_col = 'num';
+       }
+       my $cond = '(tid = ? OR sid = ?) AND num > ?';
+       my $msgs = do_get($self, <<"", {}, $tid, $sid, $num);
+SELECT num,ts,ds,ddd FROM over WHERE $cond ORDER BY $sort_col ASC
 
        return $msgs unless wantarray;
 
-       my $nr = $dbh->selectrow_array(<<"", undef, $tid, $sid, $prev);
-SELECT COUNT(num) $cond
+       my $nr = $dbh->selectrow_array(<<"", undef, $tid, $sid, $num);
+SELECT COUNT(num) FROM over WHERE $cond
 
        ($nr, $msgs);
 }
@@ -127,7 +135,7 @@ sub recent {
                }
        }
        my $msgs = do_get($self, <<"", $opts, @v);
-SELECT * FROM over WHERE $s
+SELECT ts,ds,ddd FROM over WHERE $s
 
        return $msgs unless wantarray;
 
@@ -141,10 +149,39 @@ sub get_art {
        my ($self, $num) = @_;
        my $dbh = $self->connect;
        my $smsg = $dbh->selectrow_hashref(<<'', undef, $num);
-SELECT * from OVER where num = ? LIMIT 1
+SELECT num,ds,ts,ddd FROM over WHERE num = ? LIMIT 1
 
        return load_from_row($smsg) if $smsg;
        undef;
 }
 
+sub next_by_mid {
+       my ($self, $mid, $id, $prev) = @_;
+       my $dbh = $self->connect;
+
+       unless (defined $$id) {
+               my $sth = $dbh->prepare_cached(<<'', undef, 1);
+       SELECT id FROM msgid WHERE mid = ? LIMIT 1
+
+               $sth->execute($mid);
+               $$id = $sth->fetchrow_array;
+               defined $$id or return;
+       }
+       my $sth = $dbh->prepare_cached(<<"", undef, 1);
+SELECT num FROM id2num WHERE id = ? AND num > ?
+ORDER BY num ASC LIMIT 1
+
+       $$prev ||= 0;
+       $sth->execute($$id, $$prev);
+       my $num = $sth->fetchrow_array or return;
+       $$prev = $num;
+
+       $sth = $dbh->prepare_cached(<<"", undef, 1);
+SELECT num,ts,ds,ddd FROM over WHERE num = ? LIMIT 1
+
+       $sth->execute($num);
+       my $smsg = $sth->fetchrow_hashref or return;
+       load_from_row($smsg);
+}
+
 1;