Apply fixes from StyleCI

.editorconfig

@@ -18,8 +18,5 @@ trim_trailing_whitespace = false
 [*.{php,xml,json}]
 indent_size = 4
 
-[{tsconfig.json,prettierrc.json}]
+[tsconfig.json]
 indent_size = 2
-
-[*.neon]
-indent_style = tab

.github/CODEOWNERS

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

.github/workflows/REUSABLE_backend.yml

@@ -9,12 +9,6 @@ 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
@@ -25,19 +19,12 @@ on:
         description: Versions of PHP to test with. Should be array of strings encoded as JSON array
         type: string
         required: false
-        default: '["7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4"]'
+        default: '["7.4", "8.0", "8.1"]'
-
-      php_extensions:
-        description: PHP extensions to install.
-        type: string
-        required: false
-        default: 'curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip'
-
       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", "mariadb"]'
+        default: '["mysql:5.7", "mariadb"]'
 
       php_ini_values:
         description: PHP ini values
@@ -45,82 +32,35 @@ 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
   FLARUM_TEST_TMP_DIR_LOCAL: tests/integration/tmp
-  COMPOSER_AUTH: ${{ secrets.composer_auth }}
 
 jobs:
   test:
-    runs-on: ${{ inputs.runner_type }}
+    runs-on: ubuntu-latest
 
     strategy:
       matrix:
         php: ${{ fromJSON(inputs.php_versions) }}
         service: ${{ fromJSON(inputs.db_versions) }}
-        prefix: ['']
+        prefix: ['', flarum_]
-        php_ini_values: [inputs.php_ini_values]
 
-        # 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
+            db: MySQL
-          - service: 'mysql:8.0.30'
-            db: MySQL 8.0
           - service: mariadb
             db: MariaDB
-
+          - prefix: flarum_
-          # Include Database prefix tests with only one PHP version.
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: 'mysql:5.7'
-            db: MySQL 5.7
-            prefix: flarum_
-            prefixStr: (prefix)
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: 'mysql:8.0.30'
-            db: MySQL 8.0
-            prefix: flarum_
-            prefixStr: (prefix)
-          - php: ${{ fromJSON(inputs.php_versions)[0] }}
-            service: mariadb
-            db: MariaDB
-            prefix: flarum_
             prefixStr: (prefix)
 
-          # @TODO: remove in 2.0
-          # Include testing PHP 8.2 with deprecation warnings disabled.
-          - php: 8.2
-            php_ini_values: error_reporting=E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED
-          - php: 8.3
-            php_ini_values: error_reporting=E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED
-          - php: 8.4
-            php_ini_values: error_reporting=E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED
-
-        # To reduce number of actions, we exclude some PHP versions from running with some DB versions.
         exclude:
-          - php: ${{ fromJSON(inputs.php_versions)[1] }}
+          - php: 8.0
-            service: 'mysql:8.0.30'
+            service: 'mysql:5.7'
-          - php: ${{ fromJSON(inputs.php_versions)[2] }}
+            prefix: flarum_
-            service: 'mysql:8.0.30'
+          - php: 8.0
-          - php: ${{ fromJSON(inputs.php_versions)[3] }}
+            service: mariadb
-            service: 'mysql:8.0.30'
+            prefix: flarum_
-
-          # @TODO: remove in 2.0
-          # Exclude testing PHP 8.2 with deprecation warnings enabled.
-          - php: 8.2
-            php_ini_values: error_reporting=E_ALL
 
     services:
       mysql:
@@ -130,9 +70,7 @@ jobs:
 
     name: 'PHP ${{ matrix.php }} / ${{ matrix.db }} ${{ matrix.prefixStr }}'
 
-    if: >-
+    if: inputs.enable_backend_testing
-      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:
       - uses: actions/checkout@master
@@ -142,9 +80,9 @@ 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
@@ -172,37 +110,3 @@ jobs:
         working-directory: ${{ inputs.backend_directory }}
         env:
           COMPOSER_PROCESS_TIMEOUT: 600
-
-  phpstan:
-    runs-on: ${{ inputs.runner_type }}
-
-    strategy:
-      matrix:
-        php: ${{ fromJSON(inputs.php_versions) }}
-        exclude:
-          - php: 8.4
-
-    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')
-
-    steps:
-      - uses: actions/checkout@master
-
-      - 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 }}
-
-      - name: Run PHPStan
-        run: composer analyse:phpstan

.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:
+  bundlewatch:
-    name: Checks & Build
+    name: Bundlewatch
-    runs-on: ${{ inputs.runner_type }}
+    runs-on: ubuntu-latest
-
+    if: inputs.enable_bundlewatch
-    if: >-
-      ((github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) || github.event_name != 'pull_request')
 
     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,24 +149,72 @@ jobs:
         run: ${{ env.ci_script }}
         working-directory: ${{ inputs.frontend_directory }}
 
-      - name: JS Checks & Production Build
+      - name: Typecheck
-        uses: flarum/action-build@v4
+        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_script: build
-          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 || '' }}
           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
+      # Our action will install npm/yarn, cd into `${{ inputs.frontend_directory }}`, build dist JS and typings,
-        if: ${{ inputs.enable_bundlewatch }}
+      # then commit and upload any changes iff we are on the main branch and have just pushed.
-        run: node_modules/.bin/bundlewatch --config .bundlewatch.config.json
+      - name: Build production JS
-        working-directory: ${{ inputs.frontend_directory }}
+        if: "! inputs.enable_typescript"
-        env:
+        uses: flarum/action-build@2
-          BUNDLEWATCH_GITHUB_TOKEN: ${{ secrets.bundlewatch_github_token }}
+        with:
-          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}
+          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/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-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-frontend.yml

@@ -0,0 +1,20 @@
+name: Core JS
+
+on: [workflow_dispatch, push, pull_request]
+
+jobs:
+  run:
+    uses: ./.github/workflows/REUSABLE_frontend.yml
+    with:
+      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: main
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.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-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-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-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-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-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-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-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

@@ -1,4 +1,4 @@
-name: Extension Manager PHP
+name: Package Manager PHP
 
 on: [workflow_dispatch, push, pull_request]
 
@@ -6,6 +6,6 @@ jobs:
   run:
     uses: ./.github/workflows/REUSABLE_backend.yml
     with:
-      enable_backend_testing: false
+      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-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-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-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-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-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-frontend.yml

@@ -1,4 +1,4 @@
-name: Framework JS
+name: Tags JS
 
 on: [workflow_dispatch, push, pull_request]
 
@@ -6,14 +6,14 @@ jobs:
   run:
     uses: ./.github/workflows/REUSABLE_frontend.yml
     with:
-      frontend_directory: ./
+      enable_bundlewatch: false
-      backend_directory: ./
+      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: 1.x
+      main_git_branch: main
-      enable_tests: true
-      # @TODO: fix bundlewatch
-      enable_bundlewatch: false
-
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/phpstan.yml

@@ -1,12 +0,0 @@
-name: Framework PHP
-
-on: [workflow_dispatch, push, pull_request]
-
-jobs:
-  run:
-    uses: ./.github/workflows/REUSABLE_backend.yml
-    with:
-      enable_backend_testing: false
-      enable_phpstan: true
-
-      backend_directory: .

.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,336 +1,5 @@
 # Changelog
 
