prettier is prettier

.bundlewatch.config.json

@@ -1,25 +0,0 @@
-{
-    "files": [
-        {
-            "path": "./framework/core/js/dist/*.js",
-            "maxSize": "150KB"
-        },
-        {
-            "path": "./framework/core/js/dist/*/**/*.js",
-            "maxSize": "30KB"
-        },
-        {
-            "path": "./extensions/*/js/dist/*.js",
-            "maxSize": "30KB"
-        },
-        {
-            "path": "./extensions/*/js/dist/*/**/*.js",
-            "maxSize": "30KB"
-        }
-    ],
-    "defaultCompression": "gzip",
-    "ci": {
-        "repoBranchBase": "2.x",
-        "trackBranches": ["2.x"]
-    }
-}

.github/CODEOWNERS

@@ -1 +0,0 @@
-* @flarum/core

.github/ISSUE_TEMPLATE/bug-report.md

@@ -0,0 +1,39 @@
+---
+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

@@ -1,78 +0,0 @@
-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: environment
-    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

@@ -1,17 +0,0 @@
-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

@@ -0,0 +1,7 @@
+---
+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

@@ -0,0 +1,11 @@
+---
+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/REUSABLE_backend.yml

@@ -9,42 +9,22 @@ on:
         default: true
         required: false
 
-      enable_phpstan:
-        description: "Enable PHPStan Static Analysis?"
-        type: boolean
-        default: false
-        required: false
-
       backend_directory:
         description: The directory of the project where backend code is located. This should contain a `composer.json` file, and is generally the root directory of the repo.
         type: string
         required: false
         default: '.'
 
-      # Only relevant in mono-repos.
-      monorepo_tests:
-        description: "The list of directories to test in a monorepo. This should be a space-separated list of directories relative to the backend directory."
-        type: string
-        required: false
-
       php_versions:
         description: Versions of PHP to test with. Should be array of strings encoded as JSON array
         type: string
         required: false
-        # Keep PHP versions synced with build-install-packages.yml
-        default: '["8.2", "8.3", "8.4"]'
-
-      php_extensions:
-        description: PHP extensions to install.
-        type: string
-        required: false
-        default: 'curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip'
-
+        default: '["7.4", "8.0", "8.1"]'
       db_versions:
         description: Versions of databases to test with. Should be array of strings encoded as JSON array
         type: string
         required: false
-        default: '["mysql:5.7", "mysql:8.0.30", "mysql:8.1.0", "mariadb", "sqlite:3", "postgres:10"]'
+        default: '["mysql:5.7", "mariadb"]'
 
       php_ini_values:
         description: PHP ini values
@@ -52,202 +32,45 @@ on:
         required: false
         default: error_reporting=E_ALL
 
-      runner_type:
-        description: The type of runner to use for the jobs. This should be one of the types supported by the `runs-on` keyword.
-        type: string
-        required: false
-        default: 'ubuntu-latest'
-
-    secrets:
-      composer_auth:
-        description: The Composer auth tokens to use for private packages.
-        required: false
-
 env:
   COMPOSER_ROOT_VERSION: dev-main
-  # `inputs.composer_directory` defaults to `inputs.backend_directory`
   FLARUM_TEST_TMP_DIR_LOCAL: tests/integration/tmp
-  COMPOSER_AUTH: ${{ secrets.composer_auth }}
-  DB_DATABASE: flarum_test
-  DB_USERNAME: flarum
-  DB_PASSWORD: password
 
 jobs:
   test:
-    runs-on: ${{ inputs.runner_type }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
         php: ${{ fromJSON(inputs.php_versions) }}
         service: ${{ fromJSON(inputs.db_versions) }}
-        prefix: ['']
-        php_ini_values: [inputs.php_ini_values]
+        prefix: ['', flarum_]
 
-        # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategymatrixinclude
         include:
-          # Expands the matrix by naming DBs.
           - service: 'mysql:5.7'
-            db: MySQL 5.7
-            driver: mysql
-          - service: 'mysql:8.0.30'
-            db: MySQL 8.0
-            driver: mysql
+            db: MySQL
           - service: mariadb
             db: MariaDB
-            driver: mariadb
-          - service: 'mysql:8.1.0'
-            db: MySQL 8.1
-            driver: mysql
-          - service: 'sqlite:3'
-            db: SQLite
-            driver: sqlite
-          - service: 'postgres:10'
-            db: PostgreSQL 10
-            driver: pgsql
-
-          # Include Database prefix tests with only one PHP version.
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: 'mysql:5.7'
-            db: MySQL 5.7
-            driver: mysql
-            prefix: flarum_
-            prefixStr: (prefix)
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: mariadb
-            db: MariaDB
-            driver: mariadb
-            prefix: flarum_
-            prefixStr: (prefix)
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: 'sqlite:3'
-            db: SQLite
-            driver: sqlite
-            prefix: flarum_
-            prefixStr: (prefix)
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: 'postgres:10'
-            db: PostgreSQL 10
-            driver: pgsql
-            prefix: flarum_
+          - prefix: flarum_
             prefixStr: (prefix)
 
-        # To reduce number of actions, we exclude some PHP versions from running with some DB versions.
         exclude:
-          - php: ${{ fromJSON(inputs.php_versions)[1] }}
-            service: 'mysql:8.0.30'
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
+          - php: 8.0
+            service: 'mysql:5.7'
+            prefix: flarum_
+          - php: 8.0
             service: mariadb
-          - php: ${{ fromJSON(inputs.php_versions)[1] }}
-            service: mariadb
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: 'mysql:8.1.0'
-          - php: ${{ fromJSON(inputs.php_versions)[1] }}
-            service: 'mysql:8.1.0'
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: 'sqlite:3'
-          - php: ${{ fromJSON(inputs.php_versions)[1] }}
-            service: 'sqlite:3'
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: 'postgres:10'
-          - php: ${{ fromJSON(inputs.php_versions)[1] }}
-            service: 'postgres:10'
+            prefix: flarum_
 
     services:
       mysql:
-        image: ${{ matrix.driver == 'mysql' && matrix.service || '' }}
-        env:
-          MYSQL_DATABASE: ${{ env.DB_DATABASE }}
-          MYSQL_USER: ${{ env.DB_USERNAME }}
-          MYSQL_PASSWORD: ${{ env.DB_PASSWORD }}
-          MYSQL_ROOT_PASSWORD: root
+        image: ${{ matrix.service }}
         ports:
-          - 3306
-        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=10
-      mariadb:
-        image: ${{ matrix.driver == 'mariadb' && matrix.service || '' }}
-        env:
-          MARIADB_DATABASE: ${{ env.DB_DATABASE }}
-          MARIADB_USER: ${{ env.DB_USERNAME }}
-          MARIADB_PASSWORD: ${{ env.DB_PASSWORD }}
-          MARIADB_ROOT_PASSWORD: root
-        ports:
-          - 3306
-        options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
-      postgres:
-        image: ${{ matrix.driver == 'pgsql' && matrix.service || '' }}
-        env:
-          POSTGRES_DB: ${{ env.DB_DATABASE }}
-          POSTGRES_USER: ${{ env.DB_USERNAME }}
-          POSTGRES_PASSWORD: ${{ env.DB_PASSWORD }}
-        ports:
-          - 5432
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
+          - 13306:3306
 
     name: 'PHP ${{ matrix.php }} / ${{ matrix.db }} ${{ matrix.prefixStr }}'
 
-    if: >-
-      inputs.enable_backend_testing &&
-      ((github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) || github.event_name != 'pull_request')
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 1
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          coverage: xdebug
-          extensions: ${{ inputs.php_extensions }}
-          tools: phpunit, composer:v2
-          ini-values: ${{ matrix.php_ini_values }}
-
-      - name: Install Composer dependencies
-        run: composer install
-        working-directory: ${{ inputs.backend_directory }}
-
-      # If we have a `inputs.monorepo_tests`, we will run tests for each item of the provided array in a ::group::item
-      # If we don't have a `inputs.monorepo_tests`, we will run tests for the current repository
-      # We also have to run the `composer test:setup` script first before running each test
-      - name: Run tests
-        run: |
-          if [ -z "${{ inputs.monorepo_tests }}" ]; then
-            composer test:setup
-            composer test
-          else
-            for test in ${{ inputs.monorepo_tests }}; do
-              echo "::group::Running tests for $test"
-              composer test:setup --working-dir=$test
-              composer test --working-dir=$test
-              echo "::endgroup::"
-            done
-          fi
-        working-directory: ${{ inputs.backend_directory }}
-        env:
-          DB_HOST: 127.0.0.1
-          DB_PORT: ${{ (matrix.driver == 'mysql' && job.services.mysql.ports['3306']) || (matrix.driver == 'mariadb' && job.services.mariadb.ports['3306']) || (matrix.driver == 'pgsql' && job.services.postgres.ports['5432']) }}
-          DB_PREFIX: ${{ matrix.prefix }}
-          DB_DRIVER: ${{ matrix.driver }}
-          COMPOSER_PROCESS_TIMEOUT: 600
-
-  phpstan:
-    runs-on: ${{ inputs.runner_type }}
-
-    strategy:
-      matrix:
-        php: ${{ fromJson(inputs.php_versions) }}
-
-    name: 'PHPStan PHP ${{ matrix.php }}'
-
-    if: >-
-      inputs.enable_phpstan &&
-      ((github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) || github.event_name != 'pull_request')
+    if: inputs.enable_backend_testing
 
     steps:
       - uses: actions/checkout@master
@@ -257,24 +80,33 @@ jobs:
         with:
           php-version: ${{ matrix.php }}
           coverage: xdebug
-          extensions: ${{ inputs.php_extensions }}
+          extensions: curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip
           tools: phpunit, composer:v2
-          ini-values: ${{ matrix.php_ini_values }}
+          ini-values: ${{ inputs.php_ini_values }}
+
+      # The authentication alter is necessary because newer mysql versions use the `caching_sha2_password` driver,
+      # which isn't supported prior to PHP7.4
+      # When we drop support for PHP7.3, we should remove this from the setup.
+      - name: Create MySQL Database
+        run: |
+          sudo systemctl start mysql
+          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
+          mysql -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';" --port 13306
 
       - name: Install Composer dependencies
         run: composer install
         working-directory: ${{ inputs.backend_directory }}
 
-      - name: Create MySQL Database
-        run: |
-          sudo systemctl start mysql
-          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 3306
-
-      - name: Run PHPStan
-        run: composer analyse:phpstan
+      - name: Setup Composer tests
+        run: composer test:setup
+        working-directory: ${{ inputs.backend_directory }}
         env:
-          DB_USERNAME: root
-          DB_PORT: 3306
+          DB_PORT: 13306
           DB_PASSWORD: root
+          DB_PREFIX: ${{ matrix.prefix }}
+
+      - name: Run Composer tests
+        run: composer test
+        working-directory: ${{ inputs.backend_directory }}
+        env:
           COMPOSER_PROCESS_TIMEOUT: 600
-          FLARUM_TEST_TMP_DIR_LOCAL: ./tmp

.github/workflows/REUSABLE_frontend.yml

@@ -3,37 +3,6 @@ name: Flarum Frontend Jobs
 on:
   workflow_call:
     inputs:
-      build_script:
-        description: "Script to run for production build. Empty value to disable."
-        type: string
-        required: false
-        default: build
-      build_typings_script:
-        description: "Script to run for typings build. Empty value to disable."
-        type: string
-        required: false
-        default: build-typings
-      format_script:
-        description: "Script to run for code formatting. Empty value to disable."
-        type: string
-        required: false
-        default: format-check
-      check_typings_script:
-        description: "Script to run for tyiping check. Empty value to disable."
-        type: string
-        required: false
-        default: check-typings
-      type_coverage_script:
-        description: "Script to run for type coverage. Empty value to disable."
-        type: string
-        required: false
-        default: check-typings-coverage
-      test_script:
-        description: "Script to run for tests. Empty value to disable."
-        type: string
-        required: false
-        default: test
-
       enable_bundlewatch:
         description: "Enable Bundlewatch?"
         type: boolean
@@ -49,11 +18,6 @@ on:
         type: boolean
         default: true
         required: false
-      enable_tests:
-        description: "Enable Tests?"
-        type: boolean
-        default: false
-        required: false
 
       backend_directory:
         description: The directory of the project where backend code is located. This should contain a `composer.json` file, and is generally the root directory of the repo.
@@ -74,7 +38,7 @@ on:
         description: The node version to use for the workflow.
         type: number
         required: false
-        default: 20
+        default: 16
 
       js_package_manager:
         description: "Enable TypeScript?"
@@ -86,41 +50,84 @@ on:
         type: string
         required: false
 
-      runner_type:
-        description: The type of runner to use for the jobs. This should be one of the types supported by the `runs-on` keyword.
-        type: string
-        required: false
-        default: 'ubuntu-latest'
-
     secrets:
       bundlewatch_github_token:
         description: The GitHub token to use for Bundlewatch.
         required: false
-      composer_auth:
-        description: The Composer auth tokens to use for private packages.
-        required: false
 
 env:
   COMPOSER_ROOT_VERSION: dev-main
   ci_script: ${{ inputs.js_package_manager == 'yarn' && 'yarn install --immutable' || 'npm ci' }}
   cache_dependency_path: ${{ inputs.cache_dependency_path || format(inputs.js_package_manager == 'yarn' && '{0}/yarn.lock' || '{0}/package-lock.json', inputs.frontend_directory) }}
-  COMPOSER_AUTH: ${{ secrets.composer_auth }}
-  DISABLE_V8_COMPILE_CACHE: 1
 
 jobs:
-  build:
-    name: Checks & Build
-    runs-on: ${{ inputs.runner_type }}
-
-    if: >-
-      ((github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) || github.event_name != 'pull_request')
+  bundlewatch:
+    name: Bundlewatch
+    runs-on: ubuntu-latest
+    if: inputs.enable_bundlewatch
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Set up Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ inputs.node_version }}
+          cache: ${{ inputs.js_package_manager }}
+          cache-dependency-path: ${{ env.cache_dependency_path }}
+
+      - name: Build production assets
+        uses: flarum/action-build@2
+        with:
+          github_token: ${{ secrets.github_token }}
+          build_script: build
+          package_manager: ${{ inputs.js_package_manager }}
+          js_path: ${{ inputs.frontend_directory }}
+          do_not_commit: true
+
+      - name: Check bundle size change
+        run: node_modules/.bin/bundlewatch --config .bundlewatch.config.json
+        working-directory: ${{ inputs.frontend_directory }}
+        env:
+          BUNDLEWATCH_GITHUB_TOKEN: ${{ secrets.bundlewatch_github_token }}
+          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
+
+  prettier:
+    name: Prettier
+    runs-on: ubuntu-latest
+    if: inputs.enable_prettier
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ inputs.node_version }}
+          cache: ${{ inputs.js_package_manager }}
+          cache-dependency-path: ${{ env.cache_dependency_path }}
+
+      - name: Install JS dependencies
+        run: ${{ env.ci_script }}
+        working-directory: ${{ inputs.frontend_directory }}
+
+      - name: Check JS formatting
+        run: ${{ inputs.js_package_manager }} run format-check
+        working-directory: ${{ inputs.frontend_directory }}
+
+  typecheck:
+    name: Typecheck
+    runs-on: ubuntu-latest
+    if: inputs.enable_typescript
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Node
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ inputs.node_version }}
           cache: ${{ inputs.js_package_manager }}
