Apply fixes from StyleCI

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

[skip ci]

.gitattributes

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

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,26 +1,7 @@
 ---
 name: "🚀 Feature Request"
-about: "I have a suggestion (and may want to implement it!)"
+about: "If you have a suggestion please head over to our forum!"
 
 ---
 
-<!--
-IMPORTANT: Feature requests on this GitHub issue tracker are only accepted in case they have been approved by a core developer or contain extensive argumentation and directions for implementation. For all other feature requests, ideas and feedback please post in the Flarum Community: https://discuss.flarum.org/t/feedback.
--->
-
-## Feature Request
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. eg. I have an issue when [...]
-
-**Describe the solution you'd like**
-A detailed description of your proposed solution. Include:
-- How the feature would work/behave
-- Any potential drawbacks
-- Maybe a screenshot, design, or example code
-
-**Justify why this feature belongs in Flarum's core, rather than in a third-party extension**
-Consider who this change will be useful to – most Flarum forums, or just a few?
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
+We primarily use GitHub as a bug tracker and issue tracker for items we are sure to tackle in the near future. For feature requests, ideas and feedback please post in the Flarum Community: https://discuss.flarum.org/t/proposals. Feature requests are added to GitHub only when they have been accepted by the development team and implementation details have been laid out.

.github/ISSUE_TEMPLATE/support-question.md

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

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/akismet
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/approval
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./framework/core
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/embed
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/emoji
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -12,11 +12,12 @@ jobs:
     with:
       enable_bundlewatch: false
       enable_prettier: true
-      enable_typescript: false
+      enable_typescript: true
 
       frontend_directory: ./extensions/flags/js
       backend_directory: ./extensions/flags
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/likes
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/lock
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/markdown
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/mentions
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/nicknames
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -0,0 +1,15 @@
+name: Package Manager PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
+jobs:
+  run:
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
+    with:
+      enable_backend_testing: true
+
+      backend_directory: ./extensions/package-manager

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/package-manager
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/pusher
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/statistics
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/sticky
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/subscriptions
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -18,5 +18,6 @@ jobs:
       backend_directory: ./extensions/suspend
       js_package_manager: yarn
       main_git_branch: main
+
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

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

@@ -12,7 +12,7 @@ jobs:
     with:
       enable_bundlewatch: false
       enable_prettier: false
-      enable_typescript: false
+      enable_typescript: true
 
       frontend_directory: ./extensions/tags/js
       backend_directory: ./extensions/tags

.gitignore

@@ -1 +1,3 @@
-node_modules
+node_modules
+vendor
+composer.lock

composer.json

