mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 23:17:43 +02:00
Code Issues Releases Wiki Activity

perf: speed up post creation time (#3808)

Browse Source 
* chore: drop unused visibility checking in notif syncer

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

* perf: eager load parsed mentions

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

* perf: eager load some relations needed for visibility checking

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

* perf: trigger mentions notifications in a queueable job

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

* Apply fixes from StyleCI

* fix: broken tag mentions

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

---------

Signed-off-by: Sami Mazouz <sychocouldy@gmail.com>
Co-authored-by: StyleCI Bot <bot@styleci.io>
This commit is contained in:
Sami Mazouz
2023-04-30 10:10:31 +01:00
committed by GitHub
parent 7298ccb301
commit 919c3bb770
8 changed files with 278 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Formatter/Formatter.php
View File

@@ -85,7 +85,7 @@ class Formatter
* @param string $text
* @param mixed $context
* @param User|null $user
* @return string
* @return string the parsed XML
*/
public function parse($text, $context = null, User $user = null)
{

19
framework/core/src/Notification/NotificationSyncer.php
View File

@@ -9,7 +9,6 @@
namespace Flarum\Notification;
use Flarum\Database\AbstractModel;
use Flarum\Notification\Blueprint\BlueprintInterface;
use Flarum\Notification\Driver\NotificationDriverInterface;
use Flarum\User\User;
@@ -75,12 +74,6 @@ class NotificationSyncer
continue;
}
// To add access checking on notification subjects, we first attempt
// to load visible subjects to this user.
if (! $this->userCanSeeSubject($user, $blueprint->getSubject())) {
continue;
}
$existing = $toDelete->first(function ($notification) use ($user) {
return $notification->user_id === $user->id;
});
@@ -168,18 +161,6 @@ class NotificationSyncer
Notification::whereIn('id', $ids)->update(['is_deleted' => $isDeleted]);
}
/**
* Check access to determine if the recipient is allowed to receive the notification.
*/
protected function userCanSeeSubject(User $user, ?AbstractModel $subject): bool
{
if ($subject && method_exists($subject, 'registerVisibilityScoper')) {
return (bool) $subject->newQuery()->whereVisibleTo($user)->find($subject->id);
}
return true;
}
/**
* Adds a notification driver to the list.
*

50
framework/core/tests/integration/notification/NotificationSyncerTest.php
View File

@@ -10,15 +10,11 @@
namespace Flarum\Tests\integration\notification;
use Carbon\Carbon;
use Flarum\Api\Serializer\BasicDiscussionSerializer;
use Flarum\Api\Serializer\BasicPostSerializer;
use Flarum\Database\AbstractModel;
use Flarum\Discussion\Discussion;
use Flarum\Extend;
use Flarum\Notification\Blueprint\BlueprintInterface;
use Flarum\Notification\Notification;
use Flarum\Notification\NotificationSyncer;
use Flarum\Post\Post;
use Flarum\Testing\integration\RetrievesAuthorizedUsers;
use Flarum\Testing\integration\TestCase;
use Flarum\User\User;
@@ -50,35 +46,6 @@ class NotificationSyncerTest extends TestCase
]);
}
/**
* @dataProvider visibleSubjectsProvider
* @param class-string<AbstractModel> $subjectClass
* @test
*/
public function can_receive_notification_for_visible_subjects(string $subjectClass, int $subjectId, string $serializer)
{
$this->expect_notification_count_from_sending_notification_type_with_subject(
2,
$subjectClass,
$subjectId,
$serializer
);
}
/**
* @dataProvider invisibleSubjectsProvider
* @test
*/
public function cannot_receive_notification_for_restricted_subjects(string $subjectClass, int $subjectId, string $serializer)
{
$this->expect_notification_count_from_sending_notification_type_with_subject(
0,
$subjectClass,
$subjectId,
$serializer
);
}
/**
* @param class-string<AbstractModel> $subjectClass
*/
@@ -112,23 +79,6 @@ class NotificationSyncerTest extends TestCase
->count()
);
}
public function visibleSubjectsProvider()
{
return [
[Post::class, 1, BasicPostSerializer::class],
[Discussion::class, 1, BasicDiscussionSerializer::class],
];
}
public function invisibleSubjectsProvider()
{
return [
[Post::class, 2, BasicPostSerializer::class],
[Discussion::class, 2, BasicDiscussionSerializer::class],
[Post::class, 3, BasicPostSerializer::class],
];
}
}
class CustomNotificationType implements BlueprintInterface