- my ($self, $mid, $opts) = @_;
- my $dbh = $self->connect;
- my ($tid, $sid) = $dbh->selectrow_array(<<'', undef, $mid);
-SELECT tid,sid FROM over
-LEFT JOIN id2num ON over.num = id2num.num
-LEFT JOIN msgid ON id2num.id = msgid.id
-WHERE msgid.mid = ? AND over.num > 0
-LIMIT 1
+ my ($self, $mid, $prev) = @_;
+ my $dbh = dbh($self);
+ my $opts = { cull => 1 };
+
+ my $id = $dbh->selectrow_array(<<'', undef, $mid);
+SELECT id FROM msgid WHERE mid = ? LIMIT 1
+
+ defined $id or return nothing;
+
+ my $num = $dbh->selectrow_array(<<'', undef, $id);
+SELECT num FROM id2num WHERE id = ? AND num > 0
+ORDER BY num ASC LIMIT 1
+
+ defined $num or return nothing;
+
+ my ($tid, $sid) = $dbh->selectrow_array(<<'', undef, $num);
+SELECT tid,sid FROM over WHERE num = ? LIMIT 1
+
+ defined $tid or return nothing; # $sid may be undef
+
+ my $cond_all = '(tid = ? OR sid = ?) AND num > ?';
+ my $sort_col = 'ds';
+ $num = 0;
+ if ($prev) { # mboxrd stream, only
+ $num = $prev->{num} || 0;
+ $sort_col = 'num';
+ }
+
+ my $cols = 'num,ts,ds,ddd';
+ unless (wantarray) {
+ return do_get($self, <<"", $opts, $tid, $sid, $num);
+SELECT $cols FROM over WHERE $cond_all
+ORDER BY $sort_col ASC
+
+ }
+
+ # HTML view always wants an array and never uses $prev,
+ # but the mbox stream never wants an array and always has $prev
+ die '$prev not supported with wantarray' if $prev;
+ my $nr = $dbh->selectrow_array(<<"", undef, $tid, $sid, $num);
+SELECT COUNT(num) FROM over WHERE $cond_all
+
+ # giant thread, prioritize strict (tid) matches and throw
+ # in the loose (sid) matches at the end
+ my $msgs = do_get($self, <<"", $opts, $tid, $num);
+SELECT $cols FROM over WHERE tid = ? AND num > ?
+ORDER BY $sort_col ASC