@@ -0,0 +1,182 @@
+{
+    "name": "flarum/framework",
+    "description": "Delightfully simple forum software.",
+    "keywords": [
+        "forum",
+        "discussion"
+    ],
+    "homepage": "https://flarum.org/",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Flarum",
+            "email": "info@flarum.org",
+            "homepage": "https://flarum.org/team"
+        }
+    ],
+    "funding": [
+        {
+            "type": "opencollective",
+            "url": "https://opencollective.com/flarum"
+        },
+        {
+            "type": "github",
+            "url": "https://github.com/sponsors/flarum"
+        },
+        {
+            "type": "other",
+            "url": "https://flarum.org/donate"
+        }
+    ],
+    "support": {
+        "issues": "https://github.com/flarum/core/issues",
+        "source": "https://github.com/flarum/core",
+        "docs": "https://docs.flarum.org",
+        "forum": "https://discuss.flarum.org",
+        "chat": "https://flarum.org/chat"
+    },
+    "autoload": {
+        "psr-4": {
+            "Flarum\\": "framework/core/src",
+            "Flarum\\Akismet\\": "extensions/akismet/src",
+            "Flarum\\Approval\\": "extensions/approval/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\\PackageManager\\": "extensions/package-manager/src",
+            "Flarum\\Pusher\\": "extensions/pusher/src",
+            "Flarum\\Statistics\\": "extensions/statistics/src",
+            "Flarum\\Sticky\\": "extensions/sticky/src",
+            "Flarum\\Subscriptions\\": "extensions/subscriptions/src",
+            "Flarum\\Suspend\\": "extensions/suspend/src",
+            "Flarum\\Tags\\": "extensions/tags/src",
+            "Flarum\\PHPStan\\": "php-packages/phpstan/src",
+            "Flarum\\Testing\\": "php-packages/testing/src"
+        },
+        "files": [
+            "framework/core/src/helpers.php"
+        ]
+    },
+    "replace": {
+        "flarum/core": "self.version",
+        "flarum/akismet": "self.version",
+        "flarum/approval": "self.version",
+        "flarum/bbcode": "self.version",
+        "flarum/embed": "self.version",
+        "flarum/emoji": "self.version",
+        "flarum/flags": "self.version",
+        "flarum/lang-english": "self.version",
+        "flarum/likes": "self.version",
+        "flarum/lock": "self.version",
+        "flarum/markdown": "self.version",
+        "flarum/mentions": "self.version",
+        "flarum/nicknames": "self.version",
+        "flarum/package-manager": "self.version",
+        "flarum/pusher": "self.version",
+        "flarum/statistics": "self.version",
+        "flarum/sticky": "self.version",
+        "flarum/subscriptions": "self.version",
+        "flarum/suspend": "self.version",
+        "flarum/tags": "self.version",
+        "flarum/phpstan": "self.version",
+        "flarum/testing": "self.version"
+    },
+    "require": {
+        "ext-json": "*",
+        "php": ">=7.3",
+        "axy/sourcemap": "^0.1.4",
+        "components/font-awesome": "^5.14.0",
+        "composer/composer": "^2.0",
+        "dflydev/fig-cookies": "^3.0.0",
+        "doctrine/dbal": "^2.7",
+        "dragonmantank/cron-expression": "^3.1.0",
+        "franzl/whoops-middleware": "^2.0.0",
+        "guzzlehttp/guzzle": "^7.4",
+        "illuminate/bus": "^8.0",
+        "illuminate/cache": "^8.0",
+        "illuminate/config": "^8.0",
+        "illuminate/console": "^8.0",
+        "illuminate/container": "^8.0",
+        "illuminate/contracts": "^8.0",
+        "illuminate/database": "^8.0",
+        "illuminate/events": "^8.0",
+        "illuminate/filesystem": "^8.0",
+        "illuminate/hashing": "^8.0",
+        "illuminate/mail": "^8.0",
+        "illuminate/queue": "^8.0",
+        "illuminate/session": "^8.0",
+        "illuminate/support": "^8.0",
+        "illuminate/validation": "^8.0",
+        "illuminate/view": "^8.0",
+        "intervention/image": "2.5.* || ^2.6.1",
+        "laminas/laminas-diactoros": "^2.4.1",
+        "laminas/laminas-httphandlerrunner": "^1.2.0",
+        "laminas/laminas-stratigility": "^3.2.2",
+        "league/flysystem": "^1.0.11",
+        "matthiasmullie/minify": "^1.3",
+        "middlewares/base-path": "^2.0.1",
+        "middlewares/base-path-router": "^2.0.1",
+        "middlewares/request-handler": "^2.0.1",
+        "monolog/monolog": "^1.16.0",
+        "nesbot/carbon": "^2.0",
+        "nikic/fast-route": "^0.6",
+        "psr/http-message": "^1.0",
+        "psr/http-server-handler": "^1.0",
+        "psr/http-server-middleware": "^1.0",
+        "pusher/pusher-php-server": "^2.2",
+        "s9e/text-formatter": "^2.3.6",
+        "symfony/config": "^5.2.2",
+        "symfony/console": "^5.2.2",
+        "symfony/event-dispatcher": "^5.2.2",
+        "symfony/mime": "^5.2.0",
+        "symfony/polyfill-intl-messageformatter": "^1.22.0",
+        "symfony/translation": "^5.1.5",
+        "symfony/yaml": "^5.2.2",
+        "tobscure/json-api": "^0.3.0",
+        "wikimedia/less.php": "^3.0"
+    },
+    "require-dev": {
+        "mockery/mockery": "^1.4",
+        "phpunit/phpunit": "^9.0",
+        "phpstan/phpstan-php-parser": "^1.0",
+        "phpstan/phpstan": "^1.2"
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true,
+    "extra": {
+        "flarum-subextensions": [
+            "extensions/akismet",
+            "extensions/approval",
+            "extensions/bbcode",
+            "extensions/embed",
+            "extensions/emoji",
+            "extensions/flags",
+            "extensions/lang-english",
+            "extensions/likes",
+            "extensions/lock",
+            "extensions/markdown",
+            "extensions/mentions",
+            "extensions/nicknames",
+            "extensions/package-manager",
+            "extensions/pusher",
+            "extensions/statistics",
+            "extensions/sticky",
+            "extensions/subscriptions",
+            "extensions/suspend",
+            "extensions/tags"
+        ],
+        "branch-alias": {
+            "dev-main": "1.x-dev"
+        },
+        "phpstan": {
+            "includes": [
+                "extension.neon"
+            ]
+        }
+    }
+}