@@ -129,7 +136,7 @@ jobs:
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.2'
+          php-version: '8.0'
           extensions: curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip
           tools: composer:v2
 
@@ -142,25 +149,72 @@ jobs:
         run: ${{ env.ci_script }}
         working-directory: ${{ inputs.frontend_directory }}
 
-      - name: JS Checks & Production Build
-        uses: flarum/action-build@v4
+      - name: Typecheck
+        run: ${{ inputs.js_package_manager }} run check-typings
+        working-directory: ${{ inputs.frontend_directory }}
+
+  type-coverage:
+    name: Type Coverage
+    runs-on: ubuntu-latest
+    if: inputs.enable_typescript
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ inputs.node_version }}
+          cache: ${{ inputs.js_package_manager }}
+          cache-dependency-path: ${{ env.cache_dependency_path }}
+
+      - name: Install JS dependencies
+        run: ${{ env.ci_script }}
+        working-directory: ${{ inputs.frontend_directory }}
+
+      - name: Check type coverage
+        run: ${{ inputs.js_package_manager }} run check-typings-coverage
+        working-directory: ${{ inputs.frontend_directory }}
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    if: "always() && !contains(needs.*.result, 'failed') && !contains(needs.*.result, 'cancelled')"
+    needs: [bundlewatch, prettier, typecheck, type-coverage]
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+
+      - name: Set up Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ inputs.node_version }}
+          cache: ${{ inputs.js_package_manager }}
+          cache-dependency-path: ${{ env.cache_dependency_path }}
+
+      # Our action will install npm/yarn, cd into `${{ inputs.frontend_directory }}`, build dist JS and typings,
+      # then commit and upload any changes iff we are on the main branch and have just pushed.
+      - name: Build production JS
+        if: inputs.enable_typescript
+        uses: flarum/action-build@2
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          build_script: ${{ inputs.build_script }}
-          build_typings_script: ${{ inputs.build_typings_script }}
-          format_script: ${{ inputs.enable_prettier == true && inputs.format_script || '' }}
-          check_typings_script: ${{ inputs.enable_typescript == true && inputs.check_typings_script || '' }}
-          type_coverage_script: ${{ inputs.enable_typescript == true && inputs.type_coverage_script || '' }}
-          test_script: ${{ inputs.enable_tests == true && inputs.test_script || '' }}
+          build_script: build
           package_manager: ${{ inputs.js_package_manager }}
+          typings_script: build-typings
           js_path: ${{ inputs.frontend_directory }}
           do_not_commit: ${{ github.ref != format('refs/heads/{0}', inputs.main_git_branch) || github.event_name != 'push' }}
 
-      - name: Check bundle size change
-        if: ${{ inputs.enable_bundlewatch }}
-        run: node_modules/.bin/bundlewatch --config .bundlewatch.config.json
-        working-directory: ${{ inputs.frontend_directory }}
-        env:
-          BUNDLEWATCH_GITHUB_TOKEN: ${{ secrets.bundlewatch_github_token }}
-          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
-          CI_BRANCH_BASE: ${{ github.event.pull_request.base.ref }}
+      # Our action will install npm/yarn, cd into `${{ inputs.frontend_directory }}`, build dist JS and typings,
+      # then commit and upload any changes iff we are on the main branch and have just pushed.
+      - name: Build production JS
+        if: "! inputs.enable_typescript"
+        uses: flarum/action-build@2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          build_script: build
+          package_manager: ${{ inputs.js_package_manager }}
+          js_path: ${{ inputs.frontend_directory }}
+          do_not_commit: ${{ github.ref != format('refs/heads/{0}', inputs.main_git_branch) || github.event_name != 'push' }}

.github/workflows/backend.yml

@@ -1,11 +0,0 @@
-name: Backend Tests
-
-on: [workflow_dispatch, push, pull_request]
-
-jobs:
-  run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
-    with:
-      enable_backend_testing: true
-      backend_directory: .
-      monorepo_tests: "framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags extensions/messages php-packages/testing/tests"

.github/workflows/build-install-packages.yml

@@ -1,29 +0,0 @@
-name: Build Install Packages
-
-on:
-  release:
-    types: [released]
-
-env:
-  VERSION: ${{ github.event.release.tag_name }}
-  PHP_VERSIONS: '8.2 8.3 8.4'
-  INSTALL_PACKAGES_INPUTS: '{ "flarum_version": "{0}", "php_versions": "{1}" }'
-
-jobs:
-  delay:
-    name: Wait for packagist to publish new packages
-    runs-on: ubuntu-latest
-    steps:
-      - run: sleep 30m
-
-  build:
-    name: Build Installation Packages
-    runs-on: ubuntu-latest
-    steps:
-      - name: Trigger build in flarum/installation-packages
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          workflow: Build Flarum Install Packages
-          repo: flarum/installation-packages
-          token: ${{ secrets.PACKAGES_BUILD_TOKEN }}
-          inputs: ${{ format(env.INSTALL_PACKAGES_INPUTS, env.VERSION, env.PHP_VERSIONS) }}

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

@@ -0,0 +1,11 @@
+name: Akismet PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/akismet

.github/workflows/flarum-akismet-frontend.yml

@@ -0,0 +1,20 @@
+name: Akismet JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: true
+
+      frontend_directory: ./extensions/akismet/js
+      backend_directory: ./extensions/akismet
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -1,4 +1,4 @@
-name: Static Code Analysis
+name: Approval PHP
 
 on: [workflow_dispatch, push, pull_request]
 
@@ -7,5 +7,5 @@ jobs:
     uses: ./.github/workflows/REUSABLE_backend.yml
     with:
       enable_backend_testing: false
-      enable_phpstan: true
-      backend_directory: .
+
+      backend_directory: ./extensions/approval

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

@@ -0,0 +1,20 @@
+name: Approval JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/approval/js
+      backend_directory: ./extensions/approval
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Core PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./framework/core

.github/workflows/flarum-core-frontend.yml

@@ -1,4 +1,4 @@
-name: Frontend Workflow
+name: Core JS
 
 on: [workflow_dispatch, push, pull_request]
 
@@ -6,13 +6,15 @@ jobs:
   run:
     uses: ./.github/workflows/REUSABLE_frontend.yml
     with:
-      frontend_directory: ./
-      backend_directory: ./
+      enable_bundlewatch: true
+      enable_prettier: true
+      enable_typescript: true
+
+      frontend_directory: ./framework/core/js
+      backend_directory: ./framework/core
       js_package_manager: yarn
       cache_dependency_path: ./yarn.lock
-      main_git_branch: 2.x
-      enable_tests: true
-      enable_bundlewatch: true
+      main_git_branch: main
 
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Embed PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/embed

.github/workflows/flarum-embed-frontend.yml

@@ -0,0 +1,20 @@
+name: Embed JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/embed/js
+      backend_directory: ./extensions/embed
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Emoji PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/emoji

.github/workflows/flarum-emoji-frontend.yml

@@ -0,0 +1,20 @@
+name: Emoji JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/emoji/js
+      backend_directory: ./extensions/emoji
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Flags PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/flags

.github/workflows/flarum-flags-frontend.yml

@@ -0,0 +1,20 @@
+name: Flags JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: true
+
+      frontend_directory: ./extensions/flags/js
+      backend_directory: ./extensions/flags
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Likes PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/likes

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

@@ -0,0 +1,20 @@
+name: Likes JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/likes/js
+      backend_directory: ./extensions/likes
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Lock PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/lock

.github/workflows/flarum-lock-frontend.yml

@@ -0,0 +1,20 @@
+name: Lock JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/lock/js
+      backend_directory: ./extensions/lock
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Markdown PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/markdown

.github/workflows/flarum-markdown-frontend.yml

@@ -0,0 +1,20 @@
+name: Markdown JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/markdown/js
+      backend_directory: ./extensions/markdown
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Mentions PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/mentions

.github/workflows/flarum-mentions-frontend.yml

@@ -0,0 +1,20 @@
+name: Mentions JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/mentions/js
+      backend_directory: ./extensions/mentions
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Nicknames PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/nicknames

.github/workflows/flarum-nicknames-frontend.yml

@@ -0,0 +1,20 @@
+name: Nicknames JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/nicknames/js
+      backend_directory: ./extensions/nicknames
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/flarum-package-manager-backend.yml

@@ -0,0 +1,11 @@
+name: Package Manager PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/package-manager

.github/workflows/flarum-package-manager-frontend.yml

@@ -0,0 +1,20 @@
+name: Package Manager JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: true
+
+      frontend_directory: ./extensions/package-manager/js
+      backend_directory: ./extensions/package-manager
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Pusher PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/pusher

.github/workflows/flarum-pusher-frontend.yml

@@ -0,0 +1,20 @@
+name: Pusher JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: true
+
+      frontend_directory: ./extensions/pusher/js
+      backend_directory: ./extensions/pusher
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Statistics PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/statistics

.github/workflows/flarum-statistics-frontend.yml

@@ -0,0 +1,20 @@
+name: Statistics JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: true
+
+      frontend_directory: ./extensions/statistics/js
+      backend_directory: ./extensions/statistics
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Sticky PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/sticky

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

@@ -0,0 +1,20 @@
+name: Sticky JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/sticky/js
+      backend_directory: ./extensions/sticky
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Subscriptions PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/subscriptions

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

@@ -0,0 +1,20 @@
+name: Subscriptions JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/subscriptions/js
+      backend_directory: ./extensions/subscriptions
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Suspend PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: false
+
+      backend_directory: ./extensions/suspend

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

@@ -0,0 +1,20 @@
+name: Suspend JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: false
+
+      frontend_directory: ./extensions/suspend/js
+      backend_directory: ./extensions/suspend
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,11 @@
+name: Tags PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_backend.yml
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/tags

.github/workflows/flarum-tags-frontend.yml

@@ -0,0 +1,19 @@
+name: Tags JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      enable_bundlewatch: false
+      enable_prettier: true
+      enable_typescript: true
+
+      frontend_directory: ./extensions/tags/js
+      backend_directory: ./extensions/tags
+      js_package_manager: yarn
+      cache_dependency_path: ./yarn.lock
+      main_git_branch: main
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/prepare-release.yml

@@ -1,26 +0,0 @@
-name: Prepare Release
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version to release'
-        required: true
-        type: string
-
-jobs:
-  run:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: read
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-      - name: Prepare release
-        uses: flarum/action-release@master
-        with:
-          next_tag: ${{ inputs.version }}
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          open_collective_token: ${{ secrets.OPEN_COLLECTIVE_TOKEN }}

CHANGELOG.md

@@ -1,402 +1,5 @@
 # Changelog
 
