feat: prioritize title score in fulltext search

Signed-off-by: Sami Mazouz <sychocouldy@gmail.com>

.editorconfig

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

.github/workflows/REUSABLE_backend.yml

@@ -25,7 +25,7 @@ on:
         description: Versions of PHP to test with. Should be array of strings encoded as JSON array
         type: string
         required: false
-        default: '["7.3", "7.4", "8.0", "8.1"]'
+        default: '["7.3", "7.4", "8.0", "8.1", "8.2"]'
 
       php_extensions:
         description: PHP extensions to install.
@@ -58,6 +58,7 @@ jobs:
         php: ${{ fromJSON(inputs.php_versions) }}
         service: ${{ fromJSON(inputs.db_versions) }}
         prefix: ['']
+        php_ini_values: [inputs.php_ini_values]
 
         # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstrategymatrixinclude
         include:
@@ -86,12 +87,24 @@ jobs:
             prefix: flarum_
             prefixStr: (prefix)
 
+          # @TODO: remove in 2.0
+          # Include testing PHP 8.2 with deprecation warnings disabled.
+          - php: 8.2
+            php_ini_values: error_reporting=E_ALL & ~E_DEPRECATED & ~E_USER_DEPRECATED
+
         # To reduce number of actions, we exclude some PHP versions from running with some DB versions.
         exclude:
           - php: ${{ fromJSON(inputs.php_versions)[1] }}
             service: 'mysql:8.0.30'
           - php: ${{ fromJSON(inputs.php_versions)[2] }}
             service: 'mysql:8.0.30'
+          - php: ${{ fromJSON(inputs.php_versions)[3] }}
+            service: 'mysql:8.0.30'
+
+          # @TODO: remove in 2.0
+          # Exclude testing PHP 8.2 with deprecation warnings enabled.
+          - php: 8.2
+            php_ini_values: error_reporting=E_ALL
 
     services:
       mysql:
@@ -115,7 +128,7 @@ jobs:
           coverage: xdebug
           extensions: ${{ inputs.php_extensions }}
           tools: phpunit, composer:v2
-          ini-values: ${{ inputs.php_ini_values }}
+          ini-values: ${{ matrix.php_ini_values }}
 
       # The authentication alter is necessary because newer mysql versions use the `caching_sha2_password` driver,
       # which isn't supported prior to PHP7.4
@@ -167,7 +180,7 @@ jobs:
           coverage: xdebug
           extensions: ${{ inputs.php_extensions }}
           tools: phpunit, composer:v2
-          ini-values: ${{ inputs.php_ini_values }}
+          ini-values: ${{ matrix.php_ini_values }}
 
       - name: Install Composer dependencies
         run: composer install

.github/workflows/REUSABLE_frontend.yml

@@ -28,6 +28,11 @@ on:
         type: string
         required: false
         default: check-typings-coverage
+      test_script:
+        description: "Script to run for tests. Empty value to disable."
+        type: string
+        required: false
+        default: test
 
       enable_bundlewatch:
         description: "Enable Bundlewatch?"
@@ -44,6 +49,11 @@ on:
         type: boolean
         default: true
         required: false
+      enable_tests:
+        description: "Enable Tests?"
+        type: boolean
+        default: false
+        required: false
 
       backend_directory:
         description: The directory of the project where backend code is located. This should contain a `composer.json` file, and is generally the root directory of the repo.
@@ -96,10 +106,10 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: ${{ inputs.node_version }}
           cache: ${{ inputs.js_package_manager }}
@@ -122,7 +132,7 @@ jobs:
         working-directory: ${{ inputs.frontend_directory }}
 
       - name: JS Checks & Production Build
-        uses: flarum/action-build@3
+        uses: flarum/action-build@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           build_script: ${{ inputs.build_script }}
@@ -130,6 +140,7 @@ jobs:
           format_script: ${{ inputs.enable_prettier == true && inputs.format_script || '' }}
           check_typings_script: ${{ inputs.enable_typescript == true && inputs.check_typings_script || '' }}
           type_coverage_script: ${{ inputs.enable_typescript == true && inputs.type_coverage_script || '' }}
+          test_script: ${{ inputs.enable_tests == true && inputs.test_script || '' }}
           package_manager: ${{ inputs.js_package_manager }}
           js_path: ${{ inputs.frontend_directory }}
           do_not_commit: ${{ github.ref != format('refs/heads/{0}', inputs.main_git_branch) || github.event_name != 'push' }}

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

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

.github/workflows/frontend.yml

@@ -11,6 +11,9 @@ jobs:
       js_package_manager: yarn
       cache_dependency_path: ./yarn.lock
       main_git_branch: main
+      enable_tests: true
+      # @TODO: fix bundlewatch
+      enable_bundlewatch: false
 
     secrets:
       bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+# [v1.6.3](https://github.com/flarum/framework/compare/v1.6.2...v1.6.3)
+### Fixed
+* Post mentions can be used to read any post on the forum without access control (ab1c868b978e8b0d09a5d682c54665dae17d0985).
+* Notifications can leak restricted content (d0a2b95dca57d3dae9a0d77b610b1cb1d0b1766a).
+* Any user including unactivated can reply in public discussions whose first post was permanently deleted (12f14112a0ecd1484d97330b82beb2a145919015).
+* (subscriptions) Post notifications not getting access checked (https://github.com/flarum/framework/commit/e5f05166a062a9a6eb7c12e28728bfd5db7270e3).
+
+## [v1.6.2](https://github.com/flarum/framework/compare/v1.6.1...v1.6.2)
+### Fixed
+* XSS Vulnerability in core (https://github.com/flarum/framework/pull/3684).
+
+## [v1.6.1](https://github.com/flarum/framework/compare/v1.6.0...v1.6.1)
+### Fixed
+* JS dependencies update breaks utilities.
+
 ## [v1.6.0](https://github.com/flarum/framework/compare/v1.5.0...v1.6.0)
 ### Fixed
 - (approval) posts approved for deleted users error ([b5874a0](b5874a08e482196f50af50aa78e43c93c29fb647))

composer.json

@@ -84,8 +84,8 @@
         "flarum/testing": "self.version"
     },
     "require": {
-        "ext-json": "*",
         "php": ">=7.3",
+        "ext-json": "*",
         "components/font-awesome": "^5.14.0",
         "composer/composer": "^2.0",
         "dflydev/fig-cookies": "^3.0.0",
@@ -110,8 +110,9 @@
         "illuminate/validation": "^8.0",
         "illuminate/view": "^8.0",
         "intervention/image": "2.5.* || ^2.6.1",
+        "jenssegers/agent": "^2.6",
         "laminas/laminas-diactoros": "^2.4.1",
-        "laminas/laminas-httphandlerrunner": "^1.2.0",
+        "laminas/laminas-httphandlerrunner": "^1.2.0 || ^2.3.0",
         "laminas/laminas-stratigility": "^3.2.2",
         "league/flysystem": "^1.0.11",
         "matthiasmullie/minify": "^1.3",
@@ -180,7 +181,8 @@
         }
     },
     "scripts": {
-        "analyse:phpstan": "phpstan analyse"
+        "analyse:phpstan": "phpstan analyse",
+        "clear-cache:phpstan": "phpstan clear-result-cache"
     },
     "scripts-descriptions": {
         "analyse:phpstan": "Run static analysis"

extensions/akismet/extend.php

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

extensions/akismet/src/Listener/ValidatePost.php

@@ -50,7 +50,7 @@ class ValidatePost
             ->withContent($post->content)
             ->withAuthorName($post->user->username)
             ->withAuthorEmail($post->user->email)
-            ->withType($post->number == 1 ? 'forum-post' : 'reply')
+            ->withType($post->number === 1 ? 'forum-post' : 'reply')
             ->withIp($post->ip_address)
             ->withUserAgent($_SERVER['HTTP_USER_AGENT'])
             ->checkSpam();

extensions/approval/extend.php

@@ -28,15 +28,17 @@ return [
 
     // Discussions should be approved by default
     (new Extend\Model(Discussion::class))
-        ->default('is_approved', true),
+        ->default('is_approved', true)
+        ->cast('is_approved', 'bool'),
 
     // Posts should be approved by default
     (new Extend\Model(Post::class))
-        ->default('is_approved', true),
+        ->default('is_approved', true)
+        ->cast('is_approved', 'bool'),
 
     (new Extend\ApiSerializer(BasicDiscussionSerializer::class))
         ->attribute('isApproved', function ($serializer, Discussion $discussion) {
-            return (bool) $discussion->is_approved;
+            return $discussion->is_approved;
         }),
 
     (new Extend\ApiSerializer(PostSerializer::class))

extensions/approval/src/Listener/UnapproveNewContent.php

@@ -9,6 +9,7 @@
 
 namespace Flarum\Approval\Listener;
 
+use Carbon\Carbon;
 use Flarum\Discussion\Discussion;
 use Flarum\Flags\Flag;
 use Flarum\Post\CommentPost;
@@ -55,7 +56,7 @@ class UnapproveNewContent
 
                 $flag->post_id = $post->id;
                 $flag->type = 'approval';
-                $flag->created_at = time();
+                $flag->created_at = Carbon::now();
 
                 $flag->save();
             });

extensions/approval/src/Listener/UpdateDiscussionAfterPostApproval.php

@@ -22,7 +22,7 @@ class UpdateDiscussionAfterPostApproval
         $discussion->refreshCommentCount();
         $discussion->refreshLastPost();
 
