X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FForum.pm;h=bf7dc3ca8f11b76788ef52aa4cc8bbc2b4e72582;hb=0fd1ff08781f7be2e32d33a4130de91151f5d461;hp=caeeb1cf99ca03e6f24a51ebac2d5fe26e5c82dc;hpb=84d8f30ecbac4d41009e3f979526a47557f49225;p=ndwebbie.git diff --git a/lib/NDWeb/Controller/Forum.pm b/lib/NDWeb/Controller/Forum.pm index caeeb1c..bf7dc3c 100644 --- a/lib/NDWeb/Controller/Forum.pm +++ b/lib/NDWeb/Controller/Forum.pm @@ -232,7 +232,7 @@ sub findPosts :Private { my $dbh = $c->model; my $posts = $dbh->prepare(q{ - SELECT u.uid,u.username,date_trunc('seconds',fp.time::timestamp) AS time + SELECT fpid,u.uid,u.username,date_trunc('seconds',fp.time::timestamp) AS time ,fp.message,COALESCE(fp.time > ftv.time,TRUE) AS unread FROM forum_threads ft JOIN forum_posts fp USING (ftid) @@ -294,6 +294,36 @@ sub markThreadAsRead : Private { } } +sub markThreadAsUnread : Local { + my ( $self, $c, $thread ) = @_; + my $dbh = $c->model; + + my ($fbid) = $dbh->selectrow_array(q{ +SELECT fbid FROM forum_threads WHERE ftid = $1 + },undef, $thread); + + $dbh->do(q{ +DELETE FROM forum_thread_visits WHERE uid = $1 AND ftid = $2 + }, undef, $c->user->id, $thread); + $c->res->redirect($c->uri_for('board',$fbid)); +} + +sub markPostAsUnread : Local { + my ( $self, $c, $post ) = @_; + my $dbh = $c->model; + + my ($fbid) = $dbh->selectrow_array(q{ +SELECT fbid FROM forum_threads JOIN forum_posts USING (ftid) WHERE fpid = $1 + },undef, $post); + + $dbh->do(q{ +UPDATE forum_thread_visits ftv SET time = (fp.time - interval '1 second') +FROM forum_posts fp +WHERE ftv.uid = $1 AND fp.fpid = $2 AND fp.ftid = ftv.ftid + }, undef, $c->user->id, $post); + $c->res->redirect($c->uri_for('board',$fbid)); +} + sub moveThreads : Local { my ( $self, $c, $board ) = @_; my $dbh = $c->model; @@ -487,8 +517,8 @@ sub findThread : Private { FROM forum_boards fb NATURAL JOIN forum_threads ft NATURAL JOIN forum_categories fc - LEFT OUTER JOIN (SELECT * FROM forum_access - WHERE gid IN (SELECT groups($2)) + LEFT OUTER JOIN (SELECT fa.* FROM forum_access fa + JOIN (SELECT groups($2) AS gid) g USING (gid) ) fa USING (fbid) WHERE ft.ftid = $1 AND (fa.post IS NOT NULL OR ft.ftid IN (SELECT ftid FROM forum_priv_access WHERE uid = $2))