From 113e0a00fb18c8e431d87f6428d4d30087158cac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= <suwako@076.moe>
Date: Mon, 29 Dec 2025 17:00:55 +0900
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E6=9B=B8=E3=81=8D=E8=A8=98=E4=BA=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Site/Controller/BlogPost.php | 3 ++-
 src/Site/Controller/Home.php     | 1 +
 src/Site/Lib/Auth.php            | 1 -
 util.php                         | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Site/Controller/BlogPost.php b/src/Site/Controller/BlogPost.php
index 18b842f..1a072c1 100644
--- a/src/Site/Controller/BlogPost.php
+++ b/src/Site/Controller/BlogPost.php
@@ -7,7 +7,7 @@ class BlogPost {
    * 
    * @return array 投稿の配列
    */
-  public function getPosts(string $section, ?\stdClass $user): array {
+  public function getPosts(string $section, ?\stdClass $user = null): array {
     $path = ROOT.$section;
     $posts = [];
     $isMember = $user !== NULL && $user->role !== \Roles::BANNED;
@@ -45,6 +45,7 @@ class BlogPost {
       $articleBody = trim($parts[1]);
       $preview = mb_substr(strip_tags($articleBody), 0, 50).'...';
       $slug = basename($file, '.md');
+      if (isset($metadata['draft']) && !$isStaff) continue;
 
       $posts[] = [
         'title' => $metadata['title'] ?? '',
diff --git a/src/Site/Controller/Home.php b/src/Site/Controller/Home.php
index 2537f54..fe09f4d 100644
--- a/src/Site/Controller/Home.php
+++ b/src/Site/Controller/Home.php
@@ -134,6 +134,7 @@ class Home extends BlogPost {
 
       if (!$isMember && in_array('memberonly', $meta->category)) goto denyaccess;
       if (!$isStaff && in_array('staffonly', $meta->category)) goto denyaccess;
+      if (isset($meta->draft) && !$isStaff) goto denyaccess;
 
 showpage:
       $tmpl->addCss('news-article');
diff --git a/src/Site/Lib/Auth.php b/src/Site/Lib/Auth.php
index 8e3f5ec..c0e1671 100644
--- a/src/Site/Lib/Auth.php
+++ b/src/Site/Lib/Auth.php
@@ -6,7 +6,6 @@ class Auth {
 
   /**
    * 性別： -1 = 不明, 0 = 男性, 1 = 女性
-   * ロール： -1 = BAN, 0 = ユーザー, 1 = スタッフ
    */
   private \stdClass $user;
   private \stdClass $pubUser;
diff --git a/util.php b/util.php
index 93cf04b..f3ba8c3 100644
--- a/util.php
+++ b/util.php
@@ -302,8 +302,8 @@ function namecolor(\stdClass $userData): string {
   $showname = $userData->displayname ?: $userData->username;
 
   $color = "<span style=\"{$style}\">{$showname}</span>";
-  if ($userData->role & (Roles::ADMIN | Roles::STAFF)) $color .= "<span style=\"font-size: x-small; background: #10c074; border: 1px solid #fcfcfc; border-radius: 10px; padding: 0 0.5em;\">✓</span>";
-
+  if ($userData->role & (Roles::ADMIN | Roles::STAFF))
+    $color .= "<span style=\"font-size: x-small; background: #10c074; border: 1px solid #fcfcfc; border-radius: 10px; padding: 0 0.5em;\">✓</span>";
   $suffix = $userData->gender === 0 ? 'くん' : ($userData->gender === 1 ? 'ちゃん' : 'さん');
 
   return $color.$suffix;