fix: misc (#120)

* fix: misc

* Apply fixes from StyleCI

* chore: remove debug code

---------

Co-authored-by: StyleCI Bot <bot@styleci.io>

Author: imorland

extend.php

@@ -65,6 +65,9 @@
         ->type(Notification\AwardedBestAnswerBlueprint::class, ['alert'])
         ->type(Notification\BestAnswerSetInDiscussionBlueprint::class, []),
 
+    (new Extend\ApiResource(Resource\ForumResource::class))
+        ->fields(Api\ForumAttributes::class),
+
     (new Extend\ApiResource(Resource\DiscussionResource::class))
         ->fields(Api\DiscussionAttributes::class)
         ->endpoint(Endpoint\Show::class, function (Endpoint\Show $endpoint) {
@@ -89,7 +92,8 @@
         ->whenExtensionEnabled('flarum-tags', fn () => [
             (new Extend\ApiResource(\Flarum\Tags\Api\Resource\TagResource::class))
                 ->fields(fn () => [
-                    Schema\Boolean::make('isQnA'),
+                    Schema\Boolean::make('isQnA')
+                        ->property('is_qna'),
                     Schema\Boolean::make('reminders')
                         ->property('qna_reminders'),
                 ]),
@@ -100,9 +104,6 @@
         ->default('fof-best-answer.stop_overnight', false)
         ->default('fof-best-answer.store_log_output', false)
         ->default('fof-best-answer.enabled-tags', '[]')
-        ->default('fof-best-answer.search.solution_search', true)
-        ->default('fof-best-answer.search.remove_solutions_from_main_search', false)
-        ->default('fof-best-answer.search.display_tags', true)
         ->default('fof-best-answer.discussion_sidebar_jump_button', false)
         ->serializeToForum('fof-best-answer.show_max_lines', 'fof-best-answer.show_max_lines', 'intVal'),
 

js/src/admin/components/BestAnswerSettingsPage.tsx

@@ -76,27 +76,6 @@ export default class BestAnswerSettingsPage extends ExtensionPage {
                 help: app.translator.trans('fof-best-answer.admin.settings.discussion_sidebar_jump_button_help'),
               })}
             </div>
-            <h3>{app.translator.trans('fof-best-answer.admin.settings.label.search')}</h3>
-            <div className="Section">
-              {this.buildSettingComponent({
-                type: 'boolean',
-                setting: 'fof-best-answer.search.solution_search',
-                label: app.translator.trans('fof-best-answer.admin.settings.solution_search'),
-                help: app.translator.trans('fof-best-answer.admin.settings.solution_search_help'),
-              })}
-              {this.buildSettingComponent({
-                type: 'boolean',
-                setting: 'fof-best-answer.search.remove_solutions_from_main_search',
-                label: app.translator.trans('fof-best-answer.admin.settings.remove_solutions_from_main_search'),
-                help: app.translator.trans('fof-best-answer.admin.settings.remove_solutions_from_main_search_help'),
-              })}
-              {this.buildSettingComponent({
-                type: 'boolean',
-                setting: 'fof-best-answer.search.display_tags',
-                label: app.translator.trans('fof-best-answer.admin.settings.display_tags'),
-                help: app.translator.trans('fof-best-answer.admin.settings.display_tags_help'),
-              })}
-            </div>
             <h3>{app.translator.trans('fof-best-answer.admin.settings.label.reminders')}</h3>
             <p className="helpText">
               {app.translator.trans('fof-best-answer.admin.settings.label.reminders_notice')}{' '}

resources/locale/en.yml

@@ -8,7 +8,6 @@ fof-best-answer:
         tags: Best Answer Tags
         general: General
         reminders: Reminders
-        search: Search
         advanced: Advanced
         reminders_notice: For reminders to function, you must have set up the Flarum scheduler correctly.
       allow_select_own_post: Select own post
@@ -35,12 +34,6 @@ fof-best-answer:
       remind_tags_help: Select which tags, if any, to send reminders for. Reminders will only be sent for discussions with these tags.
       tags_info: |
         When a tag is Best Answer enabled, assign permissions to each user group that may set answers (own discussion, any discussion). Permissions may be assigned globally (for any Best Answer anabled tag), or on a per tag basis.
-      solution_search: Solution search
-      solution_search_help: Enable the ability to search for discussions with Best Answers
-      remove_solutions_from_main_search: Remove solutions from main search
-      remove_solutions_from_main_search_help: Remove discussions with Best Answers from the main 'all discussions' search results
-      display_tags: Display tags in search results
-      display_tags_help: Display the tag(s) in search results for discussions with Best Answers
       discussion_sidebar_jump_button: Display jump to Best Answer button in discussion sidebar
       discussion_sidebar_jump_button_help: Adds a button to the discussion sidebar which jumps to the Best Answer in the stream of posts.
     edit_tag:
@@ -79,9 +72,6 @@ fof-best-answer:
       titlePlaceholder: Question title
     user:
       best-answer-count: "{count, plural, one { {count} best answer} other {{count} best answers}}"
-    search:
-      discussions_solutions_heading: "Discussions with solutions"
-      all_discussions_solutions_button: "Search all discussions with solutions for \"{query}\""
     discussion:
       jump_to_best_answer_button: View Best Answer
   email:

src/Api/ForumAttributes.php

@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of fof/best-answer.
+ *
+ * Copyright (c) FriendsOfFlarum.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace FoF\BestAnswer\Api;
+
+use Flarum\Api\Schema;
+use Flarum\Settings\SettingsRepositoryInterface;
+
+class ForumAttributes
+{
+    public function __construct(
+        protected SettingsRepositoryInterface $settings
+    ) {
+    }
+
+    public function __invoke(): array
+    {
+        return [
+            Schema\Boolean::make('canSelectBestAnswerOwnPost')
+                ->get(fn () => (bool) $this->settings->get('fof-best-answer.allow_select_own_post')),
+
+            Schema\Boolean::make('bestAnswerDiscussionSidebarJumpButton')
+                ->get(fn () => (bool) $this->settings->get('fof-best-answer.discussion_sidebar_jump_button')),
+
+            Schema\Boolean::make('showBestAnswerFilterUi')
+                ->get(fn () => (bool) $this->settings->get('fof-best-answer.show_filter_dropdown')),
+
+            Schema\Boolean::make('bestAnswerDiscussionSidebarJumpButton')
+                ->get(fn () => (bool) $this->settings->get('fof-best-answer.discussion_sidebar_jump_button')),
+
+            Schema\Boolean::make('useAlternativeBestAnswerUi')
+                ->get(fn () => (bool) $this->settings->get('fof-best-answer.use_alternative_ui')),
+        ];
+    }
+}

tests/integration/api/SetBestAnswerTest.php

@@ -44,14 +44,18 @@ public function setUp(): void
             ],
             Discussion::class => [
                 ['id' => 1, 'title' => __CLASS__, 'user_id' => 2, 'created_at' => Carbon::now(), 'comment_count' => 2],
+                ['id' => 2, 'title' => 'Another discussion', 'user_id' => 3, 'created_at' => Carbon::now(), 'comment_count' => 1],
             ],
             Post::class => [
                 ['id' => 1, 'discussion_id' => 1, 'user_id' => 2, 'type' => 'comment', 'content' => 'post 1 - question', 'created_at' => Carbon::now()],
                 ['id' => 2, 'discussion_id' => 1, 'user_id' => 1, 'type' => 'comment', 'content' => 'post 2 - answer1', 'created_at' => Carbon::now()],
                 ['id' => 3, 'discussion_id' => 1, 'user_id' => 3, 'type' => 'comment', 'content' => 'post 2 - answer2', 'created_at' => Carbon::now()],
+                ['id' => 4, 'discussion_id' => 2, 'user_id' => 3, 'type' => 'comment', 'content' => 'question', 'created_at' => Carbon::now()],
+                ['id' => 5, 'discussion_id' => 2, 'user_id' => 3, 'type' => 'comment', 'content' => 'answer', 'created_at' => Carbon::now()],
             ],
             'discussion_tag' => [
                 ['discussion_id' => 1, 'tag_id' => 2],
+                ['discussion_id' => 2, 'tag_id' => 2],
             ],
             'group_permission' => [
                 ['group_id' => 4, 'permission' => 'discussion.selectBestAnswerNotOwnDiscussion', 'created_at' => Carbon::now()],
@@ -91,12 +95,12 @@ public function getDiscussion(int $userId): ResponseInterface
         );
     }
 
-    public function setBestAnswer(int $userId, int $postId): ResponseInterface
+    public function setBestAnswer(int $userId, int $postId, int $discussionId = 1): ResponseInterface
     {
         return $this->send(
             $this->request(
                 'PATCH',
-                '/api/discussions/1',
+                '/api/discussions/'.$discussionId,
                 [
                     'json' => [
                         'data' => [
@@ -161,4 +165,28 @@ public function user_without_permission_cannot_set_best_answer(int $userId)
 
         $this->assertEquals(403, $response->getStatusCode());
     }
+
+    #[Test]
+    public function user_cannot_set_own_post_as_best_answer_if_not_permitted()
+    {
+        $response = $this->setBestAnswer(3, 5, 2);
+
+        $this->assertEquals(403, $response->getStatusCode());
+    }
+
+    #[Test]
+    public function user_can_set_own_post_as_best_answer_if_permitted()
+    {
+        $this->setting('fof-best-answer.allow_select_own_post', true);
+
+        $response = $this->setBestAnswer(3, 5, 2);
+
+        $this->assertEquals(200, $response->getStatusCode());
+
+        $data = json_decode($response->getBody()->getContents(), true);
+
+        $attributes = $data['data']['attributes'];
+
+        $this->assertEquals(5, $attributes['hasBestAnswer'], 'Expected best answer post ID to be 5');
+    }
 }