flashii/misuzu
flashii/misuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

// she thought

Browse source
This commit is contained in:
flash 2018-10-19 10:44:38 +02:00
parent 4d5ce2dc19
commit 164513d0e6
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/Forum/forum.php
View file

@ -177,6 +177,7 @@ function forum_increment_clicks(int $forumId): void
function forum_read_status_sql( function forum_read_status_sql(
string $topic_id_param, string $topic_id_param,
string $topic_bumped_param, string $topic_bumped_param,
string $user_param_sub,
string $forum_id_param = 'f.`forum_id`', string $forum_id_param = 'f.`forum_id`',
string $user_param = '`target_user_id`' string $user_param = '`target_user_id`'
): string { ): string {
@ -189,12 +190,12 @@ function forum_read_status_sql(
AND AND
%3$s >= NOW() - INTERVAL 1 MONTH %3$s >= NOW() - INTERVAL 1 MONTH
AND ( AND (
SELECT COUNT(tt.`topic_id`) SELECT COUNT(ti.`topic_id`)
FROM `msz_forum_topics_track` as tt FROM `msz_forum_topics` AS ti
RIGHT JOIN `msz_forum_topics` as ti LEFT JOIN `msz_forum_topics_track` AS tt
ON ti.`topic_id` = tt.`topic_id` ON tt.`topic_id` = ti.`topic_id` AND tt.`user_id` = %5$s
WHERE ti.`forum_id` = %4$s WHERE ti.`forum_id` = %4$s
AND tt.`user_id` = %1$s AND ti.`topic_deleted` IS NULL
AND ( AND (
tt.`track_last_read` IS NULL tt.`track_last_read` IS NULL
OR tt.`track_last_read` < ti.`topic_bumped` OR tt.`track_last_read` < ti.`topic_bumped`
@ -204,7 +205,8 @@ function forum_read_status_sql(
$user_param, $user_param,
$topic_id_param, $topic_id_param,
$topic_bumped_param, $topic_bumped_param,
$forum_id_param $forum_id_param,
$user_param_sub
); );
} }
@ -295,7 +297,7 @@ function forum_get_children_query(bool $small = false): string
$small $small
? MSZ_FORUM_GET_CHILDREN_QUERY_SMALL ? MSZ_FORUM_GET_CHILDREN_QUERY_SMALL
: MSZ_FORUM_GET_CHILDREN_QUERY_STANDARD, : MSZ_FORUM_GET_CHILDREN_QUERY_STANDARD,
forum_read_status_sql('t.`topic_id`', 't.`topic_bumped`'), forum_read_status_sql('t.`topic_id`', 't.`topic_bumped`', ':user_for_check'),
MSZ_FORUM_ROOT, MSZ_FORUM_ROOT,
MSZ_FORUM_TYPE_CATEGORY, MSZ_FORUM_TYPE_CATEGORY,
forum_perms_get_user_sql('forum', 'f.`forum_id`'), forum_perms_get_user_sql('forum', 'f.`forum_id`'),
@ -309,6 +311,7 @@ function forum_get_children(int $parentId, int $userId, bool $small = false): ar
$getListing->bindValue('user_id', $userId); $getListing->bindValue('user_id', $userId);
$getListing->bindValue('perm_user_id_user', $userId); $getListing->bindValue('perm_user_id_user', $userId);
$getListing->bindValue('perm_user_id_role', $userId); $getListing->bindValue('perm_user_id_role', $userId);
$getListing->bindValue('user_for_check', $userId);
$getListing->bindValue('parent_id', $parentId); $getListing->bindValue('parent_id', $parentId);
return $getListing->execute() ? $getListing->fetchAll() : []; return $getListing->execute() ? $getListing->fetchAll() : [];