Update framework/core/js/src/forum/components/LogInButtons.tsx

Co-authored-by: David Wheatley <hi@davwheat.dev>

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,7 +1,26 @@
 ---
 name: "🚀 Feature Request"
-about: "If you have a suggestion please head over to our forum!"
+about: "I have a suggestion (and may want to implement it!)"
 
 ---
 
-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.
+<!--
+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.

.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 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!
+We primarily use GitHub as an issue tracker; 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-package-manager-backend.yml

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

.gitignore

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

composer.json

@@ -1,182 +0,0 @@
-{
-    "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/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3",
+        "flarum/core": "^1.2",
         "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 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})();
+(()=>{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})();
 //# 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,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":""}
+{"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":""}

extensions/approval/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3",
+        "flarum/core": "^1.2",
         "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->first_post_id === null ? 'startWithoutApproval' : 'replyWithoutApproval';
+            $ability = $post->discussion->post_number_index == 0 ? 'startWithoutApproval' : 'replyWithoutApproval';
 
             if ($event->actor->can($ability, $post->discussion)) {
                 if ($post->is_approved === null) {

extensions/bbcode/composer.json

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

extensions/embed/composer.json

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

extensions/emoji/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3"
+        "flarum/core": "^1.2"
     },
     "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.5.1",
-        "twemoji": "^14.0.2"
+        "simple-emoji-map": "^0.4.1",
+        "twemoji": "^13.1.0"
     },
     "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",
-        "webpack": "^5.65.0",
-        "webpack-cli": "^4.9.1"
+        "typescript-coverage-report": "^0.6.1"
     },
     "scripts": {
         "dev": "webpack --mode development --watch",

extensions/flags/composer.json

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

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

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

@@ -3,5 +3,5 @@ export default class FlagsDropdown {
     getMenu(): JSX.Element;
     goToRoute(): void;
     getUnreadCount(): any;
-    getNewCount(): any;
+    getNewCount(): unknown;
 }

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

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

extensions/flags/js/dist/admin.js

@@ -1,2 +1,2 @@
-(()=>{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})();
+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"]}});
 //# sourceMappingURL=admin.js.map

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

@@ -13,6 +13,9 @@ export default class FlagList extends Component {
     this.state = this.attrs.state;
   }
 
+  /**
+   * @return {import('mithril').Children}
+   */
   view() {
     const flags = this.state.cache || [];
 

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

@@ -24,6 +24,9 @@ export default class FlagPostModal extends Modal {
     return app.translator.trans('flarum-flags.forum.flag_post.title');
   }
 
+  /**
+   * @return {import('mithril').Children}
+   */
   content() {
     if (this.success) {
       return (

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

@@ -11,6 +11,9 @@ export default class FlagsDropdown extends NotificationsDropdown {
     super.initAttrs(attrs);
   }
 
+  /**
+   * @return {import('mithril').Children}
+   */
   getMenu() {
     return (
       <div className={'Dropdown-menu ' + this.attrs.menuClassName} onclick={this.menuClick.bind(this)}>

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

@@ -18,6 +18,9 @@ export default class FlagsPage extends Page {
     this.bodyClass = 'App--flags';
   }
 
+  /**
+   * @return {import('mithril').Children}
+   */
   view() {
     return (
       <div className="FlagsPage">

extensions/lang-english/composer.json

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

extensions/likes/composer.json

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

extensions/lock/composer.json

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

extensions/markdown/composer.json

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

extensions/mentions/composer.json

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

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 = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
+            $user = (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 = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
+            $user = (isset($context->getRelations()['mentionsUsers']) || $context instanceof Post)
                 ? $context->mentionsUsers->find($attributes['id'])
                 : User::find($attributes['id']);
 

extensions/nicknames/composer.json

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

extensions/package-manager/composer.json

@@ -23,7 +23,7 @@
     },
     "require": {
         "flarum/core": "^1.0.0",
-        "composer/composer": "^2.3"
+        "composer/composer": "^2.0"
     },
     "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:-${FLARUM_TEST_TMP_DIR:-./tests/integration/tmp}} && composer install"
+            "cd $FLARUM_TEST_TMP_DIR_LOCAL && composer install"
         ]
     },
     "scripts-descriptions": {

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

@@ -1,3 +1,4 @@
+/// <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 {
@@ -7,7 +8,7 @@ export default class WhyNotModal<Attrs extends WhyNotModalAttrs = WhyNotModalAtt
     loading: boolean;
     whyNot: string | null;
     className(): string;
-    title(): any;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
     oncreate(vnode: Mithril.VnodeDOM<Attrs, this>): void;
     content(): JSX.Element;
     requestWhyNot(): void;

extensions/package-manager/js/src/admin/components/Updater.tsx

@@ -64,7 +64,7 @@ export default class Updater<Attrs> extends Component<Attrs> {
     super.oninit(vnode);
   }
 
-  view() {
+  view(): Mithril.Children {
     const extensions = this.getExtensionUpdates();
     let coreUpdate: UpdatedPackage | undefined = this.getCoreUpdate();
     let core: any;

extensions/package-manager/js/src/admin/components/WhyNotModal.tsx

@@ -26,7 +26,7 @@ export default class WhyNotModal<Attrs extends WhyNotModalAttrs = WhyNotModalAtt
     this.requestWhyNot();
   }
 
-  content() {
+  content(): Mithril.Children {
     return <div className="Modal-body">{this.loading ? <LoadingIndicator /> : <pre className="WhyNotModal-contents">{this.whyNot}</pre>}</div>;
   }
 

extensions/package-manager/src/Command/CheckForUpdatesHandler.php

@@ -58,7 +58,7 @@ class CheckForUpdatesHandler
         $actor->assertAdmin();
 
         $firstOutput = $this->runComposerCommand(false);
-        $firstOutput = json_decode($this->cleanJson($firstOutput), true);
+        $firstOutput = json_decode($firstOutput, true);
 
         $majorUpdates = false;
 
@@ -71,7 +71,7 @@ class CheckForUpdatesHandler
 
         if ($majorUpdates) {
             $secondOutput = $this->runComposerCommand(true);
-            $secondOutput = json_decode($this->cleanJson($secondOutput), true);
+            $secondOutput = json_decode($secondOutput, true);
         }
 
         if (! isset($secondOutput)) {
@@ -101,15 +101,6 @@ class CheckForUpdatesHandler
             ->save();
     }
 
-    /**
-     * Composer can sometimes return text above the JSON.
-     * This method tries to remove such occurences.
-     */
-    protected function cleanJson(string $composerOutput): string
-    {
-        return preg_replace('/^[^{]+\n({.*)/ms', '$1', $composerOutput);
-    }
-
     /**
      * @throws ComposerCommandFailedException
      */

extensions/package-manager/tests/integration/SetupComposer.php

@@ -15,11 +15,27 @@ class SetupComposer
 {
     use UsesTmpDir;
 
-    private $config;
+    private $config = [
+        'require' => [
+            'flarum/core' => '1.0.0',
+            'flarum/tags' => '1.0.3',
+            'flarum/lang-english' => '*',
+        ],
+        'config' => [
+            'preferred-install' => 'dist',
+            'sort-packages' => true,
+        ],
+        'repositories' => [
+            [
+                'type' => 'path',
+                'url' => __DIR__.'/tmp/packages/*',
+            ]
+        ]
+    ];
 
     public function __construct(array $config = null)
     {
-        $this->config = $config;
+        $this->config = array_merge($this->config, $config ?? []);
     }
 
     public function run()
@@ -28,7 +44,7 @@ class SetupComposer
         $composerLock = $this->tmpDir().'/composer.lock';
         $packages = $this->tmpDir().'/packages';
 
-        file_put_contents($composerJson, json_encode($this->getConfig(), JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
+        file_put_contents($composerJson, json_encode($this->config, JSON_UNESCAPED_SLASHES | JSON_PRETTY_PRINT));
 
         if (! file_exists($packages)) {
             mkdir($packages);
@@ -37,28 +53,5 @@ class SetupComposer
         if (file_exists($composerLock)) {
             unlink($composerLock);
         }
-
-        echo 'composer.json created with testing packages directory.';
-    }
-
-    private function getConfig(): array
-    {
-        return array_merge([
-            'require' => [
-                'flarum/core' => '1.0.0',
-                'flarum/tags' => '1.0.3',
-                'flarum/lang-english' => '*',
-            ],
-            'config' => [
-                'preferred-install' => 'dist',
-                'sort-packages' => true,
-            ],
-            'repositories' => [
-                [
-                    'type' => 'path',
-                    'url' => realpath($this->tmpDir()).'/packages/*',
-                ]
-            ]
-        ], $this->config ?? []);
     }
 }

extensions/package-manager/tests/phpunit.integration.xml

@@ -19,7 +19,10 @@
     <testsuites>
         <testsuite name="Flarum Integration Tests">
             <directory suffix="Test.php">./integration</directory>
-            <exclude>./integration/tmp</exclude>
+             <exclude>./integration/tmp</exclude>
         </testsuite>
     </testsuites>
+    <php>
+        <env name="FLARUM_TEST_TMP_DIR_LOCAL" value="tests/integration/tmp" force="true" />
+    </php>
 </phpunit>

extensions/pusher/composer.json

@@ -19,7 +19,7 @@
         }
     ],
     "require": {
-        "flarum/core": "^1.3",
+        "flarum/core": "^1.2",
         "pusher/pusher-php-server": "^2.2"
     },
     "require-dev": {

extensions/statistics/composer.json

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

extensions/statistics/js/src/admin/components/StatisticsWidget.js

@@ -46,6 +46,9 @@ export default class StatisticsWidget extends DashboardWidget {
     return 'StatisticsWidget';
   }
 
+  /**
+   * @return {import('mithril').Children}
+   */
   content() {
     const thisPeriod = this.periods[this.selectedPeriod];
 

extensions/sticky/composer.json

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

extensions/subscriptions/composer.json

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

extensions/subscriptions/js/src/forum/addSubscriptionFilter.js

@@ -38,13 +38,7 @@ export default function addSubscriptionFilter() {
 
   extend(DiscussionListState.prototype, 'requestParams', function (params) {
     if (this.params.onFollowing) {
-      params.filter ||= {};
-
-      if (params.filter.q) {
-        params.filter.q += ' is:following';
-      } else {
-        params.filter.subscription = 'following';
-      }
+      params.filter.subscription = 'following';
     }
   });
 }

extensions/suspend/composer.json

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

extensions/tags/composer.json

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

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

@@ -19,20 +19,3 @@ declare module 'flarum/common/models/Discussion' {
     canTag: () => boolean | undefined;
   }
 }
-
-declare module 'flarum/forum/components/IndexPage' {
-  export default interface IndexPage {
-    currentActiveTag?: Tag;
-    currentTagLoading?: boolean;
-    currentTag: () => Tag | undefined;
-  }
-}
-
-declare module 'flarum/admin/components/PermissionGrid' {
-  export interface PermissionConfig {
-    tagScoped?: boolean;
-  }
-  export default interface PermissionGrid {
-    loading?: boolean;
-  }
-}

extensions/tags/js/dist-typings/admin/addTagsPermissionScope.d.ts

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

extensions/tags/js/dist-typings/admin/components/EditTagModal.d.ts

@@ -1,29 +1,22 @@
-import Modal, { IInternalModalAttrs } from 'flarum/common/components/Modal';
-import Stream from 'flarum/common/utils/Stream';
-import type Mithril from 'mithril';
-import type Tag from '../../common/models/Tag';
-export interface EditTagModalAttrs extends IInternalModalAttrs {
-    primary?: boolean;
-    model?: Tag;
-}
+/// <reference types="flarum/@types/translator-icu-rich" />
 /**
  * The `EditTagModal` component shows a modal dialog which allows the user
  * to create or edit a tag.
  */
-export default class EditTagModal extends Modal<EditTagModalAttrs> {
-    tag: Tag;
-    name: Stream<string>;
-    slug: Stream<string>;
-    description: Stream<string>;
-    color: Stream<string>;
-    icon: Stream<string>;
-    isHidden: Stream<boolean>;
-    primary: Stream<boolean>;
-    oninit(vnode: Mithril.Vnode<EditTagModalAttrs, this>): void;
-    className(): string;
-    title(): any;
+export default class EditTagModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs> {
+    constructor();
+    oninit(vnode: any): void;
+    tag: any;
+    name: Stream<any> | undefined;
+    slug: Stream<any> | undefined;
+    description: Stream<any> | undefined;
+    color: Stream<any> | undefined;
+    icon: Stream<any> | undefined;
+    isHidden: Stream<any> | undefined;
+    primary: Stream<any> | undefined;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray | import("mithril").Vnode<any, any>;
     content(): JSX.Element;
-    fields(): any;
+    fields(): ItemList<any>;
     submitData(): {
         name: any;
         slug: any;
@@ -33,6 +26,9 @@ export default class EditTagModal extends Modal<EditTagModalAttrs> {
         isHidden: any;
         primary: any;
     };
-    onsubmit(e: SubmitEvent): void;
+    onsubmit(e: any): void;
     delete(): void;
 }
+import Modal from "flarum/common/components/Modal";
+import Stream from "flarum/common/utils/Stream";
+import ItemList from "flarum/common/utils/ItemList";

extensions/tags/js/dist-typings/admin/components/TagsPage.d.ts

@@ -1,9 +1,10 @@
-export default class TagsPage {
+export default class TagsPage extends ExtensionPage<import("flarum/admin/components/ExtensionPage").ExtensionPageAttrs> {
+    constructor();
     oninit(vnode: any): void;
     forcedRefreshKey: number | undefined;
-    loading: boolean | undefined;
     content(): JSX.Element;
     onListOnCreate(vnode: any): void;
     setMinTags(minTags: any, maxTags: any, value: any): void;
     onSortUpdate(e: any): void;
 }
+import ExtensionPage from "flarum/admin/components/ExtensionPage";

extensions/tags/js/dist-typings/common/helpers/tagLabel.d.ts

@@ -1 +1 @@
-export default function tagLabel(tag: any, attrs?: {}): any;
+export default function tagLabel(tag: any, attrs?: {}): import("mithril").Vnode<any, any>;

extensions/tags/js/dist-typings/common/models/Tag.d.ts

@@ -1,23 +1,24 @@
 import Model from 'flarum/common/Model';
+import Discussion from 'flarum/common/models/Discussion';
 export default class Tag extends Model {
-    name(): any;
-    slug(): any;
-    description(): any;
-    color(): any;
-    backgroundUrl(): any;
-    backgroundMode(): any;
-    icon(): any;
-    position(): any;
-    parent(): any;
-    children(): any;
-    defaultSort(): any;
-    isChild(): any;
-    isHidden(): any;
-    discussionCount(): any;
-    lastPostedAt(): any;
-    lastPostedDiscussion(): any;
-    isRestricted(): any;
-    canStartDiscussion(): any;
-    canAddToDiscussion(): any;
-    isPrimary(): any;
+    name(): string;
+    slug(): string;
+    description(): string | null;
+    color(): string | null;
+    backgroundUrl(): string | null;
+    backgroundMode(): string | null;
+    icon(): string | null;
+    position(): number | null;
+    parent(): false | Tag | null;
+    children(): false | (Tag | undefined)[];
+    defaultSort(): string | null;
+    isChild(): boolean;
+    isHidden(): boolean;
+    discussionCount(): number;
+    lastPostedAt(): Date | null | undefined;
+    lastPostedDiscussion(): false | Discussion | null;
+    isRestricted(): boolean;
+    canStartDiscussion(): boolean;
+    canAddToDiscussion(): boolean;
+    isPrimary(): boolean;
 }

extensions/tags/js/dist-typings/common/utils/sortTags.d.ts

@@ -1,2 +1 @@
-import Tag from "../models/Tag";
-export default function sortTags(tags: Tag[]): Tag[];
+export default function sortTags(tags: any): any;

extensions/tags/js/dist-typings/forum/addTagFilter.d.ts

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

extensions/tags/js/dist-typings/forum/components/DiscussionTaggedPost.d.ts

@@ -1,9 +1,9 @@
-export default class DiscussionTaggedPost {
+export default class DiscussionTaggedPost extends EventPost {
     static initAttrs(attrs: any): void;
-    icon(): string;
     descriptionKey(): "flarum-tags.forum.post_stream.added_and_removed_tags_text" | "flarum-tags.forum.post_stream.added_tags_text" | "flarum-tags.forum.post_stream.removed_tags_text";
     descriptionData(): {
         tagsAdded: any;
         tagsRemoved: any;
     };
 }
+import EventPost from "flarum/forum/components/EventPost";

extensions/tags/js/dist-typings/forum/components/TagDiscussionModal.d.ts

@@ -1,46 +1,44 @@
-import type Mithril from 'mithril';
-import Modal, { IInternalModalAttrs } from 'flarum/common/components/Modal';
-import Discussion from 'flarum/common/models/Discussion';
-import Tag from '../../common/models/Tag';
-export interface TagDiscussionModalAttrs extends IInternalModalAttrs {
-    discussion?: Discussion;
-    selectedTags?: Tag[];
-    onsubmit?: (tags: Tag[]) => {};
-}
-export default class TagDiscussionModal extends Modal<TagDiscussionModalAttrs> {
-    tagsLoading: boolean;
-    selected: Tag[];
-    filter: any;
-    focused: boolean;
+export default class TagDiscussionModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs> {
+    constructor();
+    oninit(vnode: any): void;
+    tagsLoading: boolean | undefined;
+    selected: any[] | undefined;
+    filter: Stream<string> | undefined;
+    focused: boolean | undefined;
     minPrimary: any;
     maxPrimary: any;
     minSecondary: any;
     maxSecondary: any;
-    bypassReqs: boolean;
-    navigator: any;
-    tags?: Tag[];
-    selectedTag?: Tag;
-    oninit(vnode: Mithril.Vnode<TagDiscussionModalAttrs, this>): void;
+    bypassReqs: any;
+    navigator: KeyboardNavigatable | undefined;
+    tags: any;
+    index: any;
     primaryCount(): number;
     secondaryCount(): number;
     /**
      * Add the given tag to the list of selected tags.
+     *
+     * @param {Tag} tag
      */
     addTag(tag: Tag): void;
     /**
      * Remove the given tag from the list of selected tags.
+     *
+     * @param {Tag} tag
      */
     removeTag(tag: Tag): void;
-    className(): string;
     title(): any;
-    getInstruction(primaryCount: number, secondaryCount: number): any;
+    getInstruction(primaryCount: any, secondaryCount: any): any;
     content(): JSX.Element | JSX.Element[];
-    meetsRequirements(primaryCount: number, secondaryCount: number): boolean;
-    toggleTag(tag: Tag): void;
-    select(e: KeyboardEvent): void;
-    selectableItems(): any;
-    getCurrentNumericIndex(): any;
-    getItem(selectedTag: Tag): any;
-    setIndex(index: number, scrollToItem: boolean): void;
-    onsubmit(e: SubmitEvent): void;
+    meetsRequirements(primaryCount: any, secondaryCount: any): boolean;
+    toggleTag(tag: any): void;
+    select(e: any): void;
+    selectableItems(): JQuery<HTMLElement>;
+    getCurrentNumericIndex(): number;
+    getItem(index: any): JQuery<HTMLElement>;
+    setIndex(index: any, scrollToItem: any): void;
+    onsubmit(e: any): void;
 }
+import Modal from "flarum/common/components/Modal";
+import Stream from "flarum/common/utils/Stream";
+import KeyboardNavigatable from "flarum/forum/utils/KeyboardNavigatable";

extensions/tags/js/dist-typings/forum/components/TagHero.d.ts

@@ -1,3 +1,5 @@
-export default class TagHero {
+export default class TagHero extends Component<import("flarum/common/Component").ComponentAttrs, undefined> {
+    constructor();
     view(): JSX.Element;
 }
+import Component from "flarum/common/Component";

extensions/tags/js/dist-typings/forum/components/TagLinkButton.d.ts

@@ -1,4 +1,5 @@
-export default class TagLinkButton {
+export default class TagLinkButton extends LinkButton {
     static initAttrs(attrs: any): void;
     view(vnode: any): JSX.Element;
 }
+import LinkButton from "flarum/common/components/LinkButton";

extensions/tags/js/dist-typings/forum/components/TagsPage.d.ts

@@ -1,7 +1,9 @@
-export default class TagsPage {
+export default class TagsPage extends Page<import("flarum/common/components/Page").IPageAttrs> {
+    constructor();
     oninit(vnode: any): void;
-    tags: any[] | undefined;
+    tags: any;
     loading: boolean | undefined;
     view(): JSX.Element;
     oncreate(vnode: any): void;
 }
+import Page from "flarum/common/components/Page";

extensions/tags/js/dist-typings/forum/components/ToggleButton.d.ts

@@ -1,6 +1,8 @@
 /**
  * @TODO move to core
  */
-export default class ToggleButton {
+export default class ToggleButton extends Component<import("flarum/common/Component").ComponentAttrs, undefined> {
+    constructor();
     view(vnode: any): JSX.Element;
 }
+import Component from "flarum/common/Component";

extensions/tags/js/dist-typings/forum/states/TagListState.d.ts

@@ -1,5 +1,5 @@
-import type Tag from "../../common/models/Tag";
+import Tag from "../../common/models/Tag";
 export default class TagListState {
     loadedIncludes: Set<unknown>;
-    load(includes?: string[]): Promise<Tag[]>;
+    load(includes?: never[]): Promise<Tag[]>;
 }

extensions/tags/js/src/admin/components/EditTagModal.tsx

@@ -7,7 +7,7 @@ import { slug } from 'flarum/common/utils/string';
 import Stream from 'flarum/common/utils/Stream';
 
 import tagLabel from '../../common/helpers/tagLabel';
-import type Mithril from 'mithril';
+import Mithril from 'mithril';
 import type Tag from '../../common/models/Tag';
 import extractText from 'flarum/common/utils/extractText';
 import { ModelIdentifier } from 'flarum/common/Model';
@@ -50,13 +50,13 @@ export default class EditTagModal extends Modal<EditTagModalAttrs> {
     return 'EditTagModal Modal--small';
   }
 
-  title() {
+  title(): Mithril.Children {
     return this.name()
-      ? tagLabel(app.store.createRecord('tags', { attributes: this.submitData() }))
+      ? tagLabel(app.store.createRecord<Tag>('tags', { attributes: this.submitData() }))
       : app.translator.trans('flarum-tags.admin.edit_tag.title');
   }
 
-  content() {
+  content(): Mithril.Children {
     return (
       <div className="Modal-body">
         <div className="Form">
@@ -67,7 +67,7 @@ export default class EditTagModal extends Modal<EditTagModalAttrs> {
   }
 
   fields() {
-    const items = new ItemList();
+    const items = new ItemList<Mithril.Children>();
 
     items.add('name', <div className="Form-group">
       <label>{app.translator.trans('flarum-tags.admin.edit_tag.name_label')}</label>

extensions/tags/js/src/admin/components/TagsPage.js

@@ -51,6 +51,9 @@ export default class TagsPage extends ExtensionPage {
     });
   }
 
+  /**
+   * @return {import('mithril').Children}
+   */
   content() {
     if (this.loading) {
       return <LoadingIndicator />;
@@ -63,7 +66,7 @@ export default class TagsPage extends ExtensionPage {
     const maxSecondaryTags = this.setting('flarum-tags.max_secondary_tags', 0);
 
     const tags = sortTags(app.store.all('tags').filter(tag => !tag.parent()));
-    
+
     return (
       <div className="TagsContent">
         <div className="TagsContent-list">

extensions/tags/js/src/common/helpers/tagIcon.tsx

@@ -1,6 +1,9 @@
+import { ComponentAttrs } from 'flarum/common/Component';
 import classList from 'flarum/common/utils/classList';
+import type Tag from '../models/Tag';
+import type Mithril from 'mithril';
 
-export default function tagIcon(tag, attrs = {}, settings = {}) {
+export default function tagIcon(tag: Tag, attrs: ComponentAttrs = {}, settings: {useColor?: boolean} = {}): Mithril.Children {
   const hasIcon = tag && tag.icon();
   const { useColor = true } = settings;
 

extensions/tags/js/src/common/helpers/tagLabel.tsx

@@ -1,8 +1,13 @@
+import app from 'flarum/common/app';
+
 import extract from 'flarum/common/utils/extract';
 import Link from 'flarum/common/components/Link';
 import tagIcon from './tagIcon';
+import type Tag from '../models/Tag';
+import type { ComponentAttrs } from 'flarum/common/Component';
+import type Mithril from 'mithril';
 
-export default function tagLabel(tag, attrs = {}) {
+export default function tagLabel(tag?: Tag, attrs: ComponentAttrs = {}): Mithril.Children {
   attrs.style = attrs.style || {};
   attrs.className = 'TagLabel ' + (attrs.className || '');
 
@@ -28,11 +33,15 @@ export default function tagLabel(tag, attrs = {}) {
     attrs.className += ' untagged';
   }
 
-  return (
-    m((link ? Link : 'span'), attrs,
-      <span className="TagLabel-text">
+  const children = (
+    <span className="TagLabel-text">
         {tag && tag.icon() && tagIcon(tag, {}, {useColor: false})} {tagText}
       </span>
-    )
   );
+
+  if (link) {
+    return <Link {...attrs}>{children}</Link>
+  }
+
+  return <span {...attrs}>{children}</span>;
 }

extensions/tags/js/src/common/helpers/tagsLabel.tsx

@@ -1,15 +1,18 @@
 import extract from 'flarum/common/utils/extract';
 import tagLabel from './tagLabel';
 import sortTags from '../utils/sortTags';
+import type Tag from '../models/Tag';
+import type { ComponentAttrs } from 'flarum/common/Component';
+import type Mithril from 'mithril';
 
-export default function tagsLabel(tags, attrs = {}) {
+export default function tagsLabel(tags: Tag[], attrs: ComponentAttrs = {}): Mithril.Children {
   const children = [];
   const link = extract(attrs, 'link');
 
   attrs.className = 'TagsLabel ' + (attrs.className || '');
 
   if (tags) {
-    sortTags(tags).forEach(tag => {
+    sortTags(tags).forEach((tag: Tag) => {
       if (tag || tags.length === 1) {
         children.push(tagLabel(tag, {link}));
       }

extensions/tags/js/src/forum/components/TagDiscussionModal.tsx

@@ -139,6 +139,9 @@ export default class TagDiscussionModal extends Modal<TagDiscussionModalAttrs> {
     return '';
   }
 
+  /**
+   * @return {import('mithril').Children}
+   */
   content() {
     if (this.tagsLoading || !this.tags) {
       return <LoadingIndicator />;
@@ -322,7 +325,7 @@ export default class TagDiscussionModal extends Modal<TagDiscussionModalAttrs> {
 
     m.redraw();
 
-    if (scrollToItem && this.selectedTag) {
+    if (scrollToItem) {
       const dropdownScroll = $dropdown.scrollTop()!;
       const dropdownTop = $dropdown.offset()!.top;
       const dropdownBottom = dropdownTop + $dropdown.outerHeight()!;

extensions/tags/js/src/forum/components/TagHero.js

@@ -2,6 +2,9 @@ import Component from 'flarum/common/Component';
 import tagIcon from '../../common/helpers/tagIcon';
 
 export default class TagHero extends Component {
+  /**
+   * @return {import('mithril').Children}
+   */
   view() {
     const tag = this.attrs.model;
     const color = tag.color();

extensions/tags/js/src/forum/components/TagLinkButton.js

@@ -4,6 +4,9 @@ import classList from 'flarum/common/utils/classList';
 import tagIcon from '../../common/helpers/tagIcon';
 
 export default class TagLinkButton extends LinkButton {
+  /**
+   * @return {import('mithril').Children}
+   */
   view(vnode) {
     const tag = this.attrs.model;
     const active = this.constructor.isActive(this.attrs);

extensions/tags/js/src/forum/components/TagsPage.js

@@ -35,6 +35,9 @@ export default class TagsPage extends Page {
     });
   }
 
+  /**
+   * @return {import('mithril').Children}
+   */
   view() {
     if (this.loading) {
       return <LoadingIndicator />;

extensions/tags/js/src/forum/components/ToggleButton.js

@@ -6,6 +6,9 @@ import classList from 'flarum/common/utils/classList';
  * @TODO move to core
  */
 export default class ToggleButton extends Component {
+  /**
+   * @return {import('mithril').Children}
+   */
   view(vnode) {
     const { className, isToggled, ...attrs } = this.attrs;
     const icon = isToggled ? 'far fa-check-circle' : 'far fa-circle';

extensions/tags/less/forum/TagDiscussionModal.less

@@ -44,7 +44,6 @@
   }
 }
 .TagsInput {
-  .add-keyboard-focus-ring(":focus-within");
   padding-top: 0;
   padding-bottom: 0;
   overflow: hidden;
@@ -58,7 +57,6 @@
     border: 0 !important;
     padding: 0;
     max-width: 100%;
-    min-width: 1ch;
     margin-right: -100%;
     background: transparent !important;
   }
@@ -68,7 +66,6 @@
 }
 .TagsInput-selected {
   .TagsInput-tag {
-    display: inline-flex;
     margin-right: 5px;
 
     &:last-child {

flarum-monorepo.json

@@ -4,132 +4,132 @@
       {
         "name": "akismet",
         "gitRemote": "git@github.com:flarum/akismet.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "approval",
         "gitRemote": "git@github.com:flarum/approval.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "bbcode",
         "gitRemote": "git@github.com:flarum/bbcode.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "embed",
         "gitRemote": "git@github.com:flarum/embed.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "emoji",
         "gitRemote": "git@github.com:flarum/emoji.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "flags",
         "gitRemote": "git@github.com:flarum/flags.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "lang-english",
         "gitRemote": "git@github.com:flarum/lang-english.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "likes",
         "gitRemote": "git@github.com:flarum/likes.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "lock",
         "gitRemote": "git@github.com:flarum/lock.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "markdown",
         "gitRemote": "git@github.com:flarum/markdown.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "mentions",
         "gitRemote": "git@github.com:flarum/mentions.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "nicknames",
         "gitRemote": "git@github.com:flarum/nicknames.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "package-manager",
         "gitRemote": "git@github.com:flarum/package-manager.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "pusher",
         "gitRemote": "git@github.com:flarum/pusher.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "statistics",
         "gitRemote": "git@github.com:flarum/statistics.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "sticky",
         "gitRemote": "git@github.com:flarum/sticky.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "subscriptions",
         "gitRemote": "git@github.com:flarum/subscriptions.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "suspend",
         "gitRemote": "git@github.com:flarum/suspend.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "tags",
         "gitRemote": "git@github.com:flarum/tags.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       }
     ],
     "composer": [
       {
         "name": "testing",
         "gitRemote": "git@github.com:flarum/testing.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "phpstan",
         "gitRemote": "git@github.com:flarum/phpstan.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       }
     ],
     "npm": [
       {
         "name": "prettier-config",
         "gitRemote": "git@github.com:flarum/prettier-config.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "webpack-config",
         "gitRemote": "git@github.com:flarum/flarum-webpack-config.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       },
       {
         "name": "tsconfig",
         "gitRemote": "git@github.com:flarum/flarum-tsconfig.git",
-        "mainBranch": "main"
+        "mainBranch": "master"
       }
     ],
     "core": {
       "name": "core",
-      "gitRemote": "git@github.com:flarum/flarum-core.git",
-      "mainBranch": "main"
+      "gitRemote": "git@github.com:flarum/core.git",
+      "mainBranch": "master"
     }
   }
 }