-## [v1.8.10](https://github.com/flarum/framework/compare/v1.8.9...v1.8.10)
-### Fixed
-* Session Hijacking via Authoritative Subdomain Cookie Overwrite (https://github.com/flarum/framework/security/advisories/GHSA-hg9j-64wp-m9px)
-* change starting position of `aria-posinset` (https://github.com/flarum/framework/pull/4192)
-* sanitize page param in `Tag` (https://github.com/flarum/framework/pull/4170)
-### Changed
-* make search debounce time extensible (https://github.com/flarum/framework/pull/4171)
-* skip incompatible extension updates (https://github.com/flarum/framework/pull/4176)
-* increase email field length in `email_tokens` (https://github.com/flarum/framework/pull/4125)
-* update JS deps (https://github.com/flarum/framework/pull/4204)
-
-## [v1.8.9](https://github.com/flarum/framework/compare/v1.8.8...v1.8.9)
-### Fixed
-* change condition when unread label is shown in Scrubber (https://github.com/flarum/framework/pull/4116)
-* resolve a11y warnings in Admin Frontend (https://github.com/flarum/framework/pull/4114)
-* return empty object if selected mail driver is unavailable (https://github.com/flarum/framework/pull/4113)
-### Changed
-* change private to protected, allowing extensibility (https://github.com/flarum/framework/pull/4119)
-* change length of email field (https://github.com/flarum/framework/pull/4117)
-### Added
-* Implement Support for Translatable Validation Attribute Errors (https://github.com/flarum/framework/pull/4070)
-* PHP 8.4 support (https://github.com/flarum/framework/pull/4105)
-* conditional extend whenExtensionDisabled (https://github.com/flarum/framework/pull/4107)
-
-## [v1.8.8](https://github.com/flarum/framework/compare/v1.8.7...v1.8.8)
-### Fixed
-* previously suspended admin users cannot remove their avatar after suspension (https://github.com/flarum/framework/pull/4071)
-* new search term not being passed (https://github.com/flarum/framework/pull/4083)
-* postfooter did not apply the empty subclass (https://github.com/flarum/framework/pull/4085)
-
-## [v1.8.7](https://github.com/flarum/framework/compare/v1.8.6...v1.8.7)
-### Fixed
-* BasicsPage not viewable if only one language pack enabled, and/or `flarum/nicknames` not enabled (https://github.com/flarum/framework/pull/4062)
-
-## [v1.8.6](https://github.com/flarum/framework/compare/v1.8.5...v1.8.6)
-### Fixed
-* reset admin page save button in catch handler (https://github.com/flarum/framework/pull/3963)
-* suspended users can remove avatar (https://github.com/flarum/framework/pull/3998)
-* return null if content left empty in formatter (https://github.com/flarum/framework/pull/4059)
-### Changed
-* allow DiscussionsSearchSource to be extended (https://github.com/flarum/framework/pull/4025)
-* allow modifying the discussion title on PostsUserPage (https://github.com/flarum/framework/pull/4031)
-* make it easier to modify AppearancePage, BasicsPage, MailPage (https://github.com/flarum/framework/pull/4037)
-* point fontawesome links at v5 free (https://github.com/flarum/framework/pull/4038)
-* make WelcomeHero extensible (https://github.com/flarum/framework/pull/4039)
-* make PostMeta extensible (https://github.com/flarum/framework/pull/4040)
-* extensible TagHero (https://github.com/flarum/framework/pull/4041)
-* allow extending PostPreview content (https://github.com/flarum/framework/pull/4043)
-* allow classes that extends AbstractJob to be placed on a specified queue (https://github.com/flarum/framework/pull/4026)
-* use common component for ip address display (https://github.com/flarum/framework/pull/4042)
-* make it easier to add content after the first post (https://github.com/flarum/framework/pull/4050)
-* improve extensibility of IndexPage (https://github.com/flarum/framework/pull/4045)
-* improve extensibility of DiscussionPage (https://github.com/flarum/framework/pull/4046)
-* backport & improve extensibility of DiscussionListItem (https://github.com/flarum/framework/pull/4048)
-* improve & use extensibility of CommentPost & Post (https://github.com/flarum/framework/pull/4047)
-* allow labels of PostStreamScrubber to be customized (https://github.com/flarum/framework/pull/4049)
-* allow to customize time formats through translations (https://github.com/flarum/framework/pull/4053)
-### Added
-* Export all missing modules in compat (https://github.com/flarum/framework/pull/4044)
-* Add (some) missing shims (https://github.com/flarum/framework/pull/4027)
-* provide an 'actions' dropdown for extensions to add their additional buttons to the admin UserListPage (https://github.com/flarum/framework/pull/4054)
-
-## [v1.8.5](https://github.com/flarum/framework/compare/v1.8.4...v1.8.5)
-### Fixed
-* Logout controller allows open redirects [#3948]
-
-## [v1.8.4](https://github.com/flarum/framework/compare/v1.8.3...v1.8.4)
-### Fixed
-* `s9e/textformatter` 2.15 has breaking changes [#3946]
-
-## [v1.8.3](https://github.com/flarum/framework/compare/v1.8.2...v1.8.3)
-### Fixed
-* Console extender does not accept ::class [#3900]
-* Conditional extender instantiation [#3898]
-
-## [v1.8.2](https://github.com/flarum/framework/compare/v1.8.1...v1.8.2)
-### Fixed
-* suspended users can abuse avatar upload [#3890]
-* missing compat exports [#3888]
-
-## [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

README.md

@@ -1,12 +1,11 @@
-<p align="center">
+<p align="center"><img src="https://flarum.org/assets/img/logo.png"></p>
-<a href="https://flarum.org/"><img src="https://flarum.org/images/flarum.svg"></a>
-</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>
 
@@ -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).
-

composer.json

@@ -40,13 +40,12 @@
             "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",
@@ -74,7 +73,7 @@
         "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",
@@ -85,8 +84,8 @@
         "flarum/testing": "self.version"
     },
     "require": {
-        "php": ">=7.3",
         "ext-json": "*",
+        "php": ">=7.3",
         "components/font-awesome": "^5.14.0",
         "composer/composer": "^2.0",
         "dflydev/fig-cookies": "^3.0.0",
@@ -111,10 +110,9 @@
         "illuminate/validation": "^8.0",
         "illuminate/view": "^8.0",
         "intervention/image": "2.5.* || ^2.6.1",
-        "jenssegers/agent": "^2.6",
+        "laminas/laminas-diactoros": "^2.4.1",
-        "laminas/laminas-diactoros": "^2.4.1 || ^3.0.0",
+        "laminas/laminas-httphandlerrunner": "^1.2.0",
-        "laminas/laminas-httphandlerrunner": "^1.2.0 || ^2.3.0 || ^3.0.0",
+        "laminas/laminas-stratigility": "^3.2.2",
-        "laminas/laminas-stratigility": "^3.2.2 || ^4.0.0",
         "league/flysystem": "^1.0.11",
         "matthiasmullie/minify": "^1.3",
         "middlewares/base-path": "^2.0.1",
@@ -127,8 +125,7 @@
         "psr/http-server-handler": "^1.0",
         "psr/http-server-middleware": "^1.0",
         "pusher/pusher-php-server": "^2.2",
-        "s9e/text-formatter": ">=2.3.6 <2.15",
+        "s9e/text-formatter": "^2.3.6",
-        "staudenmeir/eloquent-eager-limit": "^1.0",
         "sycho/json-api": "^0.5.0",
         "sycho/sourcemap": "^2.0.0",
         "symfony/config": "^5.2.2",
@@ -143,8 +140,8 @@
     "require-dev": {
         "mockery/mockery": "^1.4",
         "phpunit/phpunit": "^9.0",
-        "phpstan/phpstan": ">=1.8.11 < 1.9.0",
+        "phpstan/phpstan-php-parser": "^1.0",
-        "nunomaduro/larastan": "^1.0"
+        "phpstan/phpstan": "^1.2"
     },
     "config": {
         "sort-packages": true
@@ -181,12 +178,5 @@
                 "extension.neon"
             ]
         }
-    },
-    "scripts": {
-        "analyse:phpstan": "phpstan analyse",
-        "clear-cache:phpstan": "phpstan clear-result-cache"
-    },
-    "scripts-descriptions": {
-        "analyse:phpstan": "Run static analysis"
     }
 }

extensions/akismet/composer.json

@@ -19,8 +19,8 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8",
+        "flarum/core": "^1.4",
-        "flarum/approval": "^1.7"
+        "flarum/approval": "^1.2"
     },
     "autoload": {
         "psr-4": {

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/admin.js

@@ -1,2 +1,2 @@
-(()=>{var a={n:t=>{var e=t&&t.__esModule?()=>t.default:()=>t;return a.d(e,{a:e}),e},d:(t,e)=>{for(var s in e)a.o(e,s)&&!a.o(t,s)&&Object.defineProperty(t,s,{enumerable:!0,get:e[s]})},o:(a,t)=>Object.prototype.hasOwnProperty.call(a,t)};(()=>{"use strict";const t=flarum.core.compat["admin/app"];var e=a.n(t);e().initializers.add("flarum-akismet",(function(){e().extensionData.for("flarum-akismet").registerSetting({setting:"flarum-akismet.api_key",type:"text",label:e().translator.trans("flarum-akismet.admin.akismet_settings.api_key_label")}).registerSetting({setting:"flarum-akismet.delete_blatant_spam",type:"boolean",label:e().translator.trans("flarum-akismet.admin.akismet_settings.delete_blatant_spam_label"),help:e().translator.trans("flarum-akismet.admin.akismet_settings.delete_blatant_spam_help")}).registerPermission({icon:"fas fa-vote-yea",label:e().translator.trans("flarum-akismet.admin.permissions.bypass_akismet"),permission:"bypassAkismet"},"start")}))})(),module.exports={}})();
+(()=>{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,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,KAAKC,OAAO,a,aCExDC,IAAAA,aAAiBC,IAAI,kBAAkB,WACrCD,IAAAA,cAAiB,IACV,kBACJE,gBAAgB,CACfC,QAAS,yBACTC,KAAM,OACNC,MAAOL,IAAAA,WAAeM,MAAM,yDAE7BJ,gBAAgB,CAEfC,QAAS,qCACTC,KAAM,UACNC,MAAOL,IAAAA,WAAeM,MAAM,mEAC5BC,KAAMP,IAAAA,WAAeM,MAAM,oEAE5BE,mBACC,CACEC,KAAM,kBACNJ,MAAOL,IAAAA,WAAeM,MAAM,mDAC5BI,WAAY,iBAEd,QAEN,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.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))","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","flarum","core","compat","app","add","registerSetting","setting","type","label","trans","help","registerPermission","icon","permission"],"sourceRoot":""}
+{"version":3,"file":"admin.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,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 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.core.compat["common/extend"],r=flarum.core.compat["forum/app"];var e=t.n(r);const a=flarum.core.compat["forum/utils/PostControls"];var n=t.n(a);const s=flarum.core.compat["forum/components/Post"];var m=t.n(s);e().initializers.add("flarum-akismet",(function(){(0,o.extend)(n(),"destructiveControls",(function(t,o){if(t.has("approve")){var r=o.flags();if(r&&r.some((function(t){return"akismet"===(null==t?void 0:t.type())}))){var a=t.get("approve");a&&"object"==typeof a&&"children"in a&&(a.children=e().translator.trans("flarum-akismet.forum.post.not_spam_button"))}}})),(0,o.override)(m().prototype,"flagReason",(function(t,o){return"akismet"===o.type()?e().translator.trans("flarum-akismet.forum.post.akismet_flagged_text"):t(o)}))}))})(),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,KAAKC,OAAO,iBCAlD,EAA+BF,OAAOC,KAAKC,OAAO,a,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,4B,aCAxD,MAAM,EAA+BF,OAAOC,KAAKC,OAAO,yB,aCSxDC,IAAAA,aAAiBC,IAAI,kBAAkB,YACrCC,EAAAA,EAAAA,QAAOC,IAAc,uBAAuB,SAAUC,EAAmCC,GACvF,GAAID,EAAME,IAAI,WAAY,CACxB,IAAMC,EAAQF,EAAKE,QAEnB,GAAIA,GAASA,EAAMC,MAAK,SAACC,GAAI,MAAsB,aAAb,MAAJA,OAAI,EAAJA,EAAMC,OAAoB,IAAG,CAC7D,IAAMC,EAAcP,EAAMb,IAAI,WAC1BoB,GAAsC,iBAAhBA,GAA4B,aAAcA,IAClEA,EAAYC,SAAWZ,IAAAA,WAAea,MAAM,6CAEhD,CACF,CACF,KAEAC,EAAAA,EAAAA,UAASC,IAAAA,UAAyB,cAAc,SAAUC,EAAUP,GAClE,MAAoB,YAAhBA,EAAKC,OACAV,IAAAA,WAAea,MAAM,kDAGvBG,EAASP,EAClB,GACF,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.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/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.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/Post'];","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 PostComponent from 'flarum/forum/components/Post';\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(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\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","flarum","core","compat","app","add","extend","PostControls","items","post","has","flags","some","flag","type","approveItem","children","trans","override","PostComponent","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'",
+        "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"
     },
     "devDependencies": {
         "@flarum/prettier-config": "^1.0.0",
         "flarum-tsconfig": "^1.0.2",
         "prettier": "^2.5.1",
         "flarum-webpack-config": "^2.0.0",
-        "webpack": "^5.76.0",
+        "webpack": "^5.65.0",
         "webpack-cli": "^4.9.1",
         "typescript": "^4.5.4",
         "typescript-coverage-report": "^0.6.1"

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,19 +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": [
+  "include": ["src/**/*", "../vendor/*/*/js/dist-typings/@types/**/*", "@types/**/*"],
-    "src/**/*",
-    "../../../framework/core/js/dist-typings/@types/**/*",
-    "../../flags/js/dist-typings/@types/**/*",
-    "@types/**/*"
-  ],
   "compilerOptions": {
     // This will output typings to `dist-typings`
     "declarationDir": "./dist-typings",
+    "baseUrl": ".",
     "paths": {
-      "flarum/*": ["../../../framework/core/js/dist-typings/*"],
+      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"],
-      "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"],
+      "flarum/flags/*": ["../vendor/flarum/flags/js/dist-typings/*"]
-      "flarum/flags/*": ["../../flags/js/dist-typings/*"]
     }
   }
 }

extensions/akismet/src/Akismet.php

@@ -50,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,

extensions/akismet/src/Listener/ValidatePost.php

@@ -50,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

@@ -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/approval/composer.json

@@ -19,8 +19,8 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8",
+        "flarum/core": "^1.4",
-        "flarum/flags": "^1.7"
+        "flarum/flags": "^1.2"
     },
     "autoload": {
         "psr-4": {

extensions/approval/extend.php

@@ -15,6 +15,7 @@ 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;
 
@@ -28,17 +29,15 @@ return [
 
     // Discussions should be approved by default
     (new Extend\Model(Discussion::class))
-        ->default('is_approved', true)
+        ->default('is_approved', true),
-        ->cast('is_approved', 'bool'),
 
     // Posts should be approved by default
     (new Extend\Model(Post::class))
-        ->default('is_approved', true)
+        ->default('is_approved', true),
-        ->cast('is_approved', 'bool'),
 
     (new Extend\ApiSerializer(BasicDiscussionSerializer::class))
         ->attribute('isApproved', function ($serializer, Discussion $discussion) {
-            return $discussion->is_approved;
+            return (bool) $discussion->is_approved;
         }),
 
     (new Extend\ApiSerializer(PostSerializer::class))
@@ -51,9 +50,9 @@ return [
     new Extend\Locales(__DIR__.'/locale'),
 
     (new Extend\Event())
-        ->listen(PostWasApproved::class, Listener\UpdateDiscussionAfterPostApproval::class)
+        ->listen(Saving::class, [Listener\ApproveContent::class, 'approvePost'])
-        ->subscribe(Listener\ApproveContent::class)
+        ->listen(Saving::class, [Listener\UnapproveNewContent::class, 'unapproveNewPosts'])
-        ->subscribe(Listener\UnapproveNewContent::class),
+        ->listen(PostWasApproved::class, [Listener\ApproveContent::class, 'approveDiscussion']),
 
     (new Extend\Policy())
         ->modelPolicy(Tag::class, Access\TagPolicy::class),

extensions/approval/js/dist/admin.js

@@ -1,2 +1,2 @@
-(()=>{var s={n:r=>{var a=r&&r.__esModule?()=>r.default:()=>r;return s.d(a,{a}),a},d:(r,a)=>{for(var o in a)s.o(a,o)&&!s.o(r,o)&&Object.defineProperty(r,o,{enumerable:!0,get:a[o]})},o:(s,r)=>Object.prototype.hasOwnProperty.call(s,r)};(()=>{"use strict";const r=flarum.core.compat["common/extend"],a=flarum.core.compat["admin/app"];var o=s.n(a);o().initializers.add("flarum-approval",(function(){(0,r.extend)(o(),"getRequiredPermissions",(function(s,r){"discussion.startWithoutApproval"===r&&s.push("startDiscussion"),"discussion.replyWithoutApproval"===r&&s.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={}})();
+(()=>{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,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,I,mBCAlF,MAAM,EAA+BI,OAAOC,KAAKC,OAAO,iBCAlD,EAA+BF,OAAOC,KAAKC,OAAO,a,aCGxDC,IAAAA,aAAiBC,IAAI,mBAAmB,YACtCC,EAAAA,EAAAA,QAAOF,IAAK,0BAA0B,SAAUG,EAAUC,GACrC,oCAAfA,GACFD,EAASE,KAAK,mBAEG,oCAAfD,GACFD,EAASE,KAAK,mBAElB,IAEAL,IAAAA,cAAiB,IACV,mBACJM,mBACC,CACEC,KAAM,eACNC,MAAOR,IAAAA,WAAeS,MAAM,8EAC5BL,WAAY,mCAEd,QACA,IAEDE,mBACC,CACEC,KAAM,eACNC,MAAOR,IAAAA,WAAeS,MAAM,kEAC5BL,WAAY,mCAEd,QACA,IAEDE,mBACC,CACEC,KAAM,eACNC,MAAOR,IAAAA,WAAeS,MAAM,yDAC5BL,WAAY,2BAEd,WACA,GAEN,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/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))","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","flarum","core","compat","app","add","extend","required","permission","push","registerPermission","icon","label","trans"],"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 o={n:t=>{var r=t&&t.__esModule?()=>t.default:()=>t;return o.d(r,{a:r}),r},d:(t,r)=>{for(var a in r)o.o(r,a)&&!o.o(t,a)&&Object.defineProperty(t,a,{enumerable:!0,get:r[a]})},o:(o,t)=>Object.prototype.hasOwnProperty.call(o,t)};(()=>{"use strict";const t=flarum.core.compat["common/extend"],r=flarum.core.compat["forum/app"];var a=o.n(r);const e=flarum.core.compat["common/models/Discussion"];var p=o.n(e);const n=flarum.core.compat["common/models/Post"];var s=o.n(n);const i=flarum.core.compat["common/components/Badge"];var c=o.n(i);const u=flarum.core.compat["forum/components/DiscussionListItem"];var l=o.n(u);const d=flarum.core.compat["forum/components/Post"];var v=o.n(d);const f=flarum.core.compat["forum/components/CommentPost"];var A=o.n(f);const h=flarum.core.compat["common/components/Button"];var b=o.n(h);const y=flarum.core.compat["forum/utils/PostControls"];var g=o.n(y);a().initializers.add("flarum-approval",(function(){p().prototype.isApproved=p().attribute("isApproved"),(0,t.extend)(p().prototype,"badges",(function(o){this.isApproved()||o.has("hidden")||o.add("awaitingApproval",m(c(),{type:"awaitingApproval",icon:"fas fa-gavel",label:a().translator.trans("flarum-approval.forum.badge.awaiting_approval_tooltip")}))})),s().prototype.isApproved=s().attribute("isApproved"),s().prototype.canApprove=s().attribute("canApprove"),(0,t.extend)(l().prototype,"elementAttrs",(function(o){this.attrs.discussion.isApproved()||(o.className+=" DiscussionListItem--unapproved")})),(0,t.extend)(v().prototype,"elementAttrs",(function(o){this.attrs.post.isApproved()||(o.className+=" Post--unapproved")})),(0,t.extend)(A().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,t.override)(v().prototype,"flagReason",(function(o,t){return"approval"===t.type()?a().translator.trans("flarum-approval.forum.post.awaiting_approval_text"):o(t)})),(0,t.extend)(g(),"destructiveControls",(function(o,t){!t.isApproved()&&t.canApprove()&&o.add("approve",m(b(),{icon:"fas fa-check",onclick:g().approveAction.bind(t)},a().translator.trans("flarum-approval.forum.post_controls.approve_button")),10)})),g().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

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

extensions/approval/js/src/@types/shims.d.ts

@@ -1,15 +0,0 @@
-import 'flarum/common/models/Discussion';
-import 'flarum/common/models/Post';
-
-declare module 'flarum/common/models/Discussion' {
-  export default interface Discussion {
-    isApproved(): boolean;
-  }
-}
-
-declare module 'flarum/common/models/Post' {
-  export default interface Post {
-    isApproved(): boolean;
-    canApprove(): boolean;
-  }
-}

extensions/approval/src/Listener/ApproveContent.php

@@ -11,55 +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
 {
     /**
-     * @param Dispatcher $events
+     * @param Saving $event
      */
-    public function subscribe(Dispatcher $events)
+    public static function approvePost(Saving $event)
-    {
-        $events->listen(Saving::class, [$this, 'approvePost']);
-    }
-
-    /**
-     * @throws  PermissionDeniedException
-     */
-    public 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();
+    }
 }

extensions/approval/src/Listener/UnapproveNewContent.php

@@ -9,27 +9,17 @@
 
 namespace Flarum\Approval\Listener;
 
-use Carbon\Carbon;
 use Flarum\Discussion\Discussion;
 use Flarum\Flags\Flag;
 use Flarum\Post\CommentPost;
 use Flarum\Post\Event\Saving;
-use Illuminate\Contracts\Events\Dispatcher;
 
 class UnapproveNewContent
 {
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
-    {
-        $events->listen(Saving::class, [$this, 'unapproveNewPosts']);
-    }
-
     /**
      * @param Saving $event
      */
-    public function unapproveNewPosts(Saving $event)
+    public static function unapproveNewPosts(Saving $event)
     {
         $post = $event->post;
 
@@ -56,7 +46,7 @@ class UnapproveNewContent
 
                 $flag->post_id = $post->id;
                 $flag->type = 'approval';
-                $flag->created_at = Carbon::now();
+                $flag->created_at = time();
 
                 $flag->save();
             });

extensions/approval/src/Listener/UpdateDiscussionAfterPostApproval.php

@@ -1,45 +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\Listener;
-
-use Flarum\Approval\Event\PostWasApproved;
-
-class UpdateDiscussionAfterPostApproval
-{
-    public function handle(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();
-
-        if ($discussion->user) {
-            $user->refreshCommentCount();
-            $user->save();
-        }
-
-        if ($post->user) {
-            $post->user->refreshCommentCount();
-            $post->user->save();
-        }
-    }
-}

extensions/bbcode/composer.json

@@ -19,12 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^1.4"
-    },
-    "autoload": {
-        "psr-4": {
-            "Flarum\\BBCode\\": "src"
-        }
     },
     "extra": {
         "branch-alias": {

extensions/bbcode/extend.php

@@ -7,14 +7,24 @@
  * LICENSE file that was distributed with this source code.
  */
 
-namespace Flarum\BBCode;
-
 use Flarum\Extend;
+use s9e\TextFormatter\Configurator;
 
-return [
+return (new Extend\Formatter)
-    new Extend\Locales(__DIR__.'/locale'),
+    ->configure(function (Configurator $config) {
-
+        $config->BBCodes->addFromRepository('B');
-    (new Extend\Formatter)
+        $config->BBCodes->addFromRepository('I');
-        ->render(Render::class)
+        $config->BBCodes->addFromRepository('U');
-        ->configure(Configure::class),
+        $config->BBCodes->addFromRepository('S');
-];
+        $config->BBCodes->addFromRepository('URL');
+        $config->BBCodes->addFromRepository('IMG');
+        $config->BBCodes->addFromRepository('EMAIL');
+        $config->BBCodes->addFromRepository('CODE');
+        $config->BBCodes->addFromRepository('QUOTE');
+        $config->BBCodes->addFromRepository('LIST');
+        $config->BBCodes->addFromRepository('DEL');
+        $config->BBCodes->addFromRepository('COLOR');
+        $config->BBCodes->addFromRepository('CENTER');
+        $config->BBCodes->addFromRepository('SIZE');
+        $config->BBCodes->addFromRepository('*');
+    });

extensions/bbcode/locale/en.yml

@@ -1,10 +0,0 @@
-flarum-bbcode:
-
-  ##
-  # UNIQUE KEYS - The following keys are used in only one location each.
-  ##
-
-  # Translations in this namespace are used by the forum user interface.
-  forum:
-    quote:
-      wrote: wrote

extensions/bbcode/src/Configure.php

@@ -1,59 +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\BBCode;
-
-use s9e\TextFormatter\Configurator;
-
-class Configure
-{
-    public function __invoke(Configurator $config)
-    {
-        $this->addTagsFromRepositories($config);
-        $this->adaptHighlightJs($config);
-    }
-
-    protected function addTagsFromRepositories(Configurator $config): void
-    {
-        $config->BBCodes->addFromRepository('B');
-        $config->BBCodes->addFromRepository('I');
-        $config->BBCodes->addFromRepository('U');
-        $config->BBCodes->addFromRepository('S');
-        $config->BBCodes->addFromRepository('URL');
-        $config->BBCodes->addFromRepository('IMG');
-        $config->BBCodes->addFromRepository('EMAIL');
-        $config->BBCodes->addFromRepository('CODE');
-        $config->BBCodes->addFromRepository('QUOTE', 'default', [
-            'authorStr' => '<xsl:value-of select="@author"/> <xsl:value-of select="$L_WROTE"/>'
-        ]);
-        $config->BBCodes->addFromRepository('LIST');
-        $config->BBCodes->addFromRepository('DEL');
-        $config->BBCodes->addFromRepository('COLOR');
-        $config->BBCodes->addFromRepository('CENTER');
-        $config->BBCodes->addFromRepository('SIZE');
-        $config->BBCodes->addFromRepository('*');
-    }
-
-    /**
-     * Fix for highlight JS not working after changing post content.
-     *
-     * @link https://github.com/flarum/framework/issues/3794
-     */
-    protected function adaptHighlightJs(Configurator $config): void
-    {
-        $codeTag = $config->tags->get('CODE');
-        $script = '
-                <script>
-                    if(window.hljsLoader && !document.currentScript.parentNode.hasAttribute(\'data-s9e-livepreview-onupdate\')) {
-                        window.hljsLoader.highlightBlocks(document.currentScript.parentNode);
-                    }
-                </script>';
-        $codeTag->template = str_replace('</pre>', $script.'</pre>', $codeTag->template);
-    }
-}

extensions/bbcode/src/Render.php

@@ -1,33 +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\BBCode;
-
-use s9e\TextFormatter\Renderer;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-class Render
-{
-    /**
-     * @var TranslatorInterface
-     */
-    protected $translator;
-
-    public function __construct(TranslatorInterface $translator)
-    {
-        $this->translator = $translator;
-    }
-
-    public function __invoke(Renderer $renderer, $context, string $xml): string
-    {
-        $renderer->setParameter('L_WROTE', $this->translator->trans('flarum-bbcode.forum.quote.wrote'));
-
-        return $xml;
-    }
-}

extensions/embed/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^1.4"
     },
     "autoload": {
         "psr-4": {

extensions/embed/js/package.json

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

extensions/emoji/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^1.4"
     },
     "extra": {
         "branch-alias": {

extensions/emoji/js/package.json

@@ -14,7 +14,7 @@
         "prettier": "^2.5.1",
         "typescript": "^4.5.4",
         "typescript-coverage-report": "^0.6.1",
-        "webpack": "^5.76.0",
+        "webpack": "^5.65.0",
         "webpack-cli": "^4.9.1"
     },
     "scripts": {
@@ -22,6 +22,10 @@
         "build": "webpack --mode production",
         "format": "prettier --write src",
         "format-check": "prettier --check src",
-        "analyze": "cross-env ANALYZER=true yarn run build"
+        "analyze": "cross-env ANALYZER=true yarn run build",
+        "clean-typings": "npx rimraf dist-typings && mkdir dist-typings",
+        "build-typings": "npm run clean-typings && cp -r src/@types dist-typings/@types && tsc",
+        "check-typings": "tsc --noEmit --emitDeclarationOnly false",
+        "check-typings-coverage": "typescript-coverage-report"
     }
 }

extensions/emoji/js/src/forum/addComposerAutocomplete.js

@@ -3,7 +3,7 @@ import emojiMap from 'simple-emoji-map';
 import { extend } from 'flarum/common/extend';
 import TextEditor from 'flarum/common/components/TextEditor';
 import TextEditorButton from 'flarum/common/components/TextEditorButton';
-import KeyboardNavigatable from 'flarum/common/utils/KeyboardNavigatable';
+import KeyboardNavigatable from 'flarum/forum/utils/KeyboardNavigatable';
 
 import AutocompleteDropdown from './fragments/AutocompleteDropdown';
 import getEmojiIconCode from './helpers/getEmojiIconCode';
@@ -80,7 +80,7 @@ export default function addComposerAutocomplete() {
                 dropdown.setIndex($(this).parent().index() - 1);
               }}
             >
-              <img alt={emoji} className="emoji" draggable="false" loading="lazy" src={`${cdn}72x72/${code}.png`} />
+              <img alt={emoji} class="emoji" draggable="false" loading="lazy" src={`${cdn}72x72/${code}.png`} />
               {name}
             </button>
           );

extensions/emoji/js/src/forum/compat.ts

@@ -1,7 +0,0 @@
-import AutocompleteDropdown from './fragments/AutocompleteDropdown';
-import getEmojiIconCode from './helpers/getEmojiIconCode';
-
-export default {
-  'emoji/fragments/AutocompleteDropdown': AutocompleteDropdown,
-  'emoji/helpers/getEmojiIconCode': getEmojiIconCode,
-};

extensions/emoji/js/src/forum/index.js

@@ -11,9 +11,3 @@ app.initializers.add('flarum-emoji', () => {
   // render emoji as image in Posts content and title.
   renderEmoji();
 });
-
-// Expose compat API
-import emojiCompat from './compat';
-import { compat } from '@flarum/core/forum';
-
-Object.assign(compat, emojiCompat);

extensions/flags/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8.6"
+        "flarum/core": "^1.4"
     },
     "autoload": {
         "psr-4": {

extensions/flags/extend.php

@@ -46,7 +46,7 @@ return [
         ->delete('/posts/{id}/flags', 'flags.delete', DeleteFlagsController::class),
 
     (new Extend\Model(User::class))
-        ->cast('read_flags_at', 'datetime'),
+        ->dateAttribute('read_flags_at'),
 
     (new Extend\Model(Post::class))
         ->hasMany('flags', Flag::class, 'post_id'),

extensions/flags/js/dist-typings/@types/shims.d.ts

@@ -1,7 +1,3 @@
-import 'flarum/common/models/Post';
-import 'flarum/forum/ForumApplication';
-import 'flarum/forum/components/Post';
-
 import Flag from '../forum/models/Flag';
 import FlagListState from '../forum/states/FlagListState';
 import Mithril from 'mithril';

extensions/flags/js/dist-typings/forum/compat.d.ts

@@ -1,4 +1,4 @@
-declare const _default: {
+declare var _default: {
     'flags/addFlagsToPosts': typeof addFlagsToPosts;
     'flags/addFlagControl': typeof addFlagControl;
     'flags/addFlagsDropdown': typeof addFlagsDropdown;
@@ -7,7 +7,6 @@ declare const _default: {
     'flags/components/FlagPostModal': typeof FlagPostModal;
     'flags/components/FlagsPage': typeof FlagsPage;
     'flags/components/FlagsDropdown': typeof FlagsDropdown;
-    'flags/states/FlagListState': typeof FlagListState;
 };
 export default _default;
 import addFlagsToPosts from "./addFlagsToPosts";
@@ -18,4 +17,3 @@ import FlagList from "./components/FlagList";
 import FlagPostModal from "./components/FlagPostModal";
 import FlagsPage from "./components/FlagsPage";
 import FlagsDropdown from "./components/FlagsDropdown";
-import FlagListState from "./states/FlagListState";

extensions/flags/js/dist-typings/forum/components/FlagList.d.ts

@@ -1,7 +1,5 @@
-export default class FlagList extends Component<import("flarum/common/Component").ComponentAttrs, undefined> {
+export default class FlagList {
-    constructor();
     oninit(vnode: any): void;
     state: any;
     view(): JSX.Element;
 }
-import Component from "flarum/common/Component";

extensions/flags/js/dist-typings/forum/components/FlagPostModal.d.ts

@@ -1,15 +1,12 @@
-/// <reference types="flarum/@types/translator-icu-rich" />
+export default class FlagPostModal {
-export default class FlagPostModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs, undefined> {
-    constructor();
     oninit(vnode: any): void;
     success: boolean | undefined;
-    reason: Stream<string> | undefined;
+    reason: any;
-    reasonDetail: Stream<string> | undefined;
+    reasonDetail: any;
-    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    className(): string;
+    title(): any;
     content(): JSX.Element;
-    flagReasons(): ItemList<any>;
+    flagReasons(): any;
     onsubmit(e: any): void;
+    loading: boolean | undefined;
 }
-import Modal from "flarum/common/components/Modal";
-import Stream from "flarum/common/utils/Stream";
-import ItemList from "flarum/common/utils/ItemList";

extensions/flags/js/dist-typings/forum/components/FlagsDropdown.d.ts

@@ -1,7 +1,7 @@
-export default class FlagsDropdown extends NotificationsDropdown<import("flarum/common/components/Dropdown").IDropdownAttrs> {
+export default class FlagsDropdown {
     static initAttrs(attrs: any): void;
-    constructor();
+    getMenu(): JSX.Element;
+    goToRoute(): void;
     getUnreadCount(): any;
-    getNewCount(): unknown;
+    getNewCount(): any;
 }
-import NotificationsDropdown from "flarum/forum/components/NotificationsDropdown";

extensions/flags/js/dist-typings/forum/extend.d.ts

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

extensions/flags/js/dist-typings/forum/index.d.ts

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

extensions/flags/js/dist-typings/forum/models/Flag.d.ts

@@ -1,11 +1,9 @@
 import Model from 'flarum/common/Model';
-import type Post from 'flarum/common/models/Post';
-import type User from 'flarum/common/models/User';
 export default class Flag extends Model {
-    type(): string;
+    type(): any;
-    reason(): string | null;
+    reason(): any;
-    reasonDetail(): string | null;
+    reasonDetail(): any;
-    createdAt(): Date | null | undefined;
+    createdAt(): any;
-    post(): false | Post;
+    post(): any;
-    user(): false | User | null;
+    user(): any;
 }

extensions/flags/js/dist/admin.js

@@ -1,2 +1,2 @@
-(()=>{var a={n:s=>{var e=s&&s.__esModule?()=>s.default:()=>s;return a.d(e,{a:e}),e},d:(s,e)=>{for(var l in e)a.o(e,l)&&!a.o(s,l)&&Object.defineProperty(s,l,{enumerable:!0,get:e[l]})},o:(a,s)=>Object.prototype.hasOwnProperty.call(a,s)};(()=>{"use strict";const s=flarum.core.compat["admin/app"];var e=a.n(s);e().initializers.add("flarum-flags",(function(){e().extensionData.for("flarum-flags").registerSetting({setting:"flarum-flags.guidelines_url",type:"text",label:e().translator.trans("flarum-flags.admin.settings.guidelines_url_label")},15).registerSetting({setting:"flarum-flags.can_flag_own",type:"boolean",label:e().translator.trans("flarum-flags.admin.settings.flag_own_posts_label")}).registerPermission({icon:"fas fa-flag",label:e().translator.trans("flarum-flags.admin.permissions.view_flags_label"),permission:"discussion.viewFlags"},"moderate",65).registerPermission({icon:"fas fa-flag",label:e().translator.trans("flarum-flags.admin.permissions.flag_posts_label"),permission:"discussion.flagPosts"},"reply",65)}))})(),module.exports={}})();
+(()=>{var e={n:a=>{var s=a&&a.__esModule?()=>a.default:()=>a;return e.d(s,{a:s}),s},d:(a,s)=>{for(var l in s)e.o(s,l)&&!e.o(a,l)&&Object.defineProperty(a,l,{enumerable:!0,get:s[l]})},o:(e,a)=>Object.prototype.hasOwnProperty.call(e,a),r:e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})}},a={};(()=>{"use strict";e.r(a);const s=flarum.core.compat["admin/app"];var l=e.n(s);l().initializers.add("flarum-flags",(function(){l().extensionData.for("flarum-flags").registerSetting({setting:"flarum-flags.guidelines_url",type:"text",label:l().translator.trans("flarum-flags.admin.settings.guidelines_url_label")},15).registerSetting({setting:"flarum-flags.can_flag_own",type:"boolean",label:l().translator.trans("flarum-flags.admin.settings.flag_own_posts_label")}).registerPermission({icon:"fas fa-flag",label:l().translator.trans("flarum-flags.admin.permissions.view_flags_label"),permission:"discussion.viewFlags"},"moderate",65).registerPermission({icon:"fas fa-flag",label:l().translator.trans("flarum-flags.admin.permissions.flag_posts_label"),permission:"discussion.flagPosts"},"reply",65)}))})(),module.exports=a})();
 //# sourceMappingURL=admin.js.map

extensions/flags/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,I,mBCAlF,MAAM,EAA+BI,OAAOC,KAAKC,OAAO,a,aCExDC,IAAAA,aAAiBC,IAAI,gBAAgB,WACnCD,IAAAA,cAAiB,IACV,gBACJE,gBACC,CACEC,QAAS,8BACTC,KAAM,OACNC,MAAOL,IAAAA,WAAeM,MAAM,qDAE9B,IAEDJ,gBAAgB,CACfC,QAAS,4BACTC,KAAM,UACNC,MAAOL,IAAAA,WAAeM,MAAM,sDAE7BC,mBACC,CACEC,KAAM,cACNH,MAAOL,IAAAA,WAAeM,MAAM,mDAC5BG,WAAY,wBAEd,WACA,IAGDF,mBACC,CACEC,KAAM,cACNH,MAAOL,IAAAA,WAAeM,MAAM,mDAC5BG,WAAY,wBAEd,QACA,GAEN,G","sources":["webpack://@flarum/flags/webpack/bootstrap","webpack://@flarum/flags/webpack/runtime/compat get default export","webpack://@flarum/flags/webpack/runtime/define property getters","webpack://@flarum/flags/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/flags/external root \"flarum.core.compat['admin/app']\"","webpack://@flarum/flags/./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))","const __WEBPACK_NAMESPACE_OBJECT__ = flarum.core.compat['admin/app'];","import app from 'flarum/admin/app';\n\napp.initializers.add('flarum-flags', () => {\n  app.extensionData\n    .for('flarum-flags')\n    .registerSetting(\n      {\n        setting: 'flarum-flags.guidelines_url',\n        type: 'text',\n        label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label'),\n      },\n      15\n    )\n    .registerSetting({\n      setting: 'flarum-flags.can_flag_own',\n      type: 'boolean',\n      label: app.translator.trans('flarum-flags.admin.settings.flag_own_posts_label'),\n    })\n    .registerPermission(\n      {\n        icon: 'fas fa-flag',\n        label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),\n        permission: 'discussion.viewFlags',\n      },\n      'moderate',\n      65\n    )\n\n    .registerPermission(\n      {\n        icon: 'fas fa-flag',\n        label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),\n        permission: 'discussion.flagPosts',\n      },\n      'reply',\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","flarum","core","compat","app","add","registerSetting","setting","type","label","trans","registerPermission","icon","permission"],"sourceRoot":""}
+{"version":3,"file":"admin.js","mappings":"MACA,IAAIA,EAAsB,CCA1BA,EAAyBC,IACxB,IAAIC,EAASD,GAAUA,EAAOE,WAC7B,IAAOF,EAAiB,QACxB,IAAM,EAEP,OADAD,EAAoBI,EAAEF,EAAQ,CAAEG,EAAGH,IAC5BA,GCLRF,EAAwB,CAACM,EAASC,KACjC,IAAI,IAAIC,KAAOD,EACXP,EAAoBS,EAAEF,EAAYC,KAASR,EAAoBS,EAAEH,EAASE,IAC5EE,OAAOC,eAAeL,EAASE,EAAK,CAAEI,YAAY,EAAMC,IAAKN,EAAWC,MCJ3ER,EAAwB,CAACc,EAAKC,IAAUL,OAAOM,UAAUC,eAAeC,KAAKJ,EAAKC,GCClFf,EAAyBM,IACH,oBAAXa,QAA0BA,OAAOC,aAC1CV,OAAOC,eAAeL,EAASa,OAAOC,YAAa,CAAEC,MAAO,WAE7DX,OAAOC,eAAeL,EAAS,aAAc,CAAEe,OAAO,M,+BCLvD,MAAM,EAA+BC,OAAOC,KAAKC,OAAO,a,aCExDC,IAAAA,aAAAA,IAAqB,gBAAgB,WACnCA,IAAAA,cAAAA,IACO,gBACJC,gBACC,CACEC,QAAS,8BACTC,KAAM,OACNC,MAAOJ,IAAAA,WAAAA,MAAqB,qDAE9B,IAEDC,gBAAgB,CACfC,QAAS,4BACTC,KAAM,UACNC,MAAOJ,IAAAA,WAAAA,MAAqB,sDAE7BK,mBACC,CACEC,KAAM,cACNF,MAAOJ,IAAAA,WAAAA,MAAqB,mDAC5BO,WAAY,wBAEd,WACA,IAGDF,mBACC,CACEC,KAAM,cACNF,MAAOJ,IAAAA,WAAAA,MAAqB,mDAC5BO,WAAY,wBAEd,QACA,Q","sources":["webpack://@flarum/flags/webpack/bootstrap","webpack://@flarum/flags/webpack/runtime/compat get default export","webpack://@flarum/flags/webpack/runtime/define property getters","webpack://@flarum/flags/webpack/runtime/hasOwnProperty shorthand","webpack://@flarum/flags/webpack/runtime/make namespace object","webpack://@flarum/flags/external root \"flarum.core.compat['admin/app']\"","webpack://@flarum/flags/./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-flags', () => {\n  app.extensionData\n    .for('flarum-flags')\n    .registerSetting(\n      {\n        setting: 'flarum-flags.guidelines_url',\n        type: 'text',\n        label: app.translator.trans('flarum-flags.admin.settings.guidelines_url_label'),\n      },\n      15\n    )\n    .registerSetting({\n      setting: 'flarum-flags.can_flag_own',\n      type: 'boolean',\n      label: app.translator.trans('flarum-flags.admin.settings.flag_own_posts_label'),\n    })\n    .registerPermission(\n      {\n        icon: 'fas fa-flag',\n        label: app.translator.trans('flarum-flags.admin.permissions.view_flags_label'),\n        permission: 'discussion.viewFlags',\n      },\n      'moderate',\n      65\n    )\n\n    .registerPermission(\n      {\n        icon: 'fas fa-flag',\n        label: app.translator.trans('flarum-flags.admin.permissions.flag_posts_label'),\n        permission: 'discussion.flagPosts',\n      },\n      'reply',\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","registerSetting","setting","type","label","registerPermission","icon","permission"],"sourceRoot":""}

extensions/flags/js/package.json

@@ -7,7 +7,7 @@
         "@types/mithril": "^2.0.8",
         "prettier": "^2.5.1",
         "flarum-webpack-config": "^2.0.0",
-        "webpack": "^5.76.0",
+        "webpack": "^5.65.0",
         "webpack-cli": "^4.9.1",
         "@flarum/prettier-config": "^1.0.0",
         "flarum-tsconfig": "^1.0.2",
@@ -17,13 +17,13 @@
     "scripts": {
         "dev": "webpack --mode development --watch",
         "build": "webpack --mode production",
-        "analyze": "cross-env ANALYZER=true yarn run build",
         "format": "prettier --write src",
         "format-check": "prettier --check src",
+        "analyze": "cross-env ANALYZER=true yarn run build",
         "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"
+        "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'"
     }
 }

extensions/flags/js/src/@types/shims.d.ts

@@ -1,7 +1,3 @@
-import 'flarum/common/models/Post';
-import 'flarum/forum/ForumApplication';
-import 'flarum/forum/components/Post';
-
 import Flag from '../forum/models/Flag';
 import FlagListState from '../forum/states/FlagListState';
 import Mithril from 'mithril';

extensions/flags/js/src/forum/addFlagsToPosts.js

@@ -75,7 +75,7 @@ export default function () {
     return items;
   };
 
-  extend(Post.prototype, 'viewItems', function (items) {
+  extend(Post.prototype, 'content', function (vdom) {
     const post = this.attrs.post;
     const flags = post.flags();
 
@@ -83,8 +83,7 @@ export default function () {
 
     if (post.isHidden()) this.revealContent = true;
 
-    items.add(
+    vdom.unshift(
-      'flagged',
       <div className="Post-flagged">
         <div className="Post-flagged-flags">
           {flags.map((flag) => (
@@ -92,8 +91,7 @@ export default function () {
           ))}
         </div>
         <div className="Post-flagged-actions">{this.flagActionItems().toArray()}</div>
-      </div>,
+      </div>
-      110
     );
   });
 
@@ -110,7 +108,7 @@ export default function () {
           user,
           reason,
         }),
-        !!detail && <span className="Post-flagged-detail">{detail}</span>,
+        detail ? <span className="Post-flagged-detail">{detail}</span> : '',
       ];
     }
   };

extensions/flags/js/src/forum/compat.js

@@ -6,7 +6,6 @@ import FlagList from './components/FlagList';
 import FlagPostModal from './components/FlagPostModal';
 import FlagsPage from './components/FlagsPage';
 import FlagsDropdown from './components/FlagsDropdown';
-import FlagListState from './states/FlagListState';
 
 export default {
   'flags/addFlagsToPosts': addFlagsToPosts,
@@ -17,5 +16,4 @@ export default {
   'flags/components/FlagPostModal': FlagPostModal,
   'flags/components/FlagsPage': FlagsPage,
   'flags/components/FlagsDropdown': FlagsDropdown,
-  'flags/states/FlagListState': FlagListState,
 };

extensions/flags/js/src/forum/components/FlagList.js

@@ -55,7 +55,7 @@ export default class FlagList extends Component {
             ) : !this.state.loading ? (
               <div className="NotificationList-empty">{app.translator.trans('flarum-flags.forum.flagged_posts.empty_text')}</div>
             ) : (
-              <LoadingIndicator className="LoadingIndicator--block" />
+              LoadingIndicator.component({ className: 'LoadingIndicator--block' })
             )}
           </ul>
         </div>

extensions/flags/js/src/forum/components/FlagPostModal.js

@@ -67,13 +67,15 @@ export default class FlagPostModal extends Modal {
         <input type="radio" name="reason" checked={this.reason() === 'off_topic'} value="off_topic" onclick={withAttr('value', this.reason)} />
         <strong>{app.translator.trans('flarum-flags.forum.flag_post.reason_off_topic_label')}</strong>
         {app.translator.trans('flarum-flags.forum.flag_post.reason_off_topic_text')}
-        {this.reason() === 'off_topic' && (
+        {this.reason() === 'off_topic' ? (
           <textarea
             className="FormControl"
             placeholder={app.translator.trans('flarum-flags.forum.flag_post.reason_details_placeholder')}
             value={this.reasonDetail()}
             oninput={withAttr('value', this.reasonDetail)}
           ></textarea>
+        ) : (
+          ''
         )}
       </label>,
       70
@@ -93,13 +95,15 @@ export default class FlagPostModal extends Modal {
         {app.translator.trans('flarum-flags.forum.flag_post.reason_inappropriate_text', {
           a: guidelinesUrl ? <a href={guidelinesUrl} target="_blank" /> : undefined,
         })}
-        {this.reason() === 'inappropriate' && (
+        {this.reason() === 'inappropriate' ? (
           <textarea
             className="FormControl"
             placeholder={app.translator.trans('flarum-flags.forum.flag_post.reason_details_placeholder')}
             value={this.reasonDetail()}
             oninput={withAttr('value', this.reasonDetail)}
           ></textarea>
+        ) : (
+          ''
         )}
       </label>,
       60
@@ -111,13 +115,15 @@ export default class FlagPostModal extends Modal {
         <input type="radio" name="reason" checked={this.reason() === 'spam'} value="spam" onclick={withAttr('value', this.reason)} />
         <strong>{app.translator.trans('flarum-flags.forum.flag_post.reason_spam_label')}</strong>
         {app.translator.trans('flarum-flags.forum.flag_post.reason_spam_text')}
-        {this.reason() === 'spam' && (
+        {this.reason() === 'spam' ? (
           <textarea
             className="FormControl"
             placeholder={app.translator.trans('flarum-flags.forum.flag_post.reason_details_placeholder')}
             value={this.reasonDetail()}
             oninput={withAttr('value', this.reasonDetail)}
           ></textarea>
+        ) : (
+          ''
         )}
       </label>,
       50
@@ -128,8 +134,10 @@ export default class FlagPostModal extends Modal {
       <label className="checkbox">
         <input type="radio" name="reason" checked={this.reason() === 'other'} value="other" onclick={withAttr('value', this.reason)} />
         <strong>{app.translator.trans('flarum-flags.forum.flag_post.reason_other_label')}</strong>
-        {this.reason() === 'other' && (
+        {this.reason() === 'other' ? (
           <textarea className="FormControl" value={this.reasonDetail()} oninput={withAttr('value', this.reasonDetail)}></textarea>
+        ) : (
+          ''
         )}
       </label>,
       10

extensions/flags/js/src/forum/components/FlagsDropdown.js

@@ -1,5 +1,5 @@
 import app from 'flarum/forum/app';
-import NotificationsDropdown from 'flarum/forum/components/NotificationsDropdown';
+import NotificationsDropdown from 'flarum/components/NotificationsDropdown';
 
 import FlagList from './FlagList';
 
@@ -14,7 +14,7 @@ export default class FlagsDropdown extends NotificationsDropdown {
   getMenu() {
     return (
       <div className={'Dropdown-menu ' + this.attrs.menuClassName} onclick={this.menuClick.bind(this)}>
-        {this.showing && <FlagList state={this.attrs.state} />}
+        {this.showing ? FlagList.component({ state: this.attrs.state }) : ''}
       </div>
     );
   }

extensions/flags/js/src/forum/extend.ts

@@ -1,16 +0,0 @@
-import Extend from 'flarum/common/extenders';
-import Post from 'flarum/common/models/Post';
-import FlagsPage from './components/FlagsPage';
-import Flag from './models/Flag';
-
-export default [
-  new Extend.Routes() //
-    .add('flags', '/flags', FlagsPage),
-
-  new Extend.Store() //
-    .add('flags', Flag),
-
-  new Extend.Model(Post) //
-    .hasMany<Flag>('flags')
-    .attribute<boolean>('canFlag'),
-];

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

@@ -1,13 +1,21 @@
 import app from 'flarum/forum/app';
+import Model from 'flarum/common/Model';
 
+import Flag from './models/Flag';
+import FlagsPage from './components/FlagsPage';
 import FlagListState from './states/FlagListState';
 import addFlagControl from './addFlagControl';
 import addFlagsDropdown from './addFlagsDropdown';
 import addFlagsToPosts from './addFlagsToPosts';
 
-export { default as extend } from './extend';
-
 app.initializers.add('flarum-flags', () => {
+  Post.prototype.flags = Model.hasMany<Flag>('flags');
+  Post.prototype.canFlag = Model.attribute<boolean>('canFlag');
+
+  app.store.models.flags = Flag;
+
+  app.routes.flags = { path: '/flags', component: FlagsPage };
+
   app.flags = new FlagListState(app);
 
   addFlagControl();
@@ -18,5 +26,6 @@ app.initializers.add('flarum-flags', () => {
 // Expose compat API
 import flagsCompat from './compat';
 import { compat } from '@flarum/core/forum';
+import Post from 'flarum/common/models/Post';
 
 Object.assign(compat, flagsCompat);

extensions/flags/js/tsconfig.json

@@ -4,13 +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/**/*", "../../../*/*/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/*"],
+      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"],
-      "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"]
+      "@flarum/core/*": ["../vendor/flarum/core/js/dist-typings/*"]
     }
   }
 }

extensions/flags/src/AddCanFlagAttribute.php

@@ -40,7 +40,6 @@ class AddCanFlagAttribute
             // If $actor is the post author, check to see if the setting is enabled
             return (bool) $this->settings->get('flarum-flags.can_flag_own');
         }
-
         // $actor is not the post author
         return true;
     }

extensions/flags/src/Api/Controller/ListFlagsController.php

@@ -9,7 +9,6 @@
 
 namespace Flarum\Flags\Api\Controller;
 
-use Carbon\Carbon;
 use Flarum\Api\Controller\AbstractListController;
 use Flarum\Flags\Api\Serializer\FlagSerializer;
 use Flarum\Flags\Flag;
@@ -44,7 +43,7 @@ class ListFlagsController extends AbstractListController
 
         $actor->assertRegistered();
 
-        $actor->read_flags_at = Carbon::now();
+        $actor->read_flags_at = time();
         $actor->save();
 
         $flags = Flag::whereVisibleTo($actor)

extensions/flags/src/Api/Serializer/FlagSerializer.php

@@ -12,8 +12,6 @@ namespace Flarum\Flags\Api\Serializer;
 use Flarum\Api\Serializer\AbstractSerializer;
 use Flarum\Api\Serializer\BasicUserSerializer;
 use Flarum\Api\Serializer\PostSerializer;
-use Flarum\Flags\Flag;
-use InvalidArgumentException;
 
 class FlagSerializer extends AbstractSerializer
 {
@@ -22,19 +20,16 @@ class FlagSerializer extends AbstractSerializer
      */
     protected $type = 'flags';
 
+    /**
+     * {@inheritdoc}
+     */
     protected function getDefaultAttributes($flag)
     {
-        if (! ($flag instanceof Flag)) {
-            throw new InvalidArgumentException(
-                get_class($this).' can only serialize instances of '.Flag::class
-            );
-        }
-
         return [
-            'type' => $flag->type,
+            'type'         => $flag->type,
-            'reason' => $flag->reason,
+            'reason'       => $flag->reason,
             'reasonDetail' => $flag->reason_detail,
-            'createdAt' => $this->formatDate($flag->created_at),
+            'createdAt'    => $this->formatDate($flag->created_at),
         ];
     }
 

extensions/flags/src/Command/CreateFlagHandler.php

@@ -9,7 +9,6 @@
 
 namespace Flarum\Flags\Command;
 
-use Carbon\Carbon;
 use Flarum\Flags\Event\Created;
 use Flarum\Flags\Flag;
 use Flarum\Foundation\ValidationException;
@@ -100,7 +99,7 @@ class CreateFlagHandler
         $flag->type = 'user';
         $flag->reason = Arr::get($data, 'attributes.reason');
         $flag->reason_detail = Arr::get($data, 'attributes.reasonDetail');
-        $flag->created_at = Carbon::now();
+        $flag->created_at = time();
 
         $flag->save();
 

extensions/flags/src/Command/DeleteFlagsHandler.php

@@ -11,7 +11,7 @@ namespace Flarum\Flags\Command;
 
 use Flarum\Flags\Event\Deleting;
 use Flarum\Flags\Event\FlagsWillBeDeleted;
-use Flarum\Post\Post;
+use Flarum\Flags\Flag;
 use Flarum\Post\PostRepository;
 use Illuminate\Events\Dispatcher;
 
@@ -39,7 +39,7 @@ class DeleteFlagsHandler
 
     /**
      * @param DeleteFlags $command
-     * @return Post
+     * @return Flag
      */
     public function handle(DeleteFlags $command)
     {

extensions/flags/src/Flag.php

@@ -9,23 +9,11 @@
 
 namespace Flarum\Flags;
 
-use Carbon\Carbon;
 use Flarum\Database\AbstractModel;
 use Flarum\Database\ScopeVisibilityTrait;
 use Flarum\Post\Post;
 use Flarum\User\User;
 
-/**
- * @property int $post_id
- * @property int $user_id
- * @property string $type
- * @property string $reason
- * @property string $reason_detail
- * @property Carbon $created_at
- *
- * @property-read Post $post
- * @property-read User $user
- */
 class Flag extends AbstractModel
 {
     use ScopeVisibilityTrait;

extensions/lang-english/composer.json

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

extensions/likes/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.8"
+        "flarum/core": "^1.4"
     },
     "autoload": {
         "psr-4": {

extensions/likes/extend.php

@@ -13,15 +13,14 @@ use Flarum\Api\Controller;
 use Flarum\Api\Serializer\BasicUserSerializer;
 use Flarum\Api\Serializer\PostSerializer;
 use Flarum\Extend;
-use Flarum\Likes\Api\LoadLikesRelationship;
 use Flarum\Likes\Event\PostWasLiked;
 use Flarum\Likes\Event\PostWasUnliked;
 use Flarum\Likes\Notification\PostLikedBlueprint;
 use Flarum\Likes\Query\LikedByFilter;
-use Flarum\Likes\Query\LikedFilter;
+use Flarum\Post\Event\Deleted;
+use Flarum\Post\Event\Saving;
 use Flarum\Post\Filter\PostFilterer;
 use Flarum\Post\Post;
-use Flarum\User\Filter\UserFilterer;
 use Flarum\User\User;
 
 return [
@@ -44,44 +43,29 @@ return [
         ->hasMany('likes', BasicUserSerializer::class)
         ->attribute('canLike', function (PostSerializer $serializer, $model) {
             return (bool) $serializer->getActor()->can('like', $model);
-        })
-        ->attribute('likesCount', function (PostSerializer $serializer, $model) {
-            return $model->getAttribute('likes_count') ?: 0;
         }),
 
     (new Extend\ApiController(Controller\ShowDiscussionController::class))
-        ->addInclude('posts.likes')
+        ->addInclude('posts.likes'),
-        ->loadWhere('posts.likes', [LoadLikesRelationship::class, 'mutateRelation'])
-        ->prepareDataForSerialization([LoadLikesRelationship::class, 'countRelation']),
 
     (new Extend\ApiController(Controller\ListPostsController::class))
-        ->addInclude('likes')
+        ->addInclude('likes'),
-        ->loadWhere('likes', [LoadLikesRelationship::class, 'mutateRelation'])
-        ->prepareDataForSerialization([LoadLikesRelationship::class, 'countRelation']),
     (new Extend\ApiController(Controller\ShowPostController::class))
-        ->addInclude('likes')
+        ->addInclude('likes'),
-        ->loadWhere('likes', [LoadLikesRelationship::class, 'mutateRelation'])
-        ->prepareDataForSerialization([LoadLikesRelationship::class, 'countRelation']),
     (new Extend\ApiController(Controller\CreatePostController::class))
-        ->addInclude('likes')
+        ->addInclude('likes'),
-        ->loadWhere('likes', [LoadLikesRelationship::class, 'mutateRelation'])
-        ->prepareDataForSerialization([LoadLikesRelationship::class, 'countRelation']),
     (new Extend\ApiController(Controller\UpdatePostController::class))
-        ->addInclude('likes')
+        ->addInclude('likes'),
-        ->loadWhere('likes', [LoadLikesRelationship::class, 'mutateRelation'])
-        ->prepareDataForSerialization([LoadLikesRelationship::class, 'countRelation']),
 
     (new Extend\Event())
         ->listen(PostWasLiked::class, Listener\SendNotificationWhenPostIsLiked::class)
         ->listen(PostWasUnliked::class, Listener\SendNotificationWhenPostIsUnliked::class)
-        ->subscribe(Listener\SaveLikesToDatabase::class),
+        ->listen(Deleted::class, [Listener\SaveLikesToDatabase::class, 'whenPostIsDeleted'])
+        ->listen(Saving::class, [Listener\SaveLikesToDatabase::class, 'whenPostIsSaving']),
 
     (new Extend\Filter(PostFilterer::class))
         ->addFilter(LikedByFilter::class),
 
-    (new Extend\Filter(UserFilterer::class))
-        ->addFilter(LikedFilter::class),
-
     (new Extend\Settings())
         ->default('flarum-likes.like_own_post', true),