flashii/misuzu
1
1
Fork 0
Code Issues Pull requests Releases 140 Activity

Attempt at fixing forum issues.

Browse source
This commit is contained in:
flash 2023-09-10 19:13:36 +00:00
parent 3e49f6e503
commit e376671136
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
public-legacy/forum/forum.php
View file

@ -139,7 +139,6 @@ if($categoryInfo->mayHaveTopics()) {
$topic->info = $topicInfo; $topic->info = $topicInfo;
$topic->unread = $forumTopics->checkTopicUnread($topicInfo, $currentUser); $topic->unread = $forumTopics->checkTopicUnread($topicInfo, $currentUser);
$topic->participated = $forumTopics->checkTopicParticipated($topicInfo, $currentUser); $topic->participated = $forumTopics->checkTopicParticipated($topicInfo, $currentUser);
$topic->lastPost = new stdClass;
if($topicInfo->hasUserId()) { if($topicInfo->hasUserId()) {
$topic->user = $usersCtx->getUserInfo($topicInfo->getUserId()); $topic->user = $usersCtx->getUserInfo($topicInfo->getUserId());
@ -147,6 +146,7 @@ if($categoryInfo->mayHaveTopics()) {
} }
try { try {
$topic->lastPost = new stdClass;
$topic->lastPost->info = $lastPostInfo = $forumPosts->getPost( $topic->lastPost->info = $lastPostInfo = $forumPosts->getPost(
topicInfo: $topicInfo, topicInfo: $topicInfo,
getLast: true, getLast: true,
@ -157,7 +157,9 @@ if($categoryInfo->mayHaveTopics()) {
$topic->lastPost->user = $usersCtx->getUserInfo($lastPostInfo->getUserId()); $topic->lastPost->user = $usersCtx->getUserInfo($lastPostInfo->getUserId());
$topic->lastPost->colour = $usersCtx->getUserColour($topic->lastPost->user); $topic->lastPost->colour = $usersCtx->getUserColour($topic->lastPost->user);
} }
} catch(RuntimeException $ex) {} } catch(RuntimeException $ex) {
$topic->lastPost = null;
}
} }
} }

2
public-legacy/forum/posting.php
View file

@ -214,7 +214,7 @@ if(!empty($_POST)) {
); );
$topicId = $topicInfo->getId(); $topicId = $topicInfo->getId();
$forumTopics->incrementCategoryTopics($categoryInfo); $forumCategories->incrementCategoryTopics($categoryInfo);
} else } else
$forumTopics->bumpTopic($topicInfo); $forumTopics->bumpTopic($topicInfo);

2
templates/forum/macros.twig
View file

@ -351,7 +351,7 @@
{% set topic_author_colour = '--user-colour: ' ~ topic.colour %} {% set topic_author_colour = '--user-colour: ' ~ topic.colour %}
{% endif %} {% endif %}
{% set has_reply = topic.lastPost is defined %} {% set has_reply = topic.lastPost is defined and topic.lastPost is not null %}
{% if has_reply %} {% if has_reply %}
{% set reply_id = topic.lastPost.info.id %} {% set reply_id = topic.lastPost.info.id %}
{% set reply_created = topic.lastPost.info.createdTime %} {% set reply_created = topic.lastPost.info.createdTime %}