X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=lib%2FNDWeb%2FController%2FForum.pm;h=bf7dc3ca8f11b76788ef52aa4cc8bbc2b4e72582;hb=0fd1ff08781f7be2e32d33a4130de91151f5d461;hp=a9b1cb5f3a7302e82bb3d471237e1ed21ea9b8d6;hpb=19fd4a5af02598996dd548b3b2307a2b1ea527e3;p=ndwebbie.git

diff --git a/lib/NDWeb/Controller/Forum.pm b/lib/NDWeb/Controller/Forum.pm
index a9b1cb5..bf7dc3c 100644
--- a/lib/NDWeb/Controller/Forum.pm
+++ b/lib/NDWeb/Controller/Forum.pm
@@ -26,19 +26,22 @@ sub index :Path :Args(0) {
 	my ( $self, $c ) = @_;
 	my $dbh = $c->model;
 
-	my $boards = $dbh->prepare(q{SELECT fcid,category,fb.fbid,fb.board
-			,count(NULLIF(COALESCE(fp.fpid::BOOLEAN,FALSE)
-				AND COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread
-			,date_trunc('seconds',max(fp.time)::timestamp) as last_post
-			FROM forum_categories
-				JOIN forum_boards fb USING (fcid)
-				LEFT OUTER JOIN forum_threads ft USING (fbid)
-				LEFT OUTER JOIN forum_posts fp USING (ftid)
-				LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $1) ftv USING (ftid)
-			WHERE EXISTS (SELECT fbid FROM forum_access WHERE fbid = fb.fbid AND gid IN (SELECT groups($1)))
-				OR ft.ftid IN (SELECT ftid FROM forum_priv_access WHERE uid = $1)
-			GROUP BY fcid,category,fb.fbid, fb.board
-			ORDER BY fcid,fb.fbid
+	my $boards = $dbh->prepare(q{
+SELECT fcid,category,fb.fbid,fb.board
+	,SUM((SELECT count(*) FROM forum_posts WHERE ftid = ft.ftid
+		AND COALESCE(time > ftv.time,TRUE))) AS unread
+	,date_trunc('seconds',max(ft.mtime)::timestamp ) AS last_post
+FROM forum_categories fc
+	JOIN forum_boards fb USING (fcid)
+	LEFT OUTER JOIN forum_threads ft USING (fbid)
+	LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $1)
+		ftv USING (ftid)
+WHERE fbid IN (SELECT fbid FROM forum_access
+		WHERE gid IN (SELECT groups($1)))
+	OR ftid IN (SELECT ftid FROM forum_priv_access
+		WHERE uid = $1)
+GROUP BY fcid,category,fb.fbid, fb.board
+ORDER BY fcid,fb.fbid
 		});
 		$boards->execute($c->stash->{UID});
 
@@ -58,22 +61,24 @@ sub allUnread : Local {
 	my ( $self, $c ) = @_;
 	my $dbh = $c->model;
 
-	my $threads = $dbh->prepare(q{SELECT fcid,category,fbid,board,ft.ftid,u.username,ft.subject,
-		count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread,count(fp.fpid) AS posts,
-		date_trunc('seconds',max(fp.time)::timestamp) as last_post,
-		min(fp.time)::date as posting_date, ft.sticky
-		FROM forum_categories fc 
-			JOIN forum_boards fb USING (fcid) 
-			JOIN forum_threads ft USING (fbid)
-			JOIN forum_posts fp USING (ftid) 
-			JOIN users u ON u.uid = ft.uid
-			LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $1) ftv ON ftv.ftid = ft.ftid
-		WHERE (fbid > 0 AND
-				fb.fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($1)))
-			) OR ft.ftid IN (SELECT ftid FROM forum_priv_access WHERE uid = $1)
-		GROUP BY fcid,category,fbid,board,ft.ftid, ft.subject,ft.sticky,u.username
-		HAVING count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) >= 1 
-		ORDER BY fcid,fbid,sticky DESC,last_post DESC
+	my $threads = $dbh->prepare(q{
+SELECT fcid,category,fbid,board,ft.ftid,u.username,ft.subject,ft.sticky
+	,(SELECT count(*) FROM forum_posts WHERE ftid = ft.ftid
+		AND COALESCE(time > ftv.time,TRUE)) AS unread
+	,ft.posts,date_trunc('seconds',ft.mtime::timestamp) as last_post
+	,ft.ctime::DATE as posting_date
+FROM forum_categories fc
+	JOIN forum_boards fb USING (fcid)
+	JOIN forum_threads ft USING (fbid)
+	JOIN users u ON u.uid = ft.uid
+	LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $1)
+		ftv ON ftv.ftid = ft.ftid
+WHERE COALESCE(ft.mtime > ftv.time,TRUE)
+	AND ft.ftid IN (SELECT ftid FROM forum_posts WHERE ftid = ft.ftid)
+	AND ((fbid > 0 AND
+			fb.fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($1))))
+		OR ft.ftid IN (SELECT ftid FROM forum_priv_access WHERE uid = $1))
+ORDER BY fcid,fbid,sticky DESC,last_post DESC
 		});
 
 	$threads->execute($c->stash->{UID});