-## [v2.0.0-beta.1](https://github.com/flarum/framework/compare/v1.8.9...v2.0.0-beta.1)
-### Changed
-- php 8.4 [#4103]
-- JSON:API refactor [#3971]
-- (mentions) allow renderer to be used without context [#3954]
-- (flags) add pagination to flags list [#3931]
-- (mentions) add integration test for reply approval notification [#3748]
-- (mentions,emoji) tie autocomplete to editor instance [#3913]
-- (phpstan) upgrade to be compatible with latest dependency updates [#3835]
-- (tags) prevent loading tag state if loaded previously [#4009]
-- (testing) run flarum/testing packages tests back again [#3844]
-- Do not catch exceptions when testing Console commands [#3813]
-- Patch vulnerability advisory [#3966]
-- Search box improvements on tablet devices [#4076]
-- Test using MySQL 8.1 [#3870]
-- Upgrade dependencies [#3830], [#4012]
-- Upgrade `intervention/image` to 3.2 [#3947]
-- Upgrade Wikimedia/less.php to 4.1 [#3837]
-- Upgrade Mithril to 2.2 [#3831]
-- (tags) Wrong tag input width if contains CJK characters [#4127]
-- allow custom actions runner to be defined [#3988]
-- avoid using `.fa()` mixins and `@fa-var` vars [#3912]
-- cleanup composer deps (40dcaf882cd017463ca792762d4aa11de8c5c7da)
-- corrected typos in routes comments [#3840]
-- extract `FormModal` from `Modal` [#3922]
-- extract `buildSettingComponent` method into a `FormGroup` component [#3927]
-- fix typos [#4021]
-- function names (d15438846895a5cf7b5a584479ef63a6e3119925)
-- handle deprecations from 1.x [#3909]
-- ignore deprecation errors in prod [#4072]
-- improve debugging experience [#3944]
-- improve test suite [#3814]
-- increase phpstan level to 6 [#3836]
-- `HeaderPrimary.js` converted to typescript [#4052]
-- merge the app with the container & implement the ApplicationContract [#3862]
-- recover bundlewatch [#3829]
-- remove ExtenderInterface[] as a conditional option, only support callable or ::class invoke [#3904]
-- remove listing of posts in the show discussion endpoint [#4067]
-- remove unused vars in catch [#3839]
-- simplify if else conditions [#3843]
-- simplify variable assignment using null coalescing operator [#4000]
-- support composer auth in workflows [#3961]
-- switch formatter to `format-message` [#4088]
-- transpile js to es6 [#3699]
-- unify frontend initializers naming [#4003]
-- update FontAwesome v6 icon search link [#4036]
-- use `::class` syntax to fetch class name instead of `get_class()` function [#3910]
-- use `hex_color` rule for color validation [#3936]
-- use `str_contains` instead of `strpos` [#3841]
-- graceful failure from extend/override errors [#4134]
-### Fixed
-- (a11y) convert empty links to buttons [#3926]
-- (approval) `PostWasApproved` event triggered incorrectly [#3930]
-- (em) prevent use if missing php functions (94b0d67a4020e1b7027e0df53dee1d681dc822e1)
-- (em) production ready check (f6e84a0dc576d1cfe8539b7438244edf156e3b1a)
-- (testing) use cookie for testing authentication [#3924]
-- 3 char hex color is incorrectly modified to 6 [#4013]
-- Add conditional rendering for email status in MailPage.tsx [#3997]
-- Logout controller allows open redirects [#3948], [#4091]
-- allow use of an attribute named `relationships` (1ead69e9b66ae9bc335be663498b7ea706adbf73)
-- cannot install without db prefix [#4001]
-- change length of email field [#4118]
-- color input changes while typing [#3919]
-- console extender does not accept `::class` attribute for schedule [#3903]
-- default labels with `SettingDropdown` and `SelectDropdown` [#3854]
-- duplicated `mentionsUsers` in extend.php (2b56129d70d18686a73d044ff65b418eef83f388)
-- handled API errors break preloaded content [#3920]
-- improve the flarum validator [#4133]
-- installation command config path can be null (07623afacde590c45a20537add3b72a919050819)
-- larastan changed namespace [#3955]
-- larastan changes frequently (af2a32a3a4f50874c63785f5168e1df60f947553)
-- load event mentioned tags on show discussion endpoint [#3915]
-- move `UserSearchResult` to common (35f76bce60361caac8001c41c421de30f567b221)
-- notify for all posts switch field loading state [#3938]
-- only set actor on events that have it [#3914]
-- overflowing forum stats [#3940]
-- paginated list limit hard to change [#3918]
-- prevent wiping out existing database on install [#4092]
-- reset save button state when an error occurs in admin page [#4010]
-- usage of `aria-hidden=false` might cause inconsistent behavior [#4074]
-- use dynamic viewport units for height of Modals [#3951]
-- user pages history not registered [#3916]
-- validate required cli install args [#4093]
-- make `WelcomeHero` extensible [#3848]
-- Update the scheduler info link in admin (#3826)
-### Added
-- Export Registry [#3842]
-- Code Splitting [#3860]
-- Fontawesome v6 [#4020]
-- extension bisect [#3980]
-- extension list UI [#4066]
-- admin search UI [#4022]
-- add support for `PgSQL` [#3985]
-- add support for `SQLite` [#3984]
-- separate `MariaDB` driver [#4132]
-- advanced maintenance modes [#3977]
-- notification unsubscribe links [#3872]
-- email overhaul with HTML multipart [#3872]
-- date time formats from locales [#4029]
-- messages extension [#4028]
-- search drivers (revamp search system) [#3893]
-- search UI/UX revamp [#3941]
-- post search adapted with global search [#4019]
-- vanilla CSS color scheme changes [#3996]
-- (emoji) allow the user to set the CDN address [#3908]
-- (nicknames) allow OAuth to provide a nickname [#4004]
-- (sticky) make excerpt optional in sticky [#4016]
-- JS `Notification` extender [#3974]
-- add `whenExtensionDisabled` to `Conditional` extender [#3847]
-- add option for filtering read stickied on all discussions page [#4073]
-- allow resetting settings to default [#3935]
-- define `FLARUM_START` constant [#4082]
-- dispatch event to `flarum/installation-packages` on release [#3625]
-- eloquent factories (primarily for tests) [#3982]
-- frontend content flexible order priorities [#3765]
-- improve emoji autocomplete [#3923]
-- recover support for ico favicon [#4126]
-- theming and extensibility improvements [#3876]
-
-## [v1.8.1](https://github.com/flarum/framework/compare/v1.8.0...v1.8.1)
-### Fixed
-* recover temporary solution for html entities in browser title (e72541e35de4f71f9d870bbd9bb46ddf586bdf1d)
-* custom contrast color affected by parents (577890d89c593ae5b6cb96083fab69e2f1ae600c)
-* reply placeholder wrong positioning (253a3d281dbf5ce3fa712b629b80587cf67e7dbe)
-* (mentions) missed post mentions UI changes with lazy loading [#3832]
-* (mentions) cannot use newly introduced mentionables extender [#3849]
-* (mentions) missing slug from post mention links ([5a4bb7c](5a4bb7ccf226f66dd44816cb69b3d7cfe4ad7f7c))
-
-## [v1.8.0](https://github.com/flarum/framework/compare/v1.7.1...v1.8.0)
-### Fixed
-- (a11y) reply placeholder not accessible [#3793]
-- (bbcode) highlight.js does not work after changing post content [#3817]
-- (bbcode) localize quote `wrote` string [#3809]
-- (mentions) mentions XHR fired even after mentioning is done [#3806]
-- (package-manager) available core updates cause an error in the dashboard ([fab71f2](fab71f2d01fa20ce9b3002833339dc5ea3ea6301))
-- (tags) not all tags are loaded in the permission grid [#3804]
-- (tags) tag discussion modal filters with exact matches only after first index [#3786]
-- (testing) always clear cache in integration test's tearDown [#3818]
-- `UserSecurityPage` not exported ([232618a](232618aba604ab003425df38b895208c863d3260))
-- `isDark()` utility can receive null value [#3774]
-- approving a post does not bump user `comment_count` [#3790]
-- circular dependencies disable all involved extensions [#3785]
-- color input overflowing the input box [#3796]
-- deleting a discussion from the profile does not visually remove it [#3799]
-- discussion page showing horizontal scroll on iOS [#3821]
-- empty string displayed as SelectDropdown title [#3773]
-- filter values are not validated [#3795]
-- infinite scroll not initialized for notifications on big screens [#3733]
-- notification subject discussion eager loading fails [#3788]
-- null as 2nd param in `preg_match` is deprecated [#3801]
-- unread count in post stream not visible [#3791]
-- unreadable badge icon on certain colors [#3810]
-- integrity constraint violation [#3772]
-### Changed
-- (core,mentions) limit `mentionedBy` post relation results [#3780]
-- (likes) limit `likes` relationship results [#3781]
-- Change some methods from private to protected, to be able to extend the affected classes [#3802]
-- Do not catch exceptions when testing Console commands [#3813]
-- drop usage of jquery in `install` and `update` interfaces [#3797]
-- extensibility improvements [#3729]
-- major frontend JS cleanup [#3609]
-- revert ineffective code for encoding of page title [#3768]
-- speed up post creation time [#3808]
-### Added
-- (mentions,tags) tag mentions [#3769]
-- add delete own posts permission [#3784]
-- add a trait to flush the formatter cache in tests [#3811]
-- add user creation to users list page [#3744]
-- cli command for enabling or disabling an extension [#3816]
-- conditional extenders [#3759]
-- provide old content to `Revised` event [#3789]
-
-## [v1.7.1](https://github.com/flarum/framework/compare/v1.7.0...v1.7.1)
-### Fixed
-- (tags) composer tag selection modal using wrong primary max & min numbers (abc9670659426b765274376945b818b70d84848c)
-- missing parameter names in token title translation. (#3752)
-- hardcoded language strings in StatusWidget (#3754)
-- hide developer tokens section in if there is nothing to display or create (#3753)
-- improve sessions user UI on mobile (dd868ab44e11e892d020e3b9412553c6a789e68d)
-
-## [v1.7.0](https://github.com/flarum/framework/compare/v1.6.3...v1.7.0)
-### Added
-- (actions) allow running JS tests in GH actions  [#3730]
-- (core) PHP 8.2 Support [#3709]
-- (jest) create jest config package for unit testing [#3678]
-- (jest) mithril component testing [#3679]
-- (phpstan) foundation for usage in extensions [#3666]
-- (seo) Do not use h3 header for poster author in posts stream [#3732]
-- (seo) Use h2 header for discussions on discussions list [#3731]
-- (seo) shift h1 tag from logo to discussion title [#3724]
-- (tags) admin tag selection component (reusable tag selection modal) [#3686]
-- Admin User Search [#3712]
-- access tokens user management UI [#3587]
-- add display name column to admin users list [#3740]
-- allow push additional items to the end of the poststream [#3691]
-- allow using utf8 characters in tag slugs [#3588]
-- expose queue driver, schedule status [#3593]
-- expose {time} to eventPost data, fix renamed tooltip [#3698]
-- frontend `Model` extender [#3646]
-- global logout to clear all sessions, access tokens, email tokens and password tokens [#3605]
-- improved page navigation for users list [#3741]
-- introduce frontend extenders [#3645]
-### Fixed
-- (mentions) correctly convert a 3 char. hex color to a 6 char. one [#3694]
-- (mentions) post reply mention missing notification on approval [#3738]
-- (phpstan) adapt phpstan package for extension use [#3727]
-- (tags) clickable tag labels have underline [#3737]
-- (tags) tag text color contrast [#3653]
-- 3 digit hex color value in color input not supported [#3706]
-- column `id` can be ambiguous in group filter with extensions [#3696]
-- disallow certain dangerous LESS features ([1761660](1761660c98ea5a3e9665fb8e6041d1f2ee62a444))
-- evaluated page title content [#3684]
-- invalid translation key for scheduler dashboard [#3736]
-- load actor.groups on showforumcontroller [#3716]
-- make go-to-page input number-like [#3743]
-- normal logout affects all sessions [#3571]
-- permissions table on mobile is unusable [#3722]
-- post dropdown opens all dropdowns in `.Post-actions` [#3675]
-- typo in Formatter extender docblock [#3676]
-- undefined showing in dropdown active title [#3700]
-### Changed
-- (phpstan) enable phpstan in bundled extensions [#3667]
-- Add missing states exports to `compat.ts` [#3683]
-- Indicate cross-origin request in generic error message [#3669]
-- Merge branch 'release/v1.6.2' ([e0b9dcf](e0b9dcfbcd7db175368dbc98255f9223da8df17d))
-- The negate field doesn't get used, which means you cant exclude tags [#3713]
-- Update forum.less to fix the misalignment of the choose tags button [#3726]
-- `yarn audit-fix` ([8ddb0fe](8ddb0feb097dad06c5763107d7a7f7b5a55562c4))
-- `yarn` ([ee1e04c](ee1e04cdc26b3e63057a58899f32f482901a95fd))
-- convert `Dropdown` components to TS [#3608]
-- fix php 8.1 on preg_match 2nd argument being null, which also optimizes slightly ([d7b9a03](d7b9a03f31847c39631ba495df8f515509774610))
-- improve group mentions parsing [#3723]
-- prepare `@flarum/jest-config` for release ([748cca6](748cca6d12f8b1744a6017c09395725bdbb4a118))
-- remove use of deprecated phpunit assertion ([3af0481](3af0481f304277f5380fac9c9b169a7fa651f53b))
-- set flarum version to 1.7.0 for dev ([2517bc0](2517bc0f70b0f0e3d3ea3f6ae06af8604d89b25d))
-- update JS dependencies  [#3695]
-
-## [v1.6.3](https://github.com/flarum/framework/compare/v1.6.2...v1.6.3)
-### Fixed
-* Post mentions can be used to read any post on the forum without access control (ab1c868b978e8b0d09a5d682c54665dae17d0985).
-* Notifications can leak restricted content (d0a2b95dca57d3dae9a0d77b610b1cb1d0b1766a).
-* Any user including unactivated can reply in public discussions whose first post was permanently deleted (12f14112a0ecd1484d97330b82beb2a145919015).
-* (subscriptions) Post notifications not getting access checked (https://github.com/flarum/framework/commit/e5f05166a062a9a6eb7c12e28728bfd5db7270e3).
-
-## [v1.6.2](https://github.com/flarum/framework/compare/v1.6.1...v1.6.2)
-### Fixed
-* XSS Vulnerability in core (https://github.com/flarum/framework/pull/3684).
-
-## [v1.6.1](https://github.com/flarum/framework/compare/v1.6.0...v1.6.1)
-### Fixed
-* JS dependencies update breaks utilities.
-
-## [v1.6.0](https://github.com/flarum/framework/compare/v1.5.0...v1.6.0)
-### Fixed
-- (approval) posts approved for deleted users error ([b5874a0](b5874a08e482196f50af50aa78e43c93c29fb647))
-- (regression) bad import ([5f2d7fb](5f2d7fb7b6e430d40cf2bb05eca7c73f6ca5a2cc))
-- akismet fails when the extension is not on a version ([45d9121](45d91212f6bfa777cae9fc06c55c85d01ffd174d))
-- apply flex for AppearancePage colors input [#3651]
-- groupmentions have poor contrast on some backgrounds [#3672]
-- larastan v1 incompatible with phpstan v1.9.0 [#3665]
-- package manager failures not showing alerts [#3647]
-- password reset leaks user existence [#3616]
-- statistics previous period chart is unclear [#3654]
-### Changed
-- (package-manager) config composer to use web php version ([fd19645](fd196454a5641776784fa80886cc7577c840f8ed))
-- (package-manager) set min core version and add warning ([31c3cfc](31c3cfc4eab4c314260b9b0d11e53ac2d4be158d))
-- (statistics) prepare v1.5.1 ([dc215ab](dc215aba59145dfd7b0d6efad4388444f30e47fb))
-- Apply fixes from StyleCI ([267f675](267f6759f80bd06f468337245ea6045635e827d9))
-- Fix tag discussion count decreased by 2 when hiding before deleting [#3660]
-- Log migration path when up/down keys are missing [#3664]
-- Make it possible to extend SetupScript [#3643]
-- Setup PHPStan Level 5 [#3553]
-- `yarn format` ([c5c312d](c5c312db0d800e3b84b94a4abb9691e348dea742))
-- add missing last period to custom date ranges [#3661]
-- add priorities to profile settings page [#3657]
-- allow specifying php extensions in workflow ([b0b47a0](b0b47a0888f513a459b67e9f89e72a61de38f1ce))
-- format js ([06963df](06963df4079373fc8fc51b7479e9576f02beb098))
-- group mentions [#3658]
-- remove styleci from changelog ([b2fa28e](b2fa28e4b57094e46dbdb3d79fab74f290a17d17))
-- set flarum version to dev for 1.6.0 ([fc743ba](fc743ba88872031db13597d7365a063b8004c78f))
-- throw an exception when no serializer is provided to the controller [#3614]
-### Added
-- (statistics) support for custom date ranges [#3622]
-- Allow additional login params, Introduce `LogInValidator` [#3670]
-- Allow additional reset password params, introduce `ForgotPasswordValidator` [#3671]
-- add statistics chart export button [#3662]
-- allow specifying extensions when installing an instance [#3655]
-- contrast util with yiq calculator [#3652]
-- customizable session driver [#3610]
-- replace `ColorPreviewInput` for GroupModal color input [#3650]
-- send notifications of a new reply when post is approved [#3656]
-
-## [v1.5.0](https://github.com/flarum/framework/compare/v1.4.0...v1.5.0)
-### Fixed
-- (a11y) add accessible labels to notification grid options [#3520]
-- (a11y) present post streams as feeds [#3522]
-- (a11y) set `aria-busy` when editing a post stream item [#3521]
-- (compilation) versioner not inject into compilers [#3589]
-- (mentions) accessing `id` of null `user` relation [#3618]
-- (subscriptions) add missing table prefix for filter gambit [#3599]
-- (tags) use default index sortmap [#3615]
-- Move guzzle requirement to core [#3544]
-- MyISAM tables for extensions during installation ([75aaef7](75aaef7d76317bc8578eac1439fed8091c87213b), [f926c58](f926c58e0143fe75a4a4c2e93810970c5910afc8))
-- Set the translator locale to user preference for email notifications [#3525]
-- `$events` property declared dynamically [#3598]
-- core settings header has no priority ([33bf228](33bf2284c77863a1bb18d71d87b8516483056a74))
-- html entities shown raw in page title [#3542]
-- incorrect centring of deleted user avatars in notification list [#3569]
-- intellisense imports defaulting to absolute path from `src` folder [#3549]
-- minor backward compatible fix for php 8.1 in st_replace ([07b2f86](07b2f86dcc90a3ef17c8ee19a1a07e99a4b17360))
-- post query wildcard selection causes ambiguity [#3621]
-- potential static caching memory exhaustion [#3548]
-- prepare release workflow has invalid layout ([70e483d](70e483d1b185332910be9513fd06cc6342830d49))
-- remove deprecation warning for decoding null values ([590639f](590639f5f3e1fe883f28c41e1f175c2826b4b5f4))
-- replace `.fa()` mixin usage with `.fas()` [#3537]
-- return type hint static is php 8+ ([b01b75e](b01b75e36790d8026dd27ce59051d9581ad47940))
-- sticky nav content displays below post stream [#3575]
-- titles positioned wrongly with custom header height [#3550]
-- typo in error message ([1a189f4](1a189f492320071365286a8835bc49d5a9571753))
-- unread notifications are globally cached between users. [#3543]
-- update workflow name ([628c281](628c281c39855f01069ddc40b698d80d29fec870))
-- user has wrong discussion read status [#3591]
-### Changed
-- (approval, likes) use subscribers [#3577]
-- (package-manager) last tweaks before beta tag ([335c602](335c602cea3fbaee9ad7c32ceecaaf222e5d89a7))
-- (statistics) add release notes for 1.4.1 ([f4ace73](f4ace73a3c59434b8717efb2d83f50084f470fe4))
-- (statistics) rewrite for performance on very large communities [#3531]
-- (statistics) split timed data into per-model XHR requests [#3601]
-- (tags) Replace event helper with event dispatcher [#3570]
-- Add `loading="lazy"` attribute for avatars [#3578]
-- Create CODEOWNERS ([6e48a03](6e48a0303e45bcf210e550ba3e0772bc8443a207))
-- MyISAM tables for extensions during installation" ([f128190](f128190f143398dd1262fd1379e634794daee4c1))
-- convert `AlertManager` `IndexPage` and `UserPage` components to TS [#3536]
-- convert `Badge` `Checkbox` and `Navigation` components to TS [#3532]
-- convert core modals to TypeScript [#3515]
-- convert page components to TypeScript [#3538]
-- debug line slipped in while rebasing a PR [#3580]
-- don't pass password field between auth modals [#3626]
-- fix github issue templates ([d3e456a](d3e456a1bf42d13b7cd2542c371f392712247c09))
-- format code ([4954621](495462183bfb3b33046b293e6b1088ab225968df))
-- getting the release workflow in ([5530400](5530400b093b5fd07d670e5c92d8a7da96634cfe))
-- link logo at the top with the official website [#3552]
-- prevent running both `push` and `pull_request` actions at the same time [#3597]
-- refactor prefix matrix and add `MySQL 8.0` & `PHP 7.3` to workflows [#3595]
-- relying on a third-party for avatar URL tests is unreliable  [#3586]
-- require guzzle 6 or 7 ([46b3b7a](46b3b7a9527b935c3c52269aaad2010c75dcb6d8))
-- split FA imports into separate Less file for easy overriding [#3535]
-- unify JS actions into one (rewritten `flarum/action-build`) [#3573]
-- update version constant during cycle 22 ([d864405](d86440506dd37101e60adec591d4b017e7765ec6))
-- use `isCollapsed` instead of `rangeCount` [#3581]
-- use github issue template forms [#3526]
-### Added
-- (likes) Add likes tab to user profile [#3528]
-- (likes) Option to prevent users liking their own posts [#3534]
-- (modals) support stacking modals, remove bootstrap modals dependency [#3456]
-- (subscriptions) add option to send notifications when not caught up [#3503]
-- Add custom class for email confirmation alert [#3584]
-- Admin debug mode warning [#3590]
-- Delete all notifications [#3529]
-- Queue package manager commands [#3418]
-- Restart the queue worker after cache clearing, ext enable/disable, save settings [#3565]
-- add createTableIfNotExists migration helper [#3576]
-- add new workflow for generating release meta ([0901e59](0901e59a58a3e1f017762583a2adf419f7f34257))
-- clear password & email tokens when appropriate [#3567]
-- discussion UTF-8 slug driver [#3606]
-- expose assets base url to frontend forum model [#3566]
-- extender to add custom less variables [#3530]
-- publish assets on admin dashboard cache clear [#3564]
-- throttle email change, email confirmation, and password reset endpoints. [#3555]
-
-## [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
@@ -589,7 +192,7 @@ looks rather complex and messy compared to the full list of changes made for thi
 - Pass filter params to getApiDocument (https://github.com/flarum/framework/pull/3037)
 - Use author filter instead of gambit to get a user's discussions (https://github.com/flarum/framework/pull/3068)
 - [A11Y] Accessibility improvements for the Search component (https://github.com/flarum/framework/pull/3017)
-- Add determinism to extension order resolution (https://github.com/flarum/framework/pull/3076)
+- Add determinsm to extension order resolution (https://github.com/flarum/framework/pull/3076)
 - Add cache control headers to the admin area (https://github.com/flarum/framework/pull/3097)
 
 ### Fixed

README.md

@@ -1,12 +1,11 @@
-<p align="center">
-<a href="https://flarum.org/"><img src="https://flarum.org/images/flarum.svg"></a>
-</p>
+<p align="center"><img src="https://flarum.org/assets/img/logo.png"></p>
 
 <p align="center">
 <a href="https://github.com/flarum/core/actions?query=workflow%3ATests"><img src="https://github.com/flarum/core/workflows/Tests/badge.svg" alt="PHP Tests"></a>
 <a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/dt/flarum/core" alt="Total Downloads"></a>
 <a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/github/v/release/flarum/core?sort=semver" alt="Latest Version"></a>
 <a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/l/flarum/core" alt="License"></a>
+<a href="https://huntr.dev/bounties/disclose/?target=https://github.com/flarum/core"><img src="https://cdn.huntr.dev/huntr_security_badge_mono.svg" alt="huntr"></a>
 <a href="https://github.styleci.io/repos/28257573"><img src="https://github.styleci.io/repos/28257573/shield?style=flat" alt="StyleCI"></a>
 </p>
 
@@ -20,7 +19,7 @@
 
 * **Powerful and extensible.** Customize, extend, and integrate Flarum to suit your community. Flarum’s architecture is amazingly flexible, with a powerful Extension API.
 
-![Screenshot of a Flarum instance, showing multiple discussions and tags.](https://flarum.org/assets/flarum/home-screenshot.png)
+![Screenshot of a Flarum instance, showing multiple discussions and tags.](https://flarum.org/assets/img/home-screenshot.png)
 
 ## Installation
 
@@ -37,4 +36,3 @@ If you discover a security vulnerability within Flarum, please send an e-mail to
 ## License
 
 Flarum is open-source software licensed under the [MIT License](https://github.com/flarum/flarum/blob/master/LICENSE).
-

bin/test.sh

@@ -1,16 +0,0 @@
-#!/bin/bash
-
-MONOREPO_TEST="framework/core extensions/akismet extensions/approval extensions/flags extensions/likes extensions/mentions extensions/nicknames extensions/statistics extensions/sticky extensions/subscriptions extensions/suspend extensions/tags extensions/messages php-packages/testing/tests"
-
-for test in $MONOREPO_TEST; do
-  echo ""
-  echo "===> Testing $test"
-  echo ""
-
-  # composer test:setup --working-dir=$test
-  composer test --working-dir=$test
-
-  echo ""
-  echo "===> Done testing $test"
-  echo ""
-done

composer.json

@@ -29,8 +29,8 @@
         }
     ],
     "support": {
-        "issues": "https://github.com/flarum/framework/issues",
-        "source": "https://github.com/flarum/framework",
+        "issues": "https://github.com/flarum/core/issues",
+        "source": "https://github.com/flarum/core",
         "docs": "https://docs.flarum.org",
         "forum": "https://discuss.flarum.org",
         "chat": "https://flarum.org/chat"
@@ -40,20 +40,18 @@
             "Flarum\\": "framework/core/src",
             "Flarum\\Akismet\\": "extensions/akismet/src",
             "Flarum\\Approval\\": "extensions/approval/src",
-            "Flarum\\BBCode\\": "extensions/bbcode/src",
             "Flarum\\Flags\\": "extensions/flags/src",
             "Flarum\\Likes\\": "extensions/likes/src",
             "Flarum\\Lock\\": "extensions/lock/src",
             "Flarum\\Mentions\\": "extensions/mentions/src",
             "Flarum\\Nicknames\\": "extensions/nicknames/src",
-            "Flarum\\ExtensionManager\\": "extensions/package-manager/src",
+            "Flarum\\PackageManager\\": "extensions/package-manager/src",
             "Flarum\\Pusher\\": "extensions/pusher/src",
             "Flarum\\Statistics\\": "extensions/statistics/src",
             "Flarum\\Sticky\\": "extensions/sticky/src",
             "Flarum\\Subscriptions\\": "extensions/subscriptions/src",
             "Flarum\\Suspend\\": "extensions/suspend/src",
             "Flarum\\Tags\\": "extensions/tags/src",
-            "Flarum\\Messages\\": "extensions/messages/src",
             "Flarum\\PHPStan\\": "php-packages/phpstan/src",
             "Flarum\\Testing\\": "php-packages/testing/src"
         },
@@ -61,27 +59,6 @@
             "framework/core/src/helpers.php"
         ]
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Flarum\\Tests\\": "tests",
-            "Flarum\\Akismet\\Tests\\": "extensions/akismet/tests",
-            "Flarum\\Approval\\Tests\\": "extensions/approval/tests",
-            "Flarum\\Flags\\Tests\\": "extensions/flags/tests",
-            "Flarum\\Likes\\Tests\\": "extensions/likes/tests",
-            "Flarum\\Lock\\Tests\\": "extensions/lock/tests",
-            "Flarum\\Mentions\\Tests\\": "extensions/mentions/tests",
-            "Flarum\\Nicknames\\Tests\\": "extensions/nicknames/tests",
-            "Flarum\\ExtensionManager\\Tests\\": "extensions/package-manager/tests",
-            "Flarum\\Pusher\\Tests\\": "extensions/pusher/tests",
-            "Flarum\\Statistics\\Tests\\": "extensions/statistics/tests",
-            "Flarum\\Sticky\\Tests\\": "extensions/sticky/tests",
-            "Flarum\\Subscriptions\\Tests\\": "extensions/subscriptions/tests",
-            "Flarum\\Suspend\\Tests\\": "extensions/suspend/tests",
-            "Flarum\\Tags\\Tests\\": "extensions/tags/tests",
-            "Flarum\\Messages\\Tests\\": "extensions/messages/tests",
-            "Flarum\\Testing\\Tests\\": "php-packages/testing/tests"
-        }
-    },
     "replace": {
         "flarum/core": "self.version",
         "flarum/akismet": "self.version",
@@ -96,84 +73,75 @@
         "flarum/markdown": "self.version",
         "flarum/mentions": "self.version",
         "flarum/nicknames": "self.version",
-        "flarum/extension-manager": "self.version",
+        "flarum/package-manager": "self.version",
         "flarum/pusher": "self.version",
         "flarum/statistics": "self.version",
         "flarum/sticky": "self.version",
         "flarum/subscriptions": "self.version",
         "flarum/suspend": "self.version",
         "flarum/tags": "self.version",
-        "flarum/messages": "self.version",
         "flarum/phpstan": "self.version",
         "flarum/testing": "self.version"
     },
     "require": {
-        "php": "^8.2",
         "ext-json": "*",
-        "components/font-awesome": "^6.5.2",
-        "composer/composer": "^2.7",
-        "dflydev/fig-cookies": "^3.0",
-        "doctrine/dbal": "^3.6.2",
-        "dragonmantank/cron-expression": "^3.3",
-        "fakerphp/faker": "^1.9.1",
-        "flarum/json-api-server": "^0.1.0",
-        "franzl/whoops-middleware": "2.0",
-        "guzzlehttp/guzzle": "*",
-        "illuminate/bus": "^11.0",
-        "illuminate/cache": "^11.0",
-        "illuminate/config": "^11.0",
-        "illuminate/console": "^11.0",
-        "illuminate/container": "^11.0",
-        "illuminate/contracts": "^11.0",
-        "illuminate/database": "^11.0",
-        "illuminate/events": "^11.0",
-        "illuminate/filesystem": "^11.0",
-        "illuminate/hashing": "^11.0",
-        "illuminate/mail": "^11.0",
-        "illuminate/queue": "^11.0",
-        "illuminate/session": "^11.0",
-        "illuminate/support": "^11.0",
-        "illuminate/validation": "^11.0",
-        "illuminate/view": "^11.0",
-        "intervention/image": "^3.2",
-        "jenssegers/agent": "^2.6",
-        "laminas/laminas-diactoros": "^3.0",
-        "laminas/laminas-httphandlerrunner": "^2.6",
-        "laminas/laminas-stratigility": "^3.10",
-        "league/flysystem": "^3.15",
-        "league/flysystem-memory": "^3.15",
+        "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",
+        "illuminate/bus": "^8.0",
+        "illuminate/cache": "^8.0",
+        "illuminate/config": "^8.0",
+        "illuminate/console": "^8.0",
+        "illuminate/container": "^8.0",
+        "illuminate/contracts": "^8.0",
+        "illuminate/database": "^8.0",
+        "illuminate/events": "^8.0",
+        "illuminate/filesystem": "^8.0",
+        "illuminate/hashing": "^8.0",
+        "illuminate/mail": "^8.0",
+        "illuminate/queue": "^8.0",
+        "illuminate/session": "^8.0",
+        "illuminate/support": "^8.0",
+        "illuminate/validation": "^8.0",
+        "illuminate/view": "^8.0",
+        "intervention/image": "2.5.* || ^2.6.1",
+        "laminas/laminas-diactoros": "^2.4.1",
+        "laminas/laminas-httphandlerrunner": "^1.2.0",
+        "laminas/laminas-stratigility": "^3.2.2",
+        "league/flysystem": "^1.0.11",
         "matthiasmullie/minify": "^1.3",
-        "middlewares/base-path": "^v2.1",
+        "middlewares/base-path": "^2.0.1",
         "middlewares/base-path-router": "^2.0.1",
-        "middlewares/request-handler": "^2.0.2",
-        "monolog/monolog": "^3.3",
-        "nesbot/carbon": "^3.0",
-        "nikic/fast-route": "^1.3",
-        "psr/http-message": "^1.1",
-        "psr/http-server-handler": "^1.0.2",
-        "psr/http-server-middleware": "^1.0.2",
-        "pusher/pusher-php-server": "^7.2",
-        "s9e/text-formatter": "^2.13",
-        "sycho/sourcemap": "^2.0.0",
-        "symfony/config": "^7.0",
-        "symfony/console": "^7.0",
-        "symfony/event-dispatcher": "^7.0",
-        "symfony/http-client": "^7.0",
-        "symfony/mailgun-mailer": "^7.0",
-        "symfony/mime": "^7.0",
-        "symfony/polyfill-intl-messageformatter": "^1.27",
-        "symfony/postmark-mailer": "^7.0",
-        "symfony/translation": "^7.0",
-        "symfony/yaml": "^7.0",
-        "wikimedia/less.php": "^4.1"
+        "middlewares/request-handler": "^2.0.1",
+        "monolog/monolog": "^1.16.0",
+        "nesbot/carbon": "^2.0",
+        "nikic/fast-route": "^0.6",
+        "psr/http-message": "^1.0",
+        "psr/http-server-handler": "^1.0",
+        "psr/http-server-middleware": "^1.0",
+        "pusher/pusher-php-server": "^2.2",
+        "s9e/text-formatter": "^2.3.6",
+        "symfony/config": "^5.2.2",
+        "symfony/console": "^5.2.2",
+        "symfony/event-dispatcher": "^5.2.2",
+        "symfony/mime": "^5.2.0",
+        "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": {
-        "mockery/mockery": "^1.5",
-        "phpunit/phpunit": "^11.0",
-        "phpstan/phpstan": "^1.10.0",
-        "larastan/larastan": "2.9.12",
-        "symfony/var-dumper": "^7.0",
-        "flarum/testing-tests": "*@dev"
+        "mockery/mockery": "^1.4",
+        "phpunit/phpunit": "^9.0",
+        "phpstan/phpstan-php-parser": "^1.0",
+        "phpstan/phpstan": "^1.2"
     },
     "config": {
         "sort-packages": true
@@ -200,29 +168,15 @@
             "extensions/sticky",
             "extensions/subscriptions",
             "extensions/suspend",
-            "extensions/tags",
-            "extensions/messages"
+            "extensions/tags"
         ],
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         },
         "phpstan": {
             "includes": [
                 "extension.neon"
             ]
         }
-    },
-    "scripts": {
-        "analyse:phpstan": "phpstan analyse",
-        "clear-cache:phpstan": "phpstan clear-result-cache"
-    },
-    "scripts-descriptions": {
-        "analyse:phpstan": "Run static analysis"
-    },
-    "repositories": [
-        {
-            "type": "path",
-            "url": "php-packages/testing/tests"
-        }
-    ]
+    }
 }

extensions/akismet/.gitattributes

@@ -1,20 +0,0 @@
-**/.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/.gitignore

@@ -4,7 +4,6 @@ composer.phar
 
 .DS_Store
 Thumbs.db
-tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant

extensions/akismet/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2024 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
 Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

extensions/akismet/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/framework/issues",
+        "issues": "https://github.com/flarum/core/issues",
         "source": "https://github.com/flarum/akismet",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,8 +19,9 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-beta.1",
-        "flarum/approval": "^2.0"
+        "flarum/core": "^1.3",
+        "flarum/approval": "^1.2",
+        "guzzlehttp/guzzle": "^7.4"
     },
     "autoload": {
         "psr-4": {
@@ -29,7 +30,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         },
         "flarum-extension": {
             "title": "Akismet",
@@ -75,7 +76,7 @@
         "test:setup": "Sets up a database for use with integration tests. Execute this only once."
     },
     "require-dev": {
-        "flarum/testing": "^2.0"
+        "flarum/testing": "^1.0.0"
     },
     "repositories": [
         {

extensions/akismet/extend.php

@@ -13,7 +13,6 @@ use Flarum\Approval\Event\PostWasApproved;
 use Flarum\Extend;
 use Flarum\Post\Event\Hidden;
 use Flarum\Post\Event\Saving;
-use Flarum\Post\Post;
 
 return [
     (new Extend\Frontend('forum'))
@@ -31,7 +30,4 @@ return [
 
     (new Extend\ServiceProvider())
         ->register(AkismetProvider::class),
-
-    (new Extend\Model(Post::class))
-        ->cast('is_spam', 'bool'),
 ];

extensions/akismet/js/dist-typings/admin/extend.d.ts

@@ -1,2 +0,0 @@
-declare const _default: import("flarum/common/extenders/Admin").default[];
-export default _default;

extensions/akismet/js/dist-typings/admin/index.d.ts

@@ -1 +1 @@
-export { default as extend } from './extend';
+export {};

extensions/akismet/js/dist/admin.js

@@ -1,2 +1,2 @@
-(()=>{var e={n:t=>{var a=t&&t.__esModule?()=>t.default:()=>t;return e.d(a,{a}),a},d:(t,a)=>{for(var s in a)e.o(a,s)&&!e.o(t,s)&&Object.defineProperty(t,s,{enumerable:!0,get:a[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),e.d(t,{extend:()=>n});const a=flarum.reg.get("core","admin/app");var s=e.n(a);const r=flarum.reg.get("core","common/extenders"),n=[(new(e.n(r)().Admin)).setting((()=>({setting:"flarum-akismet.api_key",type:"text",label:s().translator.trans("flarum-akismet.admin.akismet_settings.api_key_label")}))).setting((()=>({setting:"flarum-akismet.delete_blatant_spam",type:"boolean",label:s().translator.trans("flarum-akismet.admin.akismet_settings.delete_blatant_spam_label"),help:s().translator.trans("flarum-akismet.admin.akismet_settings.delete_blatant_spam_help")}))).permission((()=>({icon:"fas fa-vote-yea",label:s().translator.trans("flarum-akismet.admin.permissions.bypass_akismet"),permission:"bypassAkismet"})),"start")];s().initializers.add("flarum-akismet",(()=>{}))})(),module.exports=t})();
+(()=>{var e={n:t=>{var a=t&&t.__esModule?()=>t.default:()=>t;return e.d(a,{a}),a},d:(t,a)=>{for(var r in a)e.o(a,r)&&!e.o(t,r)&&Object.defineProperty(t,r,{enumerable:!0,get:a[r]})},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 a=flarum.core.compat["admin/app"];var r=e.n(a);r().initializers.add("flarum-akismet",(function(){r().extensionData.for("flarum-akismet").registerSetting({setting:"flarum-akismet.api_key",type:"text",label:r().translator.trans("flarum-akismet.admin.akismet_settings.api_key_label")}).registerSetting({setting:"flarum-akismet.delete_blatant_spam",type:"boolean",label:r().translator.trans("flarum-akismet.admin.akismet_settings.delete_blatant_spam_label"),help:r().translator.trans("flarum-akismet.admin.akismet_settings.delete_blatant_spam_help")}).registerPermission({icon:"fas fa-vote-yea",label:r().translator.trans("flarum-akismet.admin.permissions.bypass_akismet"),permission:"bypassAkismet"},"start")}))})(),module.exports=t})();
 //# sourceMappingURL=admin.js.map

extensions/akismet/js/dist/admin.js.map

@@ -1 +1 @@
-{"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,IACzBH,CAAM,ECLdF,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,IAE1E,ECNDR,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,GAAO,G,qDCL9D,MAAM,EAA+BC,OAAOC,IAAIV,IAAI,OAAQ,a,aCA5D,MAAM,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,oBCE5D,IAAgB,I,MAAI,WAAeW,SAAQ,KAAM,CAC/CA,QAAS,yBACTC,KAAM,OACNC,MAAO,eAAeC,MAAM,2DAC1BH,SAAQ,KAAM,CAEhBA,QAAS,qCACTC,KAAM,UACNC,MAAO,eAAeC,MAAM,mEAC5BC,KAAM,eAAeD,MAAM,sEACzBE,YAAW,KAAM,CACnBC,KAAM,kBACNJ,MAAO,eAAeC,MAAM,mDAC5BE,WAAY,mBACV,UCdJ,iBAAiBE,IAAI,kBAAkB,Q","sources":["webpack://@flarum/akismet/webpack/bootstrap","webpack://@flarum/akismet/webpack/runtime/compat get default export","webpack://@flarum/akismet/webpack/runtime/define property getters","webpack://@flarum/akismet/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/akismet/webpack/runtime/make namespace object","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'admin/app')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'common/extenders')\"","webpack://@flarum/akismet/./src/admin/extend.tsx","webpack://@flarum/akismet/./src/admin/index.ts"],"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.reg.get('core', 'admin/app');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'common/extenders');","import Extend from 'flarum/common/extenders';\nimport app from 'flarum/admin/app';\nexport default [new Extend.Admin().setting(() => ({\n  setting: 'flarum-akismet.api_key',\n  type: 'text',\n  label: app.translator.trans('flarum-akismet.admin.akismet_settings.api_key_label')\n})).setting(() => ({\n  // https://blog.akismet.com/2014/04/23/theres-a-ninja-in-your-akismet/\n  setting: 'flarum-akismet.delete_blatant_spam',\n  type: 'boolean',\n  label: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_label'),\n  help: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_help')\n})).permission(() => ({\n  icon: 'fas fa-vote-yea',\n  label: app.translator.trans('flarum-akismet.admin.permissions.bypass_akismet'),\n  permission: 'bypassAkismet'\n}), 'start')];","import app from 'flarum/admin/app';\nexport { default as extend } from './extend';\napp.initializers.add('flarum-akismet', () => {\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","reg","setting","type","label","trans","help","permission","icon","add"],"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,IACzBH,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,kBAAkB,WACrCA,IAAAA,cAAAA,IACO,kBACJC,gBAAgB,CACfC,QAAS,yBACTC,KAAM,OACNC,MAAOJ,IAAAA,WAAAA,MAAqB,yDAE7BC,gBAAgB,CAEfC,QAAS,qCACTC,KAAM,UACNC,MAAOJ,IAAAA,WAAAA,MAAqB,mEAC5BK,KAAML,IAAAA,WAAAA,MAAqB,oEAE5BM,mBACC,CACEC,KAAM,kBACNH,MAAOJ,IAAAA,WAAAA,MAAqB,mDAC5BQ,WAAY,iBAEd,a","sources":["webpack://@flarum/akismet/webpack/bootstrap","webpack://@flarum/akismet/webpack/runtime/compat get default export","webpack://@flarum/akismet/webpack/runtime/define property getters","webpack://@flarum/akismet/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/akismet/webpack/runtime/make namespace object","webpack://@flarum/akismet/external root \"flarum.core.compat['admin/app']\"","webpack://@flarum/akismet/./src/admin/index.ts"],"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-akismet', () => {\n  app.extensionData\n    .for('flarum-akismet')\n    .registerSetting({\n      setting: 'flarum-akismet.api_key',\n      type: 'text',\n      label: app.translator.trans('flarum-akismet.admin.akismet_settings.api_key_label'),\n    })\n    .registerSetting({\n      //https://blog.akismet.com/2014/04/23/theres-a-ninja-in-your-akismet/\n      setting: 'flarum-akismet.delete_blatant_spam',\n      type: 'boolean',\n      label: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_label'),\n      help: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_help'),\n    })\n    .registerPermission(\n      {\n        icon: 'fas fa-vote-yea',\n        label: app.translator.trans('flarum-akismet.admin.permissions.bypass_akismet'),\n        permission: 'bypassAkismet',\n      },\n      'start'\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","registerSetting","setting","type","label","help","registerPermission","icon","permission"],"sourceRoot":""}

extensions/akismet/js/dist/forum.js

@@ -1,2 +1,2 @@
-(()=>{var e={n:t=>{var r=t&&t.__esModule?()=>t.default:()=>t;return e.d(r,{a:r}),r},d:(t,r)=>{for(var o in r)e.o(r,o)&&!e.o(t,o)&&Object.defineProperty(t,o,{enumerable:!0,get:r[o]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};(()=>{"use strict";const t=flarum.reg.get("core","common/extend"),r=flarum.reg.get("core","forum/app");var o=e.n(r);const a=flarum.reg.get("core","forum/utils/PostControls");var n=e.n(a);const s=flarum.reg.get("core","forum/components/Post");var m=e.n(s);o().initializers.add("flarum-akismet",(()=>{(0,t.extend)(n(),"destructiveControls",(function(e,t){if(e.has("approve")){const r=t.flags();if(r&&r.some((e=>"akismet"===e?.type()))){const t=e.get("approve");t&&"object"==typeof t&&"children"in t&&(t.children=o().translator.trans("flarum-akismet.forum.post.not_spam_button"))}}})),(0,t.override)(m().prototype,"flagReason",(function(e,t){return"akismet"===t.type()?o().translator.trans("flarum-akismet.forum.post.akismet_flagged_text"):e(t)}))}))})(),module.exports={}})();
+(()=>{var t={n:e=>{var o=e&&e.__esModule?()=>e.default:()=>e;return t.d(o,{a:o}),o},d:(e,o)=>{for(var r in o)t.o(o,r)&&!t.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:o[r]})},o:(t,e)=>Object.prototype.hasOwnProperty.call(t,e),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},e={};(()=>{"use strict";t.r(e);const o=flarum.core.compat["common/extend"],r=flarum.core.compat["forum/app"];var a=t.n(r);const n=flarum.core.compat["forum/utils/PostControls"];var m=t.n(n);const s=flarum.core.compat["forum/components/CommentPost"];var l=t.n(s);a().initializers.add("flarum-akismet",(function(){(0,o.extend)(m(),"destructiveControls",(function(t,e){if(t.has("approve")){var o=e.flags();if(o&&o.some((function(t){return"akismet"===(null==t?void 0:t.type())}))){var r=t.get("approve");r&&"object"==typeof r&&"children"in r&&(r.children=a().translator.trans("flarum-akismet.forum.post.not_spam_button"))}}})),(0,o.override)(l().prototype,"flagReason",(function(t,e){return"akismet"===e.type()?a().translator.trans("flarum-akismet.forum.post.akismet_flagged_text"):t(e)}))}))})(),module.exports=e})();
 //# sourceMappingURL=forum.js.map

extensions/akismet/js/dist/forum.js.map

@@ -1 +1 @@
-{"version":3,"file":"forum.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,CAAM,ECLdF,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,IAE1E,ECNDR,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,I,mBCAlF,MAAM,EAA+BI,OAAOC,IAAIP,IAAI,OAAQ,iBCAtD,EAA+BM,OAAOC,IAAIP,IAAI,OAAQ,a,aCA5D,MAAM,EAA+BM,OAAOC,IAAIP,IAAI,OAAQ,4B,aCA5D,MAAM,EAA+BM,OAAOC,IAAIP,IAAI,OAAQ,yB,aCI5D,iBAAiBQ,IAAI,kBAAkB,MACrC,IAAAC,QAAO,IAAc,uBAAuB,SAAUC,EAAOC,GAC3D,GAAID,EAAME,IAAI,WAAY,CACxB,MAAMC,EAAQF,EAAKE,QACnB,GAAIA,GAASA,EAAMC,MAAKC,GAAyB,YAAjBA,GAAMC,SAAuB,CAC3D,MAAMC,EAAcP,EAAMV,IAAI,WAC1BiB,GAAsC,iBAAhBA,GAA4B,aAAcA,IAClEA,EAAYC,SAAW,eAAeC,MAAM,6CAEhD,CACF,CACF,KACA,IAAAC,UAAS,cAAyB,cAAc,SAAUC,EAAUN,GAClE,MAAoB,YAAhBA,EAAKC,OACA,eAAeG,MAAM,kDAEvBE,EAASN,EAClB,GAAE,G","sources":["webpack://@flarum/akismet/webpack/bootstrap","webpack://@flarum/akismet/webpack/runtime/compat get default export","webpack://@flarum/akismet/webpack/runtime/define property getters","webpack://@flarum/akismet/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'common/extend')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'forum/app')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'forum/utils/PostControls')\"","webpack://@flarum/akismet/external root \"flarum.reg.get('core', 'forum/components/Post')\"","webpack://@flarum/akismet/./src/forum/index.ts"],"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))","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'common/extend');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'forum/app');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'forum/utils/PostControls');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'forum/components/Post');","import { extend, override } from 'flarum/common/extend';\nimport app from 'flarum/forum/app';\nimport PostControls from 'flarum/forum/utils/PostControls';\nimport PostComponent from 'flarum/forum/components/Post';\napp.initializers.add('flarum-akismet', () => {\n  extend(PostControls, 'destructiveControls', function (items, post) {\n    if (items.has('approve')) {\n      const flags = post.flags();\n      if (flags && flags.some(flag => flag?.type() === 'akismet')) {\n        const approveItem = items.get('approve');\n        if (approveItem && typeof approveItem === 'object' && 'children' in approveItem) {\n          approveItem.children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');\n        }\n      }\n    }\n  });\n  override(PostComponent.prototype, 'flagReason', function (original, flag) {\n    if (flag.type() === 'akismet') {\n      return app.translator.trans('flarum-akismet.forum.post.akismet_flagged_text');\n    }\n    return original(flag);\n  });\n});"],"names":["__webpack_require__","module","getter","__esModule","d","a","exports","definition","key","o","Object","defineProperty","enumerable","get","obj","prop","prototype","hasOwnProperty","call","flarum","reg","add","extend","items","post","has","flags","some","flag","type","approveItem","children","trans","override","original"],"sourceRoot":""}
+{"version":3,"file":"forum.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,iBCAlD,EAA+BF,OAAOC,KAAKC,OAAO,a,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,4B,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,gC,aCSxDC,IAAAA,aAAAA,IAAqB,kBAAkB,YACrCC,EAAAA,EAAAA,QAAOC,IAAc,uBAAuB,SAAUC,EAAmCC,GACvF,GAAID,EAAME,IAAI,WAAY,CACxB,IAAMC,EAAQF,EAAKE,QAEnB,GAAIA,GAASA,EAAMC,MAAK,SAACC,GAAD,MAA2B,aAAb,MAAJA,OAAA,EAAAA,EAAMC,WAAuB,CAC7D,IAAMC,EAAcP,EAAMf,IAAI,WAC1BsB,GAAsC,iBAAhBA,GAA4B,aAAcA,IAClEA,EAAYC,SAAWX,IAAAA,WAAAA,MAAqB,oDAMpDY,EAAAA,EAAAA,UAASC,IAAAA,UAAuB,cAAc,SAAUC,EAAUN,GAChE,MAAoB,YAAhBA,EAAKC,OACAT,IAAAA,WAAAA,MAAqB,kDAGvBc,EAASN,U","sources":["webpack://@flarum/akismet/webpack/bootstrap","webpack://@flarum/akismet/webpack/runtime/compat get default export","webpack://@flarum/akismet/webpack/runtime/define property getters","webpack://@flarum/akismet/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/akismet/webpack/runtime/make namespace object","webpack://@flarum/akismet/external root \"flarum.core.compat['common/extend']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/app']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/utils/PostControls']\"","webpack://@flarum/akismet/external root \"flarum.core.compat['forum/components/CommentPost']\"","webpack://@flarum/akismet/./src/forum/index.ts"],"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['common/extend'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/app'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/utils/PostControls'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['forum/components/CommentPost'];","import { extend, override } from 'flarum/common/extend';\nimport app from 'flarum/forum/app';\nimport type Post from 'flarum/common/models/Post';\nimport type ItemList from 'flarum/common/utils/ItemList';\n\nimport PostControls from 'flarum/forum/utils/PostControls';\nimport CommentPost from 'flarum/forum/components/CommentPost';\nimport type Mithril from 'mithril';\n\napp.initializers.add('flarum-akismet', () => {\n  extend(PostControls, 'destructiveControls', function (items: ItemList<Mithril.Children>, post: Post) {\n    if (items.has('approve')) {\n      const flags = post.flags();\n\n      if (flags && flags.some((flag) => flag?.type() === 'akismet')) {\n        const approveItem = items.get('approve');\n        if (approveItem && typeof approveItem === 'object' && 'children' in approveItem) {\n          approveItem.children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');\n        }\n      }\n    }\n  });\n\n  override(CommentPost.prototype, 'flagReason', function (original, flag) {\n    if (flag.type() === 'akismet') {\n      return app.translator.trans('flarum-akismet.forum.post.akismet_flagged_text');\n    }\n\n    return original(flag);\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","extend","PostControls","items","post","has","flags","some","flag","type","approveItem","children","override","CommentPost","original"],"sourceRoot":""}

extensions/akismet/js/package.json

@@ -9,18 +9,18 @@
         "analyze": "cross-env ANALYZER=true yarn run build",
         "format": "prettier --write src",
         "format-check": "prettier --check src",
+        "check-typings": "tsc --noEmit --emitDeclarationOnly false",
+        "check-typings-coverage": "typescript-coverage-report",
         "clean-typings": "npx rimraf dist-typings && mkdir dist-typings",
         "build-typings": "yarn run clean-typings && ([ -e src/@types ] && cp -r src/@types dist-typings/@types || true) && tsc && yarn run post-build-typings",
-        "post-build-typings": "find dist-typings -type f -name '*.d.ts' -print0 | xargs -0 sed -i 's,../src/@types,@types,g'",
-        "check-typings": "tsc --noEmit --emitDeclarationOnly false",
-        "check-typings-coverage": "typescript-coverage-report"
+        "post-build-typings": "find dist-typings -type f -name '*.d.ts' -print0 | xargs -0 sed -i 's,../src/@types,@types,g'"
     },
     "devDependencies": {
         "@flarum/prettier-config": "^1.0.0",
-        "flarum-tsconfig": "^2.0.0",
+        "flarum-tsconfig": "^1.0.2",
         "prettier": "^2.5.1",
-        "flarum-webpack-config": "^3.0.0",
-        "webpack": "^5.76.0",
+        "flarum-webpack-config": "^2.0.0",
+        "webpack": "^5.65.0",
         "webpack-cli": "^4.9.1",
         "typescript": "^4.5.4",
         "typescript-coverage-report": "^0.6.1"

extensions/akismet/js/src/admin/extend.tsx

@@ -1,26 +0,0 @@
-import Extend from 'flarum/common/extenders';
-import app from 'flarum/admin/app';
-
-export default [
-  new Extend.Admin()
-    .setting(() => ({
-      setting: 'flarum-akismet.api_key',
-      type: 'text',
-      label: app.translator.trans('flarum-akismet.admin.akismet_settings.api_key_label'),
-    }))
-    .setting(() => ({
-      // https://blog.akismet.com/2014/04/23/theres-a-ninja-in-your-akismet/
-      setting: 'flarum-akismet.delete_blatant_spam',
-      type: 'boolean',
-      label: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_label'),
-      help: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_help'),
-    }))
-    .permission(
-      () => ({
-        icon: 'fas fa-vote-yea',
-        label: app.translator.trans('flarum-akismet.admin.permissions.bypass_akismet'),
-        permission: 'bypassAkismet',
-      }),
-      'start'
-    ),
-];

extensions/akismet/js/src/admin/index.ts

@@ -1,7 +1,26 @@
 import app from 'flarum/admin/app';
 
-export { default as extend } from './extend';
-
 app.initializers.add('flarum-akismet', () => {
-  // ...
+  app.extensionData
+    .for('flarum-akismet')
+    .registerSetting({
+      setting: 'flarum-akismet.api_key',
+      type: 'text',
+      label: app.translator.trans('flarum-akismet.admin.akismet_settings.api_key_label'),
+    })
+    .registerSetting({
+      //https://blog.akismet.com/2014/04/23/theres-a-ninja-in-your-akismet/
+      setting: 'flarum-akismet.delete_blatant_spam',
+      type: 'boolean',
+      label: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_label'),
+      help: app.translator.trans('flarum-akismet.admin.akismet_settings.delete_blatant_spam_help'),
+    })
+    .registerPermission(
+      {
+        icon: 'fas fa-vote-yea',
+        label: app.translator.trans('flarum-akismet.admin.permissions.bypass_akismet'),
+        permission: 'bypassAkismet',
+      },
+      'start'
+    );
 });

extensions/akismet/js/src/forum/index.ts

@@ -4,7 +4,7 @@ import type Post from 'flarum/common/models/Post';
 import type ItemList from 'flarum/common/utils/ItemList';
 
 import PostControls from 'flarum/forum/utils/PostControls';
-import PostComponent from 'flarum/forum/components/Post';
+import CommentPost from 'flarum/forum/components/CommentPost';
 import type Mithril from 'mithril';
 
 app.initializers.add('flarum-akismet', () => {
@@ -21,7 +21,7 @@ app.initializers.add('flarum-akismet', () => {
     }
   });
 
-  override(PostComponent.prototype, 'flagReason', function (original, flag) {
+  override(CommentPost.prototype, 'flagReason', function (original, flag) {
     if (flag.type() === 'akismet') {
       return app.translator.trans('flarum-akismet.forum.post.akismet_flagged_text');
     }

extensions/akismet/js/tsconfig.json

@@ -4,18 +4,14 @@
   // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
   // and also tells your Typescript server to read core's global typings for
   // access to `dayjs` and `$` in the global namespace.
-  "include": [
-    "src/**/*",
-    "../../../framework/core/js/dist-typings/@types/**/*",
-    "../../flags/js/dist-typings/@types/**/*",
-    "@types/**/*"
-  ],
+  "include": ["src/**/*", "../vendor/*/*/js/dist-typings/@types/**/*", "@types/**/*"],
   "compilerOptions": {
     // This will output typings to `dist-typings`
     "declarationDir": "./dist-typings",
+    "baseUrl": ".",
     "paths": {
-      "flarum/*": ["../../../framework/core/js/dist-typings/*"],
-      "ext:flarum/flags/*": ["../../flags/js/dist-typings/*"]
+      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"],
+      "flarum/flags/*": ["../vendor/flarum/flags/js/dist-typings/*"]
     }
   }
 }

extensions/akismet/src/Akismet.php

@@ -15,19 +15,22 @@ use Psr\Http\Message\ResponseInterface;
 
 class Akismet
 {
-    private string $apiUrl;
-    private array $params = [];
+    private $apiKey;
+    private $apiUrl;
+    private $flarumVersion;
+    private $extensionVersion;
 
-    public function __construct(
-        private readonly string $apiKey,
-        string $homeUrl,
-        private readonly string $flarumVersion,
-        private readonly string $extensionVersion,
-        bool $inDebugMode = false
-    ) {
+    private $params = [];
+
+    public function __construct(string $apiKey, string $homeUrl, string $flarumVersion, string $extensionVersion, bool $inDebugMode = false)
+    {
+        $this->apiKey = $apiKey;
         $this->apiUrl = "https://$apiKey.rest.akismet.com/1.1";
         $this->params['blog'] = $homeUrl;
 
+        $this->flarumVersion = $flarumVersion;
+        $this->extensionVersion = $extensionVersion;
+
         if ($inDebugMode) {
             $this->params['is_test'] = true;
         }
@@ -47,7 +50,7 @@ class Akismet
         $client = new Client();
 
         return $client->request('POST', "$this->apiUrl/$type", [
-            'headers' => [
+            'headers'     => [
                 'User-Agent' => "Flarum/$this->flarumVersion | Akismet/$this->extensionVersion",
             ],
             'form_params' => $this->params,
@@ -70,7 +73,7 @@ class Akismet
     /**
      * @throws GuzzleException
      */
-    public function submitSpam(): void
+    public function submitSpam()
     {
         $this->sendRequest('submit-spam');
     }
@@ -78,7 +81,7 @@ class Akismet
     /**
      * @throws GuzzleException
      */
-    public function submitHam(): void
+    public function submitHam()
     {
         $this->sendRequest('submit-ham');
     }
@@ -87,7 +90,7 @@ class Akismet
      * Allows you to set additional parameter
      * This lets you use Akismet features not supported directly in this util.
      */
-    public function withParam(string $key, mixed $value): Akismet
+    public function withParam(string $key, $value): Akismet
     {
         $new = clone $this;
         $new->params[$key] = $value;

extensions/akismet/src/Listener/SubmitHam.php

@@ -14,12 +14,17 @@ use Flarum\Approval\Event\PostWasApproved;
 
 class SubmitHam
 {
-    public function __construct(
-        protected Akismet $akismet
-    ) {
+    /**
+     * @var Akismet
+     */
+    protected $akismet;
+
+    public function __construct(Akismet $akismet)
+    {
+        $this->akismet = $akismet;
     }
 
-    public function handle(PostWasApproved $event): void
+    public function handle(PostWasApproved $event)
     {
         if (! $this->akismet->isConfigured()) {
             return;

extensions/akismet/src/Listener/SubmitSpam.php

@@ -14,12 +14,17 @@ use Flarum\Post\Event\Hidden;
 
 class SubmitSpam
 {
-    public function __construct(
-        protected Akismet $akismet
-    ) {
+    /**
+     * @var Akismet
+     */
+    protected $akismet;
+
+    public function __construct(Akismet $akismet)
+    {
+        $this->akismet = $akismet;
     }
 
-    public function handle(Hidden $event): void
+    public function handle(Hidden $event)
     {
         if (! $this->akismet->isConfigured()) {
             return;

extensions/akismet/src/Listener/ValidatePost.php

@@ -18,13 +18,22 @@ use Flarum\Settings\SettingsRepositoryInterface;
 
 class ValidatePost
 {
-    public function __construct(
-        protected Akismet $akismet,
-        protected SettingsRepositoryInterface $settings
-    ) {
+    /**
+     * @var Akismet
+     */
+    protected $akismet;
+    /**
+     * @var SettingsRepositoryInterface
+     */
+    private $settings;
+
+    public function __construct(Akismet $akismet, SettingsRepositoryInterface $settings)
+    {
+        $this->akismet = $akismet;
+        $this->settings = $settings;
     }
 
-    public function handle(Saving $event): void
+    public function handle(Saving $event)
     {
         if (! $this->akismet->isConfigured()) {
             return;
@@ -41,7 +50,7 @@ class ValidatePost
             ->withContent($post->content)
             ->withAuthorName($post->user->username)
             ->withAuthorEmail($post->user->email)
-            ->withType($post->number === 1 ? 'forum-post' : 'reply')
+            ->withType($post->number == 1 ? 'forum-post' : 'reply')
             ->withIp($post->ip_address)
             ->withUserAgent($_SERVER['HTTP_USER_AGENT'])
             ->checkSpam();

extensions/akismet/src/Provider/AkismetProvider.php

@@ -20,7 +20,7 @@ use Illuminate\Container\Container;
 
 class AkismetProvider extends AbstractServiceProvider
 {
-    public function register(): void
+    public function register()
     {
         $this->container->bind(Akismet::class, function (Container $container) {
             /** @var SettingsRepositoryInterface $settings */
@@ -38,7 +38,7 @@ class AkismetProvider extends AbstractServiceProvider
                 $settings->get('flarum-akismet.api_key'),
                 $url->to('forum')->base(),
                 $app::VERSION,
-                $extensions->getExtension('flarum-akismet')->getVersion() ?? 'unknown',
+                $extensions->getExtension('flarum-akismet')->getVersion(),
                 $config->inDebugMode()
             );
         });

extensions/akismet/tests/integration/setup.php

@@ -7,6 +7,10 @@
  * LICENSE file that was distributed with this source code.
  */
 
-$setup = require __DIR__.'/../../../../php-packages/testing/bootstrap/monorepo.php';
+use Flarum\Testing\integration\Setup\SetupScript;
+
+require __DIR__.'/../../vendor/autoload.php';
+
+$setup = new SetupScript();
 
 $setup->run();

extensions/akismet/tests/phpunit.integration.xml

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

extensions/akismet/tests/phpunit.unit.xml

@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:noNamespaceSchemaLocation="../../../vendor/phpunit/phpunit/phpunit.xsd"
+    xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
     backupGlobals="false"
-    cacheDirectory=".phpunit.cache"
-    backupStaticProperties="false"
+    backupStaticAttributes="false"
     colors="true"
+    convertErrorsToExceptions="true"
+    convertNoticesToExceptions="true"
+    convertWarningsToExceptions="true"
     processIsolation="false"
     stopOnFailure="false"
-    bootstrap="../../../php-packages/testing/bootstrap/monorepo.php"
 >
-    <source>
+    <coverage processUncoveredFiles="true">
         <include>
             <directory suffix=".php">../src/</directory>
         </include>
-    </source>
+    </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/approval/.editorconfig

@@ -17,12 +17,3 @@ trim_trailing_whitespace = false
 
 [*.{php,xml,json}]
 indent_size = 4
-
-[{tsconfig.json,prettierrc.json}]
-indent_size = 2
-
-[*.neon]
-indent_style = tab
-
-[{install,update}.php]
-indent_size = 2

extensions/approval/.gitattributes

@@ -1,20 +0,0 @@
-**/.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/.gitignore

@@ -4,7 +4,6 @@ composer.phar
 
 .DS_Store
 Thumbs.db
-tests/.phpunit.cache
 tests/.phpunit.result.cache
 /tests/integration/tmp
 .vagrant

extensions/approval/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2024 Stichting Flarum (Flarum Foundation)
+Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation)
 Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

extensions/approval/composer.json

@@ -7,7 +7,7 @@
     ],
     "license": "MIT",
     "support": {
-        "issues": "https://github.com/flarum/framework/issues",
+        "issues": "https://github.com/flarum/core/issues",
         "source": "https://github.com/flarum/approval",
         "forum": "https://discuss.flarum.org"
     },
@@ -19,8 +19,8 @@
         }
     ],
     "require": {
-        "flarum/core": "^2.0.0-beta.1",
-        "flarum/flags": "^2.0"
+        "flarum/core": "^1.3",
+        "flarum/flags": "^1.2"
     },
     "autoload": {
         "psr-4": {
@@ -29,7 +29,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "2.x-dev"
+            "dev-main": "1.x-dev"
         },
         "flarum-extension": {
             "title": "Approval",
@@ -52,7 +52,7 @@
                 "prettier": true,
                 "typescript": false,
                 "bundlewatch": false,
-                "backendTesting": true,
+                "backendTesting": false,
                 "editorConfig": true,
                 "styleci": true
             }
@@ -65,28 +65,5 @@
         }
     ],
     "minimum-stability": "dev",
-    "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": "^2.0"
-    }
+    "prefer-stable": true
 }

extensions/approval/extend.php

@@ -7,15 +7,15 @@
  * LICENSE file that was distributed with this source code.
  */
 
-use Flarum\Api\Resource;
-use Flarum\Api\Schema;
+use Flarum\Api\Serializer\BasicDiscussionSerializer;
+use Flarum\Api\Serializer\PostSerializer;
 use Flarum\Approval\Access;
-use Flarum\Approval\Api\PostResourceFields;
 use Flarum\Approval\Event\PostWasApproved;
 use Flarum\Approval\Listener;
 use Flarum\Discussion\Discussion;
 use Flarum\Extend;
 use Flarum\Post\CommentPost;
+use Flarum\Post\Event\Saving;
 use Flarum\Post\Post;
 use Flarum\Tags\Tag;
 
@@ -29,28 +29,30 @@ return [
 
     // Discussions should be approved by default
     (new Extend\Model(Discussion::class))
-        ->default('is_approved', true)
-        ->cast('is_approved', 'bool'),
+        ->default('is_approved', true),
 
     // Posts should be approved by default
     (new Extend\Model(Post::class))
-        ->default('is_approved', true)
-        ->cast('is_approved', 'bool'),
+        ->default('is_approved', true),
 
-    (new Extend\ApiResource(Resource\DiscussionResource::class))
-        ->fields(fn () => [
-            Schema\Boolean::make('isApproved'),
-        ]),
+    (new Extend\ApiSerializer(BasicDiscussionSerializer::class))
+        ->attribute('isApproved', function ($serializer, Discussion $discussion) {
+            return (bool) $discussion->is_approved;
+        }),
 
-    (new Extend\ApiResource(Resource\PostResource::class))
-        ->fields(PostResourceFields::class),
+    (new Extend\ApiSerializer(PostSerializer::class))
+        ->attribute('isApproved', function ($serializer, Post $post) {
+            return (bool) $post->is_approved;
+        })->attribute('canApprove', function (PostSerializer $serializer, Post $post) {
+            return (bool) $serializer->getActor()->can('approvePosts', $post->discussion);
+        }),
 
     new Extend\Locales(__DIR__.'/locale'),
 
     (new Extend\Event())
-        ->listen(PostWasApproved::class, Listener\UpdateDiscussionAfterPostApproval::class)
-        ->subscribe(Listener\ApproveContent::class)
-        ->subscribe(Listener\UnapproveNewContent::class),
+        ->listen(Saving::class, [Listener\ApproveContent::class, 'approvePost'])
+        ->listen(Saving::class, [Listener\UnapproveNewContent::class, 'unapproveNewPosts'])
+        ->listen(PostWasApproved::class, [Listener\ApproveContent::class, 'approveDiscussion']),
 
     (new Extend\Policy())
         ->modelPolicy(Tag::class, Access\TagPolicy::class),
@@ -62,8 +64,8 @@ return [
         ->scope(Access\ScopePrivateDiscussionVisibility::class, 'viewPrivate'),
 
     (new Extend\ModelPrivate(Discussion::class))
-        ->checker(Listener\UnapproveNewContent::markUnapprovedContentAsPrivate(...)),
+        ->checker([Listener\UnapproveNewContent::class, 'markUnapprovedContentAsPrivate']),
 
     (new Extend\ModelPrivate(CommentPost::class))
-        ->checker(Listener\UnapproveNewContent::markUnapprovedContentAsPrivate(...)),
+        ->checker([Listener\UnapproveNewContent::class, 'markUnapprovedContentAsPrivate']),
 ];

extensions/approval/js/admin.ts

@@ -1 +0,0 @@
-export * from './src/admin';

extensions/approval/js/dist/admin.js

@@ -1,2 +1,2 @@
-(()=>{var e={n:r=>{var s=r&&r.__esModule?()=>r.default:()=>r;return e.d(s,{a:s}),s},d:(r,s)=>{for(var o in s)e.o(s,o)&&!e.o(r,o)&&Object.defineProperty(r,o,{enumerable:!0,get:s[o]})},o:(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},r={};(()=>{"use strict";e.r(r),e.d(r,{extend:()=>i});const s=flarum.reg.get("core","common/extend"),o=flarum.reg.get("core","admin/app");var a=e.n(o);const t=flarum.reg.get("core","common/extenders"),i=[(new(e.n(t)().Admin)).permission((()=>({icon:"fas fa-check",label:a().translator.trans("flarum-approval.admin.permissions.start_discussions_without_approval_label"),permission:"discussion.startWithoutApproval"})),"start",95).permission((()=>({icon:"fas fa-check",label:a().translator.trans("flarum-approval.admin.permissions.reply_without_approval_label"),permission:"discussion.replyWithoutApproval"})),"reply",95).permission((()=>({icon:"fas fa-check",label:a().translator.trans("flarum-approval.admin.permissions.approve_posts_label"),permission:"discussion.approvePosts"})),"moderate",65)];a().initializers.add("flarum-approval",(()=>{(0,s.extend)(a(),"getRequiredPermissions",(function(e,r){"discussion.startWithoutApproval"===r&&e.push("startDiscussion"),"discussion.replyWithoutApproval"===r&&e.push("discussion.reply")}))}))})(),module.exports=r})();
+(()=>{var r={n:s=>{var e=s&&s.__esModule?()=>s.default:()=>s;return r.d(e,{a:e}),e},d:(s,e)=>{for(var a in e)r.o(e,a)&&!r.o(s,a)&&Object.defineProperty(s,a,{enumerable:!0,get:e[a]})},o:(r,s)=>Object.prototype.hasOwnProperty.call(r,s),r:r=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(r,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(r,"__esModule",{value:!0})}},s={};(()=>{"use strict";r.r(s);const e=flarum.core.compat["common/extend"],a=flarum.core.compat["admin/app"];var o=r.n(a);o().initializers.add("flarum-approval",(function(){(0,e.extend)(o(),"getRequiredPermissions",(function(r,s){"discussion.startWithoutApproval"===s&&r.push("startDiscussion"),"discussion.replyWithoutApproval"===s&&r.push("discussion.reply")})),o().extensionData.for("flarum-approval").registerPermission({icon:"fas fa-check",label:o().translator.trans("flarum-approval.admin.permissions.start_discussions_without_approval_label"),permission:"discussion.startWithoutApproval"},"start",95).registerPermission({icon:"fas fa-check",label:o().translator.trans("flarum-approval.admin.permissions.reply_without_approval_label"),permission:"discussion.replyWithoutApproval"},"reply",95).registerPermission({icon:"fas fa-check",label:o().translator.trans("flarum-approval.admin.permissions.approve_posts_label"),permission:"discussion.approvePosts"},"moderate",65)}))})(),module.exports=s})();
 //# sourceMappingURL=admin.js.map

extensions/approval/js/dist/admin.js.map

@@ -1 +1 @@
-{"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,CAAM,ECLdF,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,IAE1E,ECNDR,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,GAAO,G,qDCL9D,MAAM,EAA+BC,OAAOC,IAAIV,IAAI,OAAQ,iBCAtD,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,a,aCA5D,MAAM,EAA+BS,OAAOC,IAAIV,IAAI,OAAQ,oBCE5D,IAAgB,I,MAAI,WAAeW,YAAW,KAAM,CAClDC,KAAM,eACNC,MAAO,eAAeC,MAAM,8EAC5BH,WAAY,qCACV,QAAS,IAAIA,YAAW,KAAM,CAChCC,KAAM,eACNC,MAAO,eAAeC,MAAM,kEAC5BH,WAAY,qCACV,QAAS,IAAIA,YAAW,KAAM,CAChCC,KAAM,eACNC,MAAO,eAAeC,MAAM,yDAC5BH,WAAY,6BACV,WAAY,KCXhB,iBAAiBI,IAAI,mBAAmB,MACtC,IAAAC,QAAO,IAAK,0BAA0B,SAAUC,EAAUN,GACrC,oCAAfA,GACFM,EAASC,KAAK,mBAEG,oCAAfP,GACFM,EAASC,KAAK,mBAElB,GAAE,G","sources":["webpack://@flarum/approval/webpack/bootstrap","webpack://@flarum/approval/webpack/runtime/compat get default export","webpack://@flarum/approval/webpack/runtime/define property getters","webpack://@flarum/approval/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/approval/webpack/runtime/make namespace object","webpack://@flarum/approval/external root \"flarum.reg.get('core', 'common/extend')\"","webpack://@flarum/approval/external root \"flarum.reg.get('core', 'admin/app')\"","webpack://@flarum/approval/external root \"flarum.reg.get('core', 'common/extenders')\"","webpack://@flarum/approval/./src/admin/extend.tsx","webpack://@flarum/approval/./src/admin/index.ts"],"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.reg.get('core', 'common/extend');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'admin/app');","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.reg.get('core', 'common/extenders');","import Extend from 'flarum/common/extenders';\nimport app from 'flarum/admin/app';\nexport default [new Extend.Admin().permission(() => ({\n  icon: 'fas fa-check',\n  label: app.translator.trans('flarum-approval.admin.permissions.start_discussions_without_approval_label'),\n  permission: 'discussion.startWithoutApproval'\n}), 'start', 95).permission(() => ({\n  icon: 'fas fa-check',\n  label: app.translator.trans('flarum-approval.admin.permissions.reply_without_approval_label'),\n  permission: 'discussion.replyWithoutApproval'\n}), 'reply', 95).permission(() => ({\n  icon: 'fas fa-check',\n  label: app.translator.trans('flarum-approval.admin.permissions.approve_posts_label'),\n  permission: 'discussion.approvePosts'\n}), 'moderate', 65)];","import { extend } from 'flarum/common/extend';\nimport app from 'flarum/admin/app';\nexport { default as extend } from './extend';\napp.initializers.add('flarum-approval', () => {\n  extend(app, 'getRequiredPermissions', function (required, permission) {\n    if (permission === 'discussion.startWithoutApproval') {\n      required.push('startDiscussion');\n    }\n    if (permission === 'discussion.replyWithoutApproval') {\n      required.push('discussion.reply');\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","reg","permission","icon","label","trans","add","extend","required","push"],"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,iBCAlD,EAA+BF,OAAOC,KAAKC,OAAO,a,aCGxDC,IAAAA,aAAAA,IAAqB,mBAAmB,YACtCC,EAAAA,EAAAA,QAAOD,IAAK,0BAA0B,SAAUE,EAAUC,GACrC,oCAAfA,GACFD,EAASE,KAAK,mBAEG,oCAAfD,GACFD,EAASE,KAAK,uBAIlBJ,IAAAA,cAAAA,IACO,mBACJK,mBACC,CACEC,KAAM,eACNC,MAAOP,IAAAA,WAAAA,MAAqB,8EAC5BG,WAAY,mCAEd,QACA,IAEDE,mBACC,CACEC,KAAM,eACNC,MAAOP,IAAAA,WAAAA,MAAqB,kEAC5BG,WAAY,mCAEd,QACA,IAEDE,mBACC,CACEC,KAAM,eACNC,MAAOP,IAAAA,WAAAA,MAAqB,yDAC5BG,WAAY,2BAEd,WACA,Q","sources":["webpack://@flarum/approval/webpack/bootstrap","webpack://@flarum/approval/webpack/runtime/compat get default export","webpack://@flarum/approval/webpack/runtime/define property getters","webpack://@flarum/approval/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/approval/webpack/runtime/make namespace object","webpack://@flarum/approval/external root \"flarum.core.compat['common/extend']\"","webpack://@flarum/approval/external root \"flarum.core.compat['admin/app']\"","webpack://@flarum/approval/./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['common/extend'];","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['admin/app'];","import { extend } from 'flarum/common/extend';\nimport app from 'flarum/admin/app';\n\napp.initializers.add('flarum-approval', () => {\n  extend(app, 'getRequiredPermissions', function (required, permission) {\n    if (permission === 'discussion.startWithoutApproval') {\n      required.push('startDiscussion');\n    }\n    if (permission === 'discussion.replyWithoutApproval') {\n      required.push('discussion.reply');\n    }\n  });\n\n  app.extensionData\n    .for('flarum-approval')\n    .registerPermission(\n      {\n        icon: 'fas fa-check',\n        label: app.translator.trans('flarum-approval.admin.permissions.start_discussions_without_approval_label'),\n        permission: 'discussion.startWithoutApproval',\n      },\n      'start',\n      95\n    )\n    .registerPermission(\n      {\n        icon: 'fas fa-check',\n        label: app.translator.trans('flarum-approval.admin.permissions.reply_without_approval_label'),\n        permission: 'discussion.replyWithoutApproval',\n      },\n      'reply',\n      95\n    )\n    .registerPermission(\n      {\n        icon: 'fas fa-check',\n        label: app.translator.trans('flarum-approval.admin.permissions.approve_posts_label'),\n        permission: 'discussion.approvePosts',\n      },\n      'moderate',\n      65\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","extend","required","permission","push","registerPermission","icon","label"],"sourceRoot":""}

extensions/approval/js/dist/forum.js

@@ -1,2 +1,2 @@
-(()=>{var t={n:o=>{var r=o&&o.__esModule?()=>o.default:()=>o;return t.d(r,{a:r}),r},d:(o,r)=>{for(var e in r)t.o(r,e)&&!t.o(o,e)&&Object.defineProperty(o,e,{enumerable:!0,get:r[e]})},o:(t,o)=>Object.prototype.hasOwnProperty.call(t,o)};(()=>{"use strict";const o=flarum.reg.get("core","common/extend"),r=flarum.reg.get("core","forum/app");var e=t.n(r);const a=flarum.reg.get("core","common/models/Discussion");var n=t.n(a);const p=flarum.reg.get("core","common/models/Post");var s=t.n(p);const i=flarum.reg.get("core","common/components/Badge");var c=t.n(i);const u=flarum.reg.get("core","forum/components/DiscussionListItem");var l=t.n(u);const d=flarum.reg.get("core","forum/components/Post");var v=t.n(d);const f=flarum.reg.get("core","forum/components/CommentPost");var g=t.n(f);const A=flarum.reg.get("core","common/components/Button");var h=t.n(A);const b=flarum.reg.get("core","forum/utils/PostControls");var y=t.n(b);e().initializers.add("flarum-approval",(()=>{n().prototype.isApproved=n().attribute("isApproved"),(0,o.extend)(n().prototype,"badges",(function(t){this.isApproved()||t.has("hidden")||t.add("awaitingApproval",m(c(),{type:"awaitingApproval",icon:"fas fa-gavel",label:e().translator.trans("flarum-approval.forum.badge.awaiting_approval_tooltip")}))})),s().prototype.isApproved=s().attribute("isApproved"),s().prototype.canApprove=s().attribute("canApprove"),(0,o.extend)(l().prototype,"elementAttrs",(function(t){this.attrs.discussion.isApproved()||(t.className+=" DiscussionListItem--unapproved")})),(0,o.extend)(v().prototype,"elementAttrs",(function(t){this.attrs.post.isApproved()||(t.className+=" Post--unapproved")})),(0,o.extend)(g().prototype,"headerItems",(function(t){this.attrs.post.isApproved()||this.attrs.post.isHidden()||t.add("unapproved",e().translator.trans("flarum-approval.forum.post.awaiting_approval_text"))})),(0,o.override)(v().prototype,"flagReason",(function(t,o){return"approval"===o.type()?e().translator.trans("flarum-approval.forum.post.awaiting_approval_text"):t(o)})),(0,o.extend)(y(),"destructiveControls",(function(t,o){!o.isApproved()&&o.canApprove()&&t.add("approve",m(h(),{icon:"fas fa-check",onclick:y().approveAction.bind(o)},e().translator.trans("flarum-approval.forum.post_controls.approve_button")),10)})),y().approveAction=function(){this.save({isApproved:!0}),1===this.number()&&this.discussion().pushAttributes({isApproved:!0})}}),-10)})(),module.exports={}})();
+(()=>{var o={n:t=>{var r=t&&t.__esModule?()=>t.default:()=>t;return o.d(r,{a:r}),r},d:(t,r)=>{for(var e in r)o.o(r,e)&&!o.o(t,e)&&Object.defineProperty(t,e,{enumerable:!0,get:r[e]})},o:(o,t)=>Object.prototype.hasOwnProperty.call(o,t),r:o=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(o,"__esModule",{value:!0})}},t={};(()=>{"use strict";o.r(t);const r=flarum.core.compat["common/extend"],e=flarum.core.compat["forum/app"];var a=o.n(e);const p=flarum.core.compat["common/models/Discussion"];var n=o.n(p);const s=flarum.core.compat["common/models/Post"];var i=o.n(s);const c=flarum.core.compat["common/components/Badge"];var u=o.n(c);const l=flarum.core.compat["forum/components/DiscussionListItem"];var d=o.n(l);const v=flarum.core.compat["forum/components/Post"];var f=o.n(v);const A=flarum.core.compat["forum/components/CommentPost"];var y=o.n(A);const b=flarum.core.compat["common/components/Button"];var g=o.n(b);const h=flarum.core.compat["forum/utils/PostControls"];var _=o.n(h);a().initializers.add("flarum-approval",(function(){n().prototype.isApproved=n().attribute("isApproved"),(0,r.extend)(n().prototype,"badges",(function(o){this.isApproved()||o.has("hidden")||o.add("awaitingApproval",m(u(),{type:"awaitingApproval",icon:"fas fa-gavel",label:a().translator.trans("flarum-approval.forum.badge.awaiting_approval_tooltip")}))})),i().prototype.isApproved=i().attribute("isApproved"),i().prototype.canApprove=i().attribute("canApprove"),(0,r.extend)(d().prototype,"elementAttrs",(function(o){this.attrs.discussion.isApproved()||(o.className+=" DiscussionListItem--unapproved")})),(0,r.extend)(f().prototype,"elementAttrs",(function(o){this.attrs.post.isApproved()||(o.className+=" Post--unapproved")})),(0,r.extend)(y().prototype,"headerItems",(function(o){this.attrs.post.isApproved()||this.attrs.post.isHidden()||o.add("unapproved",a().translator.trans("flarum-approval.forum.post.awaiting_approval_text"))})),(0,r.override)(f().prototype,"flagReason",(function(o,t){return"approval"===t.type()?a().translator.trans("flarum-approval.forum.post.awaiting_approval_text"):o(t)})),(0,r.extend)(_(),"destructiveControls",(function(o,t){!t.isApproved()&&t.canApprove()&&o.add("approve",m(g(),{icon:"fas fa-check",onclick:_().approveAction.bind(t)},a().translator.trans("flarum-approval.forum.post_controls.approve_button")),10)})),_().approveAction=function(){this.save({isApproved:!0}),1===this.number()&&this.discussion().pushAttributes({isApproved:!0})}}),-10)})(),module.exports=t})();
 //# sourceMappingURL=forum.js.map

extensions/approval/js/package.json

@@ -5,8 +5,8 @@
     "prettier": "@flarum/prettier-config",
     "devDependencies": {
         "prettier": "^2.5.1",
-        "flarum-webpack-config": "^3.0.0",
-        "webpack": "^5.76.0",
+        "flarum-webpack-config": "^2.0.0",
+        "webpack": "^5.65.0",
         "webpack-cli": "^4.9.1",
         "@flarum/prettier-config": "^1.0.0"
     },

extensions/approval/js/src/admin/index.js

@@ -1,33 +1,43 @@
-import Extend from 'flarum/common/extenders';
+import { extend } from 'flarum/common/extend';
 import app from 'flarum/admin/app';
 
-export default [
-  new Extend.Admin()
-    .permission(
-      () => ({
+app.initializers.add('flarum-approval', () => {
+  extend(app, 'getRequiredPermissions', function (required, permission) {
+    if (permission === 'discussion.startWithoutApproval') {
+      required.push('startDiscussion');
+    }
+    if (permission === 'discussion.replyWithoutApproval') {
+      required.push('discussion.reply');
+    }
+  });
+
+  app.extensionData
+    .for('flarum-approval')
+    .registerPermission(
+      {
         icon: 'fas fa-check',
         label: app.translator.trans('flarum-approval.admin.permissions.start_discussions_without_approval_label'),
         permission: 'discussion.startWithoutApproval',
-      }),
+      },
       'start',
       95
     )
-    .permission(
-      () => ({
+    .registerPermission(
+      {
         icon: 'fas fa-check',
         label: app.translator.trans('flarum-approval.admin.permissions.reply_without_approval_label'),
         permission: 'discussion.replyWithoutApproval',
-      }),
+      },
       'reply',
       95
     )
-    .permission(
-      () => ({
+    .registerPermission(
+      {
         icon: 'fas fa-check',
         label: app.translator.trans('flarum-approval.admin.permissions.approve_posts_label'),
         permission: 'discussion.approvePosts',
-      }),
+      },
       'moderate',
       65
-    ),
-];
+    );
+});

extensions/approval/js/src/admin/index.ts

@@ -1,15 +0,0 @@
-import { extend } from 'flarum/common/extend';
-import app from 'flarum/admin/app';
-
-export { default as extend } from './extend';
-
-app.initializers.add('flarum-approval', () => {
-  extend(app, 'getRequiredPermissions', function (required, permission) {
-    if (permission === 'discussion.startWithoutApproval') {
-      required.push('startDiscussion');
-    }
-    if (permission === 'discussion.replyWithoutApproval') {
-      required.push('discussion.reply');
-    }
-  });
-});

extensions/approval/js/tsconfig.json

@@ -1,15 +0,0 @@
-{
-  // Use Flarum's tsconfig as a starting point
-  "extends": "flarum-tsconfig",
-  // This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
-  // and also tells your Typescript server to read core's global typings for
-  // access to `dayjs` and `$` in the global namespace.
-  "include": ["src/**/*", "../../../*/*/js/dist-typings/@types/**/*", "@types/**/*"],
-  "compilerOptions": {
-    // This will output typings to `dist-typings`
-    "declarationDir": "./dist-typings",
-    "paths": {
-      "flarum/*": ["../../../framework/core/js/dist-typings/*"]
-    }
-  }
-}

extensions/approval/src/Access/ScopePrivateDiscussionVisibility.php

@@ -14,7 +14,11 @@ use Illuminate\Database\Eloquent\Builder;
 
 class ScopePrivateDiscussionVisibility
 {
-    public function __invoke(User $actor, Builder $query): void
+    /**
+     * @param Builder $query
+     * @param User $actor
+     */
+    public function __invoke(User $actor, Builder $query)
     {
         // All statements need to be wrapped in an orWhere, since we're adding a
         // subset of private discussions that should be visible, not restricting the visible

extensions/approval/src/Access/ScopePrivatePostVisibility.php

@@ -9,14 +9,17 @@
 
 namespace Flarum\Approval\Access;
 
-use Closure;
 use Flarum\Discussion\Discussion;
 use Flarum\User\User;
 use Illuminate\Database\Eloquent\Builder;
 
 class ScopePrivatePostVisibility
 {
-    public function __invoke(User $actor, Builder $query): void
+    /**
+     * @param Builder $query
+     * @param User $actor
+     */
+    public function __invoke(User $actor, Builder $query)
     {
         // All statements need to be wrapped in an orWhere, since we're adding a
         // subset of private posts that should be visible, not restricting the visible
@@ -36,23 +39,14 @@ class ScopePrivatePostVisibility
         });
     }
 
-    /**
-     * 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
+    private function discussionWhereCanApprovePosts(User $actor)
     {
         return function ($query) use ($actor) {
             $query->selectRaw('1')
                 ->from('discussions')
                 ->whereColumn('discussions.id', 'posts.discussion_id')
                 ->where(function ($query) use ($actor) {
-                    $query->whereRaw('1 != 1')->orWhere(function ($query) use ($actor) {
-                        Discussion::query()->setQuery($query)->whereVisibleTo($actor, 'approvePosts');
-                    });
+                    Discussion::query()->setQuery($query)->whereVisibleTo($actor, 'approvePosts');
                 });
         };
     }

extensions/approval/src/Access/TagPolicy.php

@@ -15,7 +15,10 @@ use Flarum\User\User;
 
 class TagPolicy extends AbstractPolicy
 {
-    public function addToDiscussion(User $actor, Tag $tag): bool
+    /**
+     * @return bool|null
+     */
+    public function addToDiscussion(User $actor, Tag $tag)
     {
         return $actor->can('discussion.startWithoutApproval', $tag);
     }

extensions/approval/src/Api/PostResourceFields.php

@@ -1,29 +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\Approval\Api;
-
-use Flarum\Api\Context;
-use Flarum\Api\Schema;
-use Flarum\Post\Post;
-
-class PostResourceFields
-{
-    public function __invoke(): array
-    {
-        return [
-            Schema\Boolean::make('isApproved')
-                ->writable(fn (Post $post, Context $context) => $context->getActor()->can('approve', $post))
-                // set by the ApproveContent listener.
-                ->set(fn () => null),
-            Schema\Boolean::make('canApprove')
-                ->get(fn (Post $post, Context $context) => $context->getActor()->can('approvePosts', $post->discussion)),
-        ];
-    }
-}

extensions/approval/src/Event/PostWasApproved.php

@@ -14,9 +14,25 @@ use Flarum\User\User;
 
 class PostWasApproved
 {
-    public function __construct(
-        public Post $post,
-        public User $actor
-    ) {
+    /**
+     * The post that was approved.
+     *
+     * @var Post
+     */
+    public $post;
+
+    /**
+     * @var User
+     */
+    public $actor;
+
+    /**
+     * @param Post $post
+     * @param User $actor
+     */
+    public function __construct(Post $post, User $actor)
+    {
+        $this->post = $post;
+        $this->actor = $actor;
     }
 }

extensions/approval/src/Listener/ApproveContent.php

@@ -11,52 +11,55 @@ namespace Flarum\Approval\Listener;
 
 use Flarum\Approval\Event\PostWasApproved;
 use Flarum\Post\Event\Saving;
-use Flarum\User\Exception\PermissionDeniedException;
-use Illuminate\Contracts\Events\Dispatcher;
 
 class ApproveContent
 {
-    public function subscribe(Dispatcher $events): void
-    {
-        $events->listen(Saving::class, $this->approvePost(...));
-    }
-
     /**
-     * @throws PermissionDeniedException
+     * @param Saving $event
      */
-    public function approvePost(Saving $event): void
+    public static function approvePost(Saving $event)
     {
         $attributes = $event->data['attributes'];
         $post = $event->post;
 
-        // Nothing to do if it is already approved.
-        if ($post->is_approved) {
-            return;
-        }
-
-        /*
-         * We approve a post in one of two cases:
-         * - The post was unapproved and the allowed action is approving it. We trigger an event.
-         * - The post was unapproved and the allowed actor is hiding or un-hiding it.
-         *   We approve it silently if the action is unhiding.
-         */
-        $approvingSilently = false;
-
         if (isset($attributes['isApproved'])) {
             $event->actor->assertCan('approve', $post);
 
             $isApproved = (bool) $attributes['isApproved'];
-        } elseif (isset($attributes['isHidden']) && $event->actor->can('approve', $post)) {
+        } elseif (! empty($attributes['isHidden']) && $event->actor->can('approve', $post)) {
             $isApproved = true;
-            $approvingSilently = $attributes['isHidden'];
         }
 
         if (! empty($isApproved)) {
             $post->is_approved = true;
 
-            if (! $approvingSilently) {
-                $post->raise(new PostWasApproved($post, $event->actor));
-            }
+            $post->raise(new PostWasApproved($post, $event->actor));
         }
     }
+
+    /**
+     * @param PostWasApproved $event
+     */
+    public static function approveDiscussion(PostWasApproved $event)
+    {
+        $post = $event->post;
+        $discussion = $post->discussion;
+        $user = $discussion->user;
+
+        $discussion->refreshCommentCount();
+        $discussion->refreshLastPost();
+
+        if ($post->number == 1) {
+            $discussion->is_approved = true;
+
+            $discussion->afterSave(function () use ($user) {
+                $user->refreshDiscussionCount();
+            });
+        }
+
+        $discussion->save();
+
+        $user->refreshCommentCount();
+        $user->save();
+    }
 }