0
/
leftypol_lainchan
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge pull request #185 from nonmakina/overboardCountFix 

Adds function to count posts and images of a thread
This commit is contained in:
dedushka1 2021-01-19 14:48:59 -05:00 committed by GitHub
parent a4607fa6e6 f40beb7640
commit e46deb5da5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
templates/themes/semirand/theme.php
View File

@ -97,6 +97,18 @@
return $query->fetchAll(PDO::FETCH_ASSOC); return $query->fetchAll(PDO::FETCH_ASSOC);
} }
/**
* Retrieve count of images and posts in a thread
*/
private function fetchThreadCount($board, $thread_id, $preview_count) {
$query = prepare("SELECT SUM(t.num_files) as file_count, COUNT(t.id) as post_count FROM (SELECT * FROM ``posts_$board`` WHERE `thread` = :id ORDER BY `time` DESC LIMIT :offset , 18446744073709551615) as t;");
$query->bindValue(':id', $thread_id, PDO::PARAM_INT);
$query->bindValue(':offset', $preview_count, PDO::PARAM_INT);
$query->execute() or error(db_error($query));
return $query->fetch(PDO::FETCH_ASSOC);
}
/** /**
* Intersperse random threads between those in bump order * Intersperse random threads between those in bump order
*/ */
@ -138,27 +150,15 @@
$config['threads_preview']; $config['threads_preview'];
$replies = $this->fetchReplies($post['board'], $post['id'], $preview_count); $replies = $this->fetchReplies($post['board'], $post['id'], $preview_count);
// Chomp the last few replies
$disp_replies = $replies; $disp_replies = $replies;
$disp_img_count = 0;
foreach ($disp_replies as $reply) { foreach ($disp_replies as $reply) {
if ($reply['files'] !== '')
++$disp_img_count;
// Append the reply to the thread as it's being built // Append the reply to the thread as it's being built
$thread->add(new Post($reply, $mod ? '?/' : $config['root'], $mod)); $thread->add(new Post($reply, $mod ? '?/' : $config['root'], $mod));
} }
// Count the number of omitted image replies $threadCount = $this->fetchThreadCount($post['board'], $post['id'], $preview_count);
$omitted_img_count = count(array_filter($replies, function($p) { $thread->omitted = $threadCount['post_count'];
return $p['files'] !== ''; $thread->omitted_images = $threadCount['file_count'];
}));
// Set the corresponding omitted numbers on the thread
if (!empty($replies)) {
$thread->omitted = count($replies);
$thread->omitted_images = $omitted_img_count;
}
// Board name and link // Board name and link
$html = '<h2><a href="' . $config['root'] . $post['board'] . '/">/' . $html = '<h2><a href="' . $config['root'] . $post['board'] . '/">/' .