-        if ($post->number == 1) {
+        if ($post->number === 1) {
             $discussion->is_approved = true;
 
             $discussion->afterSave(function () use ($user) {

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

@@ -3,7 +3,7 @@ import emojiMap from 'simple-emoji-map';
 import { extend } from 'flarum/common/extend';
 import TextEditor from 'flarum/common/components/TextEditor';
 import TextEditorButton from 'flarum/common/components/TextEditorButton';
-import KeyboardNavigatable from 'flarum/forum/utils/KeyboardNavigatable';
+import KeyboardNavigatable from 'flarum/common/utils/KeyboardNavigatable';
 
 import AutocompleteDropdown from './fragments/AutocompleteDropdown';
 import getEmojiIconCode from './helpers/getEmojiIconCode';

extensions/flags/extend.php

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

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

@@ -1,5 +1,5 @@
 /// <reference types="flarum/@types/translator-icu-rich" />
-export default class FlagPostModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs> {
+export default class FlagPostModal extends Modal<import("flarum/common/components/Modal").IInternalModalAttrs, undefined> {
     constructor();
     oninit(vnode: any): void;
     success: boolean | undefined;

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

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

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

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

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

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

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

@@ -1,21 +1,13 @@
 import app from 'flarum/forum/app';
-import Model from 'flarum/common/Model';
 
-import Flag from './models/Flag';
-import FlagsPage from './components/FlagsPage';
 import FlagListState from './states/FlagListState';
 import addFlagControl from './addFlagControl';
 import addFlagsDropdown from './addFlagsDropdown';
 import addFlagsToPosts from './addFlagsToPosts';
 
+export { default as extend } from './extend';
+
 app.initializers.add('flarum-flags', () => {
-  Post.prototype.flags = Model.hasMany<Flag>('flags');
-  Post.prototype.canFlag = Model.attribute<boolean>('canFlag');
-
-  app.store.models.flags = Flag;
-
-  app.routes.flags = { path: '/flags', component: FlagsPage };
-
   app.flags = new FlagListState(app);
 
   addFlagControl();
@@ -26,6 +18,5 @@ 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/src/Api/Controller/ListFlagsController.php

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

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

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

extensions/flags/src/Command/CreateFlagHandler.php

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

extensions/flags/src/Command/DeleteFlagsHandler.php

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

extensions/flags/src/Flag.php

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

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

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

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

@@ -0,0 +1,13 @@
+import Extend from 'flarum/common/extenders';
+import Post from 'flarum/common/models/Post';
+import User from 'flarum/common/models/User';
+import LikesUserPage from './components/LikesUserPage';
+
+export default [
+  new Extend.Routes() //
+    .add('user.likes', '/u/:username/likes', LikesUserPage),
+
+  new Extend.Model(Post) //
+    .hasMany<User>('likes')
+    .attribute<boolean>('canLike'),
+];

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

@@ -1,7 +1,5 @@
 import { extend } from 'flarum/common/extend';
 import app from 'flarum/forum/app';
-import Post from 'flarum/common/models/Post';
-import Model from 'flarum/common/Model';
 import NotificationGrid from 'flarum/forum/components/NotificationGrid';
 
 import addLikeAction from './addLikeAction';
@@ -9,12 +7,11 @@ import addLikesList from './addLikesList';
 import PostLikedNotification from './components/PostLikedNotification';
 import addLikesTabToUserProfile from './addLikesTabToUserProfile';
 
+export { default as extend } from './extend';
+
 app.initializers.add('flarum-likes', () => {
   app.notificationComponents.postLiked = PostLikedNotification;
 
-  Post.prototype.canLike = Model.attribute('canLike');
-  Post.prototype.likes = Model.hasMany('likes');
-
   addLikeAction();
   addLikesList();
   addLikesTabToUserProfile();

extensions/likes/js/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  // 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/**/*", "../../../framework/core/js/dist-typings/@types/**/*", "@types/**/*"],
+  "compilerOptions": {
+    // This will output typings to `dist-typings`
+    "declarationDir": "./dist-typings",
+    "paths": {
+      "flarum/*": ["../../../framework/core/js/dist-typings/*"],
+      // TODO: remove after export registry system implemented
+      // Without this, the old-style `@flarum/core` import is resolved to
+      // source code in flarum/core instead of the dist typings.
+      // This causes an inaccurate "duplicate export" error.
+      "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"],
+    }
+  }
+}

extensions/lock/extend.php

@@ -35,12 +35,15 @@ return [
     (new Extend\Notification())
         ->type(DiscussionLockedBlueprint::class, BasicDiscussionSerializer::class, ['alert']),
 
+    (new Extend\Model(Discussion::class))
+        ->cast('is_locked', 'bool'),
+
     (new Extend\ApiSerializer(DiscussionSerializer::class))
         ->attribute('isLocked', function (DiscussionSerializer $serializer, Discussion $discussion) {
-            return (bool) $discussion->is_locked;
+            return $discussion->is_locked;
         })
         ->attribute('canLock', function (DiscussionSerializer $serializer, Discussion $discussion) {
-            return (bool) $serializer->getActor()->can('lock', $discussion);
+            return $serializer->getActor()->can('lock', $discussion);
         }),
 
     (new Extend\Post())

extensions/lock/js/dist/forum.js

@@ -1,2 +1,2 @@
-(()=>{var o={n:t=>{var n=t&&t.__esModule?()=>t.default:()=>t;return o.d(n,{a:n}),n},d:(t,n)=>{for(var c in n)o.o(n,c)&&!o.o(t,c)&&Object.defineProperty(t,c,{enumerable:!0,get:n[c]})},o:(o,t)=>Object.prototype.hasOwnProperty.call(o,t),r:o=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(o,"__esModule",{value:!0})}},t={};(()=>{"use strict";o.r(t);const n=flarum.core.compat["common/extend"],c=flarum.core.compat["forum/app"];var r=o.n(c);const e=flarum.core.compat["common/Model"];var s=o.n(e);const a=flarum.core.compat["common/models/Discussion"];var i=o.n(a);const u=flarum.core.compat["forum/components/NotificationGrid"];var l=o.n(u);function f(o,t){return f=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(o,t){return o.__proto__=t,o},f(o,t)}function p(o,t){o.prototype=Object.create(t.prototype),o.prototype.constructor=o,f(o,t)}const d=flarum.core.compat["forum/components/EventPost"];var k=function(o){function t(){return o.apply(this,arguments)||this}p(t,o);var n=t.prototype;return n.icon=function(){return this.attrs.post.content().locked?"fas fa-lock":"fas fa-unlock"},n.descriptionKey=function(){return this.attrs.post.content().locked?"flarum-lock.forum.post_stream.discussion_locked_text":"flarum-lock.forum.post_stream.discussion_unlocked_text"},t}(o.n(d)());const y=flarum.core.compat["forum/components/Notification"];var b=function(o){function t(){return o.apply(this,arguments)||this}p(t,o);var n=t.prototype;return n.icon=function(){return"fas fa-lock"},n.href=function(){var o=this.attrs.notification;return r().route.discussion(o.subject(),o.content().postNumber)},n.content=function(){return r().translator.trans("flarum-lock.forum.notifications.discussion_locked_text",{user:this.attrs.notification.fromUser()})},t}(o.n(y)());const _=flarum.core.compat["common/components/Badge"];var v=o.n(_);const h=flarum.core.compat["forum/utils/DiscussionControls"];var L=o.n(h);const g=flarum.core.compat["forum/components/DiscussionPage"];var O=o.n(g);const j=flarum.core.compat["common/components/Button"];var x=o.n(j);r().initializers.add("flarum-lock",(function(){r().postComponents.discussionLocked=k,r().notificationComponents.discussionLocked=b,i().prototype.isLocked=s().attribute("isLocked"),i().prototype.canLock=s().attribute("canLock"),(0,n.extend)(i().prototype,"badges",(function(o){this.isLocked()&&o.add("locked",v().component({type:"locked",label:r().translator.trans("flarum-lock.forum.badge.locked_tooltip"),icon:"fas fa-lock"}))})),(0,n.extend)(L(),"moderationControls",(function(o,t){t.canLock()&&o.add("lock",x().component({icon:"fas fa-lock",onclick:this.lockAction.bind(t)},r().translator.trans(t.isLocked()?"flarum-lock.forum.discussion_controls.unlock_button":"flarum-lock.forum.discussion_controls.lock_button")))})),L().lockAction=function(){this.save({isLocked:!this.isLocked()}).then((function(){r().current.matches(O())&&r().current.get("stream").update(),m.redraw()}))},(0,n.extend)(l().prototype,"notificationTypes",(function(o){o.add("discussionLocked",{name:"discussionLocked",icon:"fas fa-lock",label:r().translator.trans("flarum-lock.forum.settings.notify_discussion_locked_label")})}))}))})(),module.exports=t})();
+(()=>{var o={n:t=>{var n=t&&t.__esModule?()=>t.default:()=>t;return o.d(n,{a:n}),n},d:(t,n)=>{for(var e in n)o.o(n,e)&&!o.o(t,e)&&Object.defineProperty(t,e,{enumerable:!0,get:n[e]})},o:(o,t)=>Object.prototype.hasOwnProperty.call(o,t),r:o=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(o,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(o,"__esModule",{value:!0})}},t={};(()=>{"use strict";o.r(t),o.d(t,{extend:()=>j});const n=flarum.core.compat["common/extend"],e=flarum.core.compat["forum/app"];var c=o.n(e);const r=flarum.core.compat["forum/components/NotificationGrid"];var s=o.n(r);function a(o,t){return a=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(o,t){return o.__proto__=t,o},a(o,t)}function i(o,t){o.prototype=Object.create(t.prototype),o.prototype.constructor=o,a(o,t)}const u=flarum.core.compat["forum/components/Notification"];var l=function(o){function t(){return o.apply(this,arguments)||this}i(t,o);var n=t.prototype;return n.icon=function(){return"fas fa-lock"},n.href=function(){var o=this.attrs.notification;return c().route.discussion(o.subject(),o.content().postNumber)},n.content=function(){return c().translator.trans("flarum-lock.forum.notifications.discussion_locked_text",{user:this.attrs.notification.fromUser()})},t}(o.n(u)());const f=flarum.core.compat["common/models/Discussion"];var d=o.n(f);const p=flarum.core.compat["common/components/Badge"];var k=o.n(p);const y=flarum.core.compat["forum/utils/DiscussionControls"];var b=o.n(y);const _=flarum.core.compat["forum/components/DiscussionPage"];var v=o.n(_);const h=flarum.core.compat["common/components/Button"];var g=o.n(h);const L=flarum.core.compat["common/extenders"];var x=o.n(L);const O=flarum.core.compat["forum/components/EventPost"];var P=function(o){function t(){return o.apply(this,arguments)||this}i(t,o);var n=t.prototype;return n.icon=function(){return this.attrs.post.content().locked?"fas fa-lock":"fas fa-unlock"},n.descriptionKey=function(){return this.attrs.post.content().locked?"flarum-lock.forum.post_stream.discussion_locked_text":"flarum-lock.forum.post_stream.discussion_unlocked_text"},t}(o.n(O)());const j=[(new(x().PostTypes)).add("discussionLocked",P),new(x().Model)(d()).attribute("isLocked").attribute("canLock")];c().initializers.add("flarum-lock",(function(){c().notificationComponents.discussionLocked=l,(0,n.extend)(d().prototype,"badges",(function(o){this.isLocked()&&o.add("locked",k().component({type:"locked",label:c().translator.trans("flarum-lock.forum.badge.locked_tooltip"),icon:"fas fa-lock"}))})),(0,n.extend)(b(),"moderationControls",(function(o,t){t.canLock()&&o.add("lock",g().component({icon:"fas fa-lock",onclick:this.lockAction.bind(t)},c().translator.trans(t.isLocked()?"flarum-lock.forum.discussion_controls.unlock_button":"flarum-lock.forum.discussion_controls.lock_button")))})),b().lockAction=function(){this.save({isLocked:!this.isLocked()}).then((function(){c().current.matches(v())&&c().current.get("stream").update(),m.redraw()}))},(0,n.extend)(s().prototype,"notificationTypes",(function(o){o.add("discussionLocked",{name:"discussionLocked",icon:"fas fa-lock",label:c().translator.trans("flarum-lock.forum.settings.notify_discussion_locked_label")})}))}))})(),module.exports=t})();
 //# sourceMappingURL=forum.js.map

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

@@ -0,0 +1,12 @@
+import Extend from 'flarum/common/extenders';
+import Discussion from 'flarum/common/models/Discussion';
+import DiscussionLockedPost from './components/DiscussionLockedPost';
+
+export default [
+  new Extend.PostTypes() //
+    .add('discussionLocked', DiscussionLockedPost),
+
+  new Extend.Model(Discussion) //
+    .attribute<boolean>('isLocked')
+    .attribute<boolean>('canLock'),
+];

extensions/lock/js/src/forum/index.js

@@ -1,20 +1,15 @@
 import { extend } from 'flarum/common/extend';
 import app from 'flarum/forum/app';
-import Model from 'flarum/common/Model';
-import Discussion from 'flarum/common/models/Discussion';
 import NotificationGrid from 'flarum/forum/components/NotificationGrid';
 
-import DiscussionLockedPost from './components/DiscussionLockedPost';
 import DiscussionLockedNotification from './components/DiscussionLockedNotification';
 import addLockBadge from './addLockBadge';
 import addLockControl from './addLockControl';
 
-app.initializers.add('flarum-lock', () => {
-  app.postComponents.discussionLocked = DiscussionLockedPost;
-  app.notificationComponents.discussionLocked = DiscussionLockedNotification;
+export { default as extend } from './extend';
 
-  Discussion.prototype.isLocked = Model.attribute('isLocked');
-  Discussion.prototype.canLock = Model.attribute('canLock');
+app.initializers.add('flarum-lock', () => {
+  app.notificationComponents.discussionLocked = DiscussionLockedNotification;
 
   addLockBadge();
   addLockControl();

extensions/lock/js/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  // 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/**/*", "../../../framework/core/js/dist-typings/@types/**/*", "@types/**/*"],
+  "compilerOptions": {
+    // This will output typings to `dist-typings`
+    "declarationDir": "./dist-typings",
+    "paths": {
+      "flarum/*": ["../../../framework/core/js/dist-typings/*"],
+      // TODO: remove after export registry system implemented
+      // Without this, the old-style `@flarum/core` import is resolved to
+      // source code in flarum/core instead of the dist typings.
+      // This causes an inaccurate "duplicate export" error.
+      "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"],
+    }
+  }
+}

extensions/lock/locale/en.yml

@@ -29,8 +29,8 @@ flarum-lock:
 
     # These translations are displayed between posts in the post stream.
     post_stream:
-      discussion_locked_text: "{username} locked the discussion."
-      discussion_unlocked_text: "{username} unlocked the discussion."
+      discussion_locked_text: "{username} locked the discussion {time}."
+      discussion_unlocked_text: "{username} unlocked the discussion {time}."
 
     # These translations are used in the Settings page.
     settings:

extensions/lock/src/Access/DiscussionPolicy.php

@@ -18,7 +18,7 @@ class DiscussionPolicy extends AbstractPolicy
     /**
      * @param User $actor
      * @param Discussion $discussion
-     * @return bool
+     * @return string|void
      */
     public function reply(User $actor, Discussion $discussion)
     {

extensions/lock/src/Post/DiscussionLockedPost.php

@@ -9,6 +9,7 @@
 
 namespace Flarum\Lock\Post;
 
+use Carbon\Carbon;
 use Flarum\Post\AbstractEventPost;
 use Flarum\Post\MergeableInterface;
 use Flarum\Post\Post;
@@ -59,7 +60,7 @@ class DiscussionLockedPost extends AbstractEventPost implements MergeableInterfa
         $post = new static;
 
         $post->content = static::buildContent($isLocked);
-        $post->created_at = time();
+        $post->created_at = Carbon::now();
         $post->discussion_id = $discussionId;
         $post->user_id = $userId;
 

extensions/mentions/composer.json

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

extensions/mentions/extend.php

@@ -15,6 +15,7 @@ use Flarum\Api\Serializer\BasicUserSerializer;
 use Flarum\Api\Serializer\CurrentUserSerializer;
 use Flarum\Api\Serializer\GroupSerializer;
 use Flarum\Api\Serializer\PostSerializer;
+use Flarum\Approval\Event\PostWasApproved;
 use Flarum\Extend;
 use Flarum\Group\Group;
 use Flarum\Post\Event\Deleted;
@@ -91,11 +92,9 @@ return [
         ]),
 
     (new Extend\ApiController(Controller\CreatePostController::class))
-        ->addInclude(['mentionsPosts', 'mentionsPosts.mentionedBy'])
         ->addOptionalInclude('mentionsGroups'),
 
     (new Extend\ApiController(Controller\UpdatePostController::class))
-        ->addInclude(['mentionsPosts', 'mentionsPosts.mentionedBy'])
         ->addOptionalInclude('mentionsGroups'),
 
     (new Extend\ApiController(Controller\AbstractSerializeController::class))
@@ -108,6 +107,7 @@ return [
         ->listen(Posted::class, Listener\UpdateMentionsMetadataWhenVisible::class)
         ->listen(Restored::class, Listener\UpdateMentionsMetadataWhenVisible::class)
         ->listen(Revised::class, Listener\UpdateMentionsMetadataWhenVisible::class)
+        ->listen(PostWasApproved::class, Listener\UpdateMentionsMetadataWhenVisible::class)
         ->listen(Hidden::class, Listener\UpdateMentionsMetadataWhenInvisible::class)
         ->listen(Deleted::class, Listener\UpdateMentionsMetadataWhenInvisible::class),
 

extensions/mentions/js/src/forum/addComposerAutocomplete.js

@@ -7,7 +7,7 @@ import EditPostComposer from 'flarum/forum/components/EditPostComposer';
 import avatar from 'flarum/common/helpers/avatar';
 import usernameHelper from 'flarum/common/helpers/username';
 import highlight from 'flarum/common/helpers/highlight';
-import KeyboardNavigatable from 'flarum/forum/utils/KeyboardNavigatable';
+import KeyboardNavigatable from 'flarum/common/utils/KeyboardNavigatable';
 import { truncate } from 'flarum/common/utils/string';
 import { throttle } from 'flarum/common/utils/throttleDebounce';
 import Badge from 'flarum/common/components/Badge';

extensions/mentions/js/src/forum/addMentionedByList.js

@@ -1,7 +1,5 @@
 import app from 'flarum/forum/app';
 import { extend } from 'flarum/common/extend';
-import Model from 'flarum/common/Model';
-import Post from 'flarum/common/models/Post';
 import CommentPost from 'flarum/forum/components/CommentPost';
 import Link from 'flarum/common/components/Link';
 import PostPreview from 'flarum/forum/components/PostPreview';
@@ -10,8 +8,6 @@ import username from 'flarum/common/helpers/username';
 import icon from 'flarum/common/helpers/icon';
 
 export default function addMentionedByList() {
-  Post.prototype.mentionedBy = Model.hasMany('mentionedBy');
-
   function hidePreview() {
     this.$('.Post-mentionedBy-preview')
       .removeClass('in')

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

@@ -0,0 +1,15 @@
+import Extend from 'flarum/common/extenders';
+import Post from 'flarum/common/models/Post';
+import User from 'flarum/common/models/User';
+import MentionsUserPage from './components/MentionsUserPage';
+
+export default [
+  new Extend.Routes() //
+    .add('user.mentions', '/u/:username/mentions', MentionsUserPage),
+
+  new Extend.Model(Post) //
+    .hasMany<Post>('mentionedBy'),
+
+  new Extend.Model(User) //
+    .attribute<boolean>('canMentionGroups'),
+];

extensions/mentions/js/src/forum/index.js

@@ -2,6 +2,8 @@ import { extend } from 'flarum/common/extend';
 import app from 'flarum/forum/app';
 import NotificationGrid from 'flarum/forum/components/NotificationGrid';
 import { getPlainContent } from 'flarum/common/utils/string';
+import textContrastClass from 'flarum/common/helpers/textContrastClass';
+import Post from 'flarum/forum/components/Post';
 
 import addPostMentionPreviews from './addPostMentionPreviews';
 import addMentionedByList from './addMentionedByList';
@@ -13,13 +15,12 @@ import UserMentionedNotification from './components/UserMentionedNotification';
 import GroupMentionedNotification from './components/GroupMentionedNotification';
 import UserPage from 'flarum/forum/components/UserPage';
 import LinkButton from 'flarum/common/components/LinkButton';
-import MentionsUserPage from './components/MentionsUserPage';
 import User from 'flarum/common/models/User';
 import Model from 'flarum/common/Model';
 
-app.initializers.add('flarum-mentions', function () {
-  User.prototype.canMentionGroups = Model.attribute('canMentionGroups');
+export { default as extend } from './extend';
 
+app.initializers.add('flarum-mentions', function () {
   // For every mention of a post inside a post's content, set up a hover handler
   // that shows a preview of the mentioned post.
   addPostMentionPreviews();
@@ -65,7 +66,6 @@ app.initializers.add('flarum-mentions', function () {
   });
 
   // Add mentions tab in user profile
-  app.routes['user.mentions'] = { path: '/u/:username/mentions', component: MentionsUserPage };
   extend(UserPage.prototype, 'navItems', function (items) {
     const user = this.user;
     items.add(
@@ -84,6 +84,13 @@ app.initializers.add('flarum-mentions', function () {
 
   // Remove post mentions when rendering post previews.
   getPlainContent.removeSelectors.push('a.PostMention');
+
+  // Apply color contrast fix on group mentions.
+  extend(Post.prototype, 'oncreate', function () {
+    this.$('.GroupMention--colored').each(function () {
+      this.classList.add(textContrastClass(getComputedStyle(this).getPropertyValue('--group-color')));
+    });
+  });
 });
 
 export * from './utils/textFormatter';

extensions/mentions/js/src/forum/utils/textFormatter.js

@@ -1,7 +1,6 @@
 import app from 'flarum/forum/app';
 import username from 'flarum/common/helpers/username';
 import extractText from 'flarum/common/utils/extractText';
-import isDark from 'flarum/common/utils/isDark';
 
 export function filterUserMentions(tag) {
   let user;
@@ -41,7 +40,6 @@ export function filterGroupMentions(tag) {
       tag.setAttribute('groupname', extractText(group.namePlural()));
       tag.setAttribute('icon', group.icon());
       tag.setAttribute('color', group.color());
-      tag.setAttribute('class', isDark(group.color()) ? 'GroupMention--light' : 'GroupMention--dark');
 
       return true;
     }

extensions/mentions/js/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  // 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/**/*", "../../../framework/core/js/dist-typings/@types/**/*", "@types/**/*"],
+  "compilerOptions": {
+    // This will output typings to `dist-typings`
+    "declarationDir": "./dist-typings",
+    "paths": {
+      "flarum/*": ["../../../framework/core/js/dist-typings/*"],
+      // TODO: remove after export registry system implemented
+      // Without this, the old-style `@flarum/core` import is resolved to
+      // source code in flarum/core instead of the dist typings.
+      // This causes an inaccurate "duplicate export" error.
+      "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"],
+    }
+  }
+}

extensions/mentions/less/forum.less

@@ -1,17 +1,17 @@
 .PostMention, .UserMention, .GroupMention {
-  background: @control-bg;
-  color: @control-color;
+  background: var(--control-bg);
+  color: var(--control-color);
   border-radius: @border-radius;
   padding: 2px 5px;
   border: 0 !important;
   font-weight: 600;
 
   blockquote & {
-    background: @body-bg;
+    background: var(--body-bg);
   }
   &:hover,
   &:active {
-    color: @link-color;
+    color: var(--link-color);
   }
 }
 .UserMention, .PostMention, .GroupMention {
@@ -98,35 +98,13 @@
   .Button--color(@tooltip-color, @tooltip-bg);
 }
 .GroupMention {
-  & when (@config-dark-mode = false) {
-    &,
-    &:hover,
-    &:active {
-      color: @text-on-light;
-    }
-  }
-  & when (@config-dark-mode = true) {
-    &,
-    &:hover,
-    &:active {
-      color: @text-on-dark;
-    }
-  }
+  background-color: var(--group-color, var(--control-bg));
+  color: var(--control-color);
+  --link-color: currentColor;
 
-  &--light {
-    &,
-    &:hover,
-    &:active {
-      color: @text-on-light;
-    }
-  }
-
-  &--dark {
-    &,
-    &:hover,
-    &:active {
-      color: @text-on-dark;
-    }
+  &--colored {
+    --control-color: var(--contrast-color, var(--body-bg));
+    --link-color: var(--control-color);
   }
 
   .icon {

extensions/mentions/migrations/2022_05_20_000005_add_created_at_to_post_mentions_post_table.php

@@ -19,7 +19,7 @@ return [
         // do this manually because dbal doesn't recognize timestamp columns
         $connection = $schema->getConnection();
         $prefix = $connection->getTablePrefix();
-        $connection->statement("ALTER TABLE `${prefix}post_mentions_post` MODIFY created_at TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP");
+        $connection->statement("ALTER TABLE `{$prefix}post_mentions_post` MODIFY created_at TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP");
     },
 
     'down' => function (Builder $schema) {

extensions/mentions/migrations/2022_05_20_000006_add_created_at_to_post_mentions_user_table.php

@@ -19,7 +19,7 @@ return [
         // do this manually because dbal doesn't recognize timestamp columns
         $connection = $schema->getConnection();
         $prefix = $connection->getTablePrefix();
-        $connection->statement("ALTER TABLE `${prefix}post_mentions_user` MODIFY created_at TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP");
+        $connection->statement("ALTER TABLE `{$prefix}post_mentions_user` MODIFY created_at TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP");
     },
 
     'down' => function (Builder $schema) {

extensions/mentions/src/ConfigureMentions.php

@@ -11,11 +11,11 @@ namespace Flarum\Mentions;
 
 use Flarum\Group\Group;
 use Flarum\Http\UrlGenerator;
-use Flarum\Post\CommentPost;
+use Flarum\Post\PostRepository;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\User;
-use Illuminate\Support\Str;
 use s9e\TextFormatter\Configurator;
+use s9e\TextFormatter\Parser\Tag;
 
 class ConfigureMentions
 {
@@ -39,7 +39,7 @@ class ConfigureMentions
         $this->configureGroupMentions($config);
     }
 
-    private function configureUserMentions(Configurator $config)
+    private function configureUserMentions(Configurator $config): void
     {
         $config->rendering->parameters['PROFILE_URL'] = $this->url->to('forum')->route('user', ['username' => '']);
 
@@ -66,9 +66,8 @@ class ConfigureMentions
     }
 
     /**
-     * @param $tag
-     *
-     * @return bool
+     * @param Tag $tag
+     * @return bool|void
      */
     public static function addUserId($tag)
     {
@@ -81,7 +80,7 @@ class ConfigureMentions
         }
 
         if (isset($user)) {
-            $tag->setAttribute('id', $user->id);
+            $tag->setAttribute('id', (string) $user->id);
             $tag->setAttribute('displayname', $user->display_name);
 
             return true;
@@ -90,7 +89,7 @@ class ConfigureMentions
         $tag->invalidate();
     }
 
-    private function configurePostMentions(Configurator $config)
+    private function configurePostMentions(Configurator $config): void
     {
         $config->rendering->parameters['DISCUSSION_URL'] = $this->url->to('forum')->route('discussion', ['id' => '']);
 
@@ -115,22 +114,25 @@ class ConfigureMentions
 
         $tag->filterChain
             ->prepend([static::class, 'addPostId'])
-            ->setJS('function(tag) { return flarum.extensions["flarum-mentions"].filterPostMentions(tag); }');
+            ->setJS('function(tag) { return flarum.extensions["flarum-mentions"].filterPostMentions(tag); }')
+            ->addParameterByName('actor');
 
         $config->Preg->match('/\B@["|“](?<displayname>((?!"#[a-z]{0,3}[0-9]+).)+)["|”]#p(?<id>[0-9]+)\b/', $tagName);
     }
 
     /**
-     * @param $tag
-     * @return bool
+     * @param Tag $tag
+     * @return bool|void
      */
-    public static function addPostId($tag)
+    public static function addPostId($tag, User $actor)
     {
-        $post = CommentPost::find($tag->getAttribute('id'));
+        $post = resolve(PostRepository::class)
+            ->queryVisibleTo($actor)
+            ->find($tag->getAttribute('id'));
 
         if ($post) {
-            $tag->setAttribute('discussionid', (int) $post->discussion_id);
-            $tag->setAttribute('number', (int) $post->number);
+            $tag->setAttribute('discussionid', (string) $post->discussion_id);
+            $tag->setAttribute('number', (string) $post->number);
 
             if ($post->user) {
                 $tag->setAttribute('displayname', $post->user->display_name);
@@ -148,16 +150,37 @@ class ConfigureMentions
         $tag->attributes->add('groupname');
         $tag->attributes->add('icon');
         $tag->attributes->add('color');
-        $tag->attributes->add('class');
         $tag->attributes->add('id')->filterChain->append('#uint');
 
         $tag->template = '
             <xsl:choose>
                 <xsl:when test="@deleted != 1">
-                    <span class="GroupMention {@class}" style="background: {@color}">@<xsl:value-of select="@groupname"/><i class="icon {@icon}"></i></span>
+                    <xsl:choose>
+                        <xsl:when test="string(@color) != \'\'">
+                            <span class="GroupMention GroupMention--colored" style="--group-color:{@color};">
+                                <span class="GroupMention-name">@<xsl:value-of select="@groupname"/></span>
+                                <xsl:if test="string(@icon) != \'\'">
+                                    <i class="icon {@icon}"></i>
+                                </xsl:if>
+                            </span>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <span class="GroupMention">
+                                <span class="GroupMention-name">@<xsl:value-of select="@groupname"/></span>
+                                <xsl:if test="string(@icon) != \'\'">
+                                    <i class="icon {@icon}"></i>
+                                </xsl:if>
+                            </span>
+                        </xsl:otherwise>
+                    </xsl:choose>
                 </xsl:when>
                 <xsl:otherwise>
-                    <span class="GroupMention GroupMention--deleted" style="background: {@color}">@<xsl:value-of select="@groupname"/><i class="icon {@icon}"></i></span>
+                    <span class="GroupMention GroupMention--deleted">
+                        <span class="GroupMention-name">@<xsl:value-of select="@groupname"/></span>
+                        <xsl:if test="string(@icon) != \'\'">
+                            <i class="icon {@icon}"></i>
+                        </xsl:if>
+                    </span>
                 </xsl:otherwise>
             </xsl:choose>';
         $tag->filterChain->prepend([static::class, 'addGroupId'])
@@ -168,7 +191,7 @@ class ConfigureMentions
 
     /**
      * @param $tag
-     * @return bool
+     * @return bool|void
      */
     public static function addGroupId($tag)
     {
@@ -179,40 +202,10 @@ class ConfigureMentions
             $tag->setAttribute('groupname', $group->name_plural);
             $tag->setAttribute('icon', $group->icon ?? 'fas fa-at');
             $tag->setAttribute('color', $group->color);
-            if (! empty($group->color)) {
-                $tag->setAttribute('class', self::isDark($group->color) ? 'GroupMention--light' : 'GroupMention--dark');
-            } else {
-                $tag->setAttribute('class', '');
-            }
 
             return true;
         }
 
         $tag->invalidate();
     }
-
-    /**
-     * The `isDark` utility converts a hex color to rgb, and then calcul a YIQ
-     * value in order to get the appropriate brightness value (is it dark or is it
-     * light?) See https://www.w3.org/TR/AERT/#color-contrast for references. A YIQ
-     * value >= 128 is a light color.
-     */
-    public static function isDark(?string $hexColor): bool
-    {
-        if (! $hexColor) {
-            return false;
-        }
-
-        $hexNumbers = Str::replace('#', '', $hexColor);
-        if (Str::length($hexNumbers) === 3) {
-            $hexNumbers += $hexNumbers;
-        }
-
-        $r = hexdec(Str::substr($hexNumbers, 0, 2));
-        $g = hexdec(Str::subStr($hexNumbers, 2, 2));
-        $b = hexdec(Str::subStr($hexNumbers, 4, 2));
-        $yiq = ($r * 299 + $g * 587 + $b * 114) / 1000;
-
-        return $yiq >= 128 ? false : true;
-    }
 }

extensions/mentions/src/Formatter/FormatPostMentions.php

@@ -29,11 +29,11 @@ class FormatPostMentions
     /**
      * Configure rendering for post mentions.
      *
-     * @param s9e\TextFormatter\Renderer $renderer
+     * @param \s9e\TextFormatter\Renderer $renderer
      * @param mixed $context
      * @param string|null $xml
-     * @param Psr\Http\Message\ServerRequestInterface $request
-     * @return void
+     * @param \Psr\Http\Message\ServerRequestInterface $request
+     * @return string
      */
     public function __invoke(Renderer $renderer, $context, $xml, Request $request = null)
     {

extensions/mentions/src/Formatter/FormatUserMentions.php

@@ -37,9 +37,9 @@ class FormatUserMentions
     /**
      * Configure rendering for user mentions.
      *
-     * @param s9e\TextFormatter\Renderer $renderer
+     * @param \s9e\TextFormatter\Renderer $renderer
      * @param mixed $context
-     * @param string|null $xml
+     * @param string $xml
      * @return string $xml to be rendered
      */
     public function __invoke(Renderer $renderer, $context, string $xml)

extensions/mentions/src/Listener/UpdateMentionsMetadataWhenVisible.php

@@ -9,10 +9,12 @@
 
 namespace Flarum\Mentions\Listener;
 
+use Flarum\Approval\Event\PostWasApproved;
 use Flarum\Mentions\Notification\GroupMentionedBlueprint;
 use Flarum\Mentions\Notification\PostMentionedBlueprint;
 use Flarum\Mentions\Notification\UserMentionedBlueprint;
 use Flarum\Notification\NotificationSyncer;
+use Flarum\Post\CommentPost;
 use Flarum\Post\Event\Posted;
 use Flarum\Post\Event\Restored;
 use Flarum\Post\Event\Revised;
@@ -36,11 +38,15 @@ class UpdateMentionsMetadataWhenVisible
     }
 
     /**
-     * @param Posted|Restored|Revised $event
+     * @param Posted|Restored|Revised|PostWasApproved $event
      */
     public function handle($event)
     {
-        $content = $event->post->parsedContent;
+        if (! $event->post instanceof CommentPost) {
+            return;
+        }
+
+        $content = $event->post->parsed_content;
 
         $this->syncUserMentions(
             $event->post,

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

@@ -84,7 +84,8 @@ class GroupMentionsTest extends TestCase
 
         $response = json_decode($response->getBody(), true);
 
-        $this->assertStringContainsString('<p>One of the <span style="background:#80349E" class="GroupMention ">@Mods<i class="icon fas fa-bolt"></i></span> will look at this</p>', $response['data']['attributes']['contentHtml']);
+        $this->assertStringContainsString('GroupMention', $response['data']['attributes']['contentHtml']);
+        $this->assertStringContainsString('#80349E', $response['data']['attributes']['contentHtml']);
         $this->assertNotNull(CommentPost::find($response['data']['id'])->mentionsGroups->find(4));
     }
 

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

@@ -38,6 +38,7 @@ class PostMentionsTest extends TestCase
             ],
             'discussions' => [
                 ['id' => 2, 'title' => __CLASS__, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 3, 'first_post_id' => 4, 'comment_count' => 2],
+                ['id' => 50, 'title' => __CLASS__, 'is_private' => true, 'created_at' => Carbon::now(), 'last_posted_at' => Carbon::now(), 'user_id' => 3, 'first_post_id' => 4, 'comment_count' => 1],
             ],
             'posts' => [
                 ['id' => 4, 'number' => 2, 'discussion_id' => 2, 'created_at' => Carbon::now(), 'user_id' => 3, 'type' => 'comment', 'content' => '<r><POSTMENTION displayname="TobyFlarum___" id="5" number="2" discussionid="2" username="toby">@tobyuuu#5</POSTMENTION></r>'],
@@ -49,6 +50,9 @@ class PostMentionsTest extends TestCase
                 ['id' => 10, 'number' => 11, 'discussion_id' => 2, 'created_at' => Carbon::now(), 'user_id' => 4, 'type' => 'comment', 'content' => '<r><POSTMENTION displayname="Bad &quot;#p6 User" id="9" number="10" discussionid="2">@"Bad "#p6 User"#p9</POSTMENTION></r>'],
                 ['id' => 11, 'number' => 12, 'discussion_id' => 2, 'created_at' => Carbon::now(), 'user_id' => 40, 'type' => 'comment', 'content' => '<r><POSTMENTION displayname="Bad &quot;#p6 User" id="9" number="10" discussionid="2">@"Bad "#p6 User"#p9</POSTMENTION></r>'],
                 ['id' => 12, 'number' => 13, 'discussion_id' => 2, 'created_at' => Carbon::now(), 'user_id' => 4, 'type' => 'comment', 'content' => '<r><POSTMENTION displayname="deleted_user" id="11" number="12" discussionid="2">@"acme"#p11</POSTMENTION></r>'],
+
+                // Restricted access
+                ['id' => 50, 'number' => 1, 'discussion_id' => 50, 'created_at' => Carbon::now(), 'user_id' => 3, 'type' => 'comment', 'content' => '<r>no</r>'],
             ],
             'post_mentions_post' => [
                 ['post_id' => 4, 'mentions_post_id' => 5],
@@ -128,6 +132,37 @@ class PostMentionsTest extends TestCase
         $this->assertNotNull(CommentPost::find($response['data']['id'])->mentionsPosts->find(4));
     }
 
+    /**
+     * @test
+     */
+    public function cannot_mention_a_post_without_access()
+    {
+        $response = $this->send(
+            $this->request('POST', '/api/posts', [
+                'authenticatedAs' => 1,
+                'json' => [
+                    'data' => [
+                        'attributes' => [
+                            'content' => '@"potato"#p50',
+                        ],
+                        'relationships' => [
+                            'discussion' => ['data' => ['id' => 2]],
+                        ],
+                    ],
+                ],
+            ])
+        );
+
+        $this->assertEquals(201, $response->getStatusCode());
+
+        $response = json_decode($response->getBody(), true);
+
+        $this->assertStringContainsString('potato', $response['data']['attributes']['contentHtml']);
+        $this->assertEquals('@"potato"#p50', $response['data']['attributes']['content']);
+        $this->assertStringNotContainsString('PostMention', $response['data']['attributes']['contentHtml']);
+        $this->assertNull(CommentPost::find($response['data']['id'])->mentionsPosts->find(50));
+    }
+
     /**
      * @test
      */

extensions/nicknames/extend.php

@@ -26,6 +26,9 @@ return [
 
     new Extend\Locales(__DIR__.'/locale'),
 
+    (new Extend\Model(User::class))
+        ->cast('nickname', 'string'),
+
     (new Extend\User())
         ->displayNameDriver('nickname', NicknameDriver::class),
 

extensions/nicknames/js/dist/forum.js

@@ -1,2 +1,2 @@
-(()=>{var t={n:e=>{var n=e&&e.__esModule?()=>e.default:()=>e;return t.d(n,{a:n}),n},d:(e,n)=>{for(var a in n)t.o(n,a)&&!t.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:n[a]})},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 n=flarum.core.compat["forum/app"];var a=t.n(n);const r=flarum.core.compat["common/extend"],o=flarum.core.compat["common/components/Button"];var i=t.n(o);const s=flarum.core.compat["common/components/EditUserModal"];var c=t.n(s);const u=flarum.core.compat["forum/components/SignUpModal"];var l=t.n(u);const d=flarum.core.compat["forum/components/SettingsPage"];var p=t.n(d);const f=flarum.core.compat["common/Model"];var k=t.n(f);const h=flarum.core.compat["common/models/User"];var y=t.n(h);const b=flarum.core.compat["common/utils/extractText"];var v=t.n(b);const g=flarum.core.compat["common/utils/Stream"];var N=t.n(g);function _(t,e){return _=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},_(t,e)}const O=flarum.core.compat["common/components/Modal"];var x=function(t){var e,n;function r(){return t.apply(this,arguments)||this}n=t,(e=r).prototype=Object.create(n.prototype),e.prototype.constructor=e,_(e,n);var o=r.prototype;return o.oninit=function(e){t.prototype.oninit.call(this,e),this.nickname=N()(a().session.user.displayName())},o.className=function(){return"NickameModal Modal--small"},o.title=function(){return a().translator.trans("flarum-nicknames.forum.change_nickname.title")},o.content=function(){return m("div",{className:"Modal-body"},m("div",{className:"Form Form--centered"},m("div",{className:"Form-group"},m("input",{type:"text",autocomplete:"off",name:"nickname",className:"FormControl",bidi:this.nickname,disabled:this.loading})),m("div",{className:"Form-group"},i().component({className:"Button Button--primary Button--block",type:"submit",loading:this.loading},a().translator.trans("flarum-nicknames.forum.change_nickname.submit_button")))))},o.onsubmit=function(t){var e=this;t.preventDefault(),this.nickname()!==a().session.user.displayName()?(this.loading=!0,a().session.user.save({nickname:this.nickname()},{errorHandler:this.onerror.bind(this)}).then(this.hide.bind(this)).catch((function(){e.loading=!1,m.redraw()}))):this.hide()},r}(t.n(O)());a().initializers.add("flarum/nicknames",(function(){y().prototype.canEditNickname=k().attribute("canEditNickname"),(0,r.extend)(p().prototype,"accountItems",(function(t){"nickname"===a().forum.attribute("displayNameDriver")&&this.user.canEditNickname()&&t.add("changeNickname",m(i(),{className:"Button",onclick:function(){return a().modal.show(x)}},a().translator.trans("flarum-nicknames.forum.settings.change_nickname_button")))})),(0,r.extend)(c().prototype,"oninit",(function(){this.nickname=N()(this.attrs.user.displayName())})),(0,r.extend)(c().prototype,"fields",(function(t){"nickname"===a().forum.attribute("displayNameDriver")&&this.attrs.user.canEditNickname()&&t.add("nickname",m("div",{className:"Form-group"},m("label",null,a().translator.trans("flarum-nicknames.forum.edit_user.nicknames_heading")),m("input",{className:"FormControl",placeholder:v()(a().translator.trans("flarum-nicknames.forum.edit_user.nicknames_text")),bidi:this.nickname})),100)})),(0,r.extend)(c().prototype,"data",(function(t){"nickname"===a().forum.attribute("displayNameDriver")&&this.attrs.user.canEditNickname()&&this.nickname()!==this.attrs.user.displayName()&&(t.nickname=this.nickname())})),(0,r.extend)(l().prototype,"oninit",(function(){"nickname"===a().forum.attribute("displayNameDriver")&&(this.nickname=N()(this.attrs.username||""))})),(0,r.extend)(l().prototype,"onready",(function(){"nickname"===a().forum.attribute("displayNameDriver")&&a().forum.attribute("setNicknameOnRegistration")&&a().forum.attribute("randomizeUsernameOnRegistration")&&this.$("[name=nickname]").select()})),(0,r.extend)(l().prototype,"fields",(function(t){"nickname"===a().forum.attribute("displayNameDriver")&&a().forum.attribute("setNicknameOnRegistration")&&(t.add("nickname",m("div",{className:"Form-group"},m("input",{className:"FormControl",name:"nickname",type:"text",placeholder:v()(a().translator.trans("flarum-nicknames.forum.sign_up.nickname_placeholder")),bidi:this.nickname,disabled:this.loading||this.isProvided("nickname"),required:a().forum.attribute("randomizeUsernameOnRegistration")})),25),a().forum.attribute("randomizeUsernameOnRegistration")&&t.remove("username"))})),(0,r.extend)(l().prototype,"submitData",(function(t){if("nickname"===a().forum.attribute("displayNameDriver")&&a().forum.attribute("setNicknameOnRegistration")&&(t.nickname=this.nickname(),a().forum.attribute("randomizeUsernameOnRegistration"))){var e=new Uint32Array(2);crypto.getRandomValues(e),t.username=e.join("")}}))}))})(),module.exports=e})();
+(()=>{var t={n:e=>{var n=e&&e.__esModule?()=>e.default:()=>e;return t.d(n,{a:n}),n},d:(e,n)=>{for(var a in n)t.o(n,a)&&!t.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:n[a]})},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),t.d(e,{extend:()=>M});const n=flarum.core.compat["forum/app"];var a=t.n(n);const r=flarum.core.compat["common/extend"],o=flarum.core.compat["common/components/Button"];var i=t.n(o);const s=flarum.core.compat["common/components/EditUserModal"];var c=t.n(s);const u=flarum.core.compat["forum/components/SignUpModal"];var l=t.n(u);const d=flarum.core.compat["forum/components/SettingsPage"];var p=t.n(d);const f=flarum.core.compat["common/utils/extractText"];var k=t.n(f);const h=flarum.core.compat["common/utils/Stream"];var y=t.n(h);function b(t,e){return b=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},b(t,e)}const v=flarum.core.compat["common/components/Modal"];var g=function(t){var e,n;function r(){return t.apply(this,arguments)||this}n=t,(e=r).prototype=Object.create(n.prototype),e.prototype.constructor=e,b(e,n);var o=r.prototype;return o.oninit=function(e){t.prototype.oninit.call(this,e),this.nickname=y()(a().session.user.displayName())},o.className=function(){return"NickameModal Modal--small"},o.title=function(){return a().translator.trans("flarum-nicknames.forum.change_nickname.title")},o.content=function(){return m("div",{className:"Modal-body"},m("div",{className:"Form Form--centered"},m("div",{className:"Form-group"},m("input",{type:"text",autocomplete:"off",name:"nickname",className:"FormControl",bidi:this.nickname,disabled:this.loading})),m("div",{className:"Form-group"},i().component({className:"Button Button--primary Button--block",type:"submit",loading:this.loading},a().translator.trans("flarum-nicknames.forum.change_nickname.submit_button")))))},o.onsubmit=function(t){var e=this;t.preventDefault(),this.nickname()!==a().session.user.displayName()?(this.loading=!0,a().session.user.save({nickname:this.nickname()},{errorHandler:this.onerror.bind(this)}).then(this.hide.bind(this)).catch((function(){e.loading=!1,m.redraw()}))):this.hide()},r}(t.n(v)());const N=flarum.core.compat["common/extenders"];var _=t.n(N);const x=flarum.core.compat["common/models/User"];var O=t.n(x);const M=[new(_().Model)(O()).attribute("canEditNickname")];a().initializers.add("flarum/nicknames",(function(){(0,r.extend)(p().prototype,"accountItems",(function(t){"nickname"===a().forum.attribute("displayNameDriver")&&this.user.canEditNickname()&&t.add("changeNickname",m(i(),{className:"Button",onclick:function(){return a().modal.show(g)}},a().translator.trans("flarum-nicknames.forum.settings.change_nickname_button")))})),(0,r.extend)(c().prototype,"oninit",(function(){this.nickname=y()(this.attrs.user.displayName())})),(0,r.extend)(c().prototype,"fields",(function(t){"nickname"===a().forum.attribute("displayNameDriver")&&this.attrs.user.canEditNickname()&&t.add("nickname",m("div",{className:"Form-group"},m("label",null,a().translator.trans("flarum-nicknames.forum.edit_user.nicknames_heading")),m("input",{className:"FormControl",placeholder:k()(a().translator.trans("flarum-nicknames.forum.edit_user.nicknames_text")),bidi:this.nickname})),100)})),(0,r.extend)(c().prototype,"data",(function(t){"nickname"===a().forum.attribute("displayNameDriver")&&this.attrs.user.canEditNickname()&&this.nickname()!==this.attrs.user.displayName()&&(t.nickname=this.nickname())})),(0,r.extend)(l().prototype,"oninit",(function(){"nickname"===a().forum.attribute("displayNameDriver")&&(this.nickname=y()(this.attrs.username||""))})),(0,r.extend)(l().prototype,"onready",(function(){"nickname"===a().forum.attribute("displayNameDriver")&&a().forum.attribute("setNicknameOnRegistration")&&a().forum.attribute("randomizeUsernameOnRegistration")&&this.$("[name=nickname]").select()})),(0,r.extend)(l().prototype,"fields",(function(t){"nickname"===a().forum.attribute("displayNameDriver")&&a().forum.attribute("setNicknameOnRegistration")&&(t.add("nickname",m("div",{className:"Form-group"},m("input",{className:"FormControl",name:"nickname",type:"text",placeholder:k()(a().translator.trans("flarum-nicknames.forum.sign_up.nickname_placeholder")),bidi:this.nickname,disabled:this.loading||this.isProvided("nickname"),required:a().forum.attribute("randomizeUsernameOnRegistration")})),25),a().forum.attribute("randomizeUsernameOnRegistration")&&t.remove("username"))})),(0,r.extend)(l().prototype,"submitData",(function(t){if("nickname"===a().forum.attribute("displayNameDriver")&&a().forum.attribute("setNicknameOnRegistration")&&(t.nickname=this.nickname(),a().forum.attribute("randomizeUsernameOnRegistration"))){var e=new Uint32Array(2);crypto.getRandomValues(e),t.username=e.join("")}}))}))})(),module.exports=e})();
 //# sourceMappingURL=forum.js.map

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

@@ -0,0 +1,7 @@
+import Extend from 'flarum/common/extenders';
+import User from 'flarum/common/models/User';
+
+export default [
+  new Extend.Model(User) //
+    .attribute<boolean>('canEditNickname'),
+];

extensions/nicknames/js/src/forum/index.js

@@ -4,15 +4,13 @@ import Button from 'flarum/common/components/Button';
 import EditUserModal from 'flarum/common/components/EditUserModal';
 import SignUpModal from 'flarum/forum/components/SignUpModal';
 import SettingsPage from 'flarum/forum/components/SettingsPage';
-import Model from 'flarum/common/Model';
-import User from 'flarum/common/models/User';
 import extractText from 'flarum/common/utils/extractText';
 import Stream from 'flarum/common/utils/Stream';
 import NickNameModal from './components/NicknameModal';
 
-app.initializers.add('flarum/nicknames', () => {
-  User.prototype.canEditNickname = Model.attribute('canEditNickname');
+export { default as extend } from './extend';
 
+app.initializers.add('flarum/nicknames', () => {
   extend(SettingsPage.prototype, 'accountItems', function (items) {
     if (app.forum.attribute('displayNameDriver') !== 'nickname') return;
 

extensions/nicknames/js/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  // 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/**/*", "../../../framework/core/js/dist-typings/@types/**/*", "@types/**/*"],
+  "compilerOptions": {
+    // This will output typings to `dist-typings`
+    "declarationDir": "./dist-typings",
+    "paths": {
+      "flarum/*": ["../../../framework/core/js/dist-typings/*"],
+      // TODO: remove after export registry system implemented
+      // Without this, the old-style `@flarum/core` import is resolved to
+      // source code in flarum/core instead of the dist typings.
+      // This causes an inaccurate "duplicate export" error.
+      "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"],
+    }
+  }
+}

extensions/nicknames/src/NicknameFullTextGambit.php

@@ -58,5 +58,7 @@ class NicknameFullTextGambit implements GambitInterface
                 'id',
                 $this->getUserSearchSubQuery($searchValue)
             );
+
+        return true;
     }
 }

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

@@ -17,7 +17,7 @@ export default class ControlSection extends Component<ComponentAttrs> {
       <div className="ExtensionPage-permissions PackageManager-controlSection">
         <div className="ExtensionPage-permissions-header">
           <div className="container">
-            <h2 className="ExtensionTitle">{app.translator.trans('flarum-package-manager.admin.sections.control.title')}</h2>
+            <h1 className="ExtensionTitle">{app.translator.trans('flarum-package-manager.admin.sections.control.title')}</h1>
           </div>
         </div>
         <div className="container">

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

@@ -32,7 +32,7 @@ export default class QueueSection extends Component<{}> {
       <section id="PackageManager-queueSection" className="ExtensionPage-permissions PackageManager-queueSection">
         <div className="ExtensionPage-permissions-header PackageManager-queueSection-header">
           <div className="container">
-            <h2 className="ExtensionTitle">{app.translator.trans('flarum-package-manager.admin.sections.queue.title')}</h2>
+            <h1 className="ExtensionTitle">{app.translator.trans('flarum-package-manager.admin.sections.queue.title')}</h1>
             <Button
               className="Button Button--icon"
               icon="fas fa-sync-alt"

extensions/package-manager/src/Api/Controller/ListTasksController.php

@@ -58,7 +58,7 @@ class ListTasksController extends AbstractListController
 
         $total = $this->repository->query()->count();
 
-        $document->addMeta('total', $total);
+        $document->addMeta('total', (string) $total);
 
         $document->addPaginationLinks(
             $this->url->to('api')->route('package-manager.tasks.index'),

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

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * For detailed copyright and license information, please view the
+ * LICENSE file that was distributed with this source code.
+ */
+
+namespace Flarum\PackageManager\Command;
+
+use Flarum\PackageManager\Task\Task;
+
+abstract class AbstractActionCommand
+{
+    /**
+     * @var Task|null
+     */
+    public $task = null;
+
+    /**
+     * @var string|null
+     */
+    public $package = null;
+
+    abstract public function getOperationName(): string;
+}

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

@@ -1,15 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * For detailed copyright and license information, please view the
- * LICENSE file that was distributed with this source code.
- */
-
-namespace Flarum\PackageManager\Command;
-
-interface BusinessCommandInterface
-{
-    public function getOperationName(): string;
-}

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

@@ -12,13 +12,8 @@ namespace Flarum\PackageManager\Command;
 use Flarum\PackageManager\Task\Task;
 use Flarum\User\User;
 
-class CheckForUpdates implements BusinessCommandInterface
+class CheckForUpdates extends AbstractActionCommand
 {
-    /**
-     * @var Task
-     */
-    public $task = null;
-
     /**
      * @var \Flarum\User\User
      */

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

@@ -12,13 +12,8 @@ namespace Flarum\PackageManager\Command;
 use Flarum\PackageManager\Task\Task;
 use Flarum\User\User;
 
-class GlobalUpdate implements BusinessCommandInterface
+class GlobalUpdate extends AbstractActionCommand
 {
-    /**
-     * @var Task
-     */
-    public $task = null;
-
     /**
      * @var \Flarum\User\User
      */

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

@@ -12,13 +12,8 @@ namespace Flarum\PackageManager\Command;
 use Flarum\PackageManager\Task\Task;
 use Flarum\User\User;
 
-class MajorUpdate implements BusinessCommandInterface
+class MajorUpdate extends AbstractActionCommand
 {
-    /**
-     * @var Task
-     */
-    public $task = null;
-
     /**
      * @var \Flarum\User\User
      */

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

@@ -12,13 +12,8 @@ namespace Flarum\PackageManager\Command;
 use Flarum\PackageManager\Task\Task;
 use Flarum\User\User;
 
-class MinorUpdate implements BusinessCommandInterface
+class MinorUpdate extends AbstractActionCommand
 {
-    /**
-     * @var Task
-     */
-    public $task = null;
-
     /**
      * @var \Flarum\User\User
      */

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

@@ -12,13 +12,8 @@ namespace Flarum\PackageManager\Command;
 use Flarum\PackageManager\Task\Task;
 use Flarum\User\User;
 
-class RemoveExtension implements BusinessCommandInterface
+class RemoveExtension extends AbstractActionCommand
 {
-    /**
-     * @var Task
-     */
-    public $task = null;
-
     /**
      * @var User
      */

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

@@ -12,13 +12,8 @@ namespace Flarum\PackageManager\Command;
 use Flarum\PackageManager\Task\Task;
 use Flarum\User\User;
 
-class RequireExtension implements BusinessCommandInterface
+class RequireExtension extends AbstractActionCommand
 {
-    /**
-     * @var Task
-     */
-    public $task = null;
-
     /**
      * @var User
      */

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

@@ -12,13 +12,8 @@ namespace Flarum\PackageManager\Command;
 use Flarum\PackageManager\Task\Task;
 use Flarum\User\User;
 
-class UpdateExtension implements BusinessCommandInterface
+class UpdateExtension extends AbstractActionCommand
 {
-    /**
-     * @var Task
-     */
-    public $task = null;
-
     /**
      * @var User
      */

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

@@ -12,13 +12,8 @@ namespace Flarum\PackageManager\Command;
 use Flarum\PackageManager\Task\Task;
 use Flarum\User\User;
 
-class WhyNot implements BusinessCommandInterface
+class WhyNot extends AbstractActionCommand
 {
-    /**
-     * @var Task
-     */
-    public $task = null;
-
     /**
      * @var User
      */

extensions/package-manager/src/Composer/ComposerAdapter.php

@@ -60,6 +60,7 @@ class ComposerAdapter
         $exitCode = $this->application->run($input, $this->output);
         chdir($currDir);
 
+        // @phpstan-ignore-next-line
         $command = $input->__toString();
         $output = $this->output->fetch();
 

extensions/package-manager/src/Job/ComposerCommandJob.php

@@ -10,7 +10,7 @@
 namespace Flarum\PackageManager\Job;
 
 use Flarum\Bus\Dispatcher;
-use Flarum\PackageManager\Command\BusinessCommandInterface;
+use Flarum\PackageManager\Command\AbstractActionCommand;
 use Flarum\PackageManager\Composer\ComposerAdapter;
 use Flarum\Queue\AbstractJob;
 use Illuminate\Queue\Middleware\WithoutOverlapping;
@@ -19,7 +19,7 @@ use Throwable;
 class ComposerCommandJob extends AbstractJob
 {
     /**
-     * @var BusinessCommandInterface
+     * @var AbstractActionCommand
      */
     protected $command;
 
@@ -28,7 +28,7 @@ class ComposerCommandJob extends AbstractJob
      */
     protected $phpVersion;
 
-    public function __construct(BusinessCommandInterface $command, string $phpVersion)
+    public function __construct(AbstractActionCommand $command, string $phpVersion)
     {
         $this->command = $command;
         $this->phpVersion = $phpVersion;

extensions/package-manager/src/Job/Dispatcher.php

@@ -10,7 +10,7 @@
 namespace Flarum\PackageManager\Job;
 
 use Flarum\Bus\Dispatcher as Bus;
-use Flarum\PackageManager\Command\BusinessCommandInterface;
+use Flarum\PackageManager\Command\AbstractActionCommand;
 use Flarum\PackageManager\Task\Task;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Contracts\Queue\Queue;
@@ -63,7 +63,7 @@ class Dispatcher
         return $this;
     }
 
-    public function dispatch(BusinessCommandInterface $command): DispatcherResponse
+    public function dispatch(AbstractActionCommand $command): DispatcherResponse
     {
         $queueJobs = ($this->runSyncOverride === false) || ($this->runSyncOverride !== true && $this->settings->get('flarum-package-manager.queue_jobs'));
 

extensions/package-manager/src/Settings/LastUpdateRun.php

@@ -26,7 +26,7 @@ class LastUpdateRun implements JsonSetting
     protected $data;
 
     /**
-     * @var {'major'|'minor'|'global'}
+     * @var string|null
      */
     protected $activeUpdate;
 

extensions/package-manager/src/Task/Task.php

@@ -13,16 +13,16 @@ use Carbon\Carbon;
 use Flarum\Database\AbstractModel;
 
 /**
- * @property int id
- * @property int status
- * @property string operation
- * @property string command
- * @property string package
- * @property string output
- * @property Carbon created_at
- * @property Carbon started_at
- * @property Carbon finished_at
- * @property int peak_memory_used
+ * @property int $id
+ * @property int $status
+ * @property string $operation
+ * @property string $command
+ * @property string $package
+ * @property string $output
+ * @property Carbon $created_at
+ * @property Carbon $started_at
+ * @property Carbon $finished_at
+ * @property float $peak_memory_used
  */
 class Task extends AbstractModel
 {

extensions/pusher/src/Api/Controller/AuthController.php

@@ -48,6 +48,7 @@ class AuthController implements RequestHandlerInterface
                 $this->settings->get('flarum-pusher.app_key'),
                 $this->settings->get('flarum-pusher.app_secret'),
                 $this->settings->get('flarum-pusher.app_id'),
+                // @phpstan-ignore-next-line
                 ['cluster' => $this->settings->get('flarum-pusher.app_cluster')]
             );
 

extensions/pusher/src/Listener/PushNewPost.php

@@ -9,6 +9,7 @@
 
 namespace Flarum\Pusher\Listener;
 
+use Flarum\Extension\ExtensionManager;
 use Flarum\Post\Event\Posted;
 use Flarum\User\Guest;
 use Flarum\User\User;
@@ -22,9 +23,15 @@ class PushNewPost
      */
     protected $pusher;
 
-    public function __construct(Pusher $pusher)
+    /**
+     * @var ExtensionManager
+     */
+    protected $extensions;
+
+    public function __construct(Pusher $pusher, ExtensionManager $extensions)
     {
         $this->pusher = $pusher;
+        $this->extensions = $extensions;
     }
 
     public function handle(Posted $event)
@@ -43,6 +50,7 @@ class PushNewPost
                 return;
             }
 
+            // @phpstan-ignore-next-line
             foreach ($response->channels as $name => $channel) {
                 $userId = Str::after($name, 'private-user');
 
@@ -53,7 +61,7 @@ class PushNewPost
         }
 
         if (count($channels)) {
-            $tags = $event->post->discussion->tags;
+            $tags = $this->extensions->isEnabled('flarum-tags') ? $event->post->discussion->tags : null;
 
             $this->pusher->trigger($channels, 'newPost', [
                 'postId' => $event->post->id,

extensions/pusher/src/Provider/PusherProvider.php

@@ -29,6 +29,7 @@ class PusherProvider extends AbstractServiceProvider
                 $settings->get('flarum-pusher.app_key'),
                 $settings->get('flarum-pusher.app_secret'),
                 $settings->get('flarum-pusher.app_id'),
+                // @phpstan-ignore-next-line
                 $options
             );
         });

extensions/sticky/extend.php

@@ -9,6 +9,7 @@
 
 use Flarum\Api\Controller\ListDiscussionsController;
 use Flarum\Api\Serializer\DiscussionSerializer;
+use Flarum\Discussion\Discussion;
 use Flarum\Discussion\Event\Saving;
 use Flarum\Discussion\Filter\DiscussionFilterer;
 use Flarum\Discussion\Search\DiscussionSearcher;
@@ -26,6 +27,9 @@ return [
         ->js(__DIR__.'/js/dist/forum.js')
         ->css(__DIR__.'/less/forum.less'),
 
+    (new Extend\Model(Discussion::class))
+        ->cast('is_sticky', 'bool'),
+
     (new Extend\Post())
         ->type(DiscussionStickiedPost::class),
 

extensions/sticky/js/dist/forum.js

@@ -1,2 +1,2 @@
-(()=>{var t={n:o=>{var s=o&&o.__esModule?()=>o.default:()=>o;return t.d(s,{a:s}),s},d:(o,s)=>{for(var n in s)t.o(s,n)&&!t.o(o,n)&&Object.defineProperty(o,n,{enumerable:!0,get:s[n]})},o:(t,o)=>Object.prototype.hasOwnProperty.call(t,o),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},o={};(()=>{"use strict";t.r(o);const s=flarum.core.compat["forum/app"];var n=t.n(s);const c=flarum.core.compat["common/Model"];var r=t.n(c);const e=flarum.core.compat["common/models/Discussion"];var i=t.n(e);function a(t,o){return a=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,o){return t.__proto__=o,t},a(t,o)}const u=flarum.core.compat["forum/components/EventPost"];var p=function(t){var o,s;function n(){return t.apply(this,arguments)||this}s=t,(o=n).prototype=Object.create(s.prototype),o.prototype.constructor=o,a(o,s);var c=n.prototype;return c.icon=function(){return"fas fa-thumbtack"},c.descriptionKey=function(){return this.attrs.post.content().sticky?"flarum-sticky.forum.post_stream.discussion_stickied_text":"flarum-sticky.forum.post_stream.discussion_unstickied_text"},n}(t.n(u)());const f=flarum.core.compat["common/extend"],l=flarum.core.compat["common/components/Badge"];var d=t.n(l);const y=flarum.core.compat["forum/utils/DiscussionControls"];var k=t.n(y);const v=flarum.core.compat["forum/components/DiscussionPage"];var b=t.n(v);const h=flarum.core.compat["common/components/Button"];var _=t.n(h);const S=flarum.core.compat["forum/states/DiscussionListState"];var P=t.n(S);const g=flarum.core.compat["forum/components/DiscussionListItem"];var x=t.n(g);const O=flarum.core.compat["forum/components/IndexPage"];var j=t.n(O);const D=flarum.core.compat["common/utils/string"],I=flarum.core.compat["common/utils/classList"];var L=t.n(I);n().initializers.add("flarum-sticky",(function(){n().postComponents.discussionStickied=p,i().prototype.isSticky=r().attribute("isSticky"),i().prototype.canSticky=r().attribute("canSticky"),(0,f.extend)(i().prototype,"badges",(function(t){this.isSticky()&&t.add("sticky",d().component({type:"sticky",label:n().translator.trans("flarum-sticky.forum.badge.sticky_tooltip"),icon:"fas fa-thumbtack"}),10)})),(0,f.extend)(k(),"moderationControls",(function(t,o){o.canSticky()&&t.add("sticky",_().component({icon:"fas fa-thumbtack",onclick:this.stickyAction.bind(o)},n().translator.trans(o.isSticky()?"flarum-sticky.forum.discussion_controls.unsticky_button":"flarum-sticky.forum.discussion_controls.sticky_button")))})),k().stickyAction=function(){this.save({isSticky:!this.isSticky()}).then((function(){n().current.matches(b())&&n().current.get("stream").update(),m.redraw()}))},(0,f.extend)(P().prototype,"requestParams",(function(t){(n().current.matches(j())||n().current.matches(b()))&&t.include.push("firstPost")})),(0,f.extend)(x().prototype,"infoItems",(function(t){var o=this.attrs.discussion;if(o.isSticky()&&!this.attrs.params.q&&!o.lastReadPostNumber()){var s=o.firstPost();if(s){var n=(0,D.truncate)(s.contentPlain(),175);t.add("excerpt",m("div",null,n),-100)}}})),(0,f.extend)(x().prototype,"elementAttrs",(function(t){this.attrs.discussion.isSticky()&&(t.className=L()(t.className,"DiscussionListItem--sticky"))}))}))})(),module.exports=o})();
+(()=>{var t={n:o=>{var s=o&&o.__esModule?()=>o.default:()=>o;return t.d(s,{a:s}),s},d:(o,s)=>{for(var n in s)t.o(s,n)&&!t.o(o,n)&&Object.defineProperty(o,n,{enumerable:!0,get:s[n]})},o:(t,o)=>Object.prototype.hasOwnProperty.call(t,o),r:t=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})}},o={};(()=>{"use strict";t.r(o),t.d(o,{extend:()=>L});const s=flarum.core.compat["forum/app"];var n=t.n(s);const e=flarum.core.compat["common/extend"],r=flarum.core.compat["common/models/Discussion"];var c=t.n(r);const i=flarum.core.compat["common/components/Badge"];var a=t.n(i);const u=flarum.core.compat["forum/utils/DiscussionControls"];var f=t.n(u);const p=flarum.core.compat["forum/components/DiscussionPage"];var l=t.n(p);const d=flarum.core.compat["common/components/Button"];var y=t.n(d);const k=flarum.core.compat["forum/states/DiscussionListState"];var v=t.n(k);const b=flarum.core.compat["forum/components/DiscussionListItem"];var h=t.n(b);const _=flarum.core.compat["forum/components/IndexPage"];var S=t.n(_);const P=flarum.core.compat["common/utils/string"],x=flarum.core.compat["common/utils/classList"];var g=t.n(x);const O=flarum.core.compat["common/extenders"];var j=t.n(O);function D(t,o){return D=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,o){return t.__proto__=o,t},D(t,o)}const w=flarum.core.compat["forum/components/EventPost"];var I=function(t){var o,s;function n(){return t.apply(this,arguments)||this}s=t,(o=n).prototype=Object.create(s.prototype),o.prototype.constructor=o,D(o,s);var e=n.prototype;return e.icon=function(){return"fas fa-thumbtack"},e.descriptionKey=function(){return this.attrs.post.content().sticky?"flarum-sticky.forum.post_stream.discussion_stickied_text":"flarum-sticky.forum.post_stream.discussion_unstickied_text"},n}(t.n(w)());const L=[(new(j().PostTypes)).add("discussionStickied",I),new(j().Model)(c()).attribute("isSticky").attribute("canSticky")];n().initializers.add("flarum-sticky",(function(){(0,e.extend)(c().prototype,"badges",(function(t){this.isSticky()&&t.add("sticky",a().component({type:"sticky",label:n().translator.trans("flarum-sticky.forum.badge.sticky_tooltip"),icon:"fas fa-thumbtack"}),10)})),(0,e.extend)(f(),"moderationControls",(function(t,o){o.canSticky()&&t.add("sticky",y().component({icon:"fas fa-thumbtack",onclick:this.stickyAction.bind(o)},n().translator.trans(o.isSticky()?"flarum-sticky.forum.discussion_controls.unsticky_button":"flarum-sticky.forum.discussion_controls.sticky_button")))})),f().stickyAction=function(){this.save({isSticky:!this.isSticky()}).then((function(){n().current.matches(l())&&n().current.get("stream").update(),m.redraw()}))},(0,e.extend)(v().prototype,"requestParams",(function(t){(n().current.matches(S())||n().current.matches(l()))&&t.include.push("firstPost")})),(0,e.extend)(h().prototype,"infoItems",(function(t){var o=this.attrs.discussion;if(o.isSticky()&&!this.attrs.params.q&&!o.lastReadPostNumber()){var s=o.firstPost();if(s){var n=(0,P.truncate)(s.contentPlain(),175);t.add("excerpt",m("div",null,n),-100)}}})),(0,e.extend)(h().prototype,"elementAttrs",(function(t){this.attrs.discussion.isSticky()&&(t.className=g()(t.className,"DiscussionListItem--sticky"))}))}))})(),module.exports=o})();
 //# sourceMappingURL=forum.js.map

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

@@ -0,0 +1,12 @@
+import Extend from 'flarum/common/extenders';
+import Discussion from 'flarum/common/models/Discussion';
+import DiscussionStickiedPost from './components/DiscussionStickiedPost';
+
+export default [
+  new Extend.PostTypes() //
+    .add('discussionStickied', DiscussionStickiedPost),
+
+  new Extend.Model(Discussion) //
+    .attribute<boolean>('isSticky')
+    .attribute<boolean>('canSticky'),
+];

extensions/sticky/js/src/forum/index.js

@@ -1,19 +1,13 @@
 import app from 'flarum/forum/app';
-import Model from 'flarum/common/Model';
-import Discussion from 'flarum/common/models/Discussion';
 
-import DiscussionStickiedPost from './components/DiscussionStickiedPost';
 import addStickyBadge from './addStickyBadge';
 import addStickyControl from './addStickyControl';
 import addStickyExcerpt from './addStickyExcerpt';
 import addStickyClass from './addStickyClass';
 
+export { default as extend } from './extend';
+
 app.initializers.add('flarum-sticky', () => {
-  app.postComponents.discussionStickied = DiscussionStickiedPost;
-
-  Discussion.prototype.isSticky = Model.attribute('isSticky');
-  Discussion.prototype.canSticky = Model.attribute('canSticky');
-
   addStickyBadge();
   addStickyControl();
   addStickyExcerpt();

extensions/sticky/js/tsconfig.json

@@ -0,0 +1,20 @@
+{
+  // 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/**/*", "../../../framework/core/js/dist-typings/@types/**/*", "@types/**/*"],
+  "compilerOptions": {
+    // This will output typings to `dist-typings`
+    "declarationDir": "./dist-typings",
+    "paths": {
+      "flarum/*": ["../../../framework/core/js/dist-typings/*"],
+      // TODO: remove after export registry system implemented
+      // Without this, the old-style `@flarum/core` import is resolved to
+      // source code in flarum/core instead of the dist typings.
+      // This causes an inaccurate "duplicate export" error.
+      "@flarum/core/*": ["../../../framework/core/js/dist-typings/*"],
+    }
+  }
+}

extensions/sticky/locale/en.yml

@@ -25,8 +25,8 @@ flarum-sticky:
 
     # These translations are displayed between posts in the post stream.
     post_stream:
-      discussion_stickied_text: "{username} stickied the discussion."
-      discussion_unstickied_text: "{username} unstickied the discussion."
+      discussion_stickied_text: "{username} stickied the discussion {time}."
+      discussion_unstickied_text: "{username} unstickied the discussion {time}."
 
   ##
   # REUSED TRANSLATIONS - These keys should not be used directly in code!

extensions/sticky/src/PinStickiedDiscussionsToTop.php

@@ -43,12 +43,12 @@ class PinStickiedDiscussionsToTop
             // reorder the unread ones up to the top.
             $sticky = clone $query;
             $sticky->where('is_sticky', true);
-            $sticky->orders = null;
+            unset($sticky->orders);
 
             $query->union($sticky);
 
             $read = $query->newQuery()
-                ->selectRaw(1)
+                ->selectRaw('1')
                 ->from('discussion_user as sticky')
                 ->whereColumn('sticky.discussion_id', 'id')
                 ->where('sticky.user_id', '=', $filterState->getActor()->id)
@@ -58,14 +58,14 @@ class PinStickiedDiscussionsToTop
             // argument in orderByRaw) for now due to a bug in Laravel which
             // would add the bindings in the wrong order.
             $query->orderByRaw('is_sticky and not exists ('.$read->toSql().') and last_posted_at > ? desc')
-                ->addBinding(array_merge($read->getBindings(), [$filterState->getActor()->read_time ?: 0]), 'union');
+                ->addBinding(array_merge($read->getBindings(), [$filterState->getActor()->marked_all_as_read_at ?: 0]), 'union');
 
             $query->unionOrders = array_merge($query->unionOrders, $query->orders);
             $query->unionLimit = $query->limit;
             $query->unionOffset = $query->offset;
 
             $query->limit = $sticky->limit = $query->offset + $query->limit;
-            $query->offset = $sticky->offset = null;
+            unset($query->offset, $sticky->offset);
         }
     }
 }