perf: store message mentions for better performance (#4079)

flarum · Oct 19, 2024 · e9be7b9 · e9be7b9
1 parent 8742790
commit e9be7b9
Show file tree

Hide file tree

Showing 23 changed files with 272 additions and 45 deletions.
diff --git a/extensions/mentions/src/Formatter/FormatGroupMentions.php b/extensions/mentions/src/Formatter/FormatGroupMentions.php
@@ -9,9 +9,9 @@
 
 namespace Flarum\Mentions\Formatter;
 
+use Flarum\Database\AbstractModel;
 use Flarum\Group\Group;
 use Flarum\Locale\TranslatorInterface;
-use Flarum\Post\Post;
 use s9e\TextFormatter\Renderer;
 use s9e\TextFormatter\Utils;
 
@@ -25,8 +25,8 @@ public function __construct(
     public function __invoke(Renderer $renderer, mixed $context, string $xml): string
     {
         return Utils::replaceAttributes($xml, 'GROUPMENTION', function ($attributes) use ($context) {
-            $group = (($context && isset($context->getRelations()['mentionsGroups'])) || $context instanceof Post)
-                ? $context->mentionsGroups->find($attributes['id'])
+            $group = ($context instanceof AbstractModel && $context->isRelation('mentionsGroups'))
+                ? $context->mentionsGroups->find($attributes['id']) // @phpstan-ignore-line
                 : Group::find($attributes['id']);
 
             if ($group) {

diff --git a/extensions/mentions/src/Formatter/FormatPostMentions.php b/extensions/mentions/src/Formatter/FormatPostMentions.php
@@ -9,11 +9,11 @@
 
 namespace Flarum\Mentions\Formatter;
 
+use Flarum\Database\AbstractModel;
 use Flarum\Discussion\Discussion;
 use Flarum\Http\SlugManager;
 use Flarum\Locale\TranslatorInterface;
 use Flarum\Post\Post;
-use Psr\Http\Message\ServerRequestInterface as Request;
 use s9e\TextFormatter\Renderer;
 use s9e\TextFormatter\Utils;
 
@@ -27,18 +27,12 @@ public function __construct(
 
     /**
      * Configure rendering for post mentions.
-     *
-     * @param \s9e\TextFormatter\Renderer $renderer
-     * @param mixed $context
-     * @param string $xml
-     * @param \Psr\Http\Message\ServerRequestInterface|null $request
-     * @return string $xml to be rendered
      */
-    public function __invoke(Renderer $renderer, $context, $xml, Request $request = null)
+    public function __invoke(Renderer $renderer, mixed $context, string $xml): string
     {
         return Utils::replaceAttributes($xml, 'POSTMENTION', function ($attributes) use ($context) {
-            $post = (($context && isset($context->getRelations()['mentionsPosts'])) || $context instanceof Post)
-                ? $context->mentionsPosts->find($attributes['id'])
+            $post = ($context instanceof AbstractModel && $context->isRelation('mentionsPosts'))
+                ? $context->mentionsPosts->find($attributes['id']) // @phpstan-ignore-line
                 : Post::find($attributes['id']);
 
             if ($post && $post->user) {

diff --git a/extensions/mentions/src/Formatter/FormatTagMentions.php b/extensions/mentions/src/Formatter/FormatTagMentions.php
@@ -9,20 +9,20 @@
 
 namespace Flarum\Mentions\Formatter;
 
-use Flarum\Post\Post;
+use Flarum\Database\AbstractModel;
 use Flarum\Tags\Tag;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use s9e\TextFormatter\Renderer;
 use s9e\TextFormatter\Utils;
 
 class FormatTagMentions
 {
-    public function __invoke(Renderer $renderer, mixed $context, ?string $xml, Request $request = null): string
+    public function __invoke(Renderer $renderer, mixed $context, string $xml, Request $request = null): string
     {
         return Utils::replaceAttributes($xml, 'TAGMENTION', function ($attributes) use ($context) {
             /** @var Tag|null $tag */
-            $tag = (($context && isset($context->getRelations()['mentionsTags'])) || $context instanceof Post)
-                ? $context->mentionsTags->find($attributes['id'])
+            $tag = ($context instanceof AbstractModel && $context->isRelation('mentionsTags'))
+                ? $context->mentionsTags->find($attributes['id']) // @phpstan-ignore-line
                 : Tag::query()->find($attributes['id']);
 
             if ($tag) {

diff --git a/extensions/mentions/src/Formatter/FormatUserMentions.php b/extensions/mentions/src/Formatter/FormatUserMentions.php
@@ -9,9 +9,9 @@
 
 namespace Flarum\Mentions\Formatter;
 
+use Flarum\Database\AbstractModel;
 use Flarum\Http\SlugManager;
 use Flarum\Locale\TranslatorInterface;
-use Flarum\Post\Post;
 use Flarum\User\User;
 use s9e\TextFormatter\Renderer;
 use s9e\TextFormatter\Utils;
@@ -27,8 +27,8 @@ public function __construct(
     public function __invoke(Renderer $renderer, mixed $context, string $xml): string
     {
         return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) {
-            $user = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
-                ? $context->mentionsUsers->find($attributes['id'])
+            $user = ($context instanceof AbstractModel && $context->isRelation('mentionsUsers'))
+                ? $context->mentionsUsers->find($attributes['id']) // @phpstan-ignore-line
                 : User::find($attributes['id']);
 
             $attributes['deleted'] = false;

diff --git a/extensions/mentions/src/Formatter/UnparsePostMentions.php b/extensions/mentions/src/Formatter/UnparsePostMentions.php
@@ -9,6 +9,7 @@
 
 namespace Flarum\Mentions\Formatter;
 
+use Flarum\Database\AbstractModel;
 use Flarum\Locale\TranslatorInterface;
 use Flarum\Post\Post;
 use s9e\TextFormatter\Utils;
@@ -33,8 +34,8 @@ public function __invoke(mixed $context, string $xml): string
     protected function updatePostMentionTags(mixed $context, string $xml): string
     {
         return Utils::replaceAttributes($xml, 'POSTMENTION', function ($attributes) use ($context) {
-            $post = (($context && isset($context->getRelations()['mentionsPosts'])) || $context instanceof Post)
-                ? $context->mentionsPosts->find($attributes['id'])
+            $post = ($context instanceof AbstractModel && $context->isRelation('mentionsPosts'))
+                ? $context->mentionsPosts->find($attributes['id']) // @phpstan-ignore-line
                 : Post::find($attributes['id']);
 
             if ($post && $post->user) {

diff --git a/extensions/mentions/src/Formatter/UnparseTagMentions.php b/extensions/mentions/src/Formatter/UnparseTagMentions.php
@@ -9,7 +9,7 @@
 
 namespace Flarum\Mentions\Formatter;
 
-use Flarum\Post\Post;
+use Flarum\Database\AbstractModel;
 use Flarum\Tags\Tag;
 use s9e\TextFormatter\Utils;
 
@@ -29,8 +29,8 @@ protected function updateTagMentionTags(mixed $context, string $xml): string
     {
         return Utils::replaceAttributes($xml, 'TAGMENTION', function (array $attributes) use ($context) {
             /** @var Tag|null $tag */
-            $tag = (($context && isset($context->getRelations()['mentionsTags'])) || $context instanceof Post)
-                ? $context->mentionsTags->find($attributes['id'])
+            $tag = ($context instanceof AbstractModel && $context->isRelation('mentionsTags'))
+                ? $context->mentionsTags->find($attributes['id']) // @phpstan-ignore-line
                 : Tag::query()->find($attributes['id']);
 
             if ($tag) {

diff --git a/extensions/mentions/src/Formatter/UnparseUserMentions.php b/extensions/mentions/src/Formatter/UnparseUserMentions.php
@@ -9,8 +9,8 @@
 
 namespace Flarum\Mentions\Formatter;
 
+use Flarum\Database\AbstractModel;
 use Flarum\Locale\TranslatorInterface;
-use Flarum\Post\Post;
 use Flarum\User\User;
 use s9e\TextFormatter\Utils;
 
@@ -34,8 +34,8 @@ public function __invoke(mixed $context, string $xml): string
     protected function updateUserMentionTags(mixed $context, string $xml): string
     {
         return Utils::replaceAttributes($xml, 'USERMENTION', function ($attributes) use ($context) {
-            $user = (($context && isset($context->getRelations()['mentionsUsers'])) || $context instanceof Post)
-                ? $context->mentionsUsers->find($attributes['id'])
+            $user = ($context instanceof AbstractModel && $context->isRelation('mentionsUsers'))
+                ? $context->mentionsUsers->find($attributes['id']) // @phpstan-ignore-line
                 : User::find($attributes['id']);
 
             $attributes['displayname'] = $user?->display_name ?? $this->translator->trans('core.lib.username.deleted_text');

diff --git a/extensions/messages/extend.php b/extensions/messages/extend.php
@@ -83,5 +83,7 @@
         ->type(Notification\MessageReceivedBlueprint::class, ['email']),
 
     (new Extend\Event())
-        ->listen(DialogMessage\Event\Created::class, Listener\SendNotificationWhenMessageSent::class),
+        ->listen(DialogMessage\Event\Created::class, Listener\SendNotificationWhenMessageSent::class)
+        ->listen(DialogMessage\Event\Created::class, Listener\UpdateMentionsMetadataWhenVisible::class)
+        ->listen(DialogMessage\Event\Updated::class, Listener\UpdateMentionsMetadataWhenVisible::class),
 ];
diff --git a/extensions/messages/js/src/forum/components/MessageComposer.tsx b/extensions/messages/js/src/forum/components/MessageComposer.tsx
@@ -134,7 +134,6 @@ export default class MessageComposer<CustomAttrs extends IMessageComposerAttrs =
       })
       .then((message) => {
         this.composer.hide();
-        // @todo: app.dialogs.refresh();
         // @ts-ignore
         m.route.set(app.route('dialog', { id: message.data.relationships!.dialog.data.id }));
         this.attrs.onsubmit?.(message);

diff --git a/extensions/messages/js/src/forum/components/MessageStream.tsx b/extensions/messages/js/src/forum/components/MessageStream.tsx
@@ -117,9 +117,8 @@ export default class MessageStream<CustomAttrs extends IDialogStreamAttrs = IDia
                   .load(() => import('./MessageComposer'), {
                     user: app.session.user,
                     replyingTo: this.attrs.dialog,
-                    onsubmit: (message: DialogMessage) => {
-                      this.attrs.state.push(message);
-                      setTimeout(() => this.scrollToBottom(), 50);
+                    onsubmit: () => {
+                      this.attrs.state.refresh().then(() => setTimeout(() => this.scrollToBottom(), 50));
                     },
                   })
                   .then(() => app.composer.show());

diff --git a/extensions/messages/migrations/2024_09_01_000000_create_dialogs_table.php b/extensions/messages/migrations/2024_09_01_000000_create_dialogs_table.php
@@ -13,9 +13,9 @@
 return Migration::createTable(
     'dialogs',
     function (Blueprint $table) {
-        $table->bigIncrements('id');
-        $table->unsignedBigInteger('first_message_id')->nullable();
-        $table->unsignedBigInteger('last_message_id')->nullable();
+        $table->increments('id');
+        $table->unsignedInteger('first_message_id')->nullable();
+        $table->unsignedInteger('last_message_id')->nullable();
         $table->dateTime('last_message_at')->nullable();
         $table->unsignedInteger('last_message_user_id')->nullable();
         $table->foreign('last_message_user_id')->references('id')->on('users')->nullOnDelete();

diff --git a/extensions/messages/migrations/2024_09_01_000001_create_dialog_messages_table.php b/extensions/messages/migrations/2024_09_01_000001_create_dialog_messages_table.php
@@ -13,8 +13,9 @@
 return Migration::createTable(
     'dialog_messages',
     function (Blueprint $table) {
-        $table->bigIncrements('id');
-        $table->foreignId('dialog_id')->constrained()->cascadeOnDelete();
+        $table->increments('id');
+        $table->unsignedInteger('dialog_id');
+        $table->foreign('dialog_id')->references('id')->on('dialogs')->cascadeOnDelete();
         $table->unsignedInteger('user_id')->nullable();
         $table->foreign('user_id')->references('id')->on('users')->cascadeOnDelete();
         $table->text('content');

diff --git a/extensions/messages/migrations/2024_09_01_000002_create_dialog_user_table.php b/extensions/messages/migrations/2024_09_01_000002_create_dialog_user_table.php
@@ -14,10 +14,11 @@
     'dialog_user',
     function (Blueprint $table) {
         $table->id();
-        $table->foreignId('dialog_id')->constrained()->cascadeOnDelete();
+        $table->unsignedInteger('dialog_id');
+        $table->foreign('dialog_id')->references('id')->on('dialogs')->cascadeOnDelete();
         $table->unsignedInteger('user_id');
         $table->dateTime('joined_at');
-        $table->unsignedBigInteger('last_read_message_id')->default(0);
+        $table->unsignedInteger('last_read_message_id')->default(0);
         $table->dateTime('last_read_at')->nullable();
         $table->foreign('user_id')->references('id')->on('users')->cascadeOnDelete();
     }

diff --git a/...sions/messages/migrations/2024_10_19_000000_create_dialog_message_mentions_user_table.php b/...sions/messages/migrations/2024_10_19_000000_create_dialog_message_mentions_user_table.php
@@ -0,0 +1,24 @@
+<?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.
+ */
+
+use Flarum\Database\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+return Migration::createTable(
+    'dialog_message_mentions_user',
+    function (Blueprint $table) {
+        $table->unsignedInteger('dialog_message_id');
+        $table->unsignedInteger('mentions_user_id');
+        $table->dateTime('created_at')->nullable()->useCurrent();
+
+        $table->primary(['dialog_message_id', 'mentions_user_id']);
+        $table->foreign('dialog_message_id')->references('id')->on('dialog_messages')->cascadeOnDelete();
+        $table->foreign('mentions_user_id')->references('id')->on('users')->cascadeOnDelete();
+    }
+);
diff --git a/...sions/messages/migrations/2024_10_19_000001_create_dialog_message_mentions_post_table.php b/...sions/messages/migrations/2024_10_19_000001_create_dialog_message_mentions_post_table.php
@@ -0,0 +1,24 @@
+<?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.
+ */
+
+use Flarum\Database\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+return Migration::createTable(
+    'dialog_message_mentions_post',
+    function (Blueprint $table) {
+        $table->unsignedInteger('dialog_message_id');
+        $table->unsignedInteger('mentions_post_id');
+        $table->dateTime('created_at')->nullable()->useCurrent();
+
+        $table->primary(['dialog_message_id', 'mentions_post_id']);
+        $table->foreign('dialog_message_id')->references('id')->on('dialog_messages')->cascadeOnDelete();
+        $table->foreign('mentions_post_id')->references('id')->on('posts')->cascadeOnDelete();
+    }
+);
diff --git a/...ions/messages/migrations/2024_10_19_000002_create_dialog_message_mentions_group_table.php b/...ions/messages/migrations/2024_10_19_000002_create_dialog_message_mentions_group_table.php
@@ -0,0 +1,24 @@
+<?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.
+ */
+
+use Flarum\Database\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+return Migration::createTable(
+    'dialog_message_mentions_group',
+    function (Blueprint $table) {
+        $table->unsignedInteger('dialog_message_id');
+        $table->unsignedInteger('mentions_group_id');
+        $table->dateTime('created_at')->nullable()->useCurrent();
+
+        $table->primary(['dialog_message_id', 'mentions_group_id']);
+        $table->foreign('dialog_message_id')->references('id')->on('dialog_messages')->cascadeOnDelete();
+        $table->foreign('mentions_group_id')->references('id')->on('groups')->cascadeOnDelete();
+    }
+);
diff --git a/...nsions/messages/migrations/2024_10_19_000002_create_dialog_message_mentions_tag_table.php b/...nsions/messages/migrations/2024_10_19_000002_create_dialog_message_mentions_tag_table.php
@@ -0,0 +1,24 @@
+<?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.
+ */
+
+use Flarum\Database\Migration;
+use Illuminate\Database\Schema\Blueprint;
+
+return Migration::createTable(
+    'dialog_message_mentions_tag',
+    function (Blueprint $table) {
+        $table->unsignedInteger('dialog_message_id');
+        $table->unsignedInteger('mentions_tag_id');
+        $table->dateTime('created_at')->nullable()->useCurrent();
+
+        $table->primary(['dialog_message_id', 'mentions_tag_id']);
+        $table->foreign('dialog_message_id')->references('id')->on('dialog_messages')->cascadeOnDelete();
+        $table->foreign('mentions_tag_id')->references('id')->on('tags')->cascadeOnDelete();
+    }
+);
diff --git a/extensions/messages/src/Api/Resource/DialogMessageResource.php b/extensions/messages/src/Api/Resource/DialogMessageResource.php
@@ -16,6 +16,7 @@
 use Flarum\Api\Schema;
 use Flarum\Api\Sort\SortColumn;
 use Flarum\Bus\Dispatcher;
+use Flarum\Extension\ExtensionManager;
 use Flarum\Foundation\ErrorHandling\LogReporter;
 use Flarum\Foundation\ValidationException;
 use Flarum\Locale\Translator;
@@ -36,6 +37,7 @@ public function __construct(
         protected Translator $translator,
         protected LogReporter $log,
         protected Dispatcher $bus,
+        protected ExtensionManager $extensions,
     ) {
     }
 
@@ -77,6 +79,20 @@ public function endpoints(): array
                 }),
             Endpoint\Index::make()
                 ->authenticated()
+                ->defaultInclude([
+                    'user',
+                    'mentionsUsers',
+                    'mentionsPosts',
+                    'mentionsGroups',
+                    'mentionsTags',
+                ])
+                ->eagerLoad(function () {
+                    if ($this->extensions->isEnabled('flarum-mentions')) {
+                        return ['mentionsUsers', 'mentionsPosts', 'mentionsGroups', 'mentionsTags'];
+                    }
+
+                    return [];
+                })
                 ->paginate(),
         ];
     }
@@ -126,6 +142,18 @@ public function fields(): array
                 ->includable()
                 ->writableOnCreate()
                 ->requiredOnCreateWithout(['attributes.users']),
+            Schema\Relationship\ToMany::make('mentionsUsers')
+                ->type('users')
+                ->includable(),
+            Schema\Relationship\ToMany::make('mentionsPosts')
+                ->type('posts')
+                ->includable(),
+            Schema\Relationship\ToMany::make('mentionsGroups')
+                ->type('groups')
+                ->includable(),
+            Schema\Relationship\ToMany::make('mentionsTags')
+                ->type('tags')
+                ->includable(),
 
         ];
     }