Apply fixes from StyleCI

Includes transpiled JS/TS, and Typescript declaration files (typings).

[skip ci]

.editorconfig

@@ -17,3 +17,6 @@ trim_trailing_whitespace = false
 
 [*.{php,xml,json}]
 indent_size = 4
+
+[tsconfig.json]
+indent_size = 2

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,39 +0,0 @@
----
-name: "🐛 Bug Report"
-about: "If something isn't working as expected"
-
----
-## Bug Report
-
-**Current Behavior**
-A clear and concise description of the behavior.
-
-**Steps to Reproduce**
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected Behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Environment**
-- Flarum version: x.y.z
-- Website URL: http://example.com
-- Webserver: [e.g. apache, nginx]
-- Hosting environment: [e.g. shared, vps]
-- PHP version: x.y.z
-- Browser: [e.g. chrome 67, safari 11]
-
-```
-Output of "php flarum info", run this in terminal in your Flarum directory.
-```
-
-**Possible Solution**
-<!--- Only if you have suggestions or a fix for the bug -->
-
-**Additional Context**
-Add any other context about the problem here.

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -0,0 +1,78 @@
+name: "🐛 Bug Report"
+description: If something isn't working as expected
+labels: ["type/bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: current_behavior
+    attributes:
+      label: Current Behavior
+      description: A clear and concise description of the behavior.
+    validations:
+      required: true
+  - type: textarea
+    id: steps_to_reproduce
+    attributes:
+      label: Steps to Reproduce
+      description: The exact steps to reproduce the bug.
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error message '....'
+    validations:
+      required: true
+  - type: textarea
+    id: expected_behavior
+    attributes:
+      label: Expected Behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: screenshots
+    attributes:
+      label: Screenshots
+      description: If applicable, add screenshots to help explain your problem.
+    validations:
+      required: false
+  - type: textarea
+    id: enironment
+    attributes:
+      label: Environment
+      value: |
+        - Flarum version: x.y.z
+        - Website URL: http://example.com
+        - Webserver: [e.g. apache, nginx]
+        - Hosting environment: [e.g. shared, vps]
+        - PHP version: x.y.z
+        - Browser: [e.g. chrome 67, safari 11]
+    validations:
+      required: true
+  - type: textarea
+    id: php_flarum_info
+    attributes:
+      label: "Output of `php flarum info`"
+      value: |
+        ```
+        Output of "php flarum info", run this in terminal in your Flarum directory.
+        ```
+    validations:
+      required: false
+  - type: textarea
+    id: possible_solution
+    attributes:
+      label: Possible Solution
+      description: Only if you have suggestions or a fix for the bug.
+    validations:
+      required: false
+  - type: textarea
+    id: additional_context
+    attributes:
+      label: Additional Context
+      description: Add any other context about the problem here.
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,17 @@
+blank_issues_enabled: false
+contact_links:
+  - name: "🚀 Feature Request"
+    url: https://discuss.flarum.org/t/proposals
+    about: |
+      Thanks for taking the time to fill out this feature request!
+      We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future.
+      For feature requests, ideas and feedback please post in the Flarum Community.
+      Feature requests are added to GitHub only when they have been accepted by the development team and implementation details have been laid out.
+  - name: "🙋‍ Support Question"
+    url: https://discuss.flarum.org/t/support
+    about: |
+      We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future; for usage and support questions, please check out these resources below. Thanks!
+
+      * Flarum Community: https://discuss.flarum.org/
+      * Discord Chat: https://flarum.org/discord/
+      * Twitter: https://twitter.com/Flarum

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,7 +0,0 @@
----
-name: "🚀 Feature Request"
-about: "If you have a suggestion please head over to our forum!"
-
----
-
-We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future. For feature requests, ideas and feedback please post in the Flarum Community: https://discuss.flarum.org/t/proposals. Feature requests are added to GitHub only when they have been accepted by the development team and implementation details have been laid out.

.github/ISSUE_TEMPLATE/support-question.md

@@ -1,11 +0,0 @@
----
-name: "🙋‍ Support Question"
-about: "If you have a question, please check out our forum or Discord!"
-
----
-
-We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future; for usage and support questions, please check out these resources below. Thanks!
-
-* Flarum Community: https://discuss.flarum.org/
-* Discord Chat: https://flarum.org/discord/
-* Twitter: https://twitter.com/Flarum

.github/workflows/flarum-approval-backend.yml

@@ -6,6 +6,6 @@ jobs:
   run:
     uses: ./.github/workflows/REUSABLE_backend.yml
     with:
-      enable_backend_testing: false
+      enable_backend_testing: true
 
       backend_directory: ./extensions/approval

.github/workflows/flarum-likes-backend.yml

@@ -6,6 +6,6 @@ jobs:
   run:
     uses: ./.github/workflows/REUSABLE_backend.yml
     with:
-      enable_backend_testing: false
+      enable_backend_testing: true
 
       backend_directory: ./extensions/likes

.github/workflows/flarum-sticky-backend.yml

@@ -6,6 +6,6 @@ jobs:
   run:
     uses: ./.github/workflows/REUSABLE_backend.yml
     with:
-      enable_backend_testing: false
+      enable_backend_testing: true
 
       backend_directory: ./extensions/sticky

.github/workflows/flarum-subscriptions-backend.yml

@@ -6,6 +6,6 @@ jobs:
   run:
     uses: ./.github/workflows/REUSABLE_backend.yml
     with:
-      enable_backend_testing: false
+      enable_backend_testing: true
 
       backend_directory: ./extensions/subscriptions

.github/workflows/flarum-suspend-backend.yml

@@ -6,6 +6,6 @@ jobs:
   run:
     uses: ./.github/workflows/REUSABLE_backend.yml
     with:
-      enable_backend_testing: false
+      enable_backend_testing: true
 
       backend_directory: ./extensions/suspend

CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## [1.4.0](https://github.com/flarum/framework/compare/v1.3.1...v1.4.0)
+
+### Added
+- `created_at` and `updated_at` columns added to several tables (https://github.com/flarum/framework/pull/3435)
+- Priorities added to AdminNav links (https://github.com/flarum/framework/pull/3453)
+- `app.translator` allows retrieving and setting locale (https://github.com/flarum/framework/pull/3451)
+- Extensions can now declare custom settings components for use with `buildSettingComponent` (https://github.com/flarum/framework/pull/3494)
+- Implement extensibility on `rel` and `target` attributes on links (https://github.com/flarum/framework/pull/3455)
+- New backend tests were added to some of the bundled extensions (https://github.com/flarum/framework/issues/3508)
+
+### Changed
+- Split boot script for Flarum in HTML footer into two parts for CSP hashing (https://github.com/flarum/framework/pull/3461)
+- Split asset compilation by giving assembling compilers its own method (https://github.com/flarum/framework/pull/3446)
+- Increase visibility of Component typescript class for better extensibility (https://github.com/flarum/framework/pull/3437)
+
+### Fixed
+- Mentioning an event post breaks the notification dropdown (https://github.com/flarum/framework/pull/3493)
+- Suspension modal shows after suspension is over (https://github.com/flarum/framework/pull/3449)
+- CLI based installations don't exit with an error code on failure (https://github.com/flarum/framework/pull/3452)
+- Tabbing through dropdown controls doesn't make them visible (https://github.com/flarum/framework/pull/3450)
+- Requiring zero tags on new discussions forces the user to  select tags (https://github.com/flarum/framework/pull/3448)
+- Long topic titles in the notification list don't overflow (https://github.com/flarum/framework/pull/3500)
+- Subtags of tags the user has access to are visible even if these are not accessible (https://github.com/flarum/framework/pull/3419)
+- `assertAdmin` tests access based on wrong gate ability (https://github.com/flarum/framework/pull/3501)
+- Increasing the composer header size causes elements to slip underneath (https://github.com/flarum/framework/pull/3502)
+- The profile mentions tab errors when sorting by `created_at` (https://github.com/flarum/framework/pull/3506)
+
 ## [1.3.1](https://github.com/flarum/framework/compare/v1.3.0...v1.3.1)
 
 ### Changed

composer.json

@@ -29,8 +29,8 @@
         }
     ],
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
-        "source": "https://github.com/flarum/core",
+        "issues": "https://github.com/flarum/framework/issues",
+        "source": "https://github.com/flarum/framework",
         "docs": "https://docs.flarum.org",
         "forum": "https://discuss.flarum.org",
         "chat": "https://flarum.org/chat"
@@ -86,14 +86,13 @@
     "require": {
         "ext-json": "*",
         "php": ">=7.3",
-        "axy/sourcemap": "^0.1.4",
         "components/font-awesome": "^5.14.0",
         "composer/composer": "^2.0",
         "dflydev/fig-cookies": "^3.0.0",
         "doctrine/dbal": "^2.7",
         "dragonmantank/cron-expression": "^3.1.0",
         "franzl/whoops-middleware": "^2.0.0",
-        "guzzlehttp/guzzle": "^7.4",
+        "guzzlehttp/guzzle": "^6.0|^7.4",
         "illuminate/bus": "^8.0",
         "illuminate/cache": "^8.0",
         "illuminate/config": "^8.0",
@@ -127,6 +126,8 @@
         "psr/http-server-middleware": "^1.0",
         "pusher/pusher-php-server": "^2.2",
         "s9e/text-formatter": "^2.3.6",
+        "sycho/json-api": "^0.5.0",
+        "sycho/sourcemap": "^2.0.0",
         "symfony/config": "^5.2.2",
         "symfony/console": "^5.2.2",
         "symfony/event-dispatcher": "^5.2.2",
@@ -134,7 +135,6 @@
         "symfony/polyfill-intl-messageformatter": "^1.22.0",
         "symfony/translation": "^5.1.5",
         "symfony/yaml": "^5.2.2",
-        "tobscure/json-api": "^0.3.0",
         "wikimedia/less.php": "^3.0"
     },
     "require-dev": {

extensions/akismet/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/akismet/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/akismet/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/akismet",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,9 +19,8 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3",
-        "flarum/approval": "^1.2",
-        "guzzlehttp/guzzle": "^7.4"
+        "flarum/core": "^1.4",
+        "flarum/approval": "^1.2"
     },
     "autoload": {
         "psr-4": {

extensions/approval/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/approval/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/approval",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3",
+        "flarum/core": "^1.4",
         "flarum/flags": "^1.2"
     },
     "autoload": {
@@ -52,7 +52,7 @@
                 "prettier": true,
                 "typescript": false,
                 "bundlewatch": false,
-                "backendTesting": false,
+                "backendTesting": true,
                 "editorConfig": true,
                 "styleci": true
             }
@@ -65,5 +65,28 @@
         }
     ],
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "autoload-dev": {
+        "psr-4": {
+            "Flarum\\Approval\\Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "test": [
+            "@test:unit",
+            "@test:integration"
+        ],
+        "test:unit": "phpunit -c tests/phpunit.unit.xml",
+        "test:integration": "phpunit -c tests/phpunit.integration.xml",
+        "test:setup": "@php tests/integration/setup.php"
+    },
+    "scripts-descriptions": {
+        "test": "Runs all tests.",
+        "test:unit": "Runs all unit tests.",
+        "test:integration": "Runs all integration tests.",
+        "test:setup": "Sets up a database for use with integration tests. Execute this only once."
+    },
+    "require-dev": {
+        "flarum/testing": "^1.0.0"
+    }
 }

extensions/approval/src/Access/ScopePrivatePostVisibility.php

@@ -9,6 +9,7 @@
 
 namespace Flarum\Approval\Access;
 
+use Closure;
 use Flarum\Discussion\Discussion;
 use Flarum\User\User;
 use Illuminate\Database\Eloquent\Builder;
@@ -39,14 +40,23 @@ class ScopePrivatePostVisibility
         });
     }
 
-    private function discussionWhereCanApprovePosts(User $actor)
+    /**
+     * Looks if the actor has permission to approve posts,
+     * within the discussion which the post is a part of.
+     *
+     * For example, the tags extension,
+     * turns the `approvePosts` ability into per tag basis.
+     */
+    private function discussionWhereCanApprovePosts(User $actor): Closure
     {
         return function ($query) use ($actor) {
             $query->selectRaw('1')
                 ->from('discussions')
                 ->whereColumn('discussions.id', 'posts.discussion_id')
                 ->where(function ($query) use ($actor) {
-                    Discussion::query()->setQuery($query)->whereVisibleTo($actor, 'approvePosts');
+                    $query->whereRaw('1 != 1')->orWhere(function ($query) use ($actor) {
+                        Discussion::query()->setQuery($query)->whereVisibleTo($actor, 'approvePosts');
+                    });
                 });
         };
     }

extensions/approval/tests/integration/InteractsWithUnapprovedContent.php

@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Approval\Tests\integration;
+
+use Carbon\Carbon;
+
+trait InteractsWithUnapprovedContent
+{
+    protected function prepareUnapprovedDatabaseContent()
+    {
+        $this->prepareDatabase([
+            'users' => [
+                ['id' => 1, 'username' => 'Muralf', 'email' => 'muralf@machine.local', 'is_email_confirmed' => 1],
+                $this->normalUser(),
+                ['id' => 3, 'username' => 'acme', 'email' => 'acme@machine.local', 'is_email_confirmed' => 1],
+                ['id' => 4, 'username' => 'luceos', 'email' => 'luceos@machine.local', 'is_email_confirmed' => 1],
+            ],
+            'discussions' => [
+                ['id' => 1, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 1, 'comment_count' => 1, 'is_approved' => 1, 'is_private' => 0],
+                ['id' => 2, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 2, 'comment_count' => 1, 'is_approved' => 0, 'is_private' => 1],
+                ['id' => 3, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 3, 'comment_count' => 1, 'is_approved' => 0, 'is_private' => 1],
+                ['id' => 4, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 4, 'comment_count' => 1, 'is_approved' => 1, 'is_private' => 0],
+                ['id' => 5, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 5, 'comment_count' => 1, 'is_approved' => 1, 'is_private' => 0],
+                ['id' => 6, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 6, 'comment_count' => 1, 'is_approved' => 0, 'is_private' => 1],
+                ['id' => 7, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 4, 'first_post_id' => 7, 'comment_count' => 1, 'is_approved' => 1, 'is_private' => 0],
+            ],
+            'posts' => [
+                ['id' => 1, 'discussion_id' => 1, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 1],
+                ['id' => 2, 'discussion_id' => 2, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 1],
+                ['id' => 3, 'discussion_id' => 3, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 1],
+                ['id' => 4, 'discussion_id' => 4, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 1],
+                ['id' => 5, 'discussion_id' => 5, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 1],
+                ['id' => 6, 'discussion_id' => 6, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 1],
+                ['id' => 7, 'discussion_id' => 7, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 1],
+
+                ['id' => 8, 'discussion_id' => 7, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 2],
+                ['id' => 9, 'discussion_id' => 7, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 1, 'is_approved' => 0, 'number' => 3],
+                ['id' => 10, 'discussion_id' => 7, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 0, 'is_approved' => 1, 'number' => 4],
+                ['id' => 11, 'discussion_id' => 7, 'user_id' => 4, 'type' => 'comment', 'content' => '<t><p>Text</p></t>', 'is_private' => 1, 'is_approved' => 0, 'number' => 5],
+            ],
+            'groups' => [
+                ['id' => 4, 'name_singular' => 'Acme', 'name_plural' => 'Acme', 'is_hidden' => 0]
+            ],
+            'group_user' => [
+                ['user_id' => 3, 'group_id' => 4]
+            ],
+            'group_permission' => [
+                ['permission' => 'discussion.approvePosts', 'group_id' => 4]
+            ]
+        ]);
+    }
+
+    /**
+     * null: Guest, 2: Normal User.
+     */
+    public function unallowedUsers(): array
+    {
+        return [[null], [2]];
+    }
+
+    /**
+     * 1: Admin, 3: Permission Given, 4: Discussions Author.
+     */
+    public function allowedUsers(): array
+    {
+        return [[1], [3], [4]];
+    }
+}

extensions/approval/tests/integration/api/ListDiscussionsTest.php

@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Approval\Tests\integration\api;
+
+use Flarum\Approval\Tests\integration\InteractsWithUnapprovedContent;
+use Flarum\Testing\integration\RetrievesAuthorizedUsers;
+use Flarum\Testing\integration\TestCase;
+use Illuminate\Support\Arr;
+
+class ListDiscussionsTest extends TestCase
+{
+    use RetrievesAuthorizedUsers;
+    use InteractsWithUnapprovedContent;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->extension('flarum-approval');
+
+        $this->prepareUnapprovedDatabaseContent();
+    }
+
+    /**
+     * @dataProvider unallowedUsers
+     * @test
+     */
+    public function can_only_see_approved_if_not_allowed_to_approve(?int $authenticatedAs)
+    {
+        $response = $this->send(
+            $this->request('GET', '/api/discussions', compact('authenticatedAs'))
+        );
+
+        $body = json_decode($response->getBody()->getContents(), true);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEqualsCanonicalizing([1, 4, 5, 7], Arr::pluck($body['data'], 'id'));
+    }
+
+    /**
+     * @dataProvider allowedUsers
+     * @test
+     */
+    public function can_see_unapproved_if_allowed_to_approve(int $authenticatedAs)
+    {
+        $response = $this->send(
+            $this->request('GET', '/api/discussions', compact('authenticatedAs'))
+        );
+
+        $body = json_decode($response->getBody()->getContents(), true);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEqualsCanonicalizing([1, 2, 3, 4, 5, 6, 7], Arr::pluck($body['data'], 'id'));
+    }
+}

extensions/approval/tests/integration/api/ListPostsTest.php

@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Approval\Tests\integration\api;
+
+use Flarum\Approval\Tests\integration\InteractsWithUnapprovedContent;
+use Flarum\Testing\integration\RetrievesAuthorizedUsers;
+use Flarum\Testing\integration\TestCase;
+use Illuminate\Support\Arr;
+
+class ListPostsTest extends TestCase
+{
+    use RetrievesAuthorizedUsers;
+    use InteractsWithUnapprovedContent;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->extension('flarum-approval');
+
+        $this->prepareUnapprovedDatabaseContent();
+    }
+
+    /**
+     * @dataProvider unallowedUsers
+     * @test
+     */
+    public function can_only_see_approved_if_not_allowed_to_approve(?int $authenticatedAs)
+    {
+        $response = $this->send(
+            $this
+                ->request('GET', '/api/posts', compact('authenticatedAs'))
+                ->withQueryParams([
+                    'filter' => [
+                        'discussion' => 7
+                    ]
+                ])
+        );
+
+        $body = json_decode($response->getBody()->getContents(), true);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEqualsCanonicalizing([7, 8, 10], Arr::pluck($body['data'], 'id'));
+    }
+
+    /**
+     * @dataProvider allowedUsers
+     * @test
+     */
+    public function can_see_unapproved_if_allowed_to_approve(int $authenticatedAs)
+    {
+        $response = $this->send(
+            $this
+                ->request('GET', '/api/posts', compact('authenticatedAs'))
+                ->withQueryParams([
+                    'filter' => [
+                        'discussion' => 7
+                    ]
+                ])
+        );
+
+        $body = json_decode($response->getBody()->getContents(), true);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertEqualsCanonicalizing([7, 8, 9, 10, 11], Arr::pluck($body['data'], 'id'));
+    }
+}

extensions/approval/tests/integration/setup.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+use Flarum\Testing\integration\Setup\SetupScript;
+
+require __DIR__.'/../../vendor/autoload.php';
+
+$setup = new SetupScript();
+
+$setup->run();

extensions/approval/tests/phpunit.integration.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="true"
+    stopOnFailure="false"
+>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">../src/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Flarum Integration Tests">
+            <directory suffix="Test.php">./integration</directory>
+             <exclude>./integration/tmp</exclude>
+        </testsuite>
+    </testsuites>
+</phpunit>

extensions/approval/tests/phpunit.unit.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="false"
+>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">../src/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Flarum Unit Tests">
+            <directory suffix="Test.php">./unit</directory>
+        </testsuite>
+    </testsuites>
+    <listeners>
+        <listener class="\Mockery\Adapter\Phpunit\TestListener" />
+    </listeners>
+</phpunit>

extensions/bbcode/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/bbcode/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/bbcode/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/bbcode",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.4"
     },
     "extra": {
         "branch-alias": {

extensions/embed/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/embed/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/embed/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/embed",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.4"
     },
     "autoload": {
         "psr-4": {

extensions/emoji/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/emoji/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/emoji/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/emoji",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.4"
     },
     "extra": {
         "branch-alias": {

extensions/flags/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/flags/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/flags/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/flags",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.4"
     },
     "autoload": {
         "psr-4": {

extensions/lang-english/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/lang-english/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/lang-english/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.4"
     },
     "extra": {
         "branch-alias": {

extensions/likes/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/likes/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/likes/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/likes",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.4"
     },
     "autoload": {
         "psr-4": {
@@ -51,7 +51,7 @@
                 "prettier": true,
                 "typescript": false,
                 "bundlewatch": false,
-                "backendTesting": false,
+                "backendTesting": true,
                 "editorConfig": true,
                 "styleci": true
             }
@@ -64,5 +64,28 @@
         }
     ],
     "minimum-stability": "dev",
-    "prefer-stable": true
+    "prefer-stable": true,
+    "autoload-dev": {
+        "psr-4": {
+            "Flarum\\Likes\\Tests\\": "tests/"
+        }
+    },
+    "scripts": {
+        "test": [
+            "@test:unit",
+            "@test:integration"
+        ],
+        "test:unit": "phpunit -c tests/phpunit.unit.xml",
+        "test:integration": "phpunit -c tests/phpunit.integration.xml",
+        "test:setup": "@php tests/integration/setup.php"
+    },
+    "scripts-descriptions": {
+        "test": "Runs all tests.",
+        "test:unit": "Runs all unit tests.",
+        "test:integration": "Runs all integration tests.",
+        "test:setup": "Sets up a database for use with integration tests. Execute this only once."
+    },
+    "require-dev": {
+        "flarum/testing": "^1.0.0"
+    }
 }

extensions/likes/extend.php

@@ -13,8 +13,13 @@ use Flarum\Api\Controller;
 use Flarum\Api\Serializer\BasicUserSerializer;
 use Flarum\Api\Serializer\PostSerializer;
 use Flarum\Extend;
+use Flarum\Likes\Event\PostWasLiked;
+use Flarum\Likes\Event\PostWasUnliked;
+use Flarum\Likes\Notification\PostLikedBlueprint;
+use Flarum\Likes\Query\LikedByFilter;
 use Flarum\Post\Event\Deleted;
 use Flarum\Post\Event\Saving;
+use Flarum\Post\Filter\PostFilterer;
 use Flarum\Post\Post;
 use Flarum\User\User;
 
@@ -27,54 +32,43 @@ return [
         ->js(__DIR__.'/js/dist/admin.js'),
 
     (new Extend\Model(Post::class))
-        ->belongsToMany('likes', User::class, 'post_likes', 'post_id', 'user_id')
-        ->relationship('recentLikes', Model\RecentLikesRelationship::class),
+        ->belongsToMany('likes', User::class, 'post_likes', 'post_id', 'user_id'),
 
     new Extend\Locales(__DIR__.'/locale'),
 
     (new Extend\Notification())
-        ->type(Notification\PostLikedBlueprint::class, PostSerializer::class, ['alert']),
+        ->type(PostLikedBlueprint::class, PostSerializer::class, ['alert']),
 
     (new Extend\ApiSerializer(PostSerializer::class))
-        ->relationship('recentLikes', Api\RecentLikesRelationship::class)
-        ->attributes(function (PostSerializer $serializer, $model, $attributes) {
-            $actor = $serializer->getActor();
-            $model->loadCount('likes');
-            $attributes['likesCount'] = $model->likes_count;
-            $attributes['likedByActor'] = $actor && $model->likes()->where('id', $actor->id)->exists();
-
-            return $attributes;
-        })
         ->hasMany('likes', BasicUserSerializer::class)
         ->attribute('canLike', function (PostSerializer $serializer, $model) {
-            return $serializer->getActor()->can('like', $model);
+            return (bool) $serializer->getActor()->can('like', $model);
         }),
 
     (new Extend\ApiController(Controller\ShowDiscussionController::class))
-        ->addOptionalInclude('posts.likes')
-        ->addInclude('posts.recentLikes')
-        ->load('posts.recentLikes'),
+        ->addInclude('posts.likes'),
 
     (new Extend\ApiController(Controller\ListPostsController::class))
-        ->addOptionalInclude('likes')
-        ->addInclude('recentLikes')
-        ->load('posts.recentLikes'),
+        ->addInclude('likes'),
     (new Extend\ApiController(Controller\ShowPostController::class))
-        ->addOptionalInclude('likes')
-        ->addInclude('recentLikes')
-        ->load('posts.recentLikes'),
+        ->addInclude('likes'),
     (new Extend\ApiController(Controller\CreatePostController::class))
-        ->addOptionalInclude('likes')
-        ->addInclude('recentLikes')
-        ->load('posts.recentLikes'),
+        ->addInclude('likes'),
     (new Extend\ApiController(Controller\UpdatePostController::class))
-        ->addOptionalInclude('likes')
-        ->addInclude('recentLikes')
-        ->load('posts.recentLikes'),
+        ->addInclude('likes'),
 
     (new Extend\Event())
-        ->listen(Event\PostWasLiked::class, Listener\SendNotificationWhenPostIsLiked::class)
-        ->listen(Event\PostWasUnliked::class, Listener\SendNotificationWhenPostIsUnliked::class)
+        ->listen(PostWasLiked::class, Listener\SendNotificationWhenPostIsLiked::class)
+        ->listen(PostWasUnliked::class, Listener\SendNotificationWhenPostIsUnliked::class)
         ->listen(Deleted::class, [Listener\SaveLikesToDatabase::class, 'whenPostIsDeleted'])
         ->listen(Saving::class, [Listener\SaveLikesToDatabase::class, 'whenPostIsSaving']),
+
+    (new Extend\Filter(PostFilterer::class))
+        ->addFilter(LikedByFilter::class),
+
+    (new Extend\Settings())
+        ->default('flarum-likes.like_own_post', true),
+
+    (new Extend\Policy())
+        ->modelPolicy(Post::class, Access\LikePostPolicy::class),
 ];

extensions/likes/js/dist/admin.js

@@ -1,120 +1,2 @@
-/******/ (() => { // webpackBootstrap
-/******/ 	// runtime can't be in strict mode because a global variable is assign and maybe created.
-/******/ 	var __webpack_modules__ = ({
-
-/***/ "./src/admin/index.js":
-/*!****************************!*\
-  !*** ./src/admin/index.js ***!
-  \****************************/
-/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var flarum_admin_app__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! flarum/admin/app */ "flarum/admin/app");
-/* harmony import */ var flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(flarum_admin_app__WEBPACK_IMPORTED_MODULE_0__);
-
-flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default().initializers.add('flarum-likes', function () {
-  flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default().extensionData["for"]('flarum-likes').registerPermission({
-    icon: 'far fa-thumbs-up',
-    label: flarum_admin_app__WEBPACK_IMPORTED_MODULE_0___default().translator.trans('flarum-likes.admin.permissions.like_posts_label'),
-    permission: 'discussion.likePosts'
-  }, 'reply');
-});
-
-/***/ }),
-
-/***/ "flarum/admin/app":
-/*!**************************************************!*\
-  !*** external "flarum.core.compat['admin/app']" ***!
-  \**************************************************/
-/***/ ((module) => {
-
-"use strict";
-module.exports = flarum.core.compat['admin/app'];
-
-/***/ })
-
-/******/ 	});
-/************************************************************************/
-/******/ 	// The module cache
-/******/ 	var __webpack_module_cache__ = {};
-/******/ 	
-/******/ 	// The require function
-/******/ 	function __webpack_require__(moduleId) {
-/******/ 		// Check if module is in cache
-/******/ 		var cachedModule = __webpack_module_cache__[moduleId];
-/******/ 		if (cachedModule !== undefined) {
-/******/ 			return cachedModule.exports;
-/******/ 		}
-/******/ 		// Create a new module (and put it into the cache)
-/******/ 		var module = __webpack_module_cache__[moduleId] = {
-/******/ 			// no module.id needed
-/******/ 			// no module.loaded needed
-/******/ 			exports: {}
-/******/ 		};
-/******/ 	
-/******/ 		// Execute the module function
-/******/ 		__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-/******/ 	
-/******/ 		// Return the exports of the module
-/******/ 		return module.exports;
-/******/ 	}
-/******/ 	
-/************************************************************************/
-/******/ 	/* webpack/runtime/compat get default export */
-/******/ 	(() => {
-/******/ 		// getDefaultExport function for compatibility with non-harmony modules
-/******/ 		__webpack_require__.n = (module) => {
-/******/ 			var getter = module && module.__esModule ?
-/******/ 				() => (module['default']) :
-/******/ 				() => (module);
-/******/ 			__webpack_require__.d(getter, { a: getter });
-/******/ 			return getter;
-/******/ 		};
-/******/ 	})();
-/******/ 	
-/******/ 	/* webpack/runtime/define property getters */
-/******/ 	(() => {
-/******/ 		// define getter functions for harmony exports
-/******/ 		__webpack_require__.d = (exports, definition) => {
-/******/ 			for(var key in definition) {
-/******/ 				if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
-/******/ 					Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
-/******/ 				}
-/******/ 			}
-/******/ 		};
-/******/ 	})();
-/******/ 	
-/******/ 	/* webpack/runtime/hasOwnProperty shorthand */
-/******/ 	(() => {
-/******/ 		__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
-/******/ 	})();
-/******/ 	
-/******/ 	/* webpack/runtime/make namespace object */
-/******/ 	(() => {
-/******/ 		// define __esModule on exports
-/******/ 		__webpack_require__.r = (exports) => {
-/******/ 			if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 				Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 			}
-/******/ 			Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 		};
-/******/ 	})();
-/******/ 	
-/************************************************************************/
-var __webpack_exports__ = {};
-// This entry need to be wrapped in an IIFE because it need to be in strict mode.
-(() => {
-"use strict";
-/*!******************!*\
-  !*** ./admin.js ***!
-  \******************/
-__webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _src_admin__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./src/admin */ "./src/admin/index.js");
-
-})();
-
-module.exports = __webpack_exports__;
-/******/ })()
-;
+(()=>{var e={n:t=>{var r=t&&t.__esModule?()=>t.default:()=>t;return e.d(r,{a:r}),r},d:(t,r)=>{for(var s in r)e.o(r,s)&&!e.o(t,s)&&Object.defineProperty(t,s,{enumerable:!0,get:r[s]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},t={};(()=>{"use strict";e.r(t);const r=flarum.core.compat["admin/app"];var s=e.n(r);s().initializers.add("flarum-likes",(function(){s().extensionData.for("flarum-likes").registerPermission({icon:"far fa-thumbs-up",label:s().translator.trans("flarum-likes.admin.permissions.like_posts_label"),permission:"discussion.likePosts"},"reply").registerSetting({setting:"flarum-likes.like_own_post",type:"bool",label:s().translator.trans("flarum-likes.admin.settings.like_own_posts_label"),help:s().translator.trans("flarum-likes.admin.settings.like_own_posts_help")})}))})(),module.exports=t})();
 //# sourceMappingURL=admin.js.map

extensions/likes/js/dist/admin.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin.js","mappings":";;;;;;;;;;;;;;AAAA;AAEAA,wEAAA,CAAqB,cAArB,EAAqC,YAAM;AACzCA,EAAAA,4EAAA,CAAsB,cAAtB,EAAsCI,kBAAtC,CACE;AACEC,IAAAA,IAAI,EAAE,kBADR;AAEEC,IAAAA,KAAK,EAAEN,wEAAA,CAAqB,iDAArB,CAFT;AAGES,IAAAA,UAAU,EAAE;AAHd,GADF,EAME,OANF;AAQD,CATD;;;;;;;;;;;ACFA;;;;;;UCAA;UACA;;UAEA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;UACA;;UAEA;UACA;;UAEA;UACA;UACA;;;;;WCtBA;WACA;WACA;WACA;WACA;WACA,iCAAiC,WAAW;WAC5C;WACA;;;;;WCPA;WACA;WACA;WACA;WACA,yCAAyC,wCAAwC;WACjF;WACA;WACA;;;;;WCPA;;;;;WCAA;WACA;WACA;WACA,uDAAuD,iBAAiB;WACxE;WACA,gDAAgD,aAAa;WAC7D","sources":["webpack://@flarum/likes/./src/admin/index.js","webpack://@flarum/likes/external root \"flarum.core.compat['admin/app']\"","webpack://@flarum/likes/webpack/bootstrap","webpack://@flarum/likes/webpack/runtime/compat get default export","webpack://@flarum/likes/webpack/runtime/define property getters","webpack://@flarum/likes/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/likes/webpack/runtime/make namespace object","webpack://@flarum/likes/./admin.js"],"sourcesContent":["import app from 'flarum/admin/app';\n\napp.initializers.add('flarum-likes', () => {\n  app.extensionData.for('flarum-likes').registerPermission(\n    {\n      icon: 'far fa-thumbs-up',\n      label: app.translator.trans('flarum-likes.admin.permissions.like_posts_label'),\n      permission: 'discussion.likePosts',\n    },\n    'reply'\n  );\n});\n","module.exports = flarum.core.compat['admin/app'];","// The module cache\nvar __webpack_module_cache__ = {};\n\n// The require function\nfunction __webpack_require__(moduleId) {\n\t// Check if module is in cache\n\tvar cachedModule = __webpack_module_cache__[moduleId];\n\tif (cachedModule !== undefined) {\n\t\treturn cachedModule.exports;\n\t}\n\t// Create a new module (and put it into the cache)\n\tvar module = __webpack_module_cache__[moduleId] = {\n\t\t// no module.id needed\n\t\t// no module.loaded needed\n\t\texports: {}\n\t};\n\n\t// Execute the module function\n\t__webpack_modules__[moduleId](module, module.exports, __webpack_require__);\n\n\t// Return the exports of the module\n\treturn module.exports;\n}\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","export * from './src/admin';\n"],"names":["app","initializers","add","extensionData","registerPermission","icon","label","translator","trans","permission"],"sourceRoot":""}
+{"version":3,"file":"admin.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,EAAGH,IAC5BA,GCLRF,EAAwB,CAACM,EAASC,KACjC,IAAI,IAAIC,KAAOD,EACXP,EAAoBS,EAAEF,EAAYC,KAASR,EAAoBS,EAAEH,EAASE,IAC5EE,OAAOC,eAAeL,EAASE,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,MCJ3ER,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,GCClFf,EAAyBM,IACH,oBAAXa,QAA0BA,OAAOC,aAC1CV,OAAOC,eAAeL,EAASa,OAAOC,YAAa,CAAEC,MAAO,WAE7DX,OAAOC,eAAeL,EAAS,aAAc,CAAEe,OAAO,M,+BCLvD,MAAM,EAA+BC,OAAOC,KAAKC,OAAO,a,aCExDC,IAAAA,aAAAA,IAAqB,gBAAgB,WACnCA,IAAAA,cAAAA,IACO,gBACJC,mBACC,CACEC,KAAM,mBACNC,MAAOH,IAAAA,WAAAA,MAAqB,mDAC5BI,WAAY,wBAEd,SAEDC,gBAAgB,CACfC,QAAS,6BACTC,KAAM,OACNJ,MAAOH,IAAAA,WAAAA,MAAqB,oDAC5BQ,KAAMR,IAAAA,WAAAA,MAAqB,yD","sources":["webpack://@flarum/likes/webpack/bootstrap","webpack://@flarum/likes/webpack/runtime/compat get default export","webpack://@flarum/likes/webpack/runtime/define property getters","webpack://@flarum/likes/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/likes/webpack/runtime/make namespace object","webpack://@flarum/likes/external root \"flarum.core.compat['admin/app']\"","webpack://@flarum/likes/./src/admin/index.js"],"sourcesContent":["// The require scope\nvar __webpack_require__ = {};\n\n","// getDefaultExport function for compatibility with non-harmony modules\n__webpack_require__.n = (module) => {\n\tvar getter = module && module.__esModule ?\n\t\t() => (module['default']) :\n\t\t() => (module);\n\t__webpack_require__.d(getter, { a: getter });\n\treturn getter;\n};","// define getter functions for harmony exports\n__webpack_require__.d = (exports, definition) => {\n\tfor(var key in definition) {\n\t\tif(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {\n\t\t\tObject.defineProperty(exports, key, { enumerable: true, get: definition[key] });\n\t\t}\n\t}\n};","__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))","// define __esModule on exports\n__webpack_require__.r = (exports) => {\n\tif(typeof Symbol !== 'undefined' && Symbol.toStringTag) {\n\t\tObject.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });\n\t}\n\tObject.defineProperty(exports, '__esModule', { value: true });\n};","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['admin/app'];","import app from 'flarum/admin/app';\n\napp.initializers.add('flarum-likes', () => {\n  app.extensionData\n    .for('flarum-likes')\n    .registerPermission(\n      {\n        icon: 'far fa-thumbs-up',\n        label: app.translator.trans('flarum-likes.admin.permissions.like_posts_label'),\n        permission: 'discussion.likePosts',\n      },\n      'reply'\n    )\n    .registerSetting({\n      setting: 'flarum-likes.like_own_post',\n      type: 'bool',\n      label: app.translator.trans('flarum-likes.admin.settings.like_own_posts_label'),\n      help: app.translator.trans('flarum-likes.admin.settings.like_own_posts_help'),\n    });\n});\n"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","Symbol","toStringTag","value","flarum","core","compat","app","registerPermission","icon","label","permission","registerSetting","setting","type","help"],"sourceRoot":""}

extensions/likes/js/src/admin/index.js

@@ -1,12 +1,20 @@
 import app from 'flarum/admin/app';
 
 app.initializers.add('flarum-likes', () => {
-  app.extensionData.for('flarum-likes').registerPermission(
-    {
-      icon: 'far fa-thumbs-up',
-      label: app.translator.trans('flarum-likes.admin.permissions.like_posts_label'),
-      permission: 'discussion.likePosts',
-    },
-    'reply'
-  );
+  app.extensionData
+    .for('flarum-likes')
+    .registerPermission(
+      {
+        icon: 'far fa-thumbs-up',
+        label: app.translator.trans('flarum-likes.admin.permissions.like_posts_label'),
+        permission: 'discussion.likePosts',
+      },
+      'reply'
+    )
+    .registerSetting({
+      setting: 'flarum-likes.like_own_post',
+      type: 'bool',
+      label: app.translator.trans('flarum-likes.admin.settings.like_own_posts_label'),
+      help: app.translator.trans('flarum-likes.admin.settings.like_own_posts_help'),
+    });
 });

extensions/likes/js/src/forum/addLikesList.js

@@ -11,20 +11,17 @@ import PostLikesModal from './components/PostLikesModal';
 export default function () {
   extend(CommentPost.prototype, 'footerItems', function (items) {
     const post = this.attrs.post;
-    const likes = post.recentLikes();
-    const count = post.likesCount();
+    const likes = post.likes();
 
     if (likes && likes.length) {
-      // the limit is dynamic through the backend, we only load those we need
-      const limit = likes.length;
-      // overLimit indicates there are more likes than the ones we render (and load)
-      const overLimit = count > likes.length;
+      const limit = 4;
+      const overLimit = likes.length > limit;
 
       // Construct a list of names of users who have liked this post. Make sure the
       // current user is first in the list, and cap a maximum of 4 items.
       const names = likes
-        .filter((a) => a !== app.session.user)
-        .slice(0, limit)
+        .sort((a) => (a === app.session.user ? -1 : 1))
+        .slice(0, overLimit ? limit - 1 : limit)
         .map((user) => {
           return (
             <Link href={app.route.user(user)}>
@@ -33,14 +30,12 @@ export default function () {
           );
         });
 
-      if (post.likedByActor()) {
-        names.unshift(<Link href={app.route.user(app.session.user)}>{app.translator.trans('flarum-likes.forum.post.you_text')}</Link>);
-      }
-
       // If there are more users that we've run out of room to display, add a "x
       // others" name to the end of the list. Clicking on it will display a modal
       // with a full list of names.
       if (overLimit) {
+        const count = likes.length - names.length;
+
         names.push(
           <a
             href="#"
@@ -49,7 +44,7 @@ export default function () {
               app.modal.show(PostLikesModal, { post });
             }}
           >
-            {app.translator.trans('flarum-likes.forum.post.others_link', { count: count - likes.length })}
+            {app.translator.trans('flarum-likes.forum.post.others_link', { count })}
           </a>
         );
       }

extensions/likes/js/src/forum/addLikesTabToUserProfile.tsx

@@ -0,0 +1,21 @@
+import { extend } from 'flarum/common/extend';
+import app from 'flarum/forum/app';
+import UserPage from 'flarum/forum/components/UserPage';
+import LinkButton from 'flarum/common/components/LinkButton';
+import LikesUserPage from './components/LikesUserPage';
+import ItemList from 'flarum/common/utils/ItemList';
+import type Mithril from 'mithril';
+
+export default function addLikesTabToUserProfile() {
+  app.routes['user.likes'] = { path: '/u/:username/likes', component: LikesUserPage };
+  extend(UserPage.prototype, 'navItems', function (items: ItemList<Mithril.Children>) {
+    const user = this.user;
+    items.add(
+      'likes',
+      <LinkButton href={app.route('user.likes', { username: user.slug() })} icon="far fa-thumbs-up">
+        {app.translator.trans('flarum-likes.forum.user.likes_link')}
+      </LinkButton>,
+      88
+    );
+  });
+}

extensions/likes/js/src/forum/components/LikesUserPage.tsx

@@ -0,0 +1,24 @@
+import app from 'flarum/forum/app';
+import PostsUserPage from 'flarum/forum/components/PostsUserPage';
+
+/**
+ * The `LikesUserPage` component shows posts which user the user liked.
+ */
+export default class LikesUserPage extends PostsUserPage {
+  /**
+   * Load a new page of the user's activity feed.
+   *
+   * @param offset The position to start getting results from.
+   * @protected
+   */
+  loadResults(offset: number) {
+    return app.store.find('posts', {
+      filter: {
+        type: 'comment',
+        likedBy: this.user.id(),
+      },
+      page: { offset, limit: this.loadLimit },
+      sort: '-createdAt',
+    });
+  }
+}

extensions/likes/js/src/forum/index.js

@@ -7,6 +7,7 @@ import NotificationGrid from 'flarum/forum/components/NotificationGrid';
 import addLikeAction from './addLikeAction';
 import addLikesList from './addLikesList';
 import PostLikedNotification from './components/PostLikedNotification';
+import addLikesTabToUserProfile from './addLikesTabToUserProfile';
 
 app.initializers.add('flarum-likes', () => {
   app.notificationComponents.postLiked = PostLikedNotification;
@@ -14,12 +15,9 @@ app.initializers.add('flarum-likes', () => {
   Post.prototype.canLike = Model.attribute('canLike');
   Post.prototype.likes = Model.hasMany('likes');
 
-  Post.prototype.likesCount = Model.attribute('likesCount');
-  Post.prototype.recentLikes = Model.hasMany('recentLikes');
-  Post.prototype.likedByActor = Model.attribute('likedByActor');
-
   addLikeAction();
   addLikesList();
+  addLikesTabToUserProfile();
 
   extend(NotificationGrid.prototype, 'notificationTypes', function (items) {
     items.add('postLiked', {

extensions/likes/locale/en.yml

@@ -11,6 +11,10 @@ flarum-likes:
     permissions:
       like_posts_label: Like posts
 
+    settings:
+      like_own_posts_help: When enabled, subject to permission, users may 'like' their own posts on the forum. To prevent users placing a 'like' on their own posts, disable this setting.
+      like_own_posts_label: Users may like their own posts
+
   # Translations in this namespace are used by the forum user interface.
   forum:
 
@@ -35,3 +39,7 @@ flarum-likes:
     # These translations are used in the Settings page.
     settings:
       notify_post_liked_label: Someone likes one of my posts
+
+    # These translations are used in the User profile page.
+    user:
+      likes_link: Likes

extensions/likes/src/Access/LikePostPolicy.php

@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Likes\Access;
+
+use Flarum\Post\Post;
+use Flarum\Settings\SettingsRepositoryInterface;
+use Flarum\User\Access\AbstractPolicy;
+use Flarum\User\User;
+
+class LikePostPolicy extends AbstractPolicy
+{
+    /**
+     * @var SettingsRepositoryInterface
+     */
+    protected $settings;
+
+    public function __construct(SettingsRepositoryInterface $settings)
+    {
+        $this->settings = $settings;
+    }
+
+    public function like(User $actor, Post $post)
+    {
+        if ($actor->id === $post->user_id && ! (bool) $this->settings->get('flarum-likes.like_own_post')) {
+            return $this->deny();
+        }
+    }
+}

extensions/likes/src/Api/RecentLikesRelationship.php

@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\Likes\Api;
-
-use Flarum\Api\Serializer\BasicUserSerializer;
-use Flarum\Api\Serializer\PostSerializer;
-use Flarum\Post\Post;
-use Tobscure\JsonApi\Collection;
-use Tobscure\JsonApi\Relationship;
-
-class RecentLikesRelationship
-{
-    private BasicUserSerializer $serializer;
-
-    public function __construct(BasicUserSerializer $serializer)
-    {
-        $this->serializer = $serializer;
-    }
-
-    public function __invoke(PostSerializer $serializer, Post $post): Relationship
-    {
-        return new Relationship(new Collection(
-            $post->recentLikes,
-            $this->serializer
-        ));
-    }
-}

extensions/likes/src/Model/RecentLikesRelationship.php

@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\Likes\Model;
-
-use Flarum\Post\Post;
-use Flarum\User\User;
-
-class RecentLikesRelationship
-{
-    public function __invoke(Post $post)
-    {
-        return $post->belongsToMany(
-            User::class,
-            'post_likes',
-            'post_id',
-            'user_id'
-        )
-            ->limit(3)
-            ->orderBy('post_likes.created_at');
-    }
-}

extensions/likes/src/Query/LikedByFilter.php

@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Likes\Query;
+
+use Flarum\Filter\FilterInterface;
+use Flarum\Filter\FilterState;
+
+class LikedByFilter implements FilterInterface
+{
+    public function getFilterKey(): string
+    {
+        return 'likedBy';
+    }
+
+    public function filter(FilterState $filterState, string $filterValue, bool $negate)
+    {
+        $likedId = trim($filterValue, '"');
+
+        $filterState
+            ->getQuery()
+            ->whereIn('id', function ($query) use ($likedId, $negate) {
+                $query->select('post_id')
+                    ->from('post_likes')
+                    ->where('user_id', $negate ? '!=' : '=', $likedId);
+            });
+    }
+}

extensions/likes/tests/integration/api/LikePostTest.php

@@ -0,0 +1,167 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\Likes\Tests\integration\api;
+
+use Carbon\Carbon;
+use Flarum\Post\CommentPost;
+use Flarum\Testing\integration\RetrievesAuthorizedUsers;
+use Flarum\Testing\integration\TestCase;
+use Psr\Http\Message\ResponseInterface;
+
+class LikePostTest extends TestCase
+{
+    use RetrievesAuthorizedUsers;
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->extension('flarum-likes');
+
+        $this->prepareDatabase([
+            'users' => [
+                ['id' => 1, 'username' => 'Muralf', 'email' => 'muralf@machine.local', 'is_email_confirmed' => 1],
+                $this->normalUser(),
+                ['id' => 3, 'username' => 'Acme', 'email' => 'acme@machine.local', 'is_email_confirmed' => 1],
+            ],
+            'discussions' => [
+                ['id' => 1, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 1, 'first_post_id' => 1, 'comment_count' => 2],
+            ],
+            'posts' => [
+                ['id' => 1, 'number' => 1, 'discussion_id' => 1, 'created_at' => Carbon::now(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>something</p></t>'],
+                ['id' => 3, 'number' => 2, 'discussion_id' => 1, 'created_at' => Carbon::now(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>something</p></t>'],
+                ['id' => 5, 'number' => 3, 'discussion_id' => 1, 'created_at' => Carbon::now(), 'user_id' => 3, 'type' => 'discussionRenamed', 'content' => '<t><p>something</p></t>'],
+                ['id' => 6, 'number' => 4, 'discussion_id' => 1, 'created_at' => Carbon::now(), 'user_id' => 1, 'type' => 'comment', 'content' => '<t><p>something</p></t>'],
+            ],
+            'groups' => [
+                ['id' => 5, 'name_singular' => 'Acme', 'name_plural' => 'Acme', 'is_hidden' => 0],
+                ['id' => 6, 'name_singular' => 'Acme1', 'name_plural' => 'Acme1', 'is_hidden' => 0]
+            ],
+            'group_user' => [
+                ['user_id' => 3, 'group_id' => 5]
+            ]
+        ]);
+    }
+
+    protected function rewriteDefaultPermissionsAfterBoot()
+    {
+        $this->database()->table('group_permission')->where('permission', 'discussion.likePosts')->delete();
+        $this->database()->table('group_permission')->insert(['permission' => 'discussion.likePosts', 'group_id' => 5]);
+    }
+
+    /**
+     * @dataProvider allowedUsersToLike
+     * @test
+     */
+    public function can_like_a_post_if_allowed(int $postId, ?int $authenticatedAs, string $message, bool $canLikeOwnPost = null)
+    {
+        if (! is_null($canLikeOwnPost)) {
+            $this->setting('flarum-likes.like_own_post', $canLikeOwnPost);
+        }
+
+        $this->rewriteDefaultPermissionsAfterBoot();
+
+        $response = $this->sendLikeRequest($postId, $authenticatedAs);
+
+        $post = CommentPost::query()->find($postId);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertNotNull($post->likes->where('id', $authenticatedAs)->first(), $message);
+    }
+
+    /**
+     * @dataProvider unallowedUsersToLike
+     * @test
+     */
+    public function cannot_like_a_post_if_not_allowed(int $postId, ?int $authenticatedAs, string $message, bool $canLikeOwnPost = null)
+    {
+        if (! is_null($canLikeOwnPost)) {
+            $this->setting('flarum-likes.like_own_post', $canLikeOwnPost);
+        }
+
+        $this->rewriteDefaultPermissionsAfterBoot();
+
+        $response = $this->sendLikeRequest($postId, $authenticatedAs);
+
+        $post = CommentPost::query()->find($postId);
+
+        $this->assertEquals(403, $response->getStatusCode(), $message);
+        $this->assertNull($post->likes->where('id', $authenticatedAs)->first());
+    }
+
+    /**
+     * @dataProvider allowedUsersToLike
+     * @test
+     */
+    public function can_dislike_a_post_if_liked_and_allowed(int $postId, ?int $authenticatedAs, string $message, bool $canLikeOwnPost = null)
+    {
+        if (! is_null($canLikeOwnPost)) {
+            $this->setting('flarum-likes.like_own_post', $canLikeOwnPost);
+        }
+
+        $this->rewriteDefaultPermissionsAfterBoot();
+
+        $this->sendLikeRequest($postId, $authenticatedAs);
+        $response = $this->sendLikeRequest($postId, $authenticatedAs, false);
+
+        $post = CommentPost::query()->find($postId);
+
+        $this->assertEquals(200, $response->getStatusCode());
+        $this->assertNull($post->likes->where('id', $authenticatedAs)->first(), $message);
+    }
+
+    public function allowedUsersToLike(): array
+    {
+        return [
+            [1, 1, 'Admin can like any post'],
+            [1, 3, 'User with permission can like other posts'],
+            [5, 3, 'User with permission can like own post by default'],
+        ];
+    }
+
+    public function unallowedUsersToLike(): array
+    {
+        return [
+            [1, null, 'Guest cannot like any post'],
+            [1, 2, 'User without permission cannot like any post'],
+            [5, 3, 'User with permission cannot like own post if setting off', false],
+            [6, 1, 'Admin cannot like own post if setting off', false],
+        ];
+    }
+
+    protected function sendLikeRequest(int $postId, ?int $authenticatedAs, bool $liked = true): ResponseInterface
+    {
+        if (! isset($authenticatedAs)) {
+            $initial = $this->send(
+                $this->request('GET', '/')
+            );
+
+            $token = $initial->getHeaderLine('X-CSRF-Token');
+        }
+
+        $request = $this->request('PATCH', "/api/posts/$postId", [
+            'authenticatedAs' => $authenticatedAs,
+            'cookiesFrom' => $initial ?? null,
+            'json' => [
+                'data' => [
+                    'attributes' => [
+                        'isLiked' => $liked
+                    ]
+                ]
+            ]
+        ]);
+
+        if (! isset($authenticatedAs)) {
+            $request = $request->withHeader('X-CSRF-Token', $token);
+        }
+
+        return $this->send($request);
+    }
+}

extensions/likes/tests/integration/setup.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+use Flarum\Testing\integration\Setup\SetupScript;
+
+require __DIR__.'/../../vendor/autoload.php';
+
+$setup = new SetupScript();
+
+$setup->run();

extensions/likes/tests/phpunit.integration.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="true"
+    stopOnFailure="false"
+>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">../src/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Flarum Integration Tests">
+            <directory suffix="Test.php">./integration</directory>
+             <exclude>./integration/tmp</exclude>
+        </testsuite>
+    </testsuites>
+</phpunit>

extensions/likes/tests/phpunit.unit.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
+    backupGlobals="false"
+    backupStaticAttributes="false"
+    colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
+    processIsolation="false"
+    stopOnFailure="false"
+>
+    <coverage processUncoveredFiles="true">
+        <include>
+            <directory suffix=".php">../src/</directory>
+        </include>
+    </coverage>
+    <testsuites>
+        <testsuite name="Flarum Unit Tests">
+            <directory suffix="Test.php">./unit</directory>
+        </testsuite>
+    </testsuites>
+    <listeners>
+        <listener class="\Mockery\Adapter\Phpunit\TestListener" />
+    </listeners>
+</phpunit>

extensions/lock/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/lock/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/lock/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/lock",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.4"
     },
     "autoload": {
         "psr-4": {

extensions/markdown/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/markdown/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/markdown/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/markdown",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.4"
     },
     "extra": {
         "branch-alias": {

extensions/mentions/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/mentions/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/mentions/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/mentions",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.4"
     },
     "autoload": {
         "psr-4": {

extensions/mentions/less/forum.less

@@ -28,7 +28,7 @@
   }
 
   &:before {
-    .fa();
+    .fas();
     content: @fa-var-reply;
     margin-right: 5px;
   }

extensions/mentions/tests/integration/api/ListPostsTest.php

@@ -14,7 +14,7 @@ use Flarum\Testing\integration\RetrievesAuthorizedUsers;
 use Flarum\Testing\integration\TestCase;
 use Illuminate\Support\Arr;
 
-class ListTest extends TestCase
+class ListPostsTest extends TestCase
 {
     use RetrievesAuthorizedUsers;
 
@@ -85,4 +85,26 @@ class ListTest extends TestCase
         $ids = Arr::pluck($data, 'id');
         $this->assertEqualsCanonicalizing(['4'], $ids, 'IDs do not match');
     }
+
+    /**
+     * @test
+     */
+    public function mentioned_filter_works_with_sort()
+    {
+        $response = $this->send(
+            $this->request('GET', '/api/posts')
+                ->withQueryParams([
+                    'filter' => ['mentioned' => 1],
+                    'sort' => '-createdAt'
+                ])
+        );
+
+        $data = json_decode($response->getBody()->getContents(), true)['data'];
+
+        $this->assertEquals(200, $response->getStatusCode());
+
+        // Order-independent comparison
+        $ids = Arr::pluck($data, 'id');
+        $this->assertEqualsCanonicalizing(['3', '2'], $ids, 'IDs do not match');
+    }
 }

extensions/nicknames/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/nicknames/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/nicknames/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/core/issues",
+        "issues": "https://github.com/flarum/framework/issues",
         "source": "https://github.com/flarum/nicknames",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.4"
     },
     "autoload": {
         "psr-4": {

extensions/package-manager/.editorconfig

@@ -1,19 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 2
-
-[*.{diff,md}]
-trim_trailing_whitespace = false
-
-[*.{php,xml,json}]
-indent_size = 4

extensions/package-manager/.gitattributes

@@ -0,0 +1,20 @@
+**/.gitattributes export-ignore
+**/.gitignore export-ignore
+**/.gitmodules export-ignore
+**/.github export-ignore
+**/.travis export-ignore
+**/.travis.yml export-ignore
+**/.editorconfig export-ignore
+**/.styleci.yml export-ignore
+
+**/phpunit.xml export-ignore
+**/tests export-ignore
+
+**/js/dist/**/* -diff
+**/js/dist/**/* linguist-generated
+**/js/dist-typings/**/* -diff
+**/js/dist-typings/**/* linguist-generated
+**/js/yarn.lock -diff
+**/js/package-lock.json -diff
+
+* text=auto eol=lf

extensions/package-manager/extend.php

@@ -19,6 +19,8 @@ use Flarum\PackageManager\Exception\ExceptionHandler;
 use Flarum\PackageManager\Exception\MajorUpdateFailedException;
 use Flarum\PackageManager\Settings\LastUpdateCheck;
 use Flarum\PackageManager\Settings\LastUpdateRun;
+use Illuminate\Contracts\Queue\Queue;
+use Illuminate\Queue\SyncQueue;
 
 return [
     (new Extend\Routes('api'))
@@ -29,7 +31,8 @@ return [
         ->post('/package-manager/why-not', 'package-manager.why-not', Api\Controller\WhyNotController::class)
         ->post('/package-manager/minor-update', 'package-manager.minor-update', Api\Controller\MinorUpdateController::class)
         ->post('/package-manager/major-update', 'package-manager.major-update', Api\Controller\MajorUpdateController::class)
-        ->post('/package-manager/global-update', 'package-manager.global-update', Api\Controller\GlobalUpdateController::class),
+        ->post('/package-manager/global-update', 'package-manager.global-update', Api\Controller\GlobalUpdateController::class)
+        ->get('/package-manager-tasks', 'package-manager.tasks.index', Api\Controller\ListTasksController::class),
 
     (new Extend\Frontend('admin'))
         ->css(__DIR__.'/less/admin.less')
@@ -37,17 +40,20 @@ return [
         ->content(function (Document $document) {
             $paths = resolve(Paths::class);
 
-            $document->payload['isRequiredDirectoriesWritable'] = is_writable($paths->vendor)
+            $document->payload['flarum-package-manager.writable_dirs'] = is_writable($paths->vendor)
                 && is_writable($paths->storage.'/.composer')
                 && is_writable($paths->base.'/composer.json')
                 && is_writable($paths->base.'/composer.lock');
+
+            $document->payload['flarum-package-manager.using_sync_queue'] = resolve(Queue::class) instanceof SyncQueue;
         }),
 
     new Extend\Locales(__DIR__.'/locale'),
 
     (new Extend\Settings())
         ->default(LastUpdateCheck::key(), json_encode(LastUpdateCheck::default()))
-        ->default(LastUpdateRun::key(), json_encode(LastUpdateRun::default())),
+        ->default(LastUpdateRun::key(), json_encode(LastUpdateRun::default()))
+        ->default('flarum-package-manager.queue_jobs', false),
 
     (new Extend\ServiceProvider)
         ->register(PackageManagerServiceProvider::class),

extensions/package-manager/js/dist-typings/components/ControlSection.d.ts

@@ -0,0 +1,5 @@
+/// <reference types="mithril" />
+import Component from 'flarum/common/Component';
+export default class ControlSection extends Component {
+    view(): JSX.Element;
+}

extensions/package-manager/js/dist-typings/components/ExtensionItem.d.ts

@@ -1,10 +1,7 @@
-import Mithril from 'mithril';
+import type Mithril from 'mithril';
 import Component, { ComponentAttrs } from 'flarum/common/Component';
-import { Extension as BaseExtension } from 'flarum/admin/AdminApplication';
+import { Extension } from 'flarum/admin/AdminApplication';
 import { UpdatedPackage } from './Updater';
-export declare type Extension = BaseExtension & {
-    name: string;
-};
 export interface ExtensionItemAttrs extends ComponentAttrs {
     extension: Extension;
     updates: UpdatedPackage;
@@ -16,5 +13,5 @@ export interface ExtensionItemAttrs extends ComponentAttrs {
 }
 export default class ExtensionItem<Attrs extends ExtensionItemAttrs = ExtensionItemAttrs> extends Component<Attrs> {
     view(vnode: Mithril.Vnode<Attrs, this>): Mithril.Children;
-    private version;
+    version(v: string): string;
 }

extensions/package-manager/js/dist-typings/components/Installer.d.ts

@@ -1,11 +1,14 @@
 import type Mithril from 'mithril';
-import Component from 'flarum/common/Component';
+import Component, { ComponentAttrs } from 'flarum/common/Component';
 import Stream from 'flarum/common/utils/Stream';
-export default class Installer<Attrs> extends Component<Attrs> {
+interface InstallerAttrs extends ComponentAttrs {
+}
+export default class Installer extends Component<InstallerAttrs> {
     packageName: Stream<string>;
     isLoading: boolean;
-    oninit(vnode: Mithril.Vnode<Attrs, this>): void;
+    oninit(vnode: Mithril.Vnode<InstallerAttrs, this>): void;
     view(): Mithril.Children;
     data(): any;
     onsubmit(): void;
 }
+export {};

extensions/package-manager/js/dist-typings/components/Label.d.ts

@@ -0,0 +1,9 @@
+import type Mithril from 'mithril';
+import Component, { ComponentAttrs } from 'flarum/common/Component';
+interface LabelAttrs extends ComponentAttrs {
+    type: 'success' | 'error' | 'neutral' | 'warning';
+}
+export default class Label extends Component<LabelAttrs> {
+    view(vnode: Mithril.Vnode<LabelAttrs, this>): JSX.Element;
+}
+export {};

extensions/package-manager/js/dist-typings/components/MajorUpdater.d.ts

@@ -1,5 +1,5 @@
+import type Mithril from 'mithril';
 import Component, { ComponentAttrs } from 'flarum/common/Component';
-import Mithril from 'mithril';
 import { UpdatedPackage, UpdateState } from './Updater';
 interface MajorUpdaterAttrs extends ComponentAttrs {
     coreUpdate: UpdatedPackage;

extensions/package-manager/js/dist-typings/components/Pagination.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="mithril" />
+import Component, { ComponentAttrs } from 'flarum/common/Component';
+import QueueState from '../states/QueueState';
+interface PaginationAttrs extends ComponentAttrs {
+    list: QueueState;
+}
+/**
+ * @todo make it abstract in core for reusability.
+ */
+export default class Pagination extends Component<PaginationAttrs> {
+    view(): JSX.Element;
+}
+export {};

extensions/package-manager/js/dist-typings/components/QueueSection.d.ts

@@ -0,0 +1,10 @@
+import type Mithril from 'mithril';
+import Component from 'flarum/common/Component';
+import { TaskOperations } from '../models/Task';
+export default class QueueSection extends Component<{}> {
+    oninit(vnode: Mithril.Vnode<{}, this>): void;
+    view(): JSX.Element;
+    columns(): any;
+    queueTable(): JSX.Element;
+    operationIcon(operation: TaskOperations): Mithril.Children;
+}

extensions/package-manager/js/dist-typings/components/SettingsPage.d.ts

@@ -0,0 +1,6 @@
+import type Mithril from 'mithril';
+import ExtensionPage, { ExtensionPageAttrs } from 'flarum/admin/components/ExtensionPage';
+import ItemList from 'flarum/common/utils/ItemList';
+export default class SettingsPage extends ExtensionPage {
+    sections(vnode: Mithril.VnodeDOM<ExtensionPageAttrs, this>): ItemList<unknown>;
+}

extensions/package-manager/js/dist-typings/components/TaskOutputModal.d.ts

@@ -0,0 +1,12 @@
+/// <reference types="mithril" />
+import Modal, { IInternalModalAttrs } from 'flarum/common/components/Modal';
+import Task from '../models/Task';
+interface TaskOutputModalAttrs extends IInternalModalAttrs {
+    task: Task;
+}
+export default class TaskOutputModal<CustomAttrs extends TaskOutputModalAttrs = TaskOutputModalAttrs> extends Modal<CustomAttrs> {
+    className(): string;
+    title(): any;
+    content(): JSX.Element;
+}
+export {};

extensions/package-manager/js/dist-typings/components/Updater.d.ts

@@ -1,6 +1,6 @@
 import Mithril from 'mithril';
-import Component from 'flarum/common/Component';
-import { Extension } from './ExtensionItem';
+import Component, { ComponentAttrs } from 'flarum/common/Component';
+import { Extension } from 'flarum/admin/AdminApplication';
 export declare type UpdatedPackage = {
     name: string;
     version: string;
@@ -30,12 +30,14 @@ export declare type LastUpdateRun = {
 } & {
     limitedPackages: () => string[];
 };
-export default class Updater<Attrs> extends Component<Attrs> {
+interface UpdaterAttrs extends ComponentAttrs {
+}
+export default class Updater extends Component<UpdaterAttrs> {
     isLoading: string | null;
     packageUpdates: Record<string, UpdatedPackage>;
     lastUpdateCheck: LastUpdateCheck;
     get lastUpdateRun(): LastUpdateRun;
-    oninit(vnode: Mithril.Vnode<Attrs, this>): void;
+    oninit(vnode: Mithril.Vnode<UpdaterAttrs, this>): void;
     view(): (JSX.Element | null)[];
     getExtensionUpdates(): Extension[];
     getCoreUpdate(): UpdatedPackage | undefined;

extensions/package-manager/js/dist-typings/components/WhyNotModal.d.ts

@@ -1,14 +1,14 @@
-import Mithril from 'mithril';
+import type Mithril from 'mithril';
 import Modal, { IInternalModalAttrs } from 'flarum/common/components/Modal';
 export interface WhyNotModalAttrs extends IInternalModalAttrs {
     package: string;
 }
-export default class WhyNotModal<Attrs extends WhyNotModalAttrs = WhyNotModalAttrs> extends Modal<Attrs> {
+export default class WhyNotModal<CustomAttrs extends WhyNotModalAttrs = WhyNotModalAttrs> extends Modal<CustomAttrs> {
     loading: boolean;
     whyNot: string | null;
     className(): string;
     title(): any;
-    oncreate(vnode: Mithril.VnodeDOM<Attrs, this>): void;
+    oncreate(vnode: Mithril.VnodeDOM<CustomAttrs, this>): void;
     content(): JSX.Element;
     requestWhyNot(): void;
 }

extensions/package-manager/js/dist-typings/models/Task.d.ts

@@ -0,0 +1,13 @@
+import Model from 'flarum/common/Model';
+export declare type TaskOperations = 'extension_install' | 'extension_remove' | 'extension_update' | 'update_global' | 'update_minor' | 'update_major' | 'update_check' | 'why_not';
+export default class Task extends Model {
+    status(): any;
+    operation(): any;
+    command(): any;
+    package(): any;
+    output(): any;
+    createdAt(): any;
+    startedAt(): any;
+    finishedAt(): any;
+    peakMemoryUsed(): string;
+}

extensions/package-manager/js/dist-typings/states/QueueState.d.ts

@@ -0,0 +1,16 @@
+import Task from '../models/Task';
+import { ApiQueryParamsPlural } from 'flarum/common/Store';
+export default class QueueState {
+    private tasks;
+    private limit;
+    private offset;
+    private total;
+    load(params?: ApiQueryParamsPlural): any;
+    getItems(): Task[] | null;
+    getTotalPages(): number;
+    pageNumber(): number;
+    hasPrev(): boolean;
+    hasNext(): boolean;
+    prev(): void;
+    next(): void;
+}

extensions/package-manager/js/dist-typings/utils/humanDuration.d.ts

@@ -0,0 +1 @@
+export default function humanDuration(start: Date, end: Date): any;

extensions/package-manager/js/dist-typings/utils/jumpToQueue.d.ts

@@ -0,0 +1 @@
+export default function jumpToQueue(): void;