extensions/akismet/.gitattributes

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

extensions/akismet/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.2",
+        "flarum/core": "^1.3",
         "flarum/approval": "^1.2",
         "guzzlehttp/guzzle": "^7.4"
     },

extensions/akismet/js/dist/forum.js

@@ -1,2 +1,2 @@
-(()=>{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 u=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();o&&o.some((function(t){return"akismet"===t.type()}))&&(t.get("approve").children=a().translator.trans("flarum-akismet.forum.post.not_spam_button"))}})),(0,o.override)(u().prototype,"flagReason",(function(t,e){return"akismet"===e.type()?a().translator.trans("flarum-akismet.forum.post.akismet_flagged_text"):t(e)}))}))})(),module.exports=e})();
+(()=>{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,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,aCQxDC,IAAAA,aAAAA,IAAqB,kBAAkB,YACrCC,EAAAA,EAAAA,QAAOC,IAAc,uBAAuB,SAAUC,EAAiBC,GACrE,GAAID,EAAME,IAAI,WAAY,CACxB,IAAMC,EAAQF,EAAKE,QAEfA,GAASA,EAAMC,MAAK,SAACC,GAAD,MAA0B,YAAhBA,EAAKC,YACrCN,EAAMf,IAAI,WAAWsB,SAAWV,IAAAA,WAAAA,MAAqB,mDAK3DW,EAAAA,EAAAA,UAASC,IAAAA,UAAuB,cAAc,SAAUC,EAAUL,GAChE,MAAoB,YAAhBA,EAAKC,OACAT,IAAAA,WAAAA,MAAqB,kDAGvBa,EAASL,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';\n\nimport PostControls from 'flarum/forum/utils/PostControls';\nimport CommentPost from 'flarum/forum/components/CommentPost';\nimport ItemList from 'flarum/common/utils/ItemList';\nimport Post from 'flarum/common/models/Post';\n\napp.initializers.add('flarum-akismet', () => {\n  extend(PostControls, 'destructiveControls', function (items: ItemList, post: Post) {\n    if (items.has('approve')) {\n      const flags = post.flags();\n\n      if (flags && flags.some((flag) => flag.type() === 'akismet')) {\n        items.get('approve').children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');\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","children","override","CommentPost","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

@@ -12,7 +12,7 @@
         "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 && tsc && yarn run post-build-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'"
     },
     "devDependencies": {

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

@@ -1,18 +1,22 @@
 import { extend, override } from 'flarum/common/extend';
 import app from 'flarum/forum/app';
+import type Post from 'flarum/common/models/Post';
+import type ItemList from 'flarum/common/utils/ItemList';
 
 import PostControls from 'flarum/forum/utils/PostControls';
 import CommentPost from 'flarum/forum/components/CommentPost';
-import ItemList from 'flarum/common/utils/ItemList';
-import Post from 'flarum/common/models/Post';
+import type Mithril from 'mithril';
 
 app.initializers.add('flarum-akismet', () => {
-  extend(PostControls, 'destructiveControls', function (items: ItemList, post: Post) {
+  extend(PostControls, 'destructiveControls', function (items: ItemList<Mithril.Children>, post: Post) {
     if (items.has('approve')) {
       const flags = post.flags();
 
-      if (flags && flags.some((flag) => flag.type() === 'akismet')) {
-        items.get('approve').children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');
+      if (flags && flags.some((flag) => flag?.type() === 'akismet')) {
+        const approveItem = items.get('approve');
+        if (approveItem && typeof approveItem === 'object' && 'children' in approveItem) {
+          approveItem.children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');
+        }
       }
     }
   });

extensions/akismet/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/**/*", "../vendor/flarum/core/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/*": ["../vendor/flarum/core/js/dist-typings/*"]
+      "flarum/*": ["../vendor/flarum/core/js/dist-typings/*"],
+      "flarum/flags/*": ["../vendor/flarum/flags/js/dist-typings/*"]
     }
   }
 }

extensions/approval/.gitattributes

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

extensions/approval/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.2",
+        "flarum/core": "^1.3",
         "flarum/flags": "^1.2"
     },
     "autoload": {

extensions/approval/src/Listener/UnapproveNewContent.php

@@ -24,7 +24,7 @@ class UnapproveNewContent
         $post = $event->post;
 
         if (! $post->exists) {
-            $ability = $post->discussion->post_number_index == 0 ? 'startWithoutApproval' : 'replyWithoutApproval';
+            $ability = $post->discussion->first_post_id === null ? 'startWithoutApproval' : 'replyWithoutApproval';
 
             if ($event->actor->can($ability, $post->discussion)) {
                 if ($post->is_approved === null) {

extensions/bbcode/.gitattributes

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

extensions/bbcode/composer.json

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

extensions/embed/.gitattributes

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

extensions/embed/composer.json

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

extensions/emoji/.gitattributes

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

extensions/emoji/composer.json

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

extensions/emoji/js/package.json

@@ -4,18 +4,18 @@
     "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
     "dependencies": {
-        "simple-emoji-map": "^0.4.1",
-        "twemoji": "^13.1.0"
+        "simple-emoji-map": "^0.5.1",
+        "twemoji": "^14.0.2"
     },
     "devDependencies": {
-        "prettier": "^2.5.1",
-        "flarum-webpack-config": "^2.0.0",
-        "webpack": "^5.65.0",
-        "webpack-cli": "^4.9.1",
         "@flarum/prettier-config": "^1.0.0",
         "flarum-tsconfig": "^1.0.2",
+        "flarum-webpack-config": "^2.0.0",
+        "prettier": "^2.5.1",
         "typescript": "^4.5.4",
-        "typescript-coverage-report": "^0.6.1"
+        "typescript-coverage-report": "^0.6.1",
+        "webpack": "^5.65.0",
+        "webpack-cli": "^4.9.1"
     },
     "scripts": {
         "dev": "webpack --mode development --watch",

extensions/flags/.gitattributes

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

extensions/flags/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.2"
+        "flarum/core": "^1.3"
     },
     "autoload": {
         "psr-4": {
@@ -49,7 +49,7 @@
                 "gitConf": true,
                 "githubActions": true,
                 "prettier": true,
-                "typescript": false,
+                "typescript": true,
                 "bundlewatch": false,
                 "backendTesting": true,
                 "editorConfig": true,

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

@@ -0,0 +1,22 @@
+import Flag from '../forum/models/Flag';
+import FlagListState from '../forum/states/FlagListState';
+import Mithril from 'mithril';
+
+declare module 'flarum/common/models/Post' {
+  export default interface Post {
+    flags: () => false | (Flag | undefined)[];
+    canFlag: () => boolean;
+  }
+}
+
+declare module 'flarum/forum/ForumApplication' {
+  export default interface ForumApplication {
+    flags: FlagListState;
+  }
+}
+
+declare module 'flarum/forum/components/Post' {
+  export default interface Post {
+    flagReason: (flag: Flag) => Mithril.Children;
+  }
+}

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

@@ -0,0 +1 @@
+export {};

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

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

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

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

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

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

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

@@ -0,0 +1,19 @@
+declare var _default: {
+    'flags/addFlagsToPosts': typeof addFlagsToPosts;
+    'flags/addFlagControl': typeof addFlagControl;
+    'flags/addFlagsDropdown': typeof addFlagsDropdown;
+    'flags/models/Flag': typeof Flag;
+    'flags/components/FlagList': typeof FlagList;
+    'flags/components/FlagPostModal': typeof FlagPostModal;
+    'flags/components/FlagsPage': typeof FlagsPage;
+    'flags/components/FlagsDropdown': typeof FlagsDropdown;
+};
+export default _default;
+import addFlagsToPosts from "./addFlagsToPosts";
+import addFlagControl from "./addFlagControl";
+import addFlagsDropdown from "./addFlagsDropdown";
+import Flag from "./models/Flag";
+import FlagList from "./components/FlagList";
+import FlagPostModal from "./components/FlagPostModal";
+import FlagsPage from "./components/FlagsPage";
+import FlagsDropdown from "./components/FlagsDropdown";

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

@@ -0,0 +1,5 @@
+export default class FlagList {
+    oninit(vnode: any): void;
+    state: any;
+    view(): JSX.Element;
+}

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

@@ -0,0 +1,12 @@
+export default class FlagPostModal {
+    oninit(vnode: any): void;
+    success: boolean | undefined;
+    reason: any;
+    reasonDetail: any;
+    className(): string;
+    title(): any;
+    content(): JSX.Element;
+    flagReasons(): any;
+    onsubmit(e: any): void;
+    loading: boolean | undefined;
+}

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

@@ -0,0 +1,7 @@
+export default class FlagsDropdown {
+    static initAttrs(attrs: any): void;
+    getMenu(): JSX.Element;
+    goToRoute(): void;
+    getUnreadCount(): any;
+    getNewCount(): any;
+}

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

@@ -0,0 +1,9 @@
+/**
+ * The `FlagsPage` component shows the flags list. It is only
+ * used on mobile devices where the flags dropdown is within the drawer.
+ */
+export default class FlagsPage {
+    oninit(vnode: any): void;
+    bodyClass: string | undefined;
+    view(): JSX.Element;
+}

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

@@ -0,0 +1 @@
+export {};

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

@@ -0,0 +1,9 @@
+import Model from 'flarum/common/Model';
+export default class Flag extends Model {
+    type(): any;
+    reason(): any;
+    reasonDetail(): any;
+    createdAt(): any;
+    post(): any;
+    user(): any;
+}

extensions/flags/js/dist-typings/forum/states/FlagListState.d.ts

@@ -0,0 +1,16 @@
+export default class FlagListState {
+    constructor(app: any);
+    app: any;
+    /**
+     * Whether or not the flags are loading.
+     *
+     * @type {Boolean}
+     */
+    loading: boolean;
+    /**
+     * Load flags into the application's cache if they haven't already
+     * been loaded.
+     */
+    load(): void;
+    cache: any;
+}

extensions/flags/js/dist/admin.js

@@ -1,2 +1,2 @@
-module.exports=function(e){var t={};function r(n){if(t[n])return t[n].exports;var a=t[n]={i:n,l:!1,exports:{}};return e[n].call(a.exports,a,a.exports,r),a.l=!0,a.exports}return r.m=e,r.c=t,r.d=function(e,t,n){r.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:n})},r.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var a in e)r.d(n,a,function(t){return e[t]}.bind(null,a));return n},r.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return r.d(t,"a",t),t},r.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},r.p="",r(r.s=24)}({24:function(e,t,r){"use strict";r.r(t);var n=r(5),a=r.n(n);a.a.initializers.add("flarum-flags",(function(){a.a.extensionData.for("flarum-flags").registerSetting({setting:"flarum-flags.guidelines_url",type:"text",label:a.a.translator.trans("flarum-flags.admin.settings.guidelines_url_label")},15).registerSetting({setting:"flarum-flags.can_flag_own",type:"boolean",label:a.a.translator.trans("flarum-flags.admin.settings.flag_own_posts_label")}).registerPermission({icon:"fas fa-flag",label:a.a.translator.trans("flarum-flags.admin.permissions.view_flags_label"),permission:"discussion.viewFlags"},"moderate",65).registerPermission({icon:"fas fa-flag",label:a.a.translator.trans("flarum-flags.admin.permissions.flag_posts_label"),permission:"discussion.flagPosts"},"reply",65)}))},5:function(e,t){e.exports=flarum.core.compat["admin/app"]}});
+(()=>{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/package.json

@@ -3,12 +3,8 @@
     "name": "@flarum/flags",
     "version": "0.0.0",
     "prettier": "@flarum/prettier-config",
-    "dependencies": {
-        "@flarum/prettier-config": "^1.0.0",
-        "flarum-webpack-config": "^1.0.0",
-        "flarum-tsconfig": "^1.0.2"
-    },
     "devDependencies": {
+        "@types/mithril": "^2.0.8",
         "prettier": "^2.5.1",
         "flarum-webpack-config": "^2.0.0",
         "webpack": "^5.65.0",
@@ -25,8 +21,9 @@
         "format-check": "prettier --check src",
         "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",
+        "build-typings": "yarn run clean-typings && ([ -e src/@types ] && cp -r src/@types dist-typings/@types || true) && tsc && yarn run post-build-typings",
         "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

@@ -0,0 +1,22 @@
+import Flag from '../forum/models/Flag';
+import FlagListState from '../forum/states/FlagListState';
+import Mithril from 'mithril';
+
+declare module 'flarum/common/models/Post' {
+  export default interface Post {
+    flags: () => false | (Flag | undefined)[];
+    canFlag: () => boolean;
+  }
+}
+
+declare module 'flarum/forum/ForumApplication' {
+  export default interface ForumApplication {
+    flags: FlagListState;
+  }
+}
+
+declare module 'flarum/forum/components/Post' {
+  export default interface Post {
+    flagReason: (flag: Flag) => Mithril.Children;
+  }
+}

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

@@ -9,8 +9,8 @@ import addFlagsDropdown from './addFlagsDropdown';
 import addFlagsToPosts from './addFlagsToPosts';
 
 app.initializers.add('flarum-flags', () => {
-  app.store.models.posts.prototype.flags = Model.hasMany('flags');
-  app.store.models.posts.prototype.canFlag = Model.attribute('canFlag');
+  Post.prototype.flags = Model.hasMany<Flag>('flags');
+  Post.prototype.canFlag = Model.attribute<boolean>('canFlag');
 
   app.store.models.flags = Flag;
 
@@ -26,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/src/forum/models/Flag.js

@@ -1,15 +0,0 @@
-import Model from 'flarum/common/Model';
-
-class Flag extends Model {}
-
-Object.assign(Flag.prototype, {
-  type: Model.attribute('type'),
-  reason: Model.attribute('reason'),
-  reasonDetail: Model.attribute('reasonDetail'),
-  createdAt: Model.attribute('createdAt', Model.transformDate),
-
-  post: Model.hasOne('post'),
-  user: Model.hasOne('user'),
-});
-
-export default Flag;

extensions/flags/js/src/forum/models/Flag.ts

@@ -0,0 +1,25 @@
+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() {
+    return Model.attribute<string>('type').call(this);
+  }
+  reason() {
+    return Model.attribute<string | null>('reason').call(this);
+  }
+  reasonDetail() {
+    return Model.attribute<string | null>('reasonDetail').call(this);
+  }
+  createdAt() {
+    return Model.attribute('createdAt', Model.transformDate).call(this);
+  }
+
+  post() {
+    return Model.hasOne<Post>('post').call(this);
+  }
+  user() {
+    return Model.hasOne<User | null>('user').call(this);
+  }
+}

extensions/flags/js/tsconfig.json

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

extensions/lang-english/.gitattributes

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

extensions/lang-english/composer.json

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

extensions/likes/.gitattributes

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

extensions/likes/composer.json

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

extensions/lock/.gitattributes

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

extensions/lock/composer.json

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

extensions/markdown/.gitattributes

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

extensions/markdown/composer.json

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

extensions/mentions/.gitattributes

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

extensions/mentions/composer.json

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

extensions/mentions/src/ConfigureMentions.php

@@ -125,10 +125,13 @@ class ConfigureMentions
     {
         $post = CommentPost::find($tag->getAttribute('id'));
 
-        if ($post && $post->user) {
+        if ($post) {
             $tag->setAttribute('discussionid', (int) $post->discussion_id);
             $tag->setAttribute('number', (int) $post->number);
-            $tag->setAttribute('displayname', $post->user->display_name);
+
+            if ($post->user) {
+                $tag->setAttribute('displayname', $post->user->display_name);
+            }
 
             return true;
         }

extensions/mentions/src/Formatter/FormatUserMentions.php

@@ -45,7 +45,7 @@ class FormatUserMentions
     public function __invoke(Renderer $renderer, $context, string $xml)
     {
         return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) {
-            $user = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post)
+            $user = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
                 ? $context->mentionsUsers->find($attributes['id'])
                 : User::find($attributes['id']);
 

extensions/mentions/src/Formatter/UnparseUserMentions.php

@@ -51,7 +51,7 @@ class UnparseUserMentions
     protected function updateUserMentionTags($context, string $xml): string
     {
         return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) {
-            $user = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post)
+            $user = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
                 ? $context->mentionsUsers->find($attributes['id'])
                 : User::find($attributes['id']);
 

extensions/nicknames/.gitattributes

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

extensions/nicknames/composer.json

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

extensions/nicknames/src/AddNicknameValidation.php

@@ -40,7 +40,7 @@ class AddNicknameValidation
             function ($attribute, $value, $fail) {
                 $regex = $this->settings->get('flarum-nicknames.regex');
                 if ($regex && ! preg_match_all("/$regex/", $value)) {
-                    $this->translator->trans('flarum-nicknames.api.invalid_nickname_message');
+                    $fail($this->translator->trans('flarum-nicknames.api.invalid_nickname_message'));
                 }
             },
             'min:'.$this->settings->get('flarum-nicknames.min'),

extensions/nicknames/tests/integration/api/RegisterTest.php

@@ -74,4 +74,48 @@ class RegisterTest extends TestCase
 
         $this->assertEquals(403, $response->getStatusCode());
     }
+
+    /**
+     * @test
+     */
+    public function cant_register_with_nickname_if_invalid_regex()
+    {
+        $this->setting('flarum-nicknames.set_on_registration', true);
+        $this->setting('flarum-nicknames.regex', '^[A-z]+$');
+
+        $response = $this->send(
+            $this->request('POST', '/register', [
+                'json' => [
+                    'nickname' => '007',
+                    'username' => 'test',
+                    'password' => 'too-obscure',
+                    'email' => 'test@machine.local',
+                ]
+            ])
+        );
+
+        $this->assertEquals(422, $response->getStatusCode());
+    }
+
+    /**
+     * @test
+     */
+    public function can_register_with_nickname_if_valid_regex()
+    {
+        $this->setting('flarum-nicknames.set_on_registration', true);
+        $this->setting('flarum-nicknames.regex', '^[A-z]+$');
+
+        $response = $this->send(
+            $this->request('POST', '/register', [
+                'json' => [
+                    'nickname' => 'Acme',
+                    'username' => 'test',
+                    'password' => 'too-obscure',
+                    'email' => 'test@machine.local',
+                ]
+            ])
+        );
+
+        $this->assertEquals(201, $response->getStatusCode());
+    }
 }

extensions/package-manager/.gitattributes

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

extensions/package-manager/composer.json

@@ -23,7 +23,7 @@
     },
     "require": {
         "flarum/core": "^1.0.0",
-        "composer/composer": "^2.0"
+        "composer/composer": "^2.3"
     },
     "require-dev": {
         "flarum/testing": "^1.0.0",
@@ -86,7 +86,7 @@
         "test:integration": "phpunit -c tests/phpunit.integration.xml",
         "test:setup": [
             "@php tests/integration/setup.php",
-            "cd $FLARUM_TEST_TMP_DIR_LOCAL && composer install"
+            "cd ${FLARUM_TEST_TMP_DIR_LOCAL:-${FLARUM_TEST_TMP_DIR:-./tests/integration/tmp}} && composer install"
         ]
     },
     "scripts-descriptions": {

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

@@ -1,4 +1,3 @@
-/// <reference path="../../../vendor/flarum/core/js/src/common/translator-icu-rich.d.ts" />
 import Mithril from 'mithril';
 import Modal, { IInternalModalAttrs } from 'flarum/common/components/Modal';
 export interface WhyNotModalAttrs extends IInternalModalAttrs {
@@ -8,7 +7,7 @@ export default class WhyNotModal<Attrs extends WhyNotModalAttrs = WhyNotModalAtt
     loading: boolean;
     whyNot: string | null;
     className(): string;
-    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    title(): any;
     oncreate(vnode: Mithril.VnodeDOM<Attrs, this>): void;
     content(): JSX.Element;
     requestWhyNot(): void;