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

Fixed topic type string usage.

Browse source
This commit is contained in:
flash 2023-08-28 01:41:13 +00:00
parent 460a0ca57d
commit 57b9e82c10
3 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -169,11 +169,6 @@ if(!empty($_POST)) {
} else {
$isEditingTopic = empty($topicInfo) || ($mode === 'edit' && $originalPostInfo->getId() == $postInfo->getId());
if(is_string($topicType))
$topicType = ForumTopicInfo::TYPE_ALIASES[$topicType] ?? ForumTopicInfo::TYPE_DISCUSSION;
else
$topicType = (int)$topicType;
if($mode === 'create') {
$postTimeout = $cfg->getInteger('forum.posting.timeout', 5);
if($postTimeout > 0) {
@ -192,7 +187,7 @@ if(!empty($_POST)) {
if($isEditingTopic) {
$originalTopicTitle = $topicInfo?->getTitle() ?? null;
$topicTitleChanged = $topicTitle !== $originalTopicTitle;
$originalTopicType = (int)($topicInfo?->getType() ?? 0);
$originalTopicType = $topicInfo?->getTypeString() ?? 'discussion';
$topicTypeChanged = $topicType !== null && $topicType !== $originalTopicType;
$topicTitleLengths = $cfg->getValues([
@ -329,14 +324,6 @@ try {
$selectedParser = Parser::BBCODE;
}
// this sucks, fix it!
$topicTypeName = match($topicType ?? $topicInfo?->getType() ?? null) {
default => 'discussion',
ForumTopicInfo::TYPE_STICKY => 'sticky',
ForumTopicInfo::TYPE_ANNOUNCE => 'announce',
ForumTopicInfo::TYPE_GLOBAL => 'global',
};
Template::render('forum.posting', [
'posting_breadcrumbs' => $forum->getCategoryAncestry($categoryInfo),
'global_accent_colour' => $forum->getCategoryColour($categoryInfo),
@ -348,7 +335,6 @@ Template::render('forum.posting', [
'posting_notices' => $notices,
'posting_mode' => $mode,
'posting_types' => $topicTypes,
'posting_type_selected' => $topicTypeName,
'posting_defaults' => [
'title' => $topicTitle ?? null,
'type' => $topicType ?? null,

9
src/Forum/ForumTopicInfo.php
View file

@ -65,6 +65,15 @@ class ForumTopicInfo {
return $this->type;
}
public function getTypeString(): string {
return match($this->type) {
self::TYPE_GLOBAL => 'global',
self::TYPE_ANNOUNCE => 'announce',
self::TYPE_STICKY => 'sticky',
default => 'discussion',
};
}
public function isDiscussion(): bool {
return $this->type === self::TYPE_DISCUSSION;
}

2
templates/forum/posting.twig
View file

@ -152,7 +152,7 @@
{% if is_opening and posting_types|length > 1 %}
<select class="input__select forum__post__dropdown" name="post[type]">
{% for type_name, type_title in posting_types %}
<option value="{{ type_name }}"{% if type_name == posting_type_selected %} selected{% endif %}>{{ type_title }}</option>
<option value="{{ type_name }}"{% if type_name == posting_topic.typeString|default('discussion') %} selected{% endif %}>{{ type_title }}</option>
{% endfor %}
</select>
{% endif %}