flashii/misuzu-interim
flashii/misuzu-interim
Archived
2
1
Fork 0
Code Issues Pull requests Releases 163 Wiki Activity Actions

Moved forum category views into the router.

Browse source
This commit is contained in:
flash 2024-12-19 23:41:52 +00:00
parent c061f46a2e
commit 06faf86d05
3 changed files with 170 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,171 +0,0 @@
<?php
namespace Misuzu;
use stdClass;
use RuntimeException;
if(!isset($msz) || !($msz instanceof \Misuzu\MisuzuContext))
die('Script must be called through the Misuzu route dispatcher.');
$categoryId = (string)filter_input(INPUT_GET, 'f', FILTER_SANITIZE_NUMBER_INT);
try {
$categoryInfo = $msz->forumCtx->categories->getCategory(categoryId: $categoryId);
} catch(RuntimeException $ex) {
Template::throwError(404);
}
$perms = $msz->authInfo->getPerms('forum', $categoryInfo);
$currentUser = $msz->authInfo->userInfo;
$currentUserId = $currentUser === null ? '0' : $currentUser->id;
if(!$perms->check(Perm::F_CATEGORY_VIEW))
Template::throwError(403);
if($msz->usersCtx->hasActiveBan($currentUser))
$perms = $perms->apply(fn($calc) => $calc & (Perm::F_CATEGORY_LIST | Perm::F_CATEGORY_VIEW));
if($categoryInfo->isLink) {
$msz->forumCtx->categories->incrementCategoryClicks($categoryInfo);
Tools::redirect($categoryInfo->linkTarget ?? '/');
return;
}
$forumPagination = Pagination::fromInput($msz->forumCtx->topics->countTopics(
categoryInfo: $categoryInfo,
global: true,
deleted: $perms->check(Perm::F_POST_DELETE_ANY) ? null : false
), 20);
if(!$forumPagination->validOffset)
Template::throwError(404);
$children = [];
$topics = [];
if($categoryInfo->mayHaveChildren) {
$children = $msz->forumCtx->categories->getCategoryChildren($categoryInfo, hidden: false, asTree: true);
foreach($children as $childId => $child) {
$childPerms = $msz->authInfo->getPerms('forum', $child->info);
if(!$childPerms->check(Perm::F_CATEGORY_LIST)) {
unset($category->children[$childId]);
continue;
}
$childUnread = false;
if($child->info->mayHaveChildren) {
foreach($child->children as $grandChildId => $grandChild) {
$grandChildPerms = $msz->authInfo->getPerms('forum', $grandChild->info);
if(!$grandChildPerms->check(Perm::F_CATEGORY_LIST)) {
unset($child->children[$grandChildId]);
continue;
}
$grandChildUnread = false;
if($grandChild->info->mayHaveTopics) {
$catIds = [$grandChild->info->id];
foreach($grandChild->childIds as $greatGrandChildId) {
$greatGrandChildPerms = $msz->authInfo->getPerms('forum', $greatGrandChildId);
if(!$greatGrandChildPerms->check(Perm::F_CATEGORY_LIST))
$catIds[] = $greatGrandChildId;
}
$grandChildUnread = $msz->forumCtx->categories->checkCategoryUnread($catIds, $currentUser);
if($grandChildUnread)
$childUnread = true;
}
$grandChild->perms = $grandChildPerms;
$grandChild->unread = $grandChildUnread;
}
}
if($child->info->mayHaveChildren || $child->info->mayHaveTopics) {
$catIds = [$child->info->id];
foreach($child->childIds as $grandChildId) {
$grandChildPerms = $msz->authInfo->getPerms('forum', $grandChildId);
if($grandChildPerms->check(Perm::F_CATEGORY_LIST))
$catIds[] = $grandChildId;
}
try {
$lastPostInfo = $msz->forumCtx->posts->getPost(categoryInfos: $catIds, getLast: true, deleted: false);
} catch(RuntimeException $ex) {
$lastPostInfo = null;
}
if($lastPostInfo !== null) {
$child->lastPost = new stdClass;
$child->lastPost->info = $lastPostInfo;
$child->lastPost->topicInfo = $msz->forumCtx->topics->getTopic(postInfo: $lastPostInfo);
if($lastPostInfo->userId !== null) {
$child->lastPost->user = $msz->usersCtx->getUserInfo($lastPostInfo->userId);
$child->lastPost->colour = $msz->usersCtx->getUserColour($child->lastPost->user);
}
}
}
if($child->info->mayHaveTopics && !$childUnread)
$childUnread = $msz->forumCtx->categories->checkCategoryUnread($child->info, $currentUser);
$child->perms = $childPerms;
$child->unread = $childUnread;
}
}
if($categoryInfo->mayHaveTopics) {
$topicInfos = $msz->forumCtx->topics->getTopics(
categoryInfo: $categoryInfo,
global: true,
deleted: $perms->check(Perm::F_POST_DELETE_ANY) ? null : false,
pagination: $forumPagination,
);
foreach($topicInfos as $topicInfo) {
$topics[] = $topic = new stdClass;
$topic->info = $topicInfo;
$topic->unread = $msz->forumCtx->topics->checkTopicUnread($topicInfo, $currentUser);
$topic->participated = $msz->forumCtx->topics->checkTopicParticipated($topicInfo, $currentUser);
if($topicInfo->userId !== null) {
$topic->user = $msz->usersCtx->getUserInfo($topicInfo->userId);
$topic->colour = $msz->usersCtx->getUserColour($topic->user);
}
try {
$topic->lastPost = new stdClass;
$topic->lastPost->info = $lastPostInfo = $msz->forumCtx->posts->getPost(
topicInfo: $topicInfo,
getLast: true,
deleted: $topicInfo->deleted ? null : false,
);
if($lastPostInfo->userId !== null) {
$topic->lastPost->user = $msz->usersCtx->getUserInfo($lastPostInfo->userId);
$topic->lastPost->colour = $msz->usersCtx->getUserColour($topic->lastPost->user);
}
} catch(RuntimeException $ex) {
$topic->lastPost = null;
}
}
}
$perms = $perms->checkMany([
'can_create_topic' => Perm::F_TOPIC_CREATE,
]);
Template::render('forum.forum', [
'forum_breadcrumbs' => iterator_to_array($msz->forumCtx->categories->getCategoryAncestry($categoryInfo)),
'global_accent_colour' => $msz->forumCtx->categories->getCategoryColour($categoryInfo),
'forum_info' => $categoryInfo,
'forum_children' => $children,
'forum_topics' => $topics,
'forum_pagination' => $forumPagination,
'forum_show_mark_as_read' => $currentUser !== null,
'forum_perms' => $perms,
]);

163
src/Forum/ForumCategoriesRoutes.php
View file

@ -6,7 +6,7 @@ use RuntimeException;
use Index\Http\{HttpRequest,HttpResponseBuilder}; use Index\Http\{HttpRequest,HttpResponseBuilder};
use Index\Http\Routing\{HttpGet,HttpPost,RouteHandler,RouteHandlerTrait}; use Index\Http\Routing\{HttpGet,HttpPost,RouteHandler,RouteHandlerTrait};
use Index\Urls\{UrlFormat,UrlSource,UrlSourceTrait}; use Index\Urls\{UrlFormat,UrlSource,UrlSourceTrait};
use Misuzu\{CSRF,Perm,Template}; use Misuzu\{CSRF,Pagination,Perm,Template};
use Misuzu\Auth\AuthInfo; use Misuzu\Auth\AuthInfo;
use Misuzu\Users\UsersContext; use Misuzu\Users\UsersContext;
@ -21,6 +21,7 @@ class ForumCategoriesRoutes implements RouteHandler, UrlSource {
#[HttpGet('/forum')] #[HttpGet('/forum')]
#[UrlFormat('forum-index', '/forum')] #[UrlFormat('forum-index', '/forum')]
#[UrlFormat('forum-category-root', '/forum', fragment: '<forum>')]
public function getIndex() { public function getIndex() {
$cats = $this->forum->categories->getCategories(hidden: false, asTree: true); $cats = $this->forum->categories->getCategories(hidden: false, asTree: true);
@ -169,6 +170,166 @@ class ForumCategoriesRoutes implements RouteHandler, UrlSource {
]); ]);
} }
#[HttpGet('/forum/([0-9]+)')]
#[UrlFormat('forum-category', '/forum/<forum>', ['p' => '<page>'])]
public function getCategory(HttpResponseBuilder $response, HttpRequest $request, string $catId) {
try {
$category = $this->forum->categories->getCategory(categoryId: $catId);
} catch(RuntimeException $ex) {
return 404;
}
$perms = $this->authInfo->getPerms('forum', $category);
if(!$perms->check(Perm::F_CATEGORY_VIEW))
return 403;
if($category->isLink) {
$this->forum->categories->incrementCategoryClicks($category);
$response->redirect($category->linkTarget ?? '/');
return;
}
if($this->usersCtx->hasActiveBan($this->authInfo->userInfo))
$perms = $perms->apply(fn(int $calc) => $calc & (Perm::F_CATEGORY_LIST | Perm::F_CATEGORY_VIEW));
$pagination = Pagination::fromRequest($request, $this->forum->topics->countTopics(
categoryInfo: $category,
global: true,
deleted: $perms->check(Perm::F_POST_DELETE_ANY) ? null : false
), 20, 'p');
if(!$pagination->validOffset)
return 404;
$children = [];
$topics = [];
if($category->mayHaveChildren) {
$children = $this->forum->categories->getCategoryChildren($category, hidden: false, asTree: true);
foreach($children as $childId => $child) {
$childPerms = $this->authInfo->getPerms('forum', $child->info);
if(!$childPerms->check(Perm::F_CATEGORY_LIST)) {
unset($category->children[$childId]);
continue;
}
$childUnread = false;
if($child->info->mayHaveChildren) {
foreach($child->children as $grandChildId => $grandChild) {
$grandChildPerms = $this->authInfo->getPerms('forum', $grandChild->info);
if(!$grandChildPerms->check(Perm::F_CATEGORY_LIST)) {
unset($child->children[$grandChildId]);
continue;
}
$grandChildUnread = false;
if($grandChild->info->mayHaveTopics) {
$catIds = [$grandChild->info->id];
foreach($grandChild->childIds as $greatGrandChildId) {
$greatGrandChildPerms = $this->authInfo->getPerms('forum', $greatGrandChildId);
if(!$greatGrandChildPerms->check(Perm::F_CATEGORY_LIST))
$catIds[] = $greatGrandChildId;
}
$grandChildUnread = $this->forum->categories->checkCategoryUnread($catIds, $this->authInfo->userInfo);
if($grandChildUnread)
$childUnread = true;
}
$grandChild->perms = $grandChildPerms;
$grandChild->unread = $grandChildUnread;
}
}
if($child->info->mayHaveChildren || $child->info->mayHaveTopics) {
$catIds = [$child->info->id];
foreach($child->childIds as $grandChildId) {
$grandChildPerms = $this->authInfo->getPerms('forum', $grandChildId);
if($grandChildPerms->check(Perm::F_CATEGORY_LIST))
$catIds[] = $grandChildId;
}
try {
$lastPostInfo = $this->forum->posts->getPost(categoryInfos: $catIds, getLast: true, deleted: false);
} catch(RuntimeException $ex) {
$lastPostInfo = null;
}
if($lastPostInfo !== null) {
$child->lastPost = new stdClass;
$child->lastPost->info = $lastPostInfo;
$child->lastPost->topicInfo = $this->forum->topics->getTopic(postInfo: $lastPostInfo);
if($lastPostInfo->userId !== null) {
$child->lastPost->user = $this->usersCtx->getUserInfo($lastPostInfo->userId);
$child->lastPost->colour = $this->usersCtx->getUserColour($child->lastPost->user);
}
}
}
if($child->info->mayHaveTopics && !$childUnread)
$childUnread = $this->forum->categories->checkCategoryUnread($child->info, $this->authInfo->userInfo);
$child->perms = $childPerms;
$child->unread = $childUnread;
}
}
if($category->mayHaveTopics) {
$topicInfos = $this->forum->topics->getTopics(
categoryInfo: $category,
global: true,
deleted: $perms->check(Perm::F_POST_DELETE_ANY) ? null : false,
pagination: $pagination,
);
foreach($topicInfos as $topicInfo) {
$topics[] = $topic = new stdClass;
$topic->info = $topicInfo;
$topic->unread = $this->forum->topics->checkTopicUnread($topicInfo, $this->authInfo->userInfo);
$topic->participated = $this->forum->topics->checkTopicParticipated($topicInfo, $this->authInfo->userInfo);
if($topicInfo->userId !== null) {
$topic->user = $this->usersCtx->getUserInfo($topicInfo->userId);
$topic->colour = $this->usersCtx->getUserColour($topic->user);
}
try {
$topic->lastPost = new stdClass;
$topic->lastPost->info = $lastPostInfo = $this->forum->posts->getPost(
topicInfo: $topicInfo,
getLast: true,
deleted: $topicInfo->deleted ? null : false,
);
if($lastPostInfo->userId !== null) {
$topic->lastPost->user = $this->usersCtx->getUserInfo($lastPostInfo->userId);
$topic->lastPost->colour = $this->usersCtx->getUserColour($topic->lastPost->user);
}
} catch(RuntimeException $ex) {
$topic->lastPost = null;
}
}
}
$perms = $perms->checkMany([
'can_create_topic' => Perm::F_TOPIC_CREATE,
]);
return Template::renderRaw('forum.forum', [
'forum_breadcrumbs' => iterator_to_array($this->forum->categories->getCategoryAncestry($category)),
'global_accent_colour' => $this->forum->categories->getCategoryColour($category),
'forum_info' => $category,
'forum_children' => $children,
'forum_topics' => $topics,
'forum_pagination' => $pagination,
'forum_show_mark_as_read' => $this->authInfo->isLoggedIn,
'forum_perms' => $perms,
]);
}
#[HttpPost('/forum/mark-as-read')] #[HttpPost('/forum/mark-as-read')]
#[UrlFormat('forum-mark-as-read', '/forum/mark-as-read', ['cat' => '<category>', 'rec' => '<recursive>'])] #[UrlFormat('forum-mark-as-read', '/forum/mark-as-read', ['cat' => '<category>', 'rec' => '<recursive>'])]
public function postMarkAsRead(HttpResponseBuilder $response, HttpRequest $request) { public function postMarkAsRead(HttpResponseBuilder $response, HttpRequest $request) {

10
src/LegacyRoutes.php
View file

@ -32,8 +32,6 @@ class LegacyRoutes implements RouteHandler, UrlSource {
$urls->register('forum-leaderboard', '/forum/leaderboard.php', ['id' => '<id>', 'mode' => '<mode>']); $urls->register('forum-leaderboard', '/forum/leaderboard.php', ['id' => '<id>', 'mode' => '<mode>']);
$urls->register('forum-topic-new', '/forum/posting.php', ['f' => '<forum>']); $urls->register('forum-topic-new', '/forum/posting.php', ['f' => '<forum>']);
$urls->register('forum-reply-new', '/forum/posting.php', ['t' => '<topic>']); $urls->register('forum-reply-new', '/forum/posting.php', ['t' => '<topic>']);
$urls->register('forum-category', '/forum/forum.php', ['f' => '<forum>', 'p' => '<page>']);
$urls->register('forum-category-root', '/forum/index.php', fragment: '<forum>');
$urls->register('forum-topic', '/forum/topic.php', ['t' => '<topic>', 'page' => '<page>'], '<topic_fragment>'); $urls->register('forum-topic', '/forum/topic.php', ['t' => '<topic>', 'page' => '<page>'], '<topic_fragment>');
$urls->register('forum-topic-create', '/forum/posting.php', ['f' => '<forum>']); $urls->register('forum-topic-create', '/forum/posting.php', ['f' => '<forum>']);
$urls->register('forum-post', '/forum/topic.php', ['p' => '<post>'], 'p<post>'); $urls->register('forum-post', '/forum/topic.php', ['p' => '<post>'], 'p<post>');
@ -189,6 +187,14 @@ class LegacyRoutes implements RouteHandler, UrlSource {
$response->redirect($this->urls->format('forum-index'), true); $response->redirect($this->urls->format('forum-index'), true);
} }
#[HttpGet('/forum/forum.php')]
public function getForumForumPHP(HttpResponseBuilder $response, HttpRequest $request): void {
$response->redirect($this->urls->format('forum-category', [
'forum' => $request->getParam('f', FILTER_SANITIZE_NUMBER_INT),
'page' => $request->getParam('p', FILTER_SANITIZE_NUMBER_INT),
]), true);
}
#[HttpGet('/forum/post.php')] #[HttpGet('/forum/post.php')]
public function getForumPostPHP(HttpResponseBuilder $response, HttpRequest $request): void { public function getForumPostPHP(HttpResponseBuilder $response, HttpRequest $request): void {
$response->redirect($this->urls->format('forum-post', [ $response->redirect($this->urls->format('forum-post', [