@@ -163,20 +168,22 @@ sub board : Local {
 		$c->detach('/default');
 	}
 
-	my $threads = $dbh->prepare(q{SELECT ft.ftid,u.username,ft.subject
-		,count(NULLIF(COALESCE(fp.time > ftv.time,TRUE),FALSE)) AS unread,count(fp.fpid) AS posts
-		,date_trunc('seconds',max(fp.time)::timestamp) as last_post
-		,min(fp.time)::date as posting_date, ft.sticky
-		FROM forum_threads ft 
-			JOIN forum_posts fp USING (ftid)
-			JOIN users u ON u.uid = ft.uid
-			LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2) ftv ON ftv.ftid = ft.ftid
-		WHERE ft.fbid = $1 AND (
-			ft.fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($2)))
-			OR ft.ftid IN (SELECT ftid FROM forum_priv_access WHERE uid = $2)
-			)
-		GROUP BY ft.ftid, ft.subject,ft.sticky,u.username
-		ORDER BY sticky DESC,last_post DESC
+	my $threads = $dbh->prepare(q{
+SELECT ft.ftid,u.username,ft.subject,ft.posts, ft.sticky
+	,(SELECT count(*) FROM forum_posts WHERE ftid = ft.ftid
+		AND COALESCE(time > ftv.time,TRUE)) AS unread
+	,ft.ctime::DATE as posting_date
+	,date_trunc('seconds',ft.mtime::timestamp) as last_post
+FROM forum_threads ft
+	JOIN users u USING(uid)
+	LEFT OUTER JOIN (SELECT * FROM forum_thread_visits WHERE uid = $2)
+		ftv ON ftv.ftid = ft.ftid
+WHERE ft.posts > 0 AND ft.fbid = $1 AND (
+		ft.fbid IN (SELECT fbid FROM forum_access WHERE gid IN (SELECT groups($2)))
+		OR ft.ftid IN (SELECT ftid FROM forum_priv_access WHERE uid = $2)
+	)
+GROUP BY ft.ftid, ft.subject,ft.sticky,u.username,ft.ctime,ft.mtime,ft.posts,ftv.time
+ORDER BY sticky DESC,last_post DESC
 	});
 	$threads->execute($board->{fbid},$c->stash->{UID});
 	my @threads;
@@ -225,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)
@@ -287,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;
@@ -465,7 +502,7 @@ sub findUsers : Private {
 
 	my $query = $dbh->prepare(q{SELECT uid,username FROM users
 		WHERE uid > 0 AND uid IN (SELECT uid FROM groupmembers)
-		ORDER BY LOWER(username)});
+		ORDER BY username});
 	$query->execute;
 
 	$c->stash(users => $query->fetchall_arrayref({}) );
@@ -480,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))