add platform issue tags

venix12 · Aug 11, 2024 · b62fb05 · b62fb05
1 parent a66d151
commit b62fb05
Show file tree

Hide file tree

Showing 8 changed files with 74 additions and 4 deletions.
diff --git a/app/Http/Controllers/Forum/TopicsController.php b/app/Http/Controllers/Forum/TopicsController.php
@@ -166,7 +166,11 @@ public function issueTag($id)
         $state = get_bool(Request::input('state'));
         $type = 'issue_tag_'.$issueTag;
 
-        if ($issueTag === null || !$topic->isIssue() || !in_array($issueTag, $topic::ISSUE_TAGS, true)) {
+        if (
+            $issueTag === null
+            || !$topic->isIssue()
+            || !in_array($issueTag, array_merge($topic::ISSUE_TAGS, $topic::PLATFORM_ISSUE_TAGS), true)
+        ) {
             abort(422);
         }
 

diff --git a/app/Models/Forum/Topic.php b/app/Models/Forum/Topic.php
@@ -103,6 +103,12 @@ class Topic extends Model implements AfterCommit
         'topic_title' => 100,
     ];
 
+    const PLATFORM_ISSUE_TAGS = [
+        'lazer',
+        'stable',
+        'web',
+    ];
+
     const VIEW_COUNT_INTERVAL = 86400; // 1 day
 
     protected $table = 'phpbb_topics';
@@ -811,6 +817,10 @@ public function setIssueTag($tag)
     {
         $this->topic_type = static::typeInt($tag === 'confirmed' ? 'sticky' : 'normal');
 
+        if (in_array($tag, static::PLATFORM_ISSUE_TAGS)) {
+            $tag = "osu!{$tag}";
+        }
+
         if (!$this->hasIssueTag($tag)) {
             $this->topic_title = "[{$tag}] {$this->topic_title}";
         }
@@ -822,6 +832,10 @@ public function unsetIssueTag($tag)
     {
         $this->topic_type = static::typeInt($tag === 'resolved' ? 'sticky' : 'normal');
 
+        if (in_array($tag, static::PLATFORM_ISSUE_TAGS)) {
+            $tag = "osu!{$tag}";
+        }
+
         $this->topic_title = preg_replace(
             '/  +/',
             ' ',
@@ -833,6 +847,10 @@ public function unsetIssueTag($tag)
 
     public function hasIssueTag($tag)
     {
+        if (in_array($tag, static::PLATFORM_ISSUE_TAGS)) {
+            $tag = "osu!{$tag}";
+        }
+
         return strpos($this->topic_title, "[{$tag}]") !== false;
     }
 

diff --git a/app/helpers.php b/app/helpers.php
@@ -1023,12 +1023,18 @@ function issue_icon($issue)
             return 'fas fa-user';
         case 'confirmed':
             return 'fas fa-exclamation-triangle';
-        case 'resolved':
-            return 'far fa-check-circle';
         case 'duplicate':
             return 'fas fa-copy';
         case 'invalid':
             return 'far fa-times-circle';
+        case 'lazer':
+            return 'fas fa-extra-mode-osu';
+        case 'resolved':
+            return 'far fa-check-circle';
+        case 'stable':
+            return 'fas fa-extra-osu';
+        case 'web':
+            return 'fas fa-globe';
     }
 }
 

diff --git a/resources/lang/en/forum.php b/resources/lang/en/forum.php
@@ -287,13 +287,34 @@
             'to_1_done' => 'Added "invalid" tag',
         ],
 
+        'issue_tag_lazer' => [
+            'to_0' => 'Remove "osu!lazer" tag',
+            'to_0_done' => 'Removed "osu!lazer" tag',
+            'to_1' => 'Add "osu!lazer" tag',
+            'to_1_done' => 'Added "osu!lazer" tag',
+        ],
+
         'issue_tag_resolved' => [
             'to_0' => 'Remove "resolved" tag',
             'to_0_done' => 'Removed "resolved" tag',
             'to_1' => 'Add "resolved" tag',
             'to_1_done' => 'Added "resolved" tag',
         ],
 
+        'issue_tag_stable' => [
+            'to_0' => 'Remove "osu!stable" tag',
+            'to_0_done' => 'Removed "osu!stable" tag',
+            'to_1' => 'Add "osu!stable" tag',
+            'to_1_done' => 'Added "osu!stable" tag',
+        ],
+
+        'issue_tag_web' => [
+            'to_0' => 'Remove "osu!web" tag',
+            'to_0_done' => 'Removed "osu!web" tag',
+            'to_1' => 'Add "osu!web" tag',
+            'to_1_done' => 'Added "osu!web" tag',
+        ],
+
         'lock' => [
             'is_locked' => 'This topic is locked and can not be replied to',
             'to_0' => 'Unlock topic',

diff --git a/resources/views/forum/topics/_issue_tag_lazer.blade.php b/resources/views/forum/topics/_issue_tag_lazer.blade.php
@@ -0,0 +1,7 @@
+{{--
+    Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+    See the LICENCE file in the repository root for full licence text.
+--}}
+@include('forum.topics._issue_tag', [
+    'issueTag' => 'lazer',
+])
diff --git a/resources/views/forum/topics/_issue_tag_stable.blade.php b/resources/views/forum/topics/_issue_tag_stable.blade.php
@@ -0,0 +1,7 @@
+{{--
+    Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+    See the LICENCE file in the repository root for full licence text.
+--}}
+@include('forum.topics._issue_tag', [
+    'issueTag' => 'stable',
+])
diff --git a/resources/views/forum/topics/_issue_tag_web.blade.php b/resources/views/forum/topics/_issue_tag_web.blade.php
@@ -0,0 +1,7 @@
+{{--
+    Copyright (c) ppy Pty Ltd <[email protected]>. Licensed under the GNU Affero General Public License v3.0.
+    See the LICENCE file in the repository root for full licence text.
+--}}
+@include('forum.topics._issue_tag', [
+    'issueTag' => 'web',
+])
diff --git a/resources/views/forum/topics/_nav.blade.php b/resources/views/forum/topics/_nav.blade.php
@@ -10,7 +10,7 @@
         @include('forum.topics._moderate_move', compact('topic'))
 
         @if ($topic->isIssue())
-            @foreach ($topic::ISSUE_TAGS as $type)
+            @foreach (array_merge($topic::ISSUE_TAGS, $topic::PLATFORM_ISSUE_TAGS) as $type)
                 @include("forum.topics._issue_tag_{$type}")
             @endforeach